Ver Fonte

Merge branch 'master' of repos.ubtob.net:usoft/uas-office-integration

RaoMeng há 4 anos atrás
pai
commit
6fc92fa1cc

+ 25 - 7
build.gradle

@@ -33,7 +33,7 @@ subprojects { Project subproject ->
         fastjson = 'com.alibaba:fastjson:1.2.47'
         threadLocal = 'com.alibaba:transmittable-thread-local:2.2.0'
         
-        repoBaseUrl = "http://maven.ubtob.com/artifactory"
+        repoBaseUrl = "https://maven.ubtob.net/artifactory"
         snapshotUrl = "$repoBaseUrl/libs-snapshot-local"
         releaseUrl = "$repoBaseUrl/libs-release-local"
     }
@@ -43,9 +43,27 @@ subprojects { Project subproject ->
         mavenCentral()
         maven { url "https://repo.spring.io/libs-milestone" }
         maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
-        maven { url "http://maven.ubtob.com/artifactory/libs-snapshot-local" }
-        maven { url "http://maven.ubtob.com/artifactory/libs-release-local" }
-        maven { url "http://maven.ubtob.com/artifactory/ext-release-local" }
+        maven {
+                    url "https://maven.ubtob.net/artifactory/libs-snapshot-local"
+                    credentials {
+                            username 'admin'
+                            password 'Admin2020yourkj2021'
+                    }
+              }
+        maven {
+                    url "https://maven.ubtob.net/artifactory/libs-release-local"
+                    credentials {
+                            username 'admin'
+                            password 'Admin2020yourkj2021'
+                    }
+              }
+        maven {
+                    url "https://maven.ubtob.net/artifactory/ext-release-local"
+                    credentials {
+                            username 'admin'
+                            password 'Admin2020yourkj2021'
+                    }
+              }
     }
 
     dependencyManagement {
@@ -74,10 +92,10 @@ subprojects { Project subproject ->
             maven {
                 url project.version.endsWith('-SNAPSHOT') ? snapshotUrl : releaseUrl
                 credentials {
-                    username = 'yingp'
-                    password = '111111'
+                    username = 'admin'
+                    password = 'Admin2020yourkj2021'
                 }
             }
         }
     }
-}
+}

+ 2 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/task/QywxCheckinTask.java

@@ -77,7 +77,8 @@ public class QywxCheckinTask {
                         lastTime = LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli();
                     }
                     Date now = new Date();
-                    long unixStartTime = lastTime / 1000 + 1;
+                    //@update 反馈:2021040337 每次往上+1秒 偶尔会导致系统漏获取一条数据
+                    long unixStartTime = lastTime / 1000 ;
                     long unixEndTime = now.getTime() / 1000;
                     Stream.iterate(0, n -> n + 1)
                             .limit((int) Math.ceil((double) employees.size() / maxSeed)).forEach(page -> {