Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/dto/JwtDTO.java

@@ -13,5 +13,6 @@ import lombok.Setter;
 public class JwtDTO {
     private String accessToken;
     private String refreshToken;
-    private Integer type;
+    private Integer type; //用户类型
+    private String typeCn; //用户类型中文
 }

user-service/src/main/java/com/diagbot/dto/UserLoginDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.enums.ConstantEnum;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -32,4 +33,14 @@ public class UserLoginDTO {
      * 用户类型
      */
     private Integer type;
+
+    /**
+     * 用户类型中文
+     */
+    private String typeCn;
+
+
+    public String getTypeCn() {
+        return ConstantEnum.getName(this.type);
+    }
 }

user-service/src/main/java/com/diagbot/enums/ConstantEnum.java

@@ -13,7 +13,11 @@ public enum ConstantEnum implements KeyedNamed {
     //TODO 短信过期时间，上线后设为3，测试阶段设大
     SMS_EXPIRED_INTERVAL(99999, "短信失效时间(分钟)"),
 
-    IMG_EXPIRED_INTERVAL(20, "图片验证码失效时间(分钟)");
+    IMG_EXPIRED_INTERVAL(20, "图片验证码失效时间(分钟)"),
+
+    INNER_USER(1, "用户-朗通"),
+    OUTER_USER(0, "用户-客户");
+
 
     @Setter
     private Integer key;

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -26,6 +26,7 @@ import com.diagbot.entity.UserOrganization;
 import com.diagbot.entity.UserRole;
 import com.diagbot.entity.wrapper.MenuWrapper;
 import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.ConstantEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -293,6 +294,7 @@ public class UserFacade extends UserServiceImpl {
         data.setAccessToken(jwt.getAccess_token());
         data.setRefreshToken(jwt.getRefresh_token());
         data.setType(user.getType());
+        data.setTypeCn(ConstantEnum.getName(user.getType()));//返回中文
         return data;
     }