更新快跑者配置信息

src/main/java/com/sqx/modules/callBack/controller/CallBackController.java

@@ -12,6 +12,7 @@ import com.sqx.modules.address.service.AddressService;
 import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.callBack.dto.CallBackDto;
+import com.sqx.modules.common.service.CommonInfoService;
 import com.sqx.modules.errand.entity.TbIndent;
 import com.sqx.modules.errand.service.TbIndentService;
 import com.sqx.modules.goods.entity.GoodsShop;
@@ -69,6 +70,9 @@ public class CallBackController {
     @Autowired
     private AddressService addressService;
 
+    @Autowired
+    private CommonInfoService commonInfoService;
+
     /**
      * 回调
      */
@@ -396,11 +400,14 @@ public class CallBackController {
         String timestamp = String.valueOf(currentTimeSeconds);
         log.info("timestamp: "+timestamp);
 //               唯一标识符
-        String ticket = "83f0ff99-7c8e-47e8-8802-bd3754414a52";
+        String ticket=commonInfoService.findOne(449).getValue();
 //               团队token
-        String teamToken = "Q444DMV4LT8WSGRW";
+        String teamToken=commonInfoService.findOne(448).getValue();
 //               开发者中心的开发密钥
-        String devKey = "31RRHA4O165VFN9W2DAPDYDH8N83BT12";
+        String devKey=commonInfoService.findOne(447).getValue();
+//              签名密钥
+        String devSecret=commonInfoService.findOne(450).getValue();
+
 
         JSONObject body2 = new JSONObject();
 //        String shopId = tbOrder.getShopId()+"";
@@ -478,7 +485,7 @@ public class CallBackController {
         body2.put("pay_status", 0);
         log.info("body2信息：" + body2);
 //               获取签名
-        String sign = SignUtil.getSign(body2.toString(), devKey, teamToken, ticket, currentTimeSeconds, 1);
+        String sign = SignUtil.getSign(body2.toString(), devKey, teamToken, ticket, currentTimeSeconds, 1,devSecret);
         String responseBody="";
         try {
             log.info("创建快跑者订单");

src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -600,11 +600,16 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         String timestamp = String.valueOf(currentTimeSeconds);
         log.info("timestamp: "+timestamp);
 //               唯一标识符
-        String ticket = "83f0ff99-7c8e-47e8-8802-bd3754414a52";
+//        String ticket = "83f0ff99-7c8e-47e8-8802-bd3754414a52";
+        String ticket=commonInfoService.findOne(449).getValue();
 //               团队token
-        String teamToken = "Q444DMV4LT8WSGRW";
+//        String teamToken = "Q444DMV4LT8WSGRW";
+        String teamToken=commonInfoService.findOne(448).getValue();
 //               开发者中心的开发密钥
-        String devKey = "31RRHA4O165VFN9W2DAPDYDH8N83BT12";
+//        String devKey = "31RRHA4O165VFN9W2DAPDYDH8N83BT12";
+        String devKey=commonInfoService.findOne(447).getValue();
+        //              签名密钥
+        String devSecret=commonInfoService.findOne(450).getValue();
 
         JSONObject body2 = new JSONObject();
 //        String shopId = tbOrder.getShopId()+"";
@@ -682,7 +687,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         body2.put("pay_status", 0);
         log.info("body2信息：" + body2);
 //               获取签名
-        String sign = SignUtil.getSign(body2.toString(), devKey, teamToken, ticket, currentTimeSeconds, 1);
+        String sign = SignUtil.getSign(body2.toString(), devKey, teamToken, ticket, currentTimeSeconds, 1,devSecret);
         String responseBody="";
         try {
             log.info("创建快跑者订单");
@@ -1651,14 +1656,19 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         long currentTimeSeconds = currentTimeMillis / 1000;
         String timestamp = String.valueOf(currentTimeSeconds);
 //               唯一标识符
-        String ticket = "83f0ff99-7c8e-47e8-8802-bd3754414a52";
+//        String ticket = "83f0ff99-7c8e-47e8-8802-bd3754414a52";
+        String ticket=commonInfoService.findOne(449).getValue();
 //               团队token
-        String teamToken = "Q444DMV4LT8WSGRW";
+//        String teamToken = "Q444DMV4LT8WSGRW";
+        String teamToken=commonInfoService.findOne(448).getValue();
 //               开发者中心的开发密钥
-        String devKey = "31RRHA4O165VFN9W2DAPDYDH8N83BT12";
+//        String devKey = "31RRHA4O165VFN9W2DAPDYDH8N83BT12";
+        String devKey=commonInfoService.findOne(447).getValue();
+        //              签名密钥
+        String devSecret=commonInfoService.findOne(450).getValue();
 
 //               获取签名
-        String sign = com.sqx.common.utils.SignUtil.getSign(body.toString(), devKey, teamToken, ticket, currentTimeSeconds, 1);
+        String sign = com.sqx.common.utils.SignUtil.getSign(body.toString(), devKey, teamToken, ticket, currentTimeSeconds, 1,devSecret);
         String responseBody="";
         try {
             log.info("撤销快跑者订单");