merge

clueSync/main.go

@@ -137,11 +137,6 @@ func main() {
 	MgoQyxy = mongodb.NewMgoWithUser(db.MgoQyxy.Address, db.MgoQyxy.DbName, db.MgoQyxy.User, db.MgoQyxy.Password, db.MgoQyxy.DbSize)
 	InitArea()
 	InitProduct(db.ProductArr)
-<<<<<<< HEAD
-	tagAllSync()
-	//activeUsers() //取关重新关注处理
-=======
->>>>>>> master
 	if *mode == 1 {
 		//30分钟一次
 		go p.VarTimeTask.RunInTimeLoop("30分钟定时任务", "", "", db.CornExp1, true, true, nil, func() {