Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

syh 5 lat temu
rodzic
commit
9cd8857390

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -28,8 +28,8 @@ spring:
             enable: true
             required: true
   ## quartz定时任务,采用数据库方式
-  #quartz:
-   # job-store-type: jdbc
+  quartz:
+    job-store-type: jdbc
   #json 时间戳统一转换
   jackson:
     date-format:   yyyy-MM-dd HH:mm:ss

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/IpPoolServiceImpl.java

@@ -34,7 +34,7 @@ public class IpPoolServiceImpl extends ServiceImpl<IpPoolMapper, IpPool> impleme
         queryWrapper.orderByAsc("last_use_time");
         IpPool ipPool = this.getOne(queryWrapper);
         if (ipPool == null) {
-            syncIpPool();
+            return null;
         } else {
             ipPool.setLastUseTime(new Date());
             this.updateById(ipPool);