Merge branch 'test' into prod

# Conflicts:
#	cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java
#	cash-api/order-server/src/main/java/com/czg/controller/DistributionPayController.java
#	cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
#	cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AppWxServiceImpl.java

@@ -1,12 +1,12 @@
 package com.czg.service.market.service.impl;
 
+import cn.hutool.crypto.SecureUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.constants.ParamCodeCst;
 import com.czg.exception.CzgException;
 import com.czg.service.RedisService;
 import com.czg.system.service.SysParamsService;
-import com.ijpay.core.kit.RsaKit;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,6 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
-import java.util.Set;
 
 /**
  * 微信支付service
@@ -80,7 +79,7 @@ public class AppWxServiceImpl extends BaseWx {
         // api支付证书公钥
         config.apiCert = payKeyMap.get(ParamCodeCst.Wechat.Pay.WX_API_CLIENT_CERT);
         try {
-            config.privateKey = RsaKit.loadPrivateKey(config.apiCertKey);
+            config.privateKey = SecureUtil.rsa(config.apiCertKey, null).getPrivateKey();
         } catch (Exception e) {
             log.warn("微信加载api证书失败");
         }
@@ -98,10 +97,6 @@ public class AppWxServiceImpl extends BaseWx {
         config.refundNotifyUrl = "";
         config.transferNotifyUrl = payKeyMap.get(ParamCodeCst.System.NATIVE_NOTIFY_URL) + "/wx/transfer";
     }
-
-    public BaseWx getAppService() {
-        return this;
-    }
 }