Merge branch 'dev/v4.9.3_dx' of qmx/jy into release/v4.9.3

src/jfw/filter/anonymousUser.go

@@ -114,7 +114,11 @@ func ChanMonitor() {
 				upData = append(upData, data)
 			}
 			// 处理 100条时处理一次 saveChan 收到的数据
-			if count == 100 {
+			anonymousNumber := util.If(util.IntAll(config.Sysconfig["anonymousNumber"]) <= 0, 100, util.IntAll(config.Sysconfig["anonymousNumber"])).(int)
+			if count == anonymousNumber {
+				count = 0
+				tm := time.Now()
+				log.Println("开始批量操作匿名信息", len(saveData), len(upData))
 				if len(saveData) > 0 {
 					var ss []interface{}
 					for _, datum := range saveData {
@@ -122,6 +126,7 @@ func ChanMonitor() {
 							ss = append(ss, datum[s])
 						}
 					}
+					log.Println("批量插入是否异常", len(saveKey), len(ss))
 					public.BaseMysql.InsertBatch("anonymous_identity", saveKey, ss)
 					saveData = []map[string]interface{}{}
 				}
@@ -142,13 +147,13 @@ func ChanMonitor() {
 					public.BaseMysql.SelectBySql(fmt.Sprintf(`UPDATE anonymous_identity
                     SET fid = CASE %s ELSE fid END,
                         trustedId = CASE %s ELSE trustedId END
-                    WHERE guestUID IN (%s);`, strings.Join(column1, " "), strings.Join(column2, " "), strings.Join(ids, " ")))
+                    WHERE guestUID IN (%s);`, strings.Join(column1, " "), strings.Join(column2, " "), strings.Join(ids, ",")))
 					upData = []map[string]interface{}{}
 				}
-				count = 0
+				log.Println("批量操作匿名信息完成", time.Now().Sub(tm))
 			}
 
-		case <-time.After(30 * time.Second):
+		case <-time.After(3 * time.Minute):
 			if len(saveData) > 0 {
 				var ss []interface{}
 				for _, datum := range saveData {