From f720eb509b7ee8f82dd3eea80a1bdeff6b397254 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Sun, 15 Dec 2024 15:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AA=E7=8E=AF=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/userService.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/service/userService.go b/service/userService.go
index db86c03..f4f009c 100644
--- a/service/userService.go
+++ b/service/userService.go
@@ -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 {