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

Compare commits

base: ljydlv:a621cb5ad20743aa31248c91ef1ac76e01b90d66
Branches Tags
ljydlv:release
ljydlv:feat-db-manager
ljydlv:master
ljydlv:feat-docker
ljydlv:master-pg
ljydlv:dev
..
compare: ljydlv:1bb639504da944a3ceb6a85a2fecfccd2fe5ec9c
Branches Tags
ljydlv:release
ljydlv:feat-db-manager
ljydlv:master
ljydlv:feat-docker
ljydlv:master-pg
ljydlv:dev

No commits in common. "a621cb5ad20743aa31248c91ef1ac76e01b90d66" and "1bb639504da944a3ceb6a85a2fecfccd2fe5ec9c" have entirely different histories.
a621cb5ad2 ... 1bb639504d

1 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

5
service/userService.go
View File

@ -6,7 +6,6 @@ import (
"strconv"
"time"
"videoplayer/dao"
"videoplayer/handler"
"videoplayer/proto"
"videoplayer/worker"
)
@ -130,7 +129,7 @@ func UserSyncDataFromMaster() {
}
// 同步数据到主服务器-增删改数据
func GetUserSyncData(device string) handler.UserSyncResp {
func GetUserSyncData(device string) proto.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"
@ -165,7 +164,7 @@ func GetUserSyncData(device string) handler.UserSyncResp {
worker.ClearRedisSet(key + "_update")
worker.SetRedisSetUnionAndStore(delete_temp_key, key+"_delete")
worker.ClearRedisSet(key + "_delete")
return handler.UserSyncResp{Add: add_users, Update: update_users, Delete: delete_users}
return proto.UserSyncResp{Add: add_users, Update: update_users, Delete: delete_users}
}
func setSyncUserDataSet(t string, id int) error {