@ServletComponentScan注解指定basePackages的参数，个别服务的启动类太深，扫描不到common包中的filter

3 years ago · 49189eeee7
37 changed files with 39 additions and 38 deletions
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class AdminApplication {
    public static void main(String[] args) {
--- a/epmet-auth/src/main/java/com/epmet/AuthApplication.java
+++ b/epmet-auth/src/main/java/com/epmet/AuthApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan // 开启Servlet容器扫描，扫描@WebFilter等注解
+@ServletComponentScan(basePackages = "com.epmet") // 开启Servlet容器扫描，扫描@WebFilter等注解
 public class AuthApplication {
    public static void main(String[] args) {
--- a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
+++ b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
@ -27,7 +27,7 @@ import org.springframework.context.annotation.FilterType;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-//@ServletComponentScan
+//@ServletComponentScan(basePackages = "com.epmet")
@ComponentScan(basePackages = {"com.epmet.*"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {RedissonConfig.class, ThreadDispatcherConfig.class, ServletExceptionHandler.class}))
 public class GatewayApplication {
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/DataAggregatorApplication.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/DataAggregatorApplication.java
@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication(scanBasePackages = {"com.epmet"}, exclude = {DataSourceAutoConfiguration.class})
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class DataAggregatorApplication {
    public static void main(String[] args) {
        SpringApplication.run(DataAggregatorApplication.class, args);
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@EnableDiscoveryClient
@EnableFeignClients
@EnableAsync
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class DataReportApplication {
    public static void main(String[] args) {
        SpringApplication.run(DataReportApplication.class, args);
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java
@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@EnableFeignClients
@SpringBootApplication (exclude = {DataSourceAutoConfiguration.class})
@EnableAsync
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class DataStatsApplication {
    public static void main(String[] args) {
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/ActivitiApplication.java
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/ActivitiApplication.java
@ -26,7 +26,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 })
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class ActivitiApplication {
    public static void main(String[] args) {
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/EpmetCommonServiceApplication.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/EpmetCommonServiceApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class EpmetCommonServiceApplication {
    public static void main(String[] args) {
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/DemoApplication.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/DemoApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class DemoApplication {
    public static void main(String[] args) {
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/EpmetExtApplication.java
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/EpmetExtApplication.java
@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class EpmetExtApplication {
    public static void main(String[] args) {
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java
@ -24,7 +24,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
@EnableAsync
 public class EpmetHeartApplication {
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/JobApplication.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/JobApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class JobApplication {
    public static void main(String[] args) {
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java
@ -24,7 +24,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
@EnableAsync
 public class MessageApplication {
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/OssApplication.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/OssApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class OssApplication {
    public static void main(String[] args) {
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java
@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
@EnableAsync
 public class EpmetPointApplication {
    public static void main(String[] args) {
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java
@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class EpmetThirdApplication {
    public static void main(String[] args) {
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java
@ -13,7 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 //@EnableConfigurationProperties(value = {DatabaseProperties.class})
 public class GovAccessApplication {
    public static void main(String[] args) {
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/GovGridApplication.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/GovGridApplication.java
@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class GovGridApplication {
    public static void main(String[] args) {
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java
@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class GovIssueApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(GovIssueApplication.class, args);
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/GovMineApplication.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/GovMineApplication.java
@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class GovMineApplication {
    public static void main(String[] args) {
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java
@ -24,7 +24,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
@EnableAsync
 public class GovOrgApplication {
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/GovProjectApplication.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/GovProjectApplication.java
@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@EnableDiscoveryClient
@EnableFeignClients
@EnableAsync
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class GovProjectApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(GovProjectApplication.class, args);
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java
@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@EnableDiscoveryClient
@EnableFeignClients
@EnableAsync
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class GovVoiceApplication {
    public static void main(String[] args) {
        SpringApplication.run(GovVoiceApplication.class, args);
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java
@ -18,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 //@ComponentScan(value = { "com.epmet" })
 public class OpenDataApplication {
    public static void main(String[] args) {
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/OperAccessApplication.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/OperAccessApplication.java
@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class OperAccessApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(OperAccessApplication.class, args);
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/OperCrmApplication.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/OperCrmApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class OperCrmApplication {
    public static void main(String[] args) {
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class OperCustomizeApplication {
    public static void main(String[] args) {
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java
@ -24,7 +24,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
@EnableAsync
 public class ResiGroupApplication {
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/ResiGuideApplication.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/ResiGuideApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class ResiGuideApplication {
    public static void main(String[] args) {
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/ResiHallApplication.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/ResiHallApplication.java
@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class ResiHallApplication {
    public static void main(String[] args) {
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/ResiHomeApplication.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/ResiHomeApplication.java
@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class ResiHomeApplication {
    public static void main(String[] args) {
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java
@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class ResiMineApplication {
    public static void main(String[] args) {
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java
@ -24,7 +24,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
@EnableAsync
 public class ResiPartyMemberApplication {
--- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/ResiVoiceApplication.java
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/ResiVoiceApplication.java
@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class ResiVoiceApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(ResiVoiceApplication.class, args);
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/ScanApplication.java
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/ScanApplication.java
@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = "com.epmet")
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class ScanApplication {
    public static void main(String[] args) {
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/controller/ScanController.java
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/controller/ScanController.java
@ -56,8 +56,9 @@ public class ScanController {
 	 */
 	@RequestMapping("textSyncScan")
 	public Result<SyncScanResult> textSyncScan(@RequestBody TextScanParam param) {
-		ValidatorUtils.validateEntity(param);
+		//ValidatorUtils.validateEntity(param);
-		return scanService.sendTextScan(param);
+		//return scanService.sendTextScan(param);
 		return null;
 	}
 	//@RequestMapping("imgAsyncScan")
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
@ -26,7 +26,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@EnableDiscoveryClient
@EnableFeignClients
@EnableAsync
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class UserApplication {
    public static void main(String[] args) {