diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java index f0ecd3d..c5c853f 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java @@ -115,11 +115,13 @@ public class SecurityUtils return passwordEncoder.matches(rawPassword, encodedPassword); } - - public static void main(String[] args) { - - String msg= encryptPassword("Admin@1234"); +//$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2 + //$2a$10$zvlw3Mu8M.j.MhAChrYwluj88ziX6lVD3AoRrBQpwKMcdIZvKMoR2 +// String msg= encryptPassword("Admin@1234"); + String msg= encryptPassword("admin123"); + boolean rest = matchesPassword("admin123","$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2"); System.err.println(msg); + System.err.println(rest); } } diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/filter/ValidateCodeFilter.java b/bonus-gateway/src/main/java/com/bonus/gateway/filter/ValidateCodeFilter.java index 5b77671..21130f4 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/filter/ValidateCodeFilter.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/filter/ValidateCodeFilter.java @@ -35,8 +35,8 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory { private final static String[] VALIDATE_URL = new String[] { "/auth/login", "/auth/register" }; - @Value("${system.decryptEnabled}") - public boolean jaData; + @Value("${system.encryptEnabled}") + public boolean encryptEnabled; @Autowired private ValidateCodeService validateCodeService; @@ -72,7 +72,7 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory } catch (Exception e) { - return ServletUtils.webFluxResponseWriter(exchange.getResponse(), e.getMessage(),jaData); + return ServletUtils.webFluxResponseWriter(exchange.getResponse(), e.getMessage(),encryptEnabled); } return chain.filter(exchange); }; diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/handler/GatewayExceptionHandler.java b/bonus-gateway/src/main/java/com/bonus/gateway/handler/GatewayExceptionHandler.java index 1e91fb2..e31c75c 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/handler/GatewayExceptionHandler.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/handler/GatewayExceptionHandler.java @@ -22,9 +22,8 @@ import reactor.core.publisher.Mono; @Configuration public class GatewayExceptionHandler implements ErrorWebExceptionHandler { - @Value("${system.decryptEnabled}") - public boolean jaData; - + @Value("${system.encryptEnabled}") + public boolean encryptEnabled; private static final Logger log = LoggerFactory.getLogger(GatewayExceptionHandler.class); @@ -56,6 +55,6 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler log.error("[网关异常处理]请求路径:{},异常信息:{}", exchange.getRequest().getPath(), ex.getMessage()); - return ServletUtils.webFluxResponseWriter(response, msg,jaData); + return ServletUtils.webFluxResponseWriter(response, msg, encryptEnabled); } } \ No newline at end of file diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/handler/SentinelFallbackHandler.java b/bonus-gateway/src/main/java/com/bonus/gateway/handler/SentinelFallbackHandler.java index 7bf5cc1..1118d91 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/handler/SentinelFallbackHandler.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/handler/SentinelFallbackHandler.java @@ -16,12 +16,12 @@ import reactor.core.publisher.Mono; */ public class SentinelFallbackHandler implements WebExceptionHandler { - @Value("${system.decryptEnabled}") - public boolean jaData; + @Value("${system.encryptEnabled}") + public boolean encryptEnabled; private Mono writeResponse(ServerResponse response, ServerWebExchange exchange) { - return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数,请稍候再试",jaData); + return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数,请稍候再试",encryptEnabled); } @Override diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java index 71cb93d..b9f301d 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java @@ -1,6 +1,10 @@ package com.bonus.file.controller; import com.bonus.common.core.utils.Base64Utils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +26,7 @@ import java.io.IOException; * @author bonus */ @RestController +@Api("服务文件存储") public class SysFileController { private static final Logger log = LoggerFactory.getLogger(SysFileController.class); @@ -33,6 +38,7 @@ public class SysFileController * 文件上传请求 */ @PostMapping("upload") + @ApiOperation("上传本地文件到服务器") public R upload(MultipartFile file) { try @@ -51,7 +57,13 @@ public class SysFileController } } + @GetMapping("/download") + @ApiOperation("从服务器下载文件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "url", value = "文件网络地址", required = true), + @ApiImplicitParam(name = "destination", value = "下载的本地路径", required = true), + }) public R downloadFile(String url, String destination) { try { String fileUrl = Base64Utils.decodeUrl(url);