From f421dda67458e4d6aaf281387a232087a07258d7 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 17:24:00 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/userService.go | 27 ++++++++++++++++----------- worker/req.go | 1 + 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/service/userService.go b/service/userService.go index 41cfb00..b670b83 100644 --- a/service/userService.go +++ b/service/userService.go @@ -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) + } } // 同步数据到主服务器-增删改数据 diff --git a/worker/req.go b/worker/req.go index fcbefd4..8dc93ef 100644 --- a/worker/req.go +++ b/worker/req.go @@ -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 } From 645106e3e611688d120c0465f98a9b95877d1e2e Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 17:38:35 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9C=AA=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 0254540..62eb453 100644 --- a/main.go +++ b/main.go @@ -289,7 +289,7 @@ func RunGeneralCron() { if err != nil { fmt.Println("RunGeneralCron Error decoding config,key value is :", res) } - for _, v := range cron_infos { + for i, v := range cron_infos { //1:日志清理，其他待定 if v.Type == 1 { //日志清理 @@ -300,6 +300,8 @@ func RunGeneralCron() { } else { v.Curr -= 10 } + cron_infos[i] = v + continue } //2 从服务器同步数据 if v.Type == 2 { @@ -312,6 +314,8 @@ func RunGeneralCron() { } else { v.Curr -= 10 } + cron_infos[i] = v + continue } } //存入redis From 6560a9a5c269590a471ac422452d5b3751baf58f Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 17:45:31 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9C=AA=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 62eb453..7c51506 100644 --- a/main.go +++ b/main.go @@ -225,8 +225,8 @@ func ReadConfigToSetSystem() { } } - var is_exist bool - user_sync_id := -1 + is_exist := false + user_sync_id := -1 //用户同步任务索引 for i, v := range cron_infos { if v.Type == 2 { is_exist = true @@ -235,6 +235,7 @@ func ReadConfigToSetSystem() { v.Curr = proto.Config.USER_SYNC_TIME } user_sync_id = i + cron_infos[i] = v break } } From 27858d41e7a9af13377286ab562bce3aa792f359 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 17:58:29 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/user.go | 6 ++++++ service/userService.go | 14 +++++++++++++- worker/req.go | 22 ++++++++++++++-------- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dao/user.go b/dao/user.go index 5f10bbe..d7c7bf1 100644 --- a/dao/user.go +++ b/dao/user.go @@ -150,3 +150,9 @@ type UserSyncResp struct { Add []User `json:"add" form:"add"` //添加用户 Delete []proto.UserDelID `json:"delete" form:"delete"` //删除用户 } + +// 清空用户表 +func ClearAllUsers() error { + res := DB.Exec("TRUNCATE TABLE users") + return res.Error +} diff --git a/service/userService.go b/service/userService.go index b670b83..915ecc5 100644 --- a/service/userService.go +++ b/service/userService.go @@ -115,6 +115,12 @@ func UserSyncDataFromMaster() { var is_all bool //是否全量同步 if all == "" || all == "1" { is_all = true + //清空数据表 + err := dao.ClearAllUsers() + if err != nil { + fmt.Println("All ClearAllUsers error:", err) + return + } worker.SetRedis("user_sync_all", "1") req.Types = 1 } else { @@ -122,7 +128,11 @@ func UserSyncDataFromMaster() { req.Types = 2 } - user_sync_data := worker.SyncDataFromMasterReq2(url, req) + user_sync_data, err := worker.SyncDataFromMasterReq2(url, req) + if err != nil { + fmt.Println("UserSyncDataFromMaster error:", err) + return + } add_users := user_sync_data.Add update_users := user_sync_data.Update delete_users := user_sync_data.Delete @@ -173,6 +183,8 @@ func UserSyncDataFromMaster() { confirm_req.Types = 3 confirm_req.Confirm = data worker.SyncDataFromMasterReq2(url, confirm_req) + } else { + } } diff --git a/worker/req.go b/worker/req.go index 8dc93ef..4f40dfe 100644 --- a/worker/req.go +++ b/worker/req.go @@ -130,16 +130,22 @@ func SyncDataFromMasterReq(url string, token string) proto.UserSync { } // 获取数据,全量及增量 -func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) proto.UserSync { +func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) (proto.UserSync, error) { + defer func() { + if r := recover(); r != nil { + fmt.Println("SyncDataFromMasterReq2 error:", r) + } + }() + var res proto.UserSync //从接口获取数据 json_data, err := json.Marshal(data) if err != nil { - return res + return res, err } req, err := http.NewRequest("POST", url, bytes.NewBuffer(json_data)) if err != nil { - return res + return res, err } req.Header.Set("Content-Type", "application/json") //传输数据 @@ -149,23 +155,23 @@ func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) proto.UserSync { //获取数据 resp, err := client.Do(req) if err != nil { - return res + return res, err } defer resp.Body.Close() //解析数据 var m map[string]interface{} err = json.NewDecoder(resp.Body).Decode(&m) if err != nil { - return res + return res, err } if m["code"].(float64) != 0 { - return res + return res, err } err = json.Unmarshal([]byte(m["data"].(string)), &res) if err != nil { fmt.Println("SyncDataFromMasterReq2 error decode data:", err) - return res + return res, err } fmt.Println("SyncDataFromMasterReq2 result add data:", len(res.Add), "update data:", len(res.Update), "delete data:", len(res.Delete)) - return res + return res, nil } From 9d01e83d7102f9257c61c1e32e1e113df37e2092 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 18:02:10 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worker/req.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/worker/req.go b/worker/req.go index 4f40dfe..28ac772 100644 --- a/worker/req.go +++ b/worker/req.go @@ -7,6 +7,7 @@ import ( "io" "io/ioutil" "net/http" + "strconv" "strings" "videoplayer/proto" ) @@ -159,15 +160,16 @@ func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) (proto.UserSync, } defer resp.Body.Close() //解析数据 - var m map[string]interface{} + var m map[string]string err = json.NewDecoder(resp.Body).Decode(&m) if err != nil { return res, err } - if m["code"].(float64) != 0 { + code, _ := strconv.Atoi(m["code"]) + if code != 0 { return res, err } - err = json.Unmarshal([]byte(m["data"].(string)), &res) + err = json.Unmarshal([]byte(m["data"]), &res) if err != nil { fmt.Println("SyncDataFromMasterReq2 error decode data:", err) return res, err From 664027a95582f8a97e20bafa5fef3922d707eeb4 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 18:31:26 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worker/req.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/worker/req.go b/worker/req.go index 28ac772..a8a30a2 100644 --- a/worker/req.go +++ b/worker/req.go @@ -7,7 +7,6 @@ import ( "io" "io/ioutil" "net/http" - "strconv" "strings" "videoplayer/proto" ) @@ -130,6 +129,12 @@ func SyncDataFromMasterReq(url string, token string) proto.UserSync { return userSync } +type Response struct { + Code int `json:"code"` + Message string `json:"message"` + Data proto.UserSync `json:"data"` +} + // 获取数据,全量及增量 func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) (proto.UserSync, error) { defer func() { @@ -160,20 +165,16 @@ func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) (proto.UserSync, } defer resp.Body.Close() //解析数据 - var m map[string]string - err = json.NewDecoder(resp.Body).Decode(&m) + responseBod, err := io.ReadAll(resp.Body) if err != nil { return res, err } - code, _ := strconv.Atoi(m["code"]) - if code != 0 { - return res, err - } - err = json.Unmarshal([]byte(m["data"]), &res) + var response Response + err = json.Unmarshal(responseBod, &response) if err != nil { - fmt.Println("SyncDataFromMasterReq2 error decode data:", err) return res, err } + res = response.Data fmt.Println("SyncDataFromMasterReq2 result add data:", len(res.Add), "update data:", len(res.Update), "delete data:", len(res.Delete)) return res, nil } From dfe767834bb85099c256bb3edbc19ec2f9c8a354 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 18:38:19 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dao/user.go b/dao/user.go index d7c7bf1..a725174 100644 --- a/dao/user.go +++ b/dao/user.go @@ -112,7 +112,7 @@ func UpdateUserByID3(id int, req proto.UpdateUserInfoReq) error { // 用户数据同步-添加 func AddUserSync(req proto.UserAddOrUpdate) uint { - res := DB.Exec("insert into users (id, created_at, updated_at, deleted_at, name, age, email, password,gender,role,redis,run,upload,video_func,device_func,cid_func,avatar,create_time,update_time) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", req.ID, req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime) + res := DB.Exec("insert into users (id, created_at, updated_at, deleted_at, name, age, email, password,gender,role,redis,run,upload,video_func,device_func,cid_func,avatar,create_time,update_time) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", req.ID, req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime) if res.Error != nil { return 0 } From e441b554e825f44a5cec3faf0b40d26fb55893ff Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 18:51:13 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/userService.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/userService.go b/service/userService.go index 915ecc5..3357789 100644 --- a/service/userService.go +++ b/service/userService.go @@ -184,7 +184,7 @@ func UserSyncDataFromMaster() { confirm_req.Confirm = data worker.SyncDataFromMasterReq2(url, confirm_req) } else { - + worker.SetRedis("user_sync_all", "2") } } From a9c57ef016e781ae92e93e3e6a6dfc62cf766a31 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sun, 15 Dec 2024 19:29:49 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/user.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dao/user.go b/dao/user.go index a725174..7da04ed 100644 --- a/dao/user.go +++ b/dao/user.go @@ -116,6 +116,10 @@ func AddUserSync(req proto.UserAddOrUpdate) uint { if res.Error != nil { return 0 } + res = DB.Exec("update users set created_at=null where id=?", req.ID) + if res.Error != nil { + return 0 + } return req.ID } @@ -125,6 +129,10 @@ func UpdateUserSync(req proto.UserAddOrUpdate) uint { if res.Error != nil { return 0 } + res = DB.Exec("update users set created_at=null where id=?", req.ID) + if res.Error != nil { + return 0 + } return req.ID } From 9fed2927fc145a92683dc8b71b407f1d3d1faf98 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Mon, 16 Dec 2024 20:47:58 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/user.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dao/user.go b/dao/user.go index 7da04ed..32ef884 100644 --- a/dao/user.go +++ b/dao/user.go @@ -113,10 +113,7 @@ func UpdateUserByID3(id int, req proto.UpdateUserInfoReq) error { // 用户数据同步-添加 func AddUserSync(req proto.UserAddOrUpdate) uint { res := DB.Exec("insert into users (id, created_at, updated_at, deleted_at, name, age, email, password,gender,role,redis,run,upload,video_func,device_func,cid_func,avatar,create_time,update_time) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", req.ID, req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime) - if res.Error != nil { - return 0 - } - res = DB.Exec("update users set created_at=null where id=?", req.ID) + res = DB.Debug().Exec("update users set created_at=null where id=?", req.ID) if res.Error != nil { return 0 } @@ -125,11 +122,9 @@ func AddUserSync(req proto.UserAddOrUpdate) uint { // 用户数据同步-更新 func UpdateUserSync(req proto.UserAddOrUpdate) uint { + //事务 res := DB.Exec("update users set created_at=?, updated_at=?, deleted_at=?, name=?, age=?, email=?, password=?,gender=?,role=?,redis=?,run=?,upload=?,video_func=?,device_func=?,cid_func=?,avatar=?,create_time=?,update_time=? where id=?", req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime, req.ID) - if res.Error != nil { - return 0 - } - res = DB.Exec("update users set created_at=null where id=?", req.ID) + res = DB.Debug().Exec("update users set created_at=null where id=?", req.ID) if res.Error != nil { return 0 } From 9408bc383173ce743df6411caa03a50c1a9ef21f Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Mon, 16 Dec 2024 20:51:50 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/user.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dao/user.go b/dao/user.go index 32ef884..87f64ea 100644 --- a/dao/user.go +++ b/dao/user.go @@ -113,7 +113,10 @@ func UpdateUserByID3(id int, req proto.UpdateUserInfoReq) error { // 用户数据同步-添加 func AddUserSync(req proto.UserAddOrUpdate) uint { res := DB.Exec("insert into users (id, created_at, updated_at, deleted_at, name, age, email, password,gender,role,redis,run,upload,video_func,device_func,cid_func,avatar,create_time,update_time) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", req.ID, req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime) - res = DB.Debug().Exec("update users set created_at=null where id=?", req.ID) + if res.Error != nil { + return 0 + } + res = DB.Debug().Exec("update users set deleted_at=null where id=?", req.ID) if res.Error != nil { return 0 } @@ -124,7 +127,10 @@ func AddUserSync(req proto.UserAddOrUpdate) uint { func UpdateUserSync(req proto.UserAddOrUpdate) uint { //事务 res := DB.Exec("update users set created_at=?, updated_at=?, deleted_at=?, name=?, age=?, email=?, password=?,gender=?,role=?,redis=?,run=?,upload=?,video_func=?,device_func=?,cid_func=?,avatar=?,create_time=?,update_time=? where id=?", req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime, req.ID) - res = DB.Debug().Exec("update users set created_at=null where id=?", req.ID) + if res.Error != nil { + return 0 + } + res = DB.Debug().Exec("update users set deleted_at=null where id=?", req.ID) if res.Error != nil { return 0 } From 5356efaa7376e90d25e71dca0c14d712cef119ac Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Mon, 16 Dec 2024 21:31:56 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 5 ++++- service/userService.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 7c51506..eee8f2b 100644 --- a/main.go +++ b/main.go @@ -9,6 +9,7 @@ import ( "io" "log" "os" + "strconv" "strings" "videoplayer/dao" "videoplayer/handler" @@ -142,7 +143,9 @@ func JWTAuthMiddleware() gin.HandlerFunc { }) return } - c.Set("id", s_id) + id, _ := strconv.Atoi(s_id) + //查看s_id类型 + c.Set("id", id) c.Next() return } diff --git a/service/userService.go b/service/userService.go index 3357789..ad44cb6 100644 --- a/service/userService.go +++ b/service/userService.go @@ -112,7 +112,7 @@ func UserSyncDataFromMaster() { req.Token = tokens[0] req.Device = proto.Config.SERVER_NAME all := worker.GetRedis("user_sync_all") - var is_all bool //是否全量同步 + is_all := false //是否全量同步 if all == "" || all == "1" { is_all = true //清空数据表 From d62ef9710de599224197a74365564f3afa5f4a78 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Mon, 16 Dec 2024 21:36:03 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index eee8f2b..10c9fb7 100644 --- a/main.go +++ b/main.go @@ -144,8 +144,9 @@ func JWTAuthMiddleware() gin.HandlerFunc { return } id, _ := strconv.Atoi(s_id) + id_float64 := float64(id) //查看s_id类型 - c.Set("id", id) + c.Set("id", id_float64) c.Next() return }