diff --git a/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java b/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java index 6022d46..aedf6d7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java @@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -24,6 +25,7 @@ @EnableAsync @Slf4j @EnableScheduling +@ServletComponentScan @MapperScan("com.casic.missiles.mapper") public class CasicApiApplication { public static void main(String[] args) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java b/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java index 6022d46..aedf6d7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java @@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -24,6 +25,7 @@ @EnableAsync @Slf4j @EnableScheduling +@ServletComponentScan @MapperScan("com.casic.missiles.mapper") public class CasicApiApplication { public static void main(String[] args) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/filter/CORSFilter.java b/casic-metering-api/src/main/java/com/casic/missiles/filter/CORSFilter.java index b3d4f64..2e1215c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/filter/CORSFilter.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/filter/CORSFilter.java @@ -4,9 +4,9 @@ import org.springframework.core.annotation.Order; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; import javax.servlet.*; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -16,8 +16,9 @@ * @Author: wangpeng * @Date: 2023/4/27 11:08 */ -@Component +//@Component @Order(Ordered.HIGHEST_PRECEDENCE) +@WebFilter(filterName = "CORSFilter", urlPatterns = "/minio/*") public class CORSFilter implements Filter { @Override public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java b/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java index 6022d46..aedf6d7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/CasicApiApplication.java @@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -24,6 +25,7 @@ @EnableAsync @Slf4j @EnableScheduling +@ServletComponentScan @MapperScan("com.casic.missiles.mapper") public class CasicApiApplication { public static void main(String[] args) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/filter/CORSFilter.java b/casic-metering-api/src/main/java/com/casic/missiles/filter/CORSFilter.java index b3d4f64..2e1215c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/filter/CORSFilter.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/filter/CORSFilter.java @@ -4,9 +4,9 @@ import org.springframework.core.annotation.Order; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; import javax.servlet.*; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -16,8 +16,9 @@ * @Author: wangpeng * @Date: 2023/4/27 11:08 */ -@Component +//@Component @Order(Ordered.HIGHEST_PRECEDENCE) +@WebFilter(filterName = "CORSFilter", urlPatterns = "/minio/*") public class CORSFilter implements Filter { @Override public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index eed1b51..45003a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -20,7 +20,7 @@ # store-type: redis casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-ui.html,/swagger-resources + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources #flowable数据源和多数据源配置 db: init: