From 590642320a35543f553011d5a4436c3f4c7274b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=B9=A6=E7=A7=91=E6=8A=80?= <412656+myteng@user.noreply.gitee.com> Date: Sat, 12 Oct 2024 05:41:42 +0000 Subject: [PATCH] =?UTF-8?q?!11=20=E4=BE=9D=E8=B5=96=E6=9B=B4=E6=96=B0=20*?= =?UTF-8?q?=20fixed:=20cors=E8=B7=A8=E5=9F=9F=20*=20pom=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20*=20=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose.yml | 2 +- playedu-api/playedu-api/pom.xml | 17 +++---- .../api/interceptor/ApiInterceptor.java | 9 +--- .../playedu/api/interceptor/WebMvcConfig.java | 10 ++++ .../src/main/resources/application.yml | 4 +- playedu-api/playedu-common/pom.xml | 3 +- playedu-api/playedu-course/pom.xml | 7 +-- playedu-api/playedu-resource/pom.xml | 5 +- playedu-api/playedu-system/pom.xml | 5 +- playedu-api/pom.xml | 48 +++++++------------ 10 files changed, 50 insertions(+), 60 deletions(-) diff --git a/compose.yml b/compose.yml index b1c2add..a84d7fe 100644 --- a/compose.yml +++ b/compose.yml @@ -20,7 +20,7 @@ volumes: services: playedu: # build: . - image: registry.cn-hangzhou.aliyuncs.com/playedu/light:1.7 + image: registry.cn-hangzhou.aliyuncs.com/playedu/light:1.8 restart: always environment: - DB_HOST=mysql diff --git a/playedu-api/playedu-api/pom.xml b/playedu-api/playedu-api/pom.xml index f8afe7c..c57c117 100644 --- a/playedu-api/playedu-api/pom.xml +++ b/playedu-api/playedu-api/pom.xml @@ -6,35 +6,32 @@ xyz.playedu playedu - 1.2 + 1.0 playedu-api - - - 17 - + 1.9 xyz.playedu playedu-common - 1.2 + 1.0 xyz.playedu playedu-system - 1.2 + 1.0 xyz.playedu playedu-course - 1.2 + 1.0 xyz.playedu playedu-resource - 1.2 + 1.0 @@ -44,7 +41,7 @@ org.springframework.boot spring-boot-maven-plugin - 3.1.2 + 3.3.4 diff --git a/playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/ApiInterceptor.java b/playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/ApiInterceptor.java index 8c75ab0..94f1a9d 100644 --- a/playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/ApiInterceptor.java +++ b/playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/ApiInterceptor.java @@ -45,20 +45,13 @@ public class ApiInterceptor implements HandlerInterceptor { public boolean preHandle( HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - response.setHeader("Access-Control-Allow-Origin", "*"); - response.setHeader("Access-Control-Allow-Headers", "*"); - response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS"); - response.setHeader("Access-Control-Max-Age", "86400"); - if ("OPTIONS".equals(request.getMethod())) { - response.setStatus(204); - // 返回false意味着整个请求执行到这里结束，不会继续乡下执行了 return false; } // 当前api的请求路径 String path = request.getRequestURI(); - // 白名单过滤 || OPTIONS请求 + // 白名单过滤 if (BackendConstant.API_LIMIT_WHITELIST.contains(path)) { return HandlerInterceptor.super.preHandle(request, response, handler); } diff --git a/playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/WebMvcConfig.java b/playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/WebMvcConfig.java index 8211a15..0be226c 100644 --- a/playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/WebMvcConfig.java +++ b/playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/WebMvcConfig.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.config.annotation.CorsRegistry; @Configuration @Slf4j @@ -38,4 +39,13 @@ public class WebMvcConfig implements WebMvcConfigurer { registry.addInterceptor(adminInterceptor).addPathPatterns("/backend/**"); registry.addInterceptor(frontInterceptor).addPathPatterns("/api/v1/**"); } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("*") + .allowedMethods("*") + .allowedHeaders("*") + .maxAge(1_296_000); + } } diff --git a/playedu-api/playedu-api/src/main/resources/application.yml b/playedu-api/playedu-api/src/main/resources/application.yml index 2ccf0de..04ac178 100644 --- a/playedu-api/playedu-api/src/main/resources/application.yml +++ b/playedu-api/playedu-api/src/main/resources/application.yml @@ -55,14 +55,14 @@ mybatis-plus: banner: false sa-token: + is-print: false token-name: "Authorization" timeout: 1296000 #token有效期[单位:秒,默认15天] is-concurrent: false #限制同时登录 is-share: false jwt-secret-key: "playeduxyz" token-prefix: "Bearer" - is-print: false - is-log: true + is-log: false log-level: "warn" playedu: diff --git a/playedu-api/playedu-common/pom.xml b/playedu-api/playedu-common/pom.xml index 7a09466..2a93226 100644 --- a/playedu-api/playedu-common/pom.xml +++ b/playedu-api/playedu-common/pom.xml @@ -6,8 +6,9 @@ xyz.playedu playedu - 1.2 + 1.0 playedu-common + 1.0 \ No newline at end of file diff --git a/playedu-api/playedu-course/pom.xml b/playedu-api/playedu-course/pom.xml index 8be026a..bda038d 100644 --- a/playedu-api/playedu-course/pom.xml +++ b/playedu-api/playedu-course/pom.xml @@ -6,21 +6,22 @@ xyz.playedu playedu - 1.2 + 1.0 playedu-course + 1.0 xyz.playedu playedu-common - 1.2 + 1.0 xyz.playedu playedu-resource - 1.2 + 1.0 \ No newline at end of file diff --git a/playedu-api/playedu-resource/pom.xml b/playedu-api/playedu-resource/pom.xml index 9cd6dd0..f099d0f 100644 --- a/playedu-api/playedu-resource/pom.xml +++ b/playedu-api/playedu-resource/pom.xml @@ -6,16 +6,17 @@ xyz.playedu playedu - 1.2 + 1.0 playedu-resource + 1.0 xyz.playedu playedu-common - 1.2 + 1.0 \ No newline at end of file diff --git a/playedu-api/playedu-system/pom.xml b/playedu-api/playedu-system/pom.xml index beebece..f285877 100644 --- a/playedu-api/playedu-system/pom.xml +++ b/playedu-api/playedu-system/pom.xml @@ -6,16 +6,17 @@ xyz.playedu playedu - 1.2 + 1.0 playedu-system + 1.0 xyz.playedu playedu-common - 1.2 + 1.0 \ No newline at end of file diff --git a/playedu-api/pom.xml b/playedu-api/pom.xml index 5c0aaac..2355c73 100644 --- a/playedu-api/pom.xml +++ b/playedu-api/pom.xml @@ -5,16 +5,16 @@ org.springframework.boot spring-boot-starter-parent - 3.1.5 + 3.3.4 xyz.playedu playedu - 1.2 + 1.0 pom - playedu - playedu + PlayEdu + 开源企业内部培训解决方案 playedu-api @@ -41,19 +41,13 @@ org.springframework.boot spring-boot-starter-websocket - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 3.0.1 - org.springframework.boot spring-boot-starter-data-redis org.springframework.boot - spring-boot-starter-test - test + spring-boot-starter-validation @@ -70,14 +64,8 @@ com.baomidou - mybatis-plus-boot-starter - 3.5.3 - - - - - org.springframework.boot - spring-boot-starter-validation + mybatis-plus-spring-boot3-starter + 3.5.7 @@ -102,6 +90,7 @@ aws-java-sdk-s3 1.12.572 + javax.xml.bind jaxb-api @@ -111,36 +100,33 @@ cn.hutool hutool-json - 5.8.16 + 5.8.32 cn.hutool hutool-http - 5.8.16 + 5.8.32 cn.hutool hutool-core - 5.8.16 + 5.8.32 - cn.dev33 sa-token-spring-boot3-starter - 1.34.0 + 1.39.0 - cn.dev33 - sa-token-dao-redis-jackson - 1.34.0 + sa-token-redis-jackson + 1.39.0 - cn.dev33 sa-token-jwt - 1.34.0 + 1.39.0 @@ -149,7 +135,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 ${java.version} ${java.version} @@ -159,7 +145,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.36.0 + 2.43.0