diff --git a/pom.xml b/pom.xml index 987d679..57f3860 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ tms 测评管理系统 - war + jar 1.8 diff --git a/src/main/java/com/msdw/tms/config/CorsConfig.java b/src/main/java/com/msdw/tms/config/CorsConfig.java index 5250d87..e45077b 100644 --- a/src/main/java/com/msdw/tms/config/CorsConfig.java +++ b/src/main/java/com/msdw/tms/config/CorsConfig.java @@ -1,19 +1,19 @@ package com.msdw.tms.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -@Configuration -public class CorsConfig implements WebMvcConfigurer { - - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("*") - .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS") - .allowCredentials(true) - .maxAge(3600) - .allowedHeaders("*"); - } -} +// +//import org.springframework.context.annotation.Configuration; +//import org.springframework.web.servlet.config.annotation.CorsRegistry; +//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +// +//@Configuration +//public class CorsConfig implements WebMvcConfigurer { +// +// @Override +// public void addCorsMappings(CorsRegistry registry) { +// registry.addMapping("/**") +// .allowedOrigins("*") +// .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS") +// .allowCredentials(true) +// .maxAge(3600) +// .allowedHeaders("*"); +// } +//} diff --git a/src/main/java/com/msdw/tms/config/FinancialCorsConfiguration.java b/src/main/java/com/msdw/tms/config/FinancialCorsConfiguration.java new file mode 100644 index 0000000..63af235 --- /dev/null +++ b/src/main/java/com/msdw/tms/config/FinancialCorsConfiguration.java @@ -0,0 +1,38 @@ +package com.msdw.tms.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + + +@Configuration +public class FinancialCorsConfiguration { + @Bean + public CorsFilter corsFilter() { + //1.添加CORS配置信息 + CorsConfiguration config = new CorsConfiguration(); + //1) 允许的域,不要写*,否则cookie就无法使用了 + config.addAllowedOrigin("*"); + //2) 是否发送Cookie信息 + config.setAllowCredentials(true); + //3) 允许的请求方式 + config.addAllowedMethod("OPTIONS"); + config.addAllowedMethod("HEAD"); + config.addAllowedMethod("GET"); + config.addAllowedMethod("PUT"); + config.addAllowedMethod("POST"); + config.addAllowedMethod("DELETE"); + config.addAllowedMethod("PATCH"); + // 4)允许的头信息 + config.addAllowedHeader("*"); + + //2.添加映射路径,我们拦截一切请求 + UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource(); + configSource.registerCorsConfiguration("/**", config); + + //3.返回新的CorsFilter. + return new CorsFilter(configSource); + } +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 68430e8..bcfc268 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -31,7 +31,9 @@ mybatis-plus: logic-delete-value: 0 logic-not-delete-value: 1 server: - port: 8080 + port: 9090 + servlet: + context-path: /evaluation tms: thread: