5 lat temu
rodzic
commit
77dc0d09f2

BIN
api_test/api_test


+ 1 - 1
api_test/config.json

@@ -2,5 +2,5 @@
     "appid": "jyPz5XQgMABgVeTkdOMTBx",
     "key": "349300qe",
     "day": "0",
-    "apiurl": "https://api.jianyu360.com"
+    "apiurl": "https://testapi2.jianyu360.com"
 }

+ 1 - 1
jyservice/src/usermanager/getdata.go

@@ -29,7 +29,7 @@ var (
 	GetDataMap     = map[string]*sync.Mutex{}
 	GetDataMapLock = &sync.Mutex{}
 	SE             = util.SimpleEncrypt{Key: "topJYBX2019"}
-	UpdateDataLock = &sync.Mutex{}
+	//UpdateDataLock = &sync.Mutex{}
 )
 
 //取增量数据

+ 10 - 2
jyservice/src/usermanager/serviceManager.go

@@ -307,8 +307,12 @@ func userBuyRecord(w http.ResponseWriter, r *http.Request) {
 
 //新旧条数
 func updateData(w http.ResponseWriter, r *http.Request) {
-	UpdateDataLock.Lock()
-	defer UpdateDataLock.Unlock()
+	GetDataMapLock.Lock()
+	defer GetDataMapLock.Unlock()
+	for _, v := range GetDataMap {
+		v.Lock()
+		defer v.Unlock()
+	}
 	log.Debug("redis到mongo条数更新开始")
 	data := redis.GetKeysByPattern(REDISDB, "limitnum_*")
 	log.Debug("data数量: ", len(data))
@@ -322,7 +326,11 @@ func updateData(w http.ResponseWriter, r *http.Request) {
 					"plan.current": val,
 				},
 			}, false, false)
+			if b {
+				redis.Del(REDISDB, key)
+			}
 			log.Debug("redis到mongo条数更新到数据库:", b, " 剩余条数: ", val, " appid: ", k[9:])
 		}
 	}
+	w.Write([]byte("ok"))
 }