diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index c1870cde..d0042aaf 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -44,6 +44,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/slrs/sar-stand-project-team/save"); //tc模块结构单元数据 addInterceptor.excludePathPatterns("/api/sarModelTree/save"); + addInterceptor.excludePathPatterns("/api/DataSync/importUserData"); + addInterceptor.excludePathPatterns("/api/DataSync/importOrgData"); // 添加自定义拦截器,并拦截对应 url addInterceptor.addPathPatterns("/**"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java index 343902b9..fa2fed00 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java @@ -23,8 +23,9 @@ public class ScheduledSync { private IDataSyncService iDataSyncService; - @Scheduled(cron = "0 */40 * * * ?") //40分钟执行同步一次 +// @Scheduled(cron = "0 */40 * * * ?") //40分钟执行同步一次 // @Scheduled(cron="*/5 * * * * ?") + @Async public void syncSchedulingTasks() throws Exception { iDataSyncService.orgDataSync(); //时间短 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java index 8dc9b5ee..a1cb94ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java @@ -33,7 +33,7 @@ import java.util.*; @RestController @Api(description = "|SarStandPutTime|") -@RequestMapping("/DataSync") +@RequestMapping("/${restPath}/DataSync") public class DataSyncController {