clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复idea 不适当的阻塞方法调用

This commit is contained in:
1332987 2022-04-20 16:15:38 +08:00
parent 7cb3f04883
commit 0556dbd111
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
View File

@ -3,7 +3,6 @@ package com.ruoyi.gateway.handler;
import com.ruoyi.common.core.exception.CaptchaException; import com.ruoyi.common.core.exception.CaptchaException;
import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.gateway.service.ValidateCodeService; import com.ruoyi.gateway.service.ValidateCodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.BodyInserters;
@ -12,7 +11,7 @@ import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse; import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.io.IOException; import javax.annotation.Resource;
/** /**
* 验证码获取 * 验证码获取
@ -21,7 +20,7 @@ import java.io.IOException;
*/ */
@Component @Component
public class ValidateCodeHandler implements HandlerFunction<ServerResponse> { public class ValidateCodeHandler implements HandlerFunction<ServerResponse> {
@Autowired @Resource
private ValidateCodeService validateCodeService; private ValidateCodeService validateCodeService;
@Override @Override
@ -29,9 +28,9 @@ public class ValidateCodeHandler implements HandlerFunction<ServerResponse> {
AjaxResult ajax; AjaxResult ajax;
try { try {
ajax = validateCodeService.createCaptcha(); ajax = validateCodeService.createCaptcha();
} catch (CaptchaException | IOException e) { return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromValue(ajax));
} catch (CaptchaException e) {
return Mono.error(e); return Mono.error(e);
} }
return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromValue(ajax));
} }
} }

2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
View File

@ -18,7 +18,7 @@ public interface ValidateCodeService {
* @throws IOException / * @throws IOException /
* @throws CaptchaException / * @throws CaptchaException /
*/ */
public AjaxResult createCaptcha() throws IOException, CaptchaException; public AjaxResult createCaptcha() throws CaptchaException;
/** /**
* 校验验证码 * 校验验证码

2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
View File

@ -43,7 +43,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
* 生成验证码 * 生成验证码
*/ */
@Override @Override
public AjaxResult createCaptcha() throws IOException, CaptchaException { public AjaxResult createCaptcha() throws CaptchaException {
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
boolean captchaOnOff = captchaProperties.getEnabled(); boolean captchaOnOff = captchaProperties.getEnabled();
ajax.put("captchaOnOff", captchaOnOff); ajax.put("captchaOnOff", captchaOnOff);