20210414v1.1

signin/src/main/java/com/ccsens/signin/api/UserController.java

@@ -12,6 +12,7 @@ import com.ccsens.util.CodeEnum;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.JwtUtil;
 import com.ccsens.util.WebConstant;
+import com.ccsens.util.exception.BaseException;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.SignatureException;
@@ -76,8 +77,8 @@ public class UserController {
             case Email:
             case Account: {
                 if (StrUtil.isEmpty(credential)) {
-                    String msg = "credential is required when type is %1$d(%2$s)";
-                    throw new UserLoginException(-2, String.format(msg, identify_type.value, identify_type.phase));
+                    String msg = "请输入%1$";
+                    throw new UserLoginException(-2, String.format(msg,identify_type.phase));
                 }
                 break;
             }

signin/src/main/java/com/ccsens/signin/bean/dto/UserDto.java

@@ -29,7 +29,7 @@ public class UserDto {
         @ApiModelProperty("登录客户端：0-wxmp,1-H5,2-Android,3-IOS，4-WxEnterprise")
         @NotNull(message = "client is required.")
         private Integer client;
-        @ApiModelProperty("登录类型：0-wxmp,1-phone,2-email,3-accounts,4-OAUTH2_Wx,5-Wx_H5,6-OAUTH2_WeiBo, 7-Wx_Enterprise")
+        @ApiModelProperty("登录类型：0-wxmp(小程序),1-phone(手机),2-email(邮箱),3-accounts(账号),4-OAUTH2_Wx（公众号）,5-Wx_H5（网页微信）,6-OAUTH2_WeiBo, 7-Wx_Enterprise（企业微信）")
         @NotNull(message = "type is required.")
         private Integer type;
         @ApiModelProperty("登录信息")

signin/src/main/java/com/ccsens/signin/service/UserService.java

@@ -368,7 +368,7 @@ public class UserService implements IUserService {
                 throw new BaseException(CodeEnum.PASSWORD_ERROR);
             }
         } else {
-            throw new BaseException(CodeEnum.NOT_ACCOUNT);
+            throw new BaseException(CodeEnum.PASSWORD_ERROR);
         }
         long end = System.currentTimeMillis();
         log.info("查询并验证账号用时：{}",end - start);
@@ -1170,6 +1170,7 @@ public class UserService implements IUserService {
         }
         long end1 = System.currentTimeMillis();
         log.info("查询用户信息用了：{}",end1 - start);
+        //获取token
         UserVo.TokenBean tokenBean1 = generateToken(clientType, userSignVo.getUserId(), theMap);
         tokenBean.setToken(tokenBean1.getToken());
         tokenBean.setRefresh_token(tokenBean1.getRefresh_token());

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common