Bladeren bron

修改熊小夕海外版机器。

hexiugang 3 jaren geleden
bovenliggende
commit
122efc7903

+ 1 - 1
pom.xml

@@ -582,7 +582,7 @@
 	<!-- 配置 -->
 	<profiles>
 		<profile>
-			<id>jdk-1.7</id>
+			<id>jdk-1.8</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 				<jdk>1.8</jdk>

+ 0 - 4
watero-rst-web/pom.xml

@@ -171,10 +171,6 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
-                    <compilerArguments>
-                        <verbose />
-                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
-                    </compilerArguments>
                 </configuration>
             </plugin>
         </plugins>

+ 5 - 2
watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/TaobaoTask.java

@@ -88,10 +88,13 @@ public class TaobaoTask {
             startTime = DateTimeUtil.format(DateTimeUtil.addHour(-15), "yyyy-MM-dd HH:mm:ss");
             RedisUtils.put("TAOBAO_SYNC_TIME", startTime);
         }
+        // 结束时间
+        String endTime = RedisUtils.get("TAOBAO_SYNC_END_TIME");
+        if (startTime == null) {
+            endTime = DateTimeUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+        }
         // 批次号
         String batchIdST = generateKeyUtil.getSalesBatchIdST();
-        // 结束时间
-        String endTime = DateTimeUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
         // 循环抓取
         boolean hasNext = true;
         long pageNo = 1;