From 65804817bbbe23c54ffb8f8a615efa86ecc6b3b4 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Tue, 30 May 2023 17:35:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91knife4j=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8=E7=9A=84bug=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/config/Swagger2Config.java | 1 + .../src/main/java/com/jero/config/filter/cors/CorsFilter.java | 3 +-- .../jero/modules/system/controller/SysDictItemController.java | 1 - .../com/jero/modules/system/controller/SysUserController.java | 2 ++ .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- jero-boot/pom.xml | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/Swagger2Config.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/Swagger2Config.java index 455a7697..a3f4f9b5 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/Swagger2Config.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/Swagger2Config.java @@ -55,6 +55,7 @@ public class Swagger2Config implements WebMvcConfigurer { public Docket defaultApi2() { return new Docket(DocumentationType.SWAGGER_2) .apiInfo(apiInfo()) + .groupName("Jero") .select() //此包路径下的类，才生成接口文档 .apis(RequestHandlerSelectors.basePackage("com.jero")) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java index 771ddcfb..0df447b3 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java @@ -70,14 +70,13 @@ public class CorsFilter implements Filter { private void responseInfo(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { HttpServletResponse httpServletResponse = (HttpServletResponse) response; httpServletResponse.setHeader("Access-Control-Allow-Origin", originIp); - httpServletResponse.addHeader("Access-Control-Allow-Headers", "Authorization"); httpServletResponse.setHeader("Access-Control-Allow-Credentials", "true"); httpServletResponse.setHeader("Access-Control-Allow-Methods", "POST,GET"); httpServletResponse.setHeader("Access-Control-Max-Age", "3600"); httpServletResponse.setHeader("Content-Security-Policy", "upgrade-insecure-requests;connect-src *"); httpServletResponse.setHeader("X-Content-Type-Options", "nosniff"); httpServletResponse.setHeader("X-XSS-Protection", "1;mode=block"); - httpServletResponse.setHeader("Access-Control-Allow-Headers", "Origin, Accept, x-auth-token, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers, authorization"); + httpServletResponse.setHeader("Access-Control-Allow-Headers", "Origin, Accept, x-auth-token, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers, authorization, Authorization, Referer"); chain.doFilter(request, response); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index d40fc637..e270ca69 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -159,7 +159,6 @@ public class SysDictItemController { */ @RequiresPermissions("sys:dict:list") @GetMapping("/dictItemCheck") - @ApiOperation("字典重复校验接口") public Results doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) { int num = 0; LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 91506aa4..d0ad18f3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -30,6 +30,7 @@ import com.jero.modules.system.service.ISysUserRoleService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.vo.SysDepartUsersVO; import com.jero.modules.system.vo.SysUserRoleVO; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -65,6 +66,7 @@ import java.util.stream.Collectors; * @Author scott * @since 2018-12-20 */ +@Api(tags = "用户管理") @Slf4j @RestController @RequestMapping("/sys/user") diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 685afc34..b612269d 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -278,7 +278,7 @@ jero: # cors白名单 notFilter: # origin地址 - originIp: http://localhost:3000, + originIp: http://localhost:3000 # 加密默认值 password: pbe: @@ -298,7 +298,7 @@ logging: knife4j: #开启增强配置 enable: true - #开启生产环境屏蔽 + #开启生产环境屏蔽，为true，则knife4j无法访问 production: false basic: enable: false diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml index 36497f9a..e2bd1ee7 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -299,7 +299,7 @@ logging: knife4j: #开启增强配置 enable: true - #开启生产环境屏蔽 + #开启生产环境屏蔽，为true，则knife4j无法访问 production: false basic: enable: false diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml index 9f1b07e7..ed320023 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml @@ -298,7 +298,7 @@ logging: knife4j: #开启增强配置 enable: true - #开启生产环境屏蔽 + #开启生产环境屏蔽，为true，则knife4j无法访问 production: false basic: enable: false diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml index 59885535..e23ef854 100644 --- a/jero-boot/pom.xml +++ b/jero-boot/pom.xml @@ -21,7 +21,7 @@ 2.2.0 1.2.75 2.0.4 - 2.0.9 + 2.0.4 42.2.6 11.2.0.3 4.0