From be72b745f388e6cc21c661cbfa691e5f99875ed6 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 28 Aug 2023 10:34:30 +0800 Subject: [PATCH 1/5] 11 --- server/websocket/internal/logic/datatransferlogic.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/websocket/internal/logic/datatransferlogic.go b/server/websocket/internal/logic/datatransferlogic.go index 02071c5c..60ad5d4b 100644 --- a/server/websocket/internal/logic/datatransferlogic.go +++ b/server/websocket/internal/logic/datatransferlogic.go @@ -209,9 +209,6 @@ func (l *DataTransferLogic) checkAuth(r *http.Request) (isAuth bool, userInfo *a logx.Error(err) return false, nil } - //todo 对接登录后要删除 - userInfo.UserId = 39 - userInfo.GuestId = 0 return true, userInfo } //白板用户 From 447f84ec6dfd9b6e96b8ae4a589f1fbcde4bb039 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 28 Aug 2023 10:44:19 +0800 Subject: [PATCH 2/5] 11 --- server/websocket/internal/logic/datatransferlogic.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/websocket/internal/logic/datatransferlogic.go b/server/websocket/internal/logic/datatransferlogic.go index 60ad5d4b..02071c5c 100644 --- a/server/websocket/internal/logic/datatransferlogic.go +++ b/server/websocket/internal/logic/datatransferlogic.go @@ -209,6 +209,9 @@ func (l *DataTransferLogic) checkAuth(r *http.Request) (isAuth bool, userInfo *a logx.Error(err) return false, nil } + //todo 对接登录后要删除 + userInfo.UserId = 39 + userInfo.GuestId = 0 return true, userInfo } //白板用户 From d0921a26b21063c0dfc1d10d79d16ee5ad2690db Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 28 Aug 2023 10:46:08 +0800 Subject: [PATCH 3/5] 11 --- server/websocket/internal/logic/datatransferlogic.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/server/websocket/internal/logic/datatransferlogic.go b/server/websocket/internal/logic/datatransferlogic.go index 02071c5c..aaaa07fc 100644 --- a/server/websocket/internal/logic/datatransferlogic.go +++ b/server/websocket/internal/logic/datatransferlogic.go @@ -198,7 +198,7 @@ func (l *DataTransferLogic) checkAuth(r *http.Request) (isAuth bool, userInfo *a claims, err := l.svcCtx.ParseJwtToken(r) // 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息 if err != nil { - logx.Error(err) + logx.Error("ParseJwtToken err:", err) return false, nil } if claims != nil { @@ -206,12 +206,9 @@ func (l *DataTransferLogic) checkAuth(r *http.Request) (isAuth bool, userInfo *a userInfo, err = auth.GetUserInfoFormMapClaims(claims) // 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息 if err != nil { - logx.Error(err) + logx.Error("GetUserInfoFormMapClaims err:", err) return false, nil } - //todo 对接登录后要删除 - userInfo.UserId = 39 - userInfo.GuestId = 0 return true, userInfo } //白板用户 From 6f89ea9391e25a848c360af8234977b20c00198d Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 28 Aug 2023 10:53:03 +0800 Subject: [PATCH 4/5] 11 --- utils/websocket_data/render_data.go | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go index e6ddfb93..ae97a9d6 100644 --- a/utils/websocket_data/render_data.go +++ b/utils/websocket_data/render_data.go @@ -17,7 +17,6 @@ type RenderData struct { TemplateTag string `json:"template_tag"` //模板标签(必须) ProductId int64 `json:"product_id"` //产品id(必须) Website string `json:"website"` //网站(可选) - Slogan string `json:"slogan"` //slogan(可选) Address string `json:"address"` //地址(可选) Phone string `json:"phone"` //电话(可选) UserId int64 `json:"user_id"` //用户id(websocket连接建立再赋值) From 1230eaf255276368cdd95b04c2278b6391ef3838 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 28 Aug 2023 10:54:18 +0800 Subject: [PATCH 5/5] 11 --- utils/websocket_data/render_data.go | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go index ae97a9d6..e6ddfb93 100644 --- a/utils/websocket_data/render_data.go +++ b/utils/websocket_data/render_data.go @@ -17,6 +17,7 @@ type RenderData struct { TemplateTag string `json:"template_tag"` //模板标签(必须) ProductId int64 `json:"product_id"` //产品id(必须) Website string `json:"website"` //网站(可选) + Slogan string `json:"slogan"` //slogan(可选) Address string `json:"address"` //地址(可选) Phone string `json:"phone"` //电话(可选) UserId int64 `json:"user_id"` //用户id(websocket连接建立再赋值)