修改测试、正式环境配置文件

docker-log.txt

@@ -9,7 +9,7 @@ docker stop promotion-service && docker rm promotion-service
 docker rmi promotion-service
 
 
-docker build -t promotion-service:latest .
+docker build -t promotion-service:0.2.0 .
 
 Live启动：
 docker run -d -p 8011:8011 --name promotion-service \
@@ -22,11 +22,11 @@ promotion-service:latest
 
 
 QA启动：
-docker run -d -p 8011:8011 --name promotion-service \
+docker run -d -p 8011:8011 --name promotion-service-020 \
 -v /var/logs/promotion-service/:/var/logs/promotion-service/ \
 -v /var/logs/xxl_job/:/var/logs/xxl_job/ \
 -v /root/promotion/planv2/:/root/promotion/planv2/ \
 --restart=always \
 --network host \
-promotion-service:latest \
+promotion-service:0.2.0 \
 --spring.profiles.active=qa
\ No newline at end of file

src/main/java/com/wangxiaolu/promotion/utils/QinCeUtils.java

@@ -84,8 +84,8 @@ public class QinCeUtils {
      */
     public Map<String, Object> queryOrgParam() {
         Map<String, Object> params = new HashMap<>();
-        DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
-        params.put("modify_date", DateUtil.format(dateTime, DatePattern.NORM_DATE_PATTERN));
+//        DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
+        params.put("modify_date", DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN));
         return params;
     }
 
@@ -98,8 +98,8 @@ public class QinCeUtils {
         if (queryId) {
             params.put("id", "");
         }
-        DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
-        params.put("modify_date", DateUtil.format(dateTime, DatePattern.NORM_DATE_PATTERN));
+//        DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
+        params.put("modify_date", DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN));
         return params;
     }
 
@@ -110,12 +110,9 @@ public class QinCeUtils {
         HashMap<String, Object> params = new HashMap<>();
         // 分页页码，默认1
         params.put("page_number", pageNum);
-        // todo 查询指定数据
-        params.put("store_code", "POS00040423");
-
-        //todo  after_modify_date：更新时间之后，查询更新时间之后的门店数据。格式：yyyy-MM-dd HH:mm:SS
-//        DateTime dateTime = DateUtil.offsetDay(new Date(), -2);
-//        params.put("after_modify_date", DateUtil.format(dateTime, DatePattern.NORM_DATETIME_PATTERN));
+        // 查询指定数据 params.put("store_code", "POS00040423"); after_modify_date：查询更新时间(2小时之内)的门店数据。格式：yyyy-MM-dd HH:mm:SS
+        DateTime dateTime = DateUtil.offsetHour(new Date(), -2);
+        params.put("after_modify_date", DateUtil.format(dateTime, DatePattern.NORM_DATETIME_PATTERN));
         return params;
     }
 
@@ -159,12 +156,11 @@ public class QinCeUtils {
     public Map<String, Object> queryDealerParam(Integer pageNum) {
         Map<String, Object> params = new HashMap<>();
         params.put("page_number", pageNum);
-//        记录状态。0：已删除，1：正常
-        params.put("status", "1");
+//        记录状态。0：已删除，1：正常 params.put("status", "1");
 
-        // 全量数据同步后，再开启指定日期同步
-//todo        DateTime dateTime = DateUtil.offsetDay(new Date(), -2);
-//        params.put("after_create_date", DateUtil.format(dateTime, DatePattern.NORM_DATETIME_PATTERN));
+        // todo 全量数据同步后，再开启指定日期同步
+        DateTime dateTime = DateUtil.offsetHour(new Date(), -2);
+        params.put("after_create_date", DateUtil.format(dateTime, DatePattern.NORM_DATETIME_PATTERN));
         return params;
     }
 }

src/main/java/com/wangxiaolu/promotion/xxljobtask/XxlJobHandler.java

@@ -27,8 +27,7 @@ public class XxlJobHandler {
 
     /**
      * 同步组织架构/部门数据
-     * 0 10 1
-     * 修改日期为昨天
+     * 每2小时同步修改日期为今天的数据
      */
     @XxlJob("qince_department_task")
     public void departmentSyncTask(){
@@ -39,8 +38,7 @@ public class XxlJobHandler {
 
     /**
      * 同步员工数据
-     * 0 0 1
-     * 修改日期为昨天
+     * 每2小时同步修改日期为今天的数据
      */
     @XxlJob("qince_employee_task")
     public void employeeSyncTask(){

src/main/resources/application-dev.yml

@@ -45,8 +45,8 @@ wx:
     employee:
       token_secret: xZq%kXASSPD$UtL
   xlt_miniapp:
-    app_id: wx5d89065bb4725557
-    app_secret: 7395e91baf6b49ca9b84b1301989f77e
+    app_id: wxac14dc7765484d7d
+    app_secret: b3315e66608a397f88e7e82b8f950bcd
 
 tengxunyun:
   #  腾讯云个人账号信息

src/main/resources/application-live.yml

@@ -44,8 +44,8 @@ wx:
     employee:
       token_secret: xZq%kXASSPD$UtL
   xlt_miniapp:
-    app_id: wx5d89065bb4725557
-    app_secret: 7395e91baf6b49ca9b84b1301989f77e
+    app_id: wxac14dc7765484d7d
+    app_secret: b3315e66608a397f88e7e82b8f950bcd
 tengxunyun:
   #  腾讯云个人账号信息
   secret_d: AKIDVt353sWyY0GXn0ANa0YyGdwDIBtjQwGS

src/main/resources/application-qa.yml

@@ -45,8 +45,8 @@ wx:
     employee:
       token_secret: xZq%kXASSPD$UtL
   xlt_miniapp:
-    app_id: wx5d89065bb4725557
-    app_secret: 7395e91baf6b49ca9b84b1301989f77e
+    app_id: wxac14dc7765484d7d
+    app_secret: b3315e66608a397f88e7e82b8f950bcd
 tengxunyun:
   #  腾讯云个人账号信息
   secret_d: AKIDVt353sWyY0GXn0ANa0YyGdwDIBtjQwGS