Ver código fonte

修改钉钉同步检查

seyason 2 anos atrás
pai
commit
d0ed94012f

+ 19 - 17
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -179,24 +179,26 @@ public class TimingTask {
     //每天2:11 同步钉钉用户前2天到未来30天时间段的打卡,请假,出差数据
     @Scheduled(cron = "0 11 2 ? * *")
     private void synDingDingWorkData() {
-        //if (isDev) return;
+        if (isDev) return;
         List<TimeType> timeTypeList = timeTypeMapper.selectList(new QueryWrapper<TimeType>().eq("sync_dingding", 1));
-        List<Integer> compIds = timeTypeList.stream().map(TimeType::getCompanyId).collect(Collectors.toList());
-        //企业内部应用才有权限调用
-        List<CompanyDingding> dingdingList = companyDingdingService.list(new QueryWrapper<CompanyDingding>().in("company_id", compIds)
-                .isNotNull("inner_appkey"));
-        System.out.println("==========获取钉钉内部应用的数量是:"+dingdingList.size());
-        if (dingdingList.size() > 0) {
-            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            LocalDateTime yestoday = LocalDateTime.now().minusDays(2);
-            String startDate = dtf.format(yestoday);
-            String endDate = dtf.format(yestoday.plusDays(32));
-            for (int i=0;i<dingdingList.size(); i++) {
-                System.out.println("钉钉公司:"+dingdingList.get(i).getCorpName());
-                long t1 = System.currentTimeMillis();
-                dingDingService.syncUserWorkData(dingdingList.get(i), null, startDate, endDate, false);
-                long t2 = System.currentTimeMillis();
-                System.out.println("同步 "+dingdingList.get(i).getCorpName()+", 总共耗时:"+(t2-t1)+"ms");
+        if (timeTypeList.size() > 0) {
+            List<Integer> compIds = timeTypeList.stream().map(TimeType::getCompanyId).collect(Collectors.toList());
+            //企业内部应用才有权限调用
+            List<CompanyDingding> dingdingList = companyDingdingService.list(new QueryWrapper<CompanyDingding>().in("company_id", compIds)
+                    .isNotNull("inner_appkey"));
+            System.out.println("==========获取钉钉内部应用的数量是:"+dingdingList.size());
+            if (dingdingList.size() > 0) {
+                DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                LocalDateTime yestoday = LocalDateTime.now().minusDays(2);
+                String startDate = dtf.format(yestoday);
+                String endDate = dtf.format(yestoday.plusDays(32));
+                for (int i=0;i<dingdingList.size(); i++) {
+                    System.out.println("钉钉公司:"+dingdingList.get(i).getCorpName());
+                    long t1 = System.currentTimeMillis();
+                    dingDingService.syncUserWorkData(dingdingList.get(i), null, startDate, endDate, false);
+                    long t2 = System.currentTimeMillis();
+                    System.out.println("同步 "+dingdingList.get(i).getCorpName()+", 总共耗时:"+(t2-t1)+"ms");
+                }
             }
         }
     }

+ 6 - 5
fhKeeper/formulahousekeeper/management-platform/src/main/resources/application-sgai.yml

@@ -7,20 +7,17 @@ server:
 spring:
   servlet:
     multipart:
-      # 配置上传文件的大小设�?
-      # Single file max size  即单个文件大�?
       max-file-size: 100MB
       max-request-size: 100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.168.54.5:3306/man_sgai?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
+    url: jdbc:mysql://10.168.54.5:3306/man_sgai?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: sgaigs
     password: gs5IP5qfsia#oq5P
     hikari:
       maximum-pool-size: 60
       minimum-idle: 10
       max-lifetime: 180000
-      # 数据库连接超时时�?默认30秒,�?0000
       connection-timeout: 60000
       connection-test-query: SELECT 1
     #######redis配置######
@@ -84,7 +81,11 @@ mybatis:
 upload:
   path: /www/staticproject/timesheet/upload/
 
-
+referer:
+  refererDomain:
+    - localhost
+    - gsmb.sgai.com.cn
+    - gspc.sgai.com.cn
 
 ##actuator健康检查配�?
 management:

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -131,7 +131,7 @@ referer:
     - mldworktime.ttkuaiban.com
     - gs.farben.com.cn
     - 47.101.180.183
-excludeUrls: /wxcorp/*,/wxcorp/*/*,/dingding/*,/error,/testClient,/corpWXAuth,/wx-corp-info/*,/clean/*,/innerRoles/*,/report/getReportListByToken,/report/getProcessErrorData,/project/synchronizationProject
+excludeUrls: /wxcorp/*,/wxcorp/*/*,/dingding/*,/error,/testClient,/corpWXAuth,/corpInsideWXAuth,/wx-corp-info/*,/clean/*,/innerRoles/*,/report/getReportListByToken,/report/getProcessErrorData,/project/synchronizationProject
 
 #企业微信相关参数
 suitId: ww4e237fd6abb635af