ljydlv
/
videoplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/feat-user-sync'

This commit is contained in:
junleea 2024-12-15 17:24:13 +08:00
parent 05489c8fd7 f421dda674
commit 2f0266f3ee
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/userService.go
View File

@ -112,7 +112,10 @@ func UserSyncDataFromMaster() {
req.Token = tokens[0] req.Token = tokens[0]
req.Device = proto.Config.SERVER_NAME req.Device = proto.Config.SERVER_NAME
all := worker.GetRedis("user_sync_all") all := worker.GetRedis("user_sync_all")
var is_all bool //是否全量同步
if all == "" || all == "1" { if all == "" || all == "1" {
is_all = true
worker.SetRedis("user_sync_all", "1")
req.Types = 1 req.Types = 1
} else { } else {
worker.SetRedis("user_sync_all", "2") worker.SetRedis("user_sync_all", "2")
@ -158,6 +161,7 @@ func UserSyncDataFromMaster() {
} }
//确认同步数据 //确认同步数据
if is_all == false {
var data proto.UserSyncConfirm var data proto.UserSyncConfirm
data.Add = add_confirm data.Add = add_confirm
data.Update = update_confirm data.Update = update_confirm
@ -169,6 +173,7 @@ func UserSyncDataFromMaster() {
confirm_req.Types = 3 confirm_req.Types = 3
confirm_req.Confirm = data confirm_req.Confirm = data
worker.SyncDataFromMasterReq2(url, confirm_req) worker.SyncDataFromMasterReq2(url, confirm_req)
}
} }
// 同步数据到主服务器-增删改数据 // 同步数据到主服务器-增删改数据

1
worker/req.go
View File

@ -166,5 +166,6 @@ func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) proto.UserSync {
fmt.Println("SyncDataFromMasterReq2 error decode data:", err) fmt.Println("SyncDataFromMasterReq2 error decode data:", err)
return res return res
} }
fmt.Println("SyncDataFromMasterReq2 result add data:", len(res.Add), "update data:", len(res.Update), "delete data:", len(res.Delete))
return res return res
} }