update 快递100配置

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PostInfoServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.Gson;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
-import com.jero.common.util.PasswordUtil;
 import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.entity.PayMailContracrList;
 import com.jero.mail.param.QueryInfoParam;
@@ -19,11 +18,11 @@ import com.kuaidi100.sdk.core.IBaseClient;
 import com.kuaidi100.sdk.pojo.HttpResult;
 import com.kuaidi100.sdk.request.QueryTrackParam;
 import com.kuaidi100.sdk.request.QueryTrackReq;
-import com.kuaidi100.sdk.utils.PropertiesReader;
 import com.kuaidi100.sdk.utils.SignUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 /**
@@ -38,8 +37,10 @@ public class PostInfoServiceImpl implements IPostInfoService {
     private IPayMailBillService payMailBillService;
     @Autowired
     private IPayMailContractService payMailContractService;
-    String key = PropertiesReader.get("key");
-    String customer = PropertiesReader.get("customer");
+    @Value("${kuaidi.key}")
+    private  String key;
+    @Value("${kuaidi.customer}")
+    private  String customer;
     private static final String SF = "shunfeng"; // 顺丰
     private static final String EMS = "ems"; //EMS
 

jero-boot-single-startup/src/main/resources/account.properties

@@ -1,6 +0,0 @@
-#快递100的基础账号信息，可以在这里获取
-# https://api.kuaidi100.com/manager/v2/myinfo/enterprise
-key = glrUQsMV4692
-customer = 580BE140491CA19C3FED37DB5845413E
-secret = 13ca4c7113dc4358ae4ef739ce5127b3
-userid = 0aca2a83308545af9299b83174d38ee8

jero-boot-single-startup/src/main/resources/application-dev.yml

@@ -136,20 +136,20 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:p6spy:mysql://10.10.10.44:3306/income_payments?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:p6spy:mysql://10.10.10.44:3306/income_payments_online_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: 123456
+          password: hzwlsoft.com
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
         # 多数据源配置
         multi-datasource1:
           url: jdbc:p6spy:mysql://10.10.10.44:3306/standards_association?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&serverTimezone=Asia/Shanghai
           username: root
-          password: 123456
+          password: hzwlsoft.com
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
   redis:
     database: 14
     #      host: 121.36.69.172
-    host: 192.168.18.254
+    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -339,4 +339,9 @@ singleSignON:
   client_secret: 3a381f2432d648879ebd10ba7b54a8ae
   client_url: https://iam.catarc.ac.cn
 
-tax_rate: 0.06
+tax_rate: 0.06
+
+# 快递100相关配置
+kuaidi:
+  key: glrUQsMV4692
+  customer: 580BE140491CA19C3FED37DB5845413E