Explorar el Código

1、验证码新增key,以便进行校验

machaoyi hace 1 año
padre
commit
b8736f9cb5

+ 3 - 3
application/src/main/java/com/ctsi/Auth/web/login.java

@@ -47,7 +47,7 @@ public class login {
     private static final Logger log = LoggerFactory.getLogger(login.class);
     @ApiOperation("登录")
     @PostMapping(value = "/login",name = "登录")
-    public ApiResult auth(@RequestBody UserForm userForm){
+    public ApiResult<TokenInfoPO> auth(@RequestBody UserForm userForm){
         try {
             // 验证码校验是否开启
             if (captchaType) {
@@ -73,7 +73,7 @@ public class login {
             return ApiResult.result(ApiResult.DEFAULT_SUCCEED_CODE, "登录成功", tokenInfoPO);
         } catch (Exception e) {
             log.error(e.getMessage());
-            return ApiResult.failure("登录失败",e.getMessage());
+            return ApiResult.failure("登录失败",null);
         }
     }
 
@@ -105,7 +105,7 @@ public class login {
 
     @ApiOperation("获取验证码")
     @GetMapping("/captcha")
-    public ApiResult getCaptcha() {
+    public ApiResult<CaptchaPO> getCaptcha() {
         try {
             String captcha = CaptchaUtil.generateRandomString();
             byte[] captchaImage = CaptchaUtil.generateCaptcha(captcha);

+ 1 - 1
core/src/main/java/com/ctsi/utils/ApiResult.java

@@ -101,7 +101,7 @@ public class ApiResult<T> {
         return result(code, message, null);
     }
 
-    public static ApiResult<Void> result(ErrorCodeEnum errorCodeEnum) {
+    public static <T> ApiResult<T> result(ErrorCodeEnum errorCodeEnum) {
         return result(errorCodeEnum.getCode(), errorCodeEnum.getMessage(), null);
     }
 }