Merge branch 'refs/heads/feat-user-sync'
This commit is contained in:
commit
a621cb5ad2
|
|
@ -6,6 +6,7 @@ import (
|
|||
"strconv"
|
||||
"time"
|
||||
"videoplayer/dao"
|
||||
"videoplayer/handler"
|
||||
"videoplayer/proto"
|
||||
"videoplayer/worker"
|
||||
)
|
||||
|
|
@ -129,7 +130,7 @@ func UserSyncDataFromMaster() {
|
|||
}
|
||||
|
||||
// 同步数据到主服务器-增删改数据
|
||||
func GetUserSyncData(device string) proto.UserSyncResp {
|
||||
func GetUserSyncData(device string) handler.UserSyncResp {
|
||||
key := device + "_sync_user_ids"
|
||||
add_temp_key := device + "_sync_user_ids_add_confirm_temp"
|
||||
update_temp_key := device + "_sync_user_ids_update_confirm_temp"
|
||||
|
|
@ -164,7 +165,7 @@ func GetUserSyncData(device string) proto.UserSyncResp {
|
|||
worker.ClearRedisSet(key + "_update")
|
||||
worker.SetRedisSetUnionAndStore(delete_temp_key, key+"_delete")
|
||||
worker.ClearRedisSet(key + "_delete")
|
||||
return proto.UserSyncResp{Add: add_users, Update: update_users, Delete: delete_users}
|
||||
return handler.UserSyncResp{Add: add_users, Update: update_users, Delete: delete_users}
|
||||
}
|
||||
|
||||
func setSyncUserDataSet(t string, id int) error {
|
||||
|
|
|
|||
Loading…
Reference in New Issue