From 45d0c9152c0915cd11e42cbf04bc7b71b7b8126e Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Fri, 12 Jan 2024 18:37:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxUserMemberServiceImpl.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java index 0dbb46e..4bfdfbd 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java @@ -229,21 +229,24 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { logger.error("刷新用户信息失败"); throw new ServiceException("刷新用户信息失败"); } + String sessionKey = redisService.getCacheObject(CacheConstants.WX_SESSION_KEY_CACHE + wxUserMember.getOpenid()); + wxUserMember.getParams().put(CacheConstants.WX_SESSION_KEY_CACHE + wxUserMember.getOpenid(), sessionKey); + return login(wxUserMember); // 2、刷新redis缓存信息 - String userKey = SecurityUtils.getUserKey(); - LoginUser loginUser = redisService.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + userKey); - loginUser.setWxUserMember(wxUserMember); - loginUser.setWxUserid(wxUserMember.getId()); - loginUser.setUsername(wxUserMember.getNickname()); - loginUser.setExpireTime(loginUser.getLoginTime() + CacheConstants.EXPIRATION * 60 * 1000); - redisService.setCacheObject(userKey, loginUser, CacheConstants.EXPIRATION, TimeUnit.MINUTES); - - // 3、构建前端缓存对象 - LoginUserVo loginUserVo = new LoginUserVo(); - BeanUtils.copyProperties(wxUserMember, loginUserVo); - loginUserVo.setToken(loginUser.getToken()); - return loginUserVo; +// String userKey = SecurityUtils.getUserKey(); +// LoginUser loginUser = redisService.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + userKey); +// loginUser.setWxUserMember(wxUserMember); +// loginUser.setWxUserid(wxUserMember.getId()); +// loginUser.setUsername(wxUserMember.getNickname()); +// loginUser.setExpireTime(loginUser.getLoginTime() + CacheConstants.EXPIRATION * 60 * 1000); +// redisService.setCacheObject(userKey, loginUser, CacheConstants.EXPIRATION, TimeUnit.MINUTES); +// +// // 3、构建前端缓存对象 +// LoginUserVo loginUserVo = new LoginUserVo(); +// BeanUtils.copyProperties(wxUserMember, loginUserVo); +// loginUserVo.setToken(loginUser.getToken()); +// return loginUserVo; } From 1942ea47be52a4daf81839f8de0fef87fc09e5f4 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Sat, 13 Jan 2024 09:54:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?loginUser=20=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BC=9A=E5=91=98=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/flossom/common/security/service/TokenService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java index 6be698b..1ae2223 100644 --- a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java +++ b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java @@ -67,6 +67,10 @@ public class TokenService claimsMap.put(SecurityConstants.USER_KEY, token); claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId); claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName); + if(loginUser.getWxUserMember() != null) { + claimsMap.put(SecurityConstants.WX_DETAILS_USER_ID, loginUser.getWxUserMember().getId()); + claimsMap.put(SecurityConstants.WX_DETAILS_USERNAME, loginUser.getWxUserMember().getNickname()); + } // 接口返回信息 Map rspMap = new HashMap(); From 00dc6ec4d393f54818924bff14d5d9132307046c Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Sat, 13 Jan 2024 10:42:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?/user/refreshWxUserInfo=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=AA=E8=83=BD=E8=8E=B7=E5=8F=96=E5=88=B0=20?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9A=84=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxUserMemberServiceImpl.java | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java index 4bfdfbd..94ae0c4 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java @@ -222,32 +222,17 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { @Override @Transactional(propagation = Propagation.SUPPORTS) public LoginUserVo refreshWxUserInfo() { - // 1、获取用户最新信息 String openid = SecurityUtils.getLoginUser().getWxUserMember().getOpenid(); WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberByOpenId(openid); if (wxUserMember == null) { logger.error("刷新用户信息失败"); throw new ServiceException("刷新用户信息失败"); } - String sessionKey = redisService.getCacheObject(CacheConstants.WX_SESSION_KEY_CACHE + wxUserMember.getOpenid()); - wxUserMember.getParams().put(CacheConstants.WX_SESSION_KEY_CACHE + wxUserMember.getOpenid(), sessionKey); - return login(wxUserMember); - - // 2、刷新redis缓存信息 -// String userKey = SecurityUtils.getUserKey(); -// LoginUser loginUser = redisService.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + userKey); -// loginUser.setWxUserMember(wxUserMember); -// loginUser.setWxUserid(wxUserMember.getId()); -// loginUser.setUsername(wxUserMember.getNickname()); -// loginUser.setExpireTime(loginUser.getLoginTime() + CacheConstants.EXPIRATION * 60 * 1000); -// redisService.setCacheObject(userKey, loginUser, CacheConstants.EXPIRATION, TimeUnit.MINUTES); -// -// // 3、构建前端缓存对象 -// LoginUserVo loginUserVo = new LoginUserVo(); -// BeanUtils.copyProperties(wxUserMember, loginUserVo); -// loginUserVo.setToken(loginUser.getToken()); -// return loginUserVo; + LoginUserVo loginUserVo = new LoginUserVo(); + BeanUtils.copyProperties(wxUserMember, loginUserVo); + loginUserVo.setToken(null); + loginUserVo.setIntegralText(null); + return loginUserVo; } - } From f738853ae8f15149e7660f6f449b82769b7cd5e5 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Sat, 13 Jan 2024 10:49:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E9=80=81?= =?UTF-8?q?=E8=AF=9D=E6=9C=AF=EF=BC=8C=E8=AF=9D=E6=9C=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=20=E6=8F=90=E7=A4=BA=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index e707d39..42745c8 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -972,9 +972,9 @@ export default { scriptTemplateId: [ {required: true, message: '请选择话术标题', trigger: 'change'} ], - scriptContent: [ - {required: true, message: '请选择话术标题'} - ], + // scriptContent: [ + // {required: true, message: '请选择话术标题'} + // ], titile: [ {required: true, message: '请输入话术标题', trigger: 'blur'} ], From 4b04a31ad7cbfd4ae7471805b579b821b7bb96c1 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Sat, 13 Jan 2024 16:52:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E9=80=81?= =?UTF-8?q?=E8=AF=9D=E6=9C=AF=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/WxScriptTag.java | 13 +++++++ .../resources/mapper/WxScriptTagMapper.xml | 6 +++- .../system/service/IWxUserMemberService.java | 2 ++ .../impl/WxScriptTemplateServiceImpl.java | 10 ++++++ .../service/impl/WxUserMemberServiceImpl.java | 1 + .../impl/WxUserScriptLogServiceImpl.java | 34 +++++++++++++++---- 6 files changed, 59 insertions(+), 7 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTag.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTag.java index 4b8b7bd..08fa140 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTag.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTag.java @@ -26,6 +26,11 @@ public class WxScriptTag extends BaseEntity @Excel(name = "标签主键") private Long tagId; + /** + * 标签类型：1小程序标签 2企业微信标签 + */ + private Integer tagType; + /** 状态（0正常 1停用） */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private Long status; @@ -67,6 +72,14 @@ public class WxScriptTag extends BaseEntity return status; } + public Integer getTagType() { + return tagType; + } + + public void setTagType(Integer tagType) { + this.tagType = tagType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptTagMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptTagMapper.xml index c8b6de9..3b5b87a 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptTagMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptTagMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, script_id, tag_id, status, create_by, create_time, update_by, update_time, remark from wx_script_tag + select id, script_id, tag_id, tag_type, status, create_by, create_time, update_by, update_time, remark from wx_script_tag