浏览代码

先联调报表

chengyao 3 年之前
父节点
当前提交
5914763161

+ 1 - 1
src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -38,7 +38,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .authorizeRequests()
                 .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
                 .antMatchers("/sys/user/getJwt").permitAll()
-                .antMatchers("/sys/user/captcha").permitAll()
+                .antMatchers("/sys/user/getCaptcha").permitAll()
                 .antMatchers("/sys/user/getHospitalMark").permitAll()
                 .antMatchers("/sys/user/getJwtNoPass").permitAll()
                 .antMatchers("/sys/user/refreshJwt").permitAll()

+ 1 - 1
src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -81,7 +81,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/actuator/**", request)
                 || matchers("/hystrix/**", request)
                 || matchers("/sys/user/getJwt", request)
-                || matchers("/sys/user/captcha", request)
+                || matchers("/sys/user/getCaptcha", request)
                 || matchers("/sys/user/getHospitalMark", request)
                 || matchers("/sys/user/getJwtNoPass", request)
                 || matchers("/sys/user/refreshJwt", request)

+ 2 - 2
src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -140,7 +140,7 @@ public class SysUserFacade extends SysUserServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "请输入密码");
         }
-        if (StringUtils.isEmpty(captcha)) {
+     /*   if (StringUtils.isEmpty(captcha)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "请输入验证码");
         }
@@ -150,7 +150,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         if(null == captchaObject || StringUtils.isEmpty(captchaObject.toString()) || !captchaObject.toString().trim().equalsIgnoreCase(captcha)){
                 throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,"验证码错误");
             }
-
+*/
         //使用MD5对密码进行加密
         String MD5Password = DigestUtils.md5DigestAsHex(password.getBytes());
         QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();

+ 1 - 1
src/main/java/com/diagbot/vo/UserLoginVO.java

@@ -18,7 +18,7 @@ public class UserLoginVO {
     private String username;
     @NotBlank(message = "请输入密码!")
     private String password;
-    @NotBlank(message = "请输入验证码!")
+   // @NotBlank(message = "请输入验证码!")
     private String captcha;
     private String captchaId;
 

+ 2 - 2
src/main/java/com/diagbot/web/SysUserController.java

@@ -72,8 +72,8 @@ public class SysUserController {
     }
 
     @ApiOperation(value = "获取验证码[by:cy]")
-    @PostMapping("/captcha")
-    @SysLogger("captcha")
+    @PostMapping("/getCaptcha")
+    @SysLogger("getCaptcha")
     public RespDTO<ImageCaptchaDTO> getCaptcha() throws IOException {
         return  RespDTO.onSuc(userFacade.getCaptcha());
     }