fix 咨询消息发送人昵称修改

nb-auth/src/main/java/com/nb/auth/bean/LoginUser.java

@@ -41,6 +41,7 @@ public class LoginUser<T> implements Serializable {
      */
     private String username;
 
+    private String nickName;
     /**
      * 登录时间
      */

nb-common/config-common/src/main/java/com/nb/common/config/web/handler/CheckRequestHandler.java

@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  * @Description
  * @createTime 2022年06月09日 14:11:00
  */
-//@Configuration
+@Configuration
 @ConditionalOnProperty(value = "request.check.enable",havingValue = "true",matchIfMissing = false)
 @Order(10)
 @Slf4j

nb-core/src/main/java/com/nb/core/doc/SwaggerConfig.java

@@ -26,7 +26,7 @@ import java.util.*;
 @Configuration
 @EnableKnife4j
 @EnableSwagger2WebMvc
-//@Profile("dev")
+@Profile("dev")
 public class SwaggerConfig implements WebMvcConfigurer {
 
     public static final String VERSION = "1.0.0";

nb-service/app-assistant/src/main/java/com/nb/app/assistant/auth/AssistantPasswordGranter.java

@@ -1,5 +1,6 @@
 package com.nb.app.assistant.auth;
 
+import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.nb.app.assistant.api.feign.result.AssistantUserResult;
@@ -62,18 +63,20 @@ public class AssistantPasswordGranter implements IAuthGranter {
         log.info("登录用户：{}", source.getUsername());
 
         // 登录
-        SecurityUtil.getStpLogic(StpTypeEnum.ASSISTANT.getText()).login(user.getId());
+        StpLogic stpLogic = SecurityUtil.getStpLogic(StpTypeEnum.ASSISTANT.getText());
+        stpLogic.login(user.getId());
         LoginUser<String> loginUser = new LoginUser();
-        loginUser.setToken(SecurityUtil.getStpLogic().getTokenValue());
+        loginUser.setToken(stpLogic.getTokenValue());
         loginUser.setUserPlatform(UserPlatformEnum.APP_ASSIST.getCode());
         loginUser.setGrantType(source.getGrantType());
         loginUser.setUsername(source.getUsername());
+        loginUser.setNickName(user.getNickname());
         loginUser.setSys(true);
         loginUser.setId(user.getId());
         loginUser.setLoginType(StpTypeEnum.ASSISTANT.getText());
         fillUserAgentInfo(loginUser);
         // 设置用户信息
-        SecurityUtil.getStpLogic(StpTypeEnum.ASSISTANT.getText()).getTokenSession().set(LOGIN_USER_KEY,loginUser);
+        stpLogic.getTokenSession().set(LOGIN_USER_KEY,loginUser);
         return loginUser;
     }
 }

nb-service/app-assistant/src/main/java/com/nb/app/assistant/auth/AssistantPhoneGranter.java

@@ -1,5 +1,6 @@
 package com.nb.app.assistant.auth;
 
+import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.util.PhoneUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
@@ -75,18 +76,20 @@ public class AssistantPhoneGranter implements IAuthGranter {
         log.info("登录用户：{}", source.getUsername());
 
         // 登录
-        SecurityUtil.getStpLogic(StpTypeEnum.ASSISTANT.getText()).login(user.getId());
+        StpLogic stpLogic = SecurityUtil.getStpLogic(StpTypeEnum.ASSISTANT.getText());
+        stpLogic.login(user.getId());
         LoginUser<String> loginUser = new LoginUser();
-        loginUser.setToken(SecurityUtil.getStpLogic().getTokenValue());
+        loginUser.setToken(stpLogic.getTokenValue());
         loginUser.setUserPlatform(UserPlatformEnum.APP_ASSIST.getCode());
         loginUser.setGrantType(source.getGrantType());
         loginUser.setUsername(source.getUsername());
         loginUser.setSys(true);
+        loginUser.setNickName(user.getNickname());
         loginUser.setId(user.getId());
         loginUser.setLoginType(StpTypeEnum.ASSISTANT.getText());
         fillUserAgentInfo(loginUser);
         // 设置用户信息
-        SecurityUtil.getStpLogic(StpTypeEnum.ASSISTANT.getText()).getTokenSession().set(LOGIN_USER_KEY,loginUser);
+        stpLogic.getTokenSession().set(LOGIN_USER_KEY,loginUser);
 
         if(register){
             SpringUtil.publishEvent(new SaveMsgEvent(this,

nb-service/app-doctor/src/main/java/com/nb/app/doctor/auth/AppDoctorAuthGranter.java

@@ -74,6 +74,7 @@ public class AppDoctorAuthGranter implements IAuthGranter {
         loginUser.setTenantId(user.getTenantId());
         loginUser.setId(user.getId());
         loginUser.setLoginType(StpTypeEnum.APP_DOCTOR.getText());
+        loginUser.setNickName(user.getRealName());
         fillUserAgentInfo(loginUser);
         // 设置用户信息
         stpLogic.getTokenSessionByToken(loginUser.getToken(),true).set(LOGIN_USER_KEY,loginUser);

nb-service/app-msg/src/main/java/com/nb/app/msg/service/LocalAppConsultService.java

@@ -29,6 +29,7 @@ import java.util.HashMap;
 @AllArgsConstructor
 public class LocalAppConsultService extends BaseService<AppConsultMapper, AppConsultEntity,String> {
     private final IPatientClient patientClient;
+
     @Override
     public void validateBeforeSave(AppConsultEntity entity) {
 
@@ -53,7 +54,7 @@ public class LocalAppConsultService extends BaseService<AppConsultMapper, AppCon
                 MsgBean.builder()
                         .msgType(MsgEnum.CONSUL)
                         .senderId(String.valueOf(loginUser.getId()))
-                        .senderNickname(loginUser.getUsername())
+                        .senderNickname(loginUser.getNickName())
                         .patientId(entity.getPatientId())
                         .patientName(entity.getPatientName())
                         .patientCode(entity.getPatientCode())

nb-service/web-service/src/main/java/com/nb/web/service/system/auth/WebAuthGranter.java

@@ -113,6 +113,7 @@ public class WebAuthGranter implements IAuthGranter {
         loginUser.setTenantId(sysUser.getTenantId());
         loginUser.setSuperAdmin(isSuperAdmin(source.getGrantType(),sysRoleList));
         loginUser.setPermissions(permissions);
+        loginUser.setNickName(sysUser.getNickname());
         loginUser.setId(sysUser.getId());
         loginUser.setLoginType(StpTypeEnum.DEFAULT.getText());
         fillUserAgentInfo(loginUser);