修复部分用户同步逻辑
This commit is contained in:
parent
067c4ccfe2
commit
f421dda674
|
|
@ -112,7 +112,10 @@ func UserSyncDataFromMaster() {
|
|||
req.Token = tokens[0]
|
||||
req.Device = proto.Config.SERVER_NAME
|
||||
all := worker.GetRedis("user_sync_all")
|
||||
var is_all bool //是否全量同步
|
||||
if all == "" || all == "1" {
|
||||
is_all = true
|
||||
worker.SetRedis("user_sync_all", "1")
|
||||
req.Types = 1
|
||||
} else {
|
||||
worker.SetRedis("user_sync_all", "2")
|
||||
|
|
@ -158,17 +161,19 @@ func UserSyncDataFromMaster() {
|
|||
}
|
||||
|
||||
//确认同步数据
|
||||
var data proto.UserSyncConfirm
|
||||
data.Add = add_confirm
|
||||
data.Update = update_confirm
|
||||
data.Delete = delete_confirm
|
||||
//确认同步数据请求
|
||||
var confirm_req proto.SyncUserReq
|
||||
confirm_req.Token = tokens[0]
|
||||
confirm_req.Device = proto.Config.SERVER_NAME
|
||||
confirm_req.Types = 3
|
||||
confirm_req.Confirm = data
|
||||
worker.SyncDataFromMasterReq2(url, confirm_req)
|
||||
if is_all == false {
|
||||
var data proto.UserSyncConfirm
|
||||
data.Add = add_confirm
|
||||
data.Update = update_confirm
|
||||
data.Delete = delete_confirm
|
||||
//确认同步数据请求
|
||||
var confirm_req proto.SyncUserReq
|
||||
confirm_req.Token = tokens[0]
|
||||
confirm_req.Device = proto.Config.SERVER_NAME
|
||||
confirm_req.Types = 3
|
||||
confirm_req.Confirm = data
|
||||
worker.SyncDataFromMasterReq2(url, confirm_req)
|
||||
}
|
||||
}
|
||||
|
||||
// 同步数据到主服务器-增删改数据
|
||||
|
|
|
|||
|
|
@ -166,5 +166,6 @@ func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) proto.UserSync {
|
|||
fmt.Println("SyncDataFromMasterReq2 error decode data:", err)
|
||||
return res
|
||||
}
|
||||
fmt.Println("SyncDataFromMasterReq2 result add data:", len(res.Add), "update data:", len(res.Update), "delete data:", len(res.Delete))
|
||||
return res
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue