merge

clueSync/config.go

@@ -138,23 +138,16 @@ type (
 			UserName string `json:"user	Name"`
 			Password string `json:"password"`
 		} `json:"es"`
-<<<<<<< HEAD
-		AllocationCap int64             `json:"allocationCap"`
-		WarningValue  int64             `json:"warningValue"`
-		NameToMail    map[string]string `json:"nameToMail"`
-		ThawDay       int64             `json:"thawDay"`
-		ProductArr    []string          `json:"productArr"`
-		LoopType      int64             `json:"loopType"`
-=======
 		AllocationCap  int64             `json:"allocationCap"`
 		WarningValue   int64             `json:"warningValue"`
 		NameToMail     map[string]string `json:"nameToMail"`
 		ThawDay        int64             `json:"thawDay"`
+		ProductArr     []string          `json:"productArr"`
+		LoopType       int64             `json:"loopType"`
 		BigSaleTime    int64             `json:"bigSaleTime"`
 		BigOrderTime   string            `json:"bigOrderTime"`
 		MarketSaleTime int64             `json:"marketSaleTime"`
 		MarketSaleMail string            `json:"marketSaleMail"`
->>>>>>> master
 	}
 )
 

clueSync/main.go

@@ -113,14 +113,11 @@ func main() {
 	MgoLog = mongodb.NewMgoWithUser(cfg.MgoLog.Address, cfg.MgoLog.DbName, cfg.MgoLog.User, cfg.MgoLog.Password, cfg.MgoLog.DbSize)
 	MgoQyxy = mongodb.NewMgoWithUser(cfg.MgoQyxy.Address, cfg.MgoQyxy.DbName, cfg.MgoQyxy.User, cfg.MgoQyxy.Password, cfg.MgoQyxy.DbSize)
 	InitArea()
-<<<<<<< HEAD
 	InitProduct(cfg.ProductArr)
 	//kcSync() //移交客成
 	rderAcceptance()
-=======
 	go kcSync()     //移交客成
 	go refundAuto() //客成移交销售
->>>>>>> master
 	if *mode == 1 {
 		//30分钟一次
 		a := cron.New()