From e813ec55750f809bef3e9589db31380903b240d1 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 11:12:37 +0800 Subject: [PATCH 1/7] fix --- .../internal/logic/ws_render_image.go | 32 +++++++------------ utils/websocket_data/render_data.go | 5 ++- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 26406921..b73979c3 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -37,7 +37,6 @@ type extendRenderProperty struct { renderCtx context.Context //渲染控制上下文（用于切换模板标签/颜色/logo取消之前发送的不相同的任务） renderCtxCancelFunc context.CancelFunc //渲染控制上下文取消方法 selectColorIndex int //选择的颜色索引（用于标记连接当前连接选择的颜色） - templateTag string //模板标签 （用于标记连接当前连接选择的模板标签） Logo string //logo地址 （用于标记连接当前连接选择的logo） } @@ -52,9 +51,6 @@ func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) { } //颜色/模板标签/logo变更 ifCancelOldCtx := false - if renderImageData.RenderData.TemplateTag != w.extendRenderProperty.templateTag { - ifCancelOldCtx = true - } if renderImageData.RenderData.TemplateTagColor.SelectedColorIndex != w.extendRenderProperty.selectColorIndex { ifCancelOldCtx = true } @@ -63,7 +59,6 @@ func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) { } if ifCancelOldCtx { //赋值新的 - w.extendRenderProperty.templateTag = renderImageData.RenderData.TemplateTag w.extendRenderProperty.selectColorIndex = renderImageData.RenderData.TemplateTagColor.SelectedColorIndex w.extendRenderProperty.Logo = renderImageData.RenderData.Logo //让之前的失效 @@ -115,23 +110,20 @@ func (w *wsConnectItem) consumeRenderImageData() { defer func() { <-limitChan }() - //如果不是无视上下文切换取消的(后面再开启) - /*if !d.IgnoreContextCancel { - go func() { - defer func() { - if err := recover(); err != nil { - logx.Error("func renderImage panic:", err) - } - }() - select { - case <-w.extendRenderProperty.renderCtx.Done(): - //抛出取消渲染异常 - cancelRenderPanic() - case <-tmpChan: - return + go func() { + defer func() { + if err := recover(); err != nil { + logx.Error("func renderImage panic:", err) } }() - }*/ + select { + case <-w.extendRenderProperty.renderCtx.Done(): + //抛出取消渲染异常 + cancelRenderPanic() + case <-tmpChan: + return + } + }() w.renderImage(d) }(data) } diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go index 4d39a94d..7bfcb881 100644 --- a/utils/websocket_data/render_data.go +++ b/utils/websocket_data/render_data.go @@ -2,9 +2,8 @@ package websocket_data // websocket接受要云渲染处理的数据 type RenderImageReqMsg struct { - RequestId string `json:"request_id"` - IgnoreContextCancel bool `json:"ignore_context_cancel"` //是否无视切换上下文取消正在执行的渲染任务 - RenderData RenderData `json:"render_data"` //渲染主要参数 + RequestId string `json:"request_id"` + RenderData RenderData `json:"render_data"` //渲染主要参数 } type RenderData struct { TemplateTag string `json:"template_tag"` //模板标签(必须) From f86c687bd8bced2587f3d887a43df47e56ae1250 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 11:14:16 +0800 Subject: [PATCH 2/7] fix --- .../internal/logic/ws_render_image.go | 34 ++++++++++++------- utils/websocket_data/render_data.go | 5 +-- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index b73979c3..e74f78eb 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -37,6 +37,7 @@ type extendRenderProperty struct { renderCtx context.Context //渲染控制上下文（用于切换模板标签/颜色/logo取消之前发送的不相同的任务） renderCtxCancelFunc context.CancelFunc //渲染控制上下文取消方法 selectColorIndex int //选择的颜色索引（用于标记连接当前连接选择的颜色） + templateTag string //模板标签 （用于标记连接当前连接选择的模板标签） Logo string //logo地址 （用于标记连接当前连接选择的logo） } @@ -51,6 +52,9 @@ func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) { } //颜色/模板标签/logo变更 ifCancelOldCtx := false + if renderImageData.RenderData.TemplateTag != w.extendRenderProperty.templateTag { + ifCancelOldCtx = true + } if renderImageData.RenderData.TemplateTagColor.SelectedColorIndex != w.extendRenderProperty.selectColorIndex { ifCancelOldCtx = true } @@ -59,6 +63,7 @@ func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) { } if ifCancelOldCtx { //赋值新的 + w.extendRenderProperty.templateTag = renderImageData.RenderData.TemplateTag w.extendRenderProperty.selectColorIndex = renderImageData.RenderData.TemplateTagColor.SelectedColorIndex w.extendRenderProperty.Logo = renderImageData.RenderData.Logo //让之前的失效 @@ -110,20 +115,23 @@ func (w *wsConnectItem) consumeRenderImageData() { defer func() { <-limitChan }() - go func() { - defer func() { - if err := recover(); err != nil { - logx.Error("func renderImage panic:", err) + //如果不是无视上下文切换取消的(后面再开启) + /*if !d.IgnoreContextCancel { + go func() { + defer func() { + if err := recover(); err != nil { + logx.Error("func renderImage panic:", err) + } + }() + select { + case <-w.extendRenderProperty.renderCtx.Done(): + //抛出取消渲染异常 + cancelRenderPanic() + case <-tmpChan: + return } }() - select { - case <-w.extendRenderProperty.renderCtx.Done(): - //抛出取消渲染异常 - cancelRenderPanic() - case <-tmpChan: - return - } - }() + }*/ w.renderImage(d) }(data) } @@ -376,7 +384,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, return err } } - //组装data数据(参照以前PHP,不要随便动) + //组装data数据 var mode map[string]interface{} if element.Mode != nil && *element.Mode != "" { if err = json.Unmarshal([]byte(*element.Mode), &mode); err != nil { diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go index 7bfcb881..4d39a94d 100644 --- a/utils/websocket_data/render_data.go +++ b/utils/websocket_data/render_data.go @@ -2,8 +2,9 @@ package websocket_data // websocket接受要云渲染处理的数据 type RenderImageReqMsg struct { - RequestId string `json:"request_id"` - RenderData RenderData `json:"render_data"` //渲染主要参数 + RequestId string `json:"request_id"` + IgnoreContextCancel bool `json:"ignore_context_cancel"` //是否无视切换上下文取消正在执行的渲染任务 + RenderData RenderData `json:"render_data"` //渲染主要参数 } type RenderData struct { TemplateTag string `json:"template_tag"` //模板标签(必须) From 982f5e1df9bd31ad45c3960dd6f8613818cd39a0 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 11:19:11 +0800 Subject: [PATCH 3/7] fix --- server/ldap-admin/internal/logic/updateldapuserlogic.go | 2 +- .../ldap-admin/internal/logic/updateldapuserpwdlogic.go | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/ldap-admin/internal/logic/updateldapuserlogic.go b/server/ldap-admin/internal/logic/updateldapuserlogic.go index af2903a1..fd3ece66 100644 --- a/server/ldap-admin/internal/logic/updateldapuserlogic.go +++ b/server/ldap-admin/internal/logic/updateldapuserlogic.go @@ -57,7 +57,7 @@ func (l *UpdateLdapUserLogic) UpdateLdapUser(req *types.UpdateLdapUserReq, r *ht } //把用户名转pinyin userNamePinyin := chinese_to_pinyin.ChineseToPinyin(req.UserName) - now := time.Now() + now := time.Now().UTC() //更新的属性 attr := map[string][]string{ "homeDirectory": {"/home/users/" + userNamePinyin}, diff --git a/server/ldap-admin/internal/logic/updateldapuserpwdlogic.go b/server/ldap-admin/internal/logic/updateldapuserpwdlogic.go index d638e74b..dbe688c9 100644 --- a/server/ldap-admin/internal/logic/updateldapuserpwdlogic.go +++ b/server/ldap-admin/internal/logic/updateldapuserpwdlogic.go @@ -1,10 +1,12 @@ package logic import ( + "fusenapi/model/gmodel" "fusenapi/utils/basic" "fusenapi/utils/email" "net/http" "strings" + "time" "context" @@ -66,6 +68,13 @@ func (l *UpdateLdapUserPwdLogic) UpdateLdapUserPwd(req *types.UpdateLdapUserPwdR logx.Error(err) return resp.SetStatusWithMessage(basic.CodeServiceErr, "修改密码失败") } + now := time.Now().UTC() + err = l.svcCtx.AllModels.LdapUser.Update(l.ctx, req.UserDN, &gmodel.LdapUser{ + Utime: &now, + }) + if err != nil { + logx.Error(err) + } return resp.SetStatusWithMessage(basic.CodeOK, "修改密码成功") } From ab472a32f6bae61db21a07f2fe44e077e503b2f5 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 11:31:55 +0800 Subject: [PATCH 4/7] fix --- .../internal/logic/savecanteentypeproductlogic.go | 13 ++++++------- .../internal/logic/calculatecartpricelogic.go | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/server/canteen/internal/logic/savecanteentypeproductlogic.go b/server/canteen/internal/logic/savecanteentypeproductlogic.go index d66abf4d..a35b3b5a 100644 --- a/server/canteen/internal/logic/savecanteentypeproductlogic.go +++ b/server/canteen/internal/logic/savecanteentypeproductlogic.go @@ -61,7 +61,6 @@ func (l *SaveCanteenTypeProductLogic) SaveCanteenTypeProduct(req *types.SaveCant now := time.Now().UTC().Unix() //开启事务 err = l.svcCtx.MysqlConn.Transaction(func(tx *gorm.DB) error { - canteenProductModel = gmodel.NewFsCanteenProductModel(tx) sort := int64(0) //新的变更记录 mapUpdateCanteenPid := make(map[int64]struct{}) @@ -73,12 +72,12 @@ func (l *SaveCanteenTypeProductLogic) SaveCanteenTypeProduct(req *types.SaveCant } if v.Id > 0 { //更新 mapUpdateCanteenPid[v.Id] = struct{}{} - err = canteenProductModel.UpdateById(l.ctx, v.Id, &gmodel.FsCanteenProduct{ + err = tx.WithContext(l.ctx).Model(&gmodel.FsCanteenProduct{}).Where("id = ?", v.Id).Updates(&gmodel.FsCanteenProduct{ SizeId: &v.SizeId, Sid: &v.SId, Sort: &sort, ProductId: sizeInfo.ProductId, - }) + }).Error if err != nil { return err } @@ -86,7 +85,7 @@ func (l *SaveCanteenTypeProductLogic) SaveCanteenTypeProduct(req *types.SaveCant } //新增 addStatus := int64(1) - err = canteenProductModel.Create(l.ctx, &gmodel.FsCanteenProduct{ + err = tx.WithContext(l.ctx).Model(&gmodel.FsCanteenProduct{}).Create(&gmodel.FsCanteenProduct{ SizeId: &v.SizeId, Sid: &v.SId, Sort: &sort, @@ -94,7 +93,7 @@ func (l *SaveCanteenTypeProductLogic) SaveCanteenTypeProduct(req *types.SaveCant Ctime: &now, CanteenType: &req.Id, ProductId: sizeInfo.ProductId, - }) + }).Error if err != nil { return err } @@ -110,9 +109,9 @@ func (l *SaveCanteenTypeProductLogic) SaveCanteenTypeProduct(req *types.SaveCant return nil } delStatus := int64(0) - if err = canteenProductModel.UpdateByIdArr(l.ctx, diffCanteenProductId, &gmodel.FsCanteenProduct{ + if err = tx.WithContext(l.ctx).Model(&gmodel.FsCanteenProduct{}).Where("id in (?)", diffCanteenProductId).Updates(&gmodel.FsCanteenProduct{ Status: &delStatus, - }); err != nil { + }).Error; err != nil { return err } return nil diff --git a/server/shopping-cart/internal/logic/calculatecartpricelogic.go b/server/shopping-cart/internal/logic/calculatecartpricelogic.go index 617363ee..aa07d1f3 100644 --- a/server/shopping-cart/internal/logic/calculatecartpricelogic.go +++ b/server/shopping-cart/internal/logic/calculatecartpricelogic.go @@ -91,7 +91,6 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri subTotalPrice := int64(0) //开启事物 err = l.svcCtx.MysqlConn.Transaction(func(tx *gorm.DB) error { - shoppingCartModel := gmodel.NewFsShoppingCartModel(tx) for _, cart := range carts { modelInfo, ok := mapModel[*cart.ModelId] if !ok { @@ -138,7 +137,7 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri subTotalPrice += totalPrice } //更新购物车购买数量 - if err = shoppingCartModel.Update(l.ctx, cart.Id, userinfo.UserId, updData); err != nil { + if err = tx.WithContext(l.ctx).Model(&gmodel.FsShoppingCart{}).Where("id = ? and user_id = ?", cart.Id, userinfo.UserId).Updates(updData).Error; err != nil { logx.Error(err) return errors.New(fmt.Sprintf("failed to update cart`s purchase quantity:%d", cart.Id)) } From f18e1760a26b4c970a06b761404e6422f789feab Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 12:05:18 +0800 Subject: [PATCH 5/7] fix --- .../internal/logic/createldapuserlogic.go | 61 +++++++++---------- .../internal/logic/deletemenulogic.go | 19 ++---- 2 files changed, 35 insertions(+), 45 deletions(-) diff --git a/server/ldap-admin/internal/logic/createldapuserlogic.go b/server/ldap-admin/internal/logic/createldapuserlogic.go index 2b73200c..5be499bf 100644 --- a/server/ldap-admin/internal/logic/createldapuserlogic.go +++ b/server/ldap-admin/internal/logic/createldapuserlogic.go @@ -6,7 +6,6 @@ import ( "fusenapi/utils/basic" "fusenapi/utils/chinese_to_pinyin" "fusenapi/utils/email" - "gorm.io/gorm" "net/http" "strings" "time" @@ -63,38 +62,38 @@ func (l *CreateLdapUserLogic) CreateLdapUser(req *types.CreateLdapUserReq, r *ht userDN := fmt.Sprintf("cn=%s,%s", req.Email, l.svcCtx.Config.Ldap.PeopleGroupDN) //新增一条记录获取递增用户id now := time.Now().UTC() - err := l.svcCtx.MysqlConn.Transaction(func(tx *gorm.DB) error { - userData := &gmodel.LdapUser{ - UserDn: &userDN, - Ctime: &now, - Utime: &now, - } - if err := tx.WithContext(l.ctx).Model(&gmodel.LdapUser{}).Create(userData).Error; err != nil { - return err - } - return l.svcCtx.Ldap.Create(userDN, map[string][]string{ - "objectClass": {"person", "organizationalPerson", "inetOrgPerson", "posixAccount", "top", "shadowAccount"}, //固有属性 - "shadowLastChange": {"19676"}, //固有属性 - "shadowMin": {"0"}, //固有属性 - "shadowMax": {"99999"}, //固有属性 - "shadowWarning": {"7"}, //固有属性 - "loginShell": {"/usr/sbin/nologin"}, //固有属性 - "homeDirectory": {"/home/users/" + userNamePinyin}, - "employeeType": {fmt.Sprintf("%d", req.EmployeeType)}, //员工类型：1正式 2实习 3外包 - "uidNumber": {fmt.Sprintf("%d", userData.Id)}, //用户id - "gidNumber": {fmt.Sprintf("%d", userData.Id)}, //用户id - "uid": {userNamePinyin}, //用户名（拼音） - "cn": {req.Email}, //邮箱 - "sn": {req.UserName}, //用户名 - "mail": {req.Email}, //邮箱 - "postalCode": {fmt.Sprintf("%d", req.Status)}, //状态 - "departmentNumber": {fmt.Sprintf("%d", req.GroupId)}, //权限分组id - "postalAddress": {req.Avatar}, //头像 - "mobile": {req.Mobile}, //手机号 - "userPassword": {req.Password}, //密码 - }) + userData := &gmodel.LdapUser{ + UserDn: &userDN, + Ctime: &now, + Utime: &now, + } + if err := l.svcCtx.AllModels.LdapUser.Create(l.ctx, userData); err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "新增用户失败！") + } + err := l.svcCtx.Ldap.Create(userDN, map[string][]string{ + "objectClass": {"person", "organizationalPerson", "inetOrgPerson", "posixAccount", "top", "shadowAccount"}, //固有属性 + "shadowLastChange": {"19676"}, //固有属性 + "shadowMin": {"0"}, //固有属性 + "shadowMax": {"99999"}, //固有属性 + "shadowWarning": {"7"}, //固有属性 + "loginShell": {"/usr/sbin/nologin"}, //固有属性 + "homeDirectory": {"/home/users/" + userNamePinyin}, + "employeeType": {fmt.Sprintf("%d", req.EmployeeType)}, //员工类型：1正式 2实习 3外包 + "uidNumber": {fmt.Sprintf("%d", userData.Id)}, //用户id + "gidNumber": {fmt.Sprintf("%d", userData.Id)}, //用户id + "uid": {userNamePinyin}, //用户名（拼音） + "cn": {req.Email}, //邮箱 + "sn": {req.UserName}, //用户名 + "mail": {req.Email}, //邮箱 + "postalCode": {fmt.Sprintf("%d", req.Status)}, //状态 + "departmentNumber": {fmt.Sprintf("%d", req.GroupId)}, //权限分组id + "postalAddress": {req.Avatar}, //头像 + "mobile": {req.Mobile}, //手机号 + "userPassword": {req.Password}, //密码 }) if err != nil { + logx.Error(err) return resp.SetStatusWithMessage(basic.CodeServiceErr, "添加用户失败,"+err.Error()) } return resp.SetStatusWithMessage(basic.CodeOK, "添加用户成功") diff --git a/server/ldap-admin/internal/logic/deletemenulogic.go b/server/ldap-admin/internal/logic/deletemenulogic.go index a9d99b6b..5494e951 100644 --- a/server/ldap-admin/internal/logic/deletemenulogic.go +++ b/server/ldap-admin/internal/logic/deletemenulogic.go @@ -6,8 +6,6 @@ import ( "fusenapi/utils/basic" "time" - "gorm.io/gorm" - "context" "fusenapi/server/ldap-admin/internal/svc" @@ -38,18 +36,11 @@ func (l *DeleteMenuLogic) DeleteMenu(req *types.DeleteMenuReq, userinfo *auth.Us if req.Id <= 0 { return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数id无效") } - err := l.svcCtx.MysqlConn.Transaction(func(tx *gorm.DB) error { - menusModel := gmodel.NewLdapMenusModel(tx) - status := int64(0) - now := time.Now().UTC() - err := menusModel.Update(l.ctx, req.Id, &gmodel.LdapMenus{ - Status: &status, - Utime: &now, - }) - if err != nil { - return err - } - return nil + status := int64(0) + now := time.Now().UTC() + err := l.svcCtx.AllModels.LdapMenus.Update(l.ctx, req.Id, &gmodel.LdapMenus{ + Status: &status, + Utime: &now, }) if err != nil { logx.Error(err) From 9b60897a2a8bb2be95c6238efa8ad01e3cd1a2c6 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 12:24:12 +0800 Subject: [PATCH 6/7] fix --- .../internal/logic/ws_render_image.go | 10 +-- utils/template_switch_info/template_switch.go | 62 +++++++++---------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index e74f78eb..e4514462 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -225,13 +225,13 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe Debug: w.debug, } //qrcode不需要依赖合图组开关 - if switchInfo.SwitchInfo.QRcode.IfShow { + if switchInfo.SwitchInfo.QRcode.IfShow && switchInfo.SwitchInfo.QRcode.UserDisabled { combineReq.Qrcode = &switchInfo.SwitchInfo.QRcode.DefaultValue } //合图组开关开启 if switchInfo.CombineIsVisible { //开启slogan - if switchInfo.SwitchInfo.Slogan.IfShow { + if switchInfo.SwitchInfo.Slogan.IfShow && switchInfo.SwitchInfo.Slogan.UserDisabled { if renderImageData.RenderData.Slogan == "" { combineReq.Slogan = &switchInfo.SwitchInfo.Slogan.DefaultValue } else { @@ -239,7 +239,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe } } //开启website - if switchInfo.SwitchInfo.Website.IfShow { + if switchInfo.SwitchInfo.Website.IfShow && switchInfo.SwitchInfo.Website.UserDisabled { if renderImageData.RenderData.Website == "" { combineReq.Website = &switchInfo.SwitchInfo.Website.DefaultValue } else { @@ -247,7 +247,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe } } //开启address - if switchInfo.SwitchInfo.Address.IfShow { + if switchInfo.SwitchInfo.Address.IfShow && switchInfo.SwitchInfo.Address.UserDisabled { if renderImageData.RenderData.Address == "" { combineReq.Address = &switchInfo.SwitchInfo.Address.DefaultValue } else { @@ -255,7 +255,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe } } //开启Phone - if switchInfo.SwitchInfo.Phone.IfShow { + if switchInfo.SwitchInfo.Phone.IfShow && switchInfo.SwitchInfo.Phone.UserDisabled { if renderImageData.RenderData.Phone == "" { combineReq.Phone = &switchInfo.SwitchInfo.Phone.DefaultValue } else { diff --git a/utils/template_switch_info/template_switch.go b/utils/template_switch_info/template_switch.go index f359dc66..bec1b8cb 100644 --- a/utils/template_switch_info/template_switch.go +++ b/utils/template_switch_info/template_switch.go @@ -70,19 +70,32 @@ func GetTemplateSwitchInfo(templateId int64, templateJsonStr *string, templateMa Id: templateId, Material: templateMaterialImg, SwitchInfo: SwitchInfo{ + QRcode: QRcode{ + UserDisabled: true, + DefaultValue: "your qrcode", + }, + Website: Website{ + UserDisabled: true, + DefaultValue: "your website", + }, + Address: Address{ + UserDisabled: true, + DefaultValue: "your address", + }, + Phone: Phone{ + UserDisabled: true, + DefaultValue: "your phone", + }, + Slogan: Slogan{ + UserDisabled: true, + DefaultValue: "your slogan", + }, Logo: Logo{ Material: "/image/logo/aHnT1_rzubdwax_scale.png", }, }, CombineIsVisible: false, } - defer func() { - returnData.SwitchInfo.QRcode.UserDisabled = true - returnData.SwitchInfo.Website.UserDisabled = true - returnData.SwitchInfo.Address.UserDisabled = true - returnData.SwitchInfo.Phone.UserDisabled = true - returnData.SwitchInfo.Slogan.UserDisabled = true - }() if templateJsonStr == nil || *templateJsonStr == "" { return returnData } @@ -98,35 +111,20 @@ func GetTemplateSwitchInfo(templateId int64, templateJsonStr *string, templateMa } switch v.Tag { case "Phone": //电话 - returnData.SwitchInfo.Phone = Phone{ - IfShow: v.Visible, - Text: v.Text, - DefaultValue: "your phone", - } + returnData.SwitchInfo.Phone.IfShow = v.Visible + returnData.SwitchInfo.Phone.Text = v.Text case "Address": //地址 - returnData.SwitchInfo.Address = Address{ - IfShow: v.Visible, - Text: v.Text, - DefaultValue: "your address", - } + returnData.SwitchInfo.Address.IfShow = v.Visible + returnData.SwitchInfo.Address.Text = v.Text case "Website": - returnData.SwitchInfo.Website = Website{ - IfShow: v.Visible, - Text: v.Text, - DefaultValue: "your website", - } + returnData.SwitchInfo.Website.IfShow = v.Visible + returnData.SwitchInfo.Website.Text = v.Text case "QRcode": - returnData.SwitchInfo.QRcode = QRcode{ - IfShow: v.Visible, - Text: v.Text, - DefaultValue: "your qrcode content", - } + returnData.SwitchInfo.QRcode.IfShow = v.Visible + returnData.SwitchInfo.QRcode.Text = v.Text case "Slogan": - returnData.SwitchInfo.Slogan = Slogan{ - IfShow: v.Visible, - Text: v.Text, - DefaultValue: "your slogan", - } + returnData.SwitchInfo.Slogan.IfShow = v.Visible + returnData.SwitchInfo.Slogan.Text = v.Text } } return returnData From d0db3f4ef02d818e3992335a6f717384700ee43d Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 12:33:29 +0800 Subject: [PATCH 7/7] fix --- .../websocket/internal/logic/ws_render_image.go | 17 +++++------------ utils/websocket_data/render_data.go | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index e4514462..195bc86d 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -140,9 +140,6 @@ func (w *wsConnectItem) consumeRenderImageData() { // 执行渲染任务 func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageReqMsg) { - //用户id赋值 - renderImageData.RenderData.UserId = w.userId - renderImageData.RenderData.GuestId = w.guestId if renderImageData.RenderData.Logo == "" { w.renderErrResponse(renderImageData.RequestId, renderImageData.RenderData.TemplateTag, "", "请传入logo", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0) return @@ -211,8 +208,8 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe defer decreaseCombineRequestCount(w.userId, w.guestId) //获取刀版图 combineReq := repositories.LogoCombineReq{ - UserId: renderImageData.RenderData.UserId, - GuestId: renderImageData.RenderData.GuestId, + UserId: w.userId, + GuestId: w.guestId, ProductTemplateV2Info: productTemplate, ProductTemplateTagGroups: renderImageData.RenderData.TemplateTagGroups, TemplateTag: renderImageData.RenderData.TemplateTag, @@ -451,8 +448,8 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, sendData := map[string]interface{}{ "id": string(temIdBytes), "order_id": 0, - "user_id": info.RenderData.UserId, - "guest_id": info.RenderData.GuestId, + "user_id": w.userId, + "guest_id": w.guestId, "sku_ids": []int64{info.RenderData.ProductId}, "tids": []string{*element.Title}, "data": result, @@ -488,11 +485,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, // 组装渲染任务id func (w *wsConnectItem) genRenderTaskId(combineImage string, renderImageData websocket_data.RenderImageReqMsg, model3dInfo *gmodel.FsProductModel3d, productTemplate *gmodel.FsProductTemplateV2, element *gmodel.FsProductTemplateElement) string { - //生成任务id(需要把user_id,guest_id设为0) - incomeHashParam := renderImageData.RenderData - incomeHashParam.UserId = 0 //设为0(渲染跟用户id无关) - incomeHashParam.GuestId = 0 //设为0(渲染跟用户id无关) - incomeHashBytes, _ := json.Marshal(incomeHashParam) + incomeHashBytes, _ := json.Marshal(renderImageData.RenderData) modelHashStr := "" templateHashStr := "" if model3dInfo.ModelInfo != nil { diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go index 4d39a94d..dd1083e3 100644 --- a/utils/websocket_data/render_data.go +++ b/utils/websocket_data/render_data.go @@ -18,8 +18,8 @@ type RenderData struct { Address string `json:"address"` //地址(可选) Phone string `json:"phone"` //电话(可选) Qrcode string `json:"qrcode"` //二维码(可选) - UserId int64 `json:"user_id"` //用户id(websocket连接建立再赋值) - GuestId int64 `json:"guest_id"` //游客id(websocket连接建立再赋值) + //UserId int64 `json:"user_id"` //用户id(websocket连接建立再赋值) + //GuestId int64 `json:"guest_id"` //游客id(websocket连接建立再赋值) } type TemplateTagColor struct { Colors [][]string `json:"colors"` //颜色组合