Merge branch 'refs/heads/feat-file' into release

# Conflicts:
#	service/userService.go

service/userService.go

@@ -121,10 +121,10 @@ func UserSyncDataFromMaster() {
 			fmt.Println("All ClearAllUsers error:", err)
 			return
 		}
-		worker.SetRedis("user_sync_all", "2")
+		worker.SetRedisForever("user_sync_all", "1")
 		req.Types = 1
 	} else {
-		worker.SetRedis("user_sync_all", "2")
+		worker.SetRedisForever("user_sync_all", "2")
 		req.Types = 2
 	}
 
@@ -184,7 +184,7 @@ func UserSyncDataFromMaster() {
 		confirm_req.Confirm = data
 		worker.SyncDataFromMasterReq2(url, confirm_req)
 	} else {
-		worker.SetRedis("user_sync_all", "2")
+		worker.SetRedisForever("user_sync_all", "2")
 	}
 }
 

worker/redis.go

@@ -71,6 +71,17 @@ func SetRedis(key string, value string) bool {
 	return true
 }
 
+// 设置redis,永久
+func SetRedisForever(key string, value string) bool {
+	ctx := context.Background()
+	err := RedisClient.Set(ctx, key, value, 0).Err()
+	if err != nil {
+		fmt.Println("Error setting key: %v", err)
+		return false
+	}
+	return true
+}
+
 // 设置hash
 func SetHashWithTime(key string, id int, name, email string, duration time.Duration) bool {
 	//捕获错误，如果错误返回