Browse Source

1. 更新配置文件
2. 商户承担运费desc修改 & isparent字段换类型

xiachuang 2 years ago
parent
commit
d65edd6201

+ 3 - 3
superdesk-data-extract-api/src/main/resources/application-prd.yml

@@ -11,9 +11,9 @@ spring:
     name: superdesk-data-extract-api
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://
-    username:
-    password:
+    url: jdbc:mysql://127.0.0.1:3306/order_prod_2020?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    username: superdesk_order
+    password: 6dhB66#x2EgK
 logging:
   level:
     cn.superdesk.data.extract: info

+ 2 - 1
superdesk-data-extract-common/src/main/java/cn/superdesk/data/extract/enums/opCenter/OpCenterGoodsTypeEnum.java

@@ -9,7 +9,7 @@ public enum OpCenterGoodsTypeEnum {
 
     商品(1, "商品", "SP"),
     运费(2, "运费", "YF"),
-    商户承担运费(3, "商户承担运费", "SHYF"),
+    商户承担运费(3, "运费", "SHYF"),
     赠品(4, "赠品", "ZP"),
     ;
 
@@ -34,6 +34,7 @@ public enum OpCenterGoodsTypeEnum {
     public String getPrefix() {
         return prefix;
     }
+
     /**
      * 根据code获取枚举
      */

+ 2 - 2
superdesk-data-extract-dao/src/main/java/cn/superdesk/data/extract/entity/flsc/FlscShopOrder.java

@@ -13,7 +13,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author storyxc
@@ -519,7 +519,7 @@ public class FlscShopOrder implements Serializable {
      * 是父订单
      */
     @TableField("isparent")
-    private Boolean isparent;
+    private Integer isparent;
 
     /**
      * 商品实际支付金额

+ 4 - 4
superdesk-data-extract-job/src/main/resources/application-prd.yml

@@ -10,9 +10,9 @@ spring:
     name: superdesk-data-extract-job
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://
-    username:
-    password:
+    url: jdbc:mysql://127.0.0.1:3306/order_prod_2020?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    username: superdesk_order
+    password: 6dhB66#x2EgK
 logging:
   level:
     cn.superdesk.data.extract: info
@@ -25,7 +25,7 @@ xxl:
     admin:
       addresses: http://127.0.0.1:18168/jobadmin
     ### xxl-job, access token
-    accessToken: X863nVQDOxWjWguCU1PVbq75FdDVGO3d
+    accessToken: KU6sEqfXIhOxjcnpzeQCb1rAZvdYlWF0
     ### xxl-job executor appname
     executor:
       appname: superdesk-data-extract-job-executor

+ 1 - 1
superdesk-data-extract-job/src/main/resources/application-test.yml

@@ -35,6 +35,6 @@ xxl:
       ip:
       port: 20373
       ### xxl-job executor log-path
-      logpath: /data/applogs/xxl-job/jobhandler/extract-job
+      logpath: /data/wwwroot/log/xxl-job/jobhandler/extract-job
       ### xxl-job executor log-retention-days
       logretentiondays: 30