快递100授权信息，改到yml

box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java

@@ -24,6 +24,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -34,14 +35,16 @@ import java.util.Map;
 
 @Service
 public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService {
-    String key = PropertiesReader.get("key");
+    /*String key = PropertiesReader.get("key");
     String customer = PropertiesReader.get("customer");
     String secret = PropertiesReader.get("secret");
     String siid = PropertiesReader.get("siid");
     String userid = PropertiesReader.get("userid");
     String tid = PropertiesReader.get("tid");
     String secret_key = PropertiesReader.get("secret_key");
-    String secret_secret = PropertiesReader.get("secret_secret");
+    String secret_secret = PropertiesReader.get("secret_secret"); */
+    @Value("${express.key}")
+    private String key;
 
     @Autowired
     private IExpSubsPushRespService expSubsPushRespService;
@@ -55,7 +58,9 @@ public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService {
      */
     @Override
     public SubscribeResp ExpressSubscribe(ExpSubscribe expSubscribe) {
-         String subscribeFrom= expSubscribe.getSalt().equals("topgp")?"topgp":"bpsemi";
+
+         String loginFrom= expSubscribe.getSalt();
+         String subscribeFrom= StringUtils.isNotEmpty(loginFrom)?loginFrom.equals("topgp")?"topgp":"localhost":"localhost";
 
         SubscribeParameters subscribeParameters = new SubscribeParameters();
         SubscribeResp subscribeResp = new SubscribeResp();

box-bps/src/main/resources/account.properties

@@ -1,9 +1,9 @@
 #快递100的基础账号信息，可以在这里获取
 # https://poll.kuaidi100.com/manager/page/myinfo/enterprise
-key = Jydbrxsm2311
+#key = kzuyKyAE3985
-customer = 2DD48B3469B82F2B7700569093AB792B
+#customer = 6774D6F41D773B17027EEBE5CC902C9E
-secret = 8781ed9b35a7438499eb02fee915915a
+#secret = 4fc7633a027c4fe1a68b68237c236d6e
-userid = 2a62da2192c24d17a943ff78ee64f8c6
+#userid = bfc0389a986f45c4b36e27d9b18b7bd3
 
 #电子面单快递公司账号信息（非必填）
 partnerId =
@@ -20,6 +20,6 @@ secret_key =
 secret_secret =
 
 #是否记录快递100接口返回结果，建议记录日志或者入库，方便后期有问题双方排查（true:启用 false: 关闭 ）
-log.return.record = true
+#log.return.record = true
 #日志记录位置，建议根据自身情况配置
-logPath = logs
+#logPath = logs

ruoyi-admin/src/main/resources/application.yml

@@ -144,7 +144,27 @@ swagger:
 #企业微信
 wechat:
   corpId: ww4ed3771457e5f463
-  agentId: 1000080
+  agentId: 1000082
-  secret: drtHKYabI9_EgjJQ8aqDPRpt3XiM4d1znaVODMCSdvc
+  secret:  PqTYlveYQc54T13QS-cDyuAesDaGgyMSgpZLXBNJ-Uc
   token: 111
-  aesKey: 111
+  aesKey: 111
+
+#快递100
+express:
+  #快递100的基础账号信息，可以在这里获取
+  # https://poll.kuaidi100.com/manager/page/myinfo/enterprise
+  key: kzuyKyAE3985
+  customer: 6774D6F41D773B17027EEBE5CC902C9E
+  secret: 4fc7633a027c4fe1a68b68237c236d6e
+  userid: bfc0389a986f45c4b36e27d9b18b7bd3
+  #电子面单快递公司账号信息（非必填）
+  partnerId:
+  partnerKey:
+  net:
+  siid:
+  #短信模板id（非必填）
+  tid:
+  #云平台相关（非必填）
+  #登录云平台 https://cloud.kuaidi100.com/buyer/user/info
+  secret_key:
+  secret_secret: