From 4e66ba832fe333ac82c083265b832ee099f3f819 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 14 Oct 2021 15:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AE=9A=E6=97=B6=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5,=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E7=99=BD=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/login/security/WebMvcConfig.java  | 2 ++
 .../src/main/java/com/adc/da/scheduled/ScheduledSync.java      | 3 ++-
 .../main/java/com/adc/da/slrs/DataSync/DataSyncController.java | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

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 {