From 614b2468963289e9d42a3aed9fbad0b5853a907c Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Thu, 24 Feb 2022 11:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/common/domain/XhpcSettingConfig.java   | 5 +++++
 .../main/resources/mapper/XhpcCommonPaymentMapper.xml    | 1 +
 .../com/xhpc/user/controller/XhpcAppUserController.java  | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcSettingConfig.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcSettingConfig.java
index 6200bd5d..3490bb62 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcSettingConfig.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcSettingConfig.java
@@ -97,4 +97,9 @@ public class XhpcSettingConfig extends BaseEntity {
      */
     private String tenantId;
 
+    /**
+     *租户id
+     */
+    private String filePrefix;
+
 }
diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml
index dd58b32c..2049bc0b 100644
--- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml
+++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml
@@ -32,6 +32,7 @@
         <result column="update_by" property="updateBy"/>
         <result column="remark" property="remark"/>
         <result column="tenant_id" property="tenantId"/>
+        <result column="file_prefix" property="filePrefix"/>
     </resultMap>
 
     <select id="getXhpcSettingConfigTenantId" resultMap="XhpcSettingConfigResult">
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java
index 05a78771..95533c6e 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java
@@ -1,5 +1,6 @@
 package com.xhpc.user.controller;
 
+import cn.hutool.core.util.URLUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayClient;
@@ -253,6 +254,8 @@ public class XhpcAppUserController extends BaseController {
         R r = settingConfigService.settingConfig(2, tenantId);
         if(r !=null && r.getCode()==200){
             Map<String, Object> map = (Map<String, Object>)r.getData();
+            String filePrefix = map.get("filePrefix").toString();
+            logger.info("filePrefix>>>>>>>>>>"+filePrefix);
             /** 初始化 **/
             CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
             /** 支付宝网关 **/
@@ -262,11 +265,11 @@ public class XhpcAppUserController extends BaseController {
             /** 应用私钥, 如何获取请参考：https://opensupport.alipay.com/support/helpcenter/207/201602471154?ant_source=antsupport  **/
             certAlipayRequest.setPrivateKey(map.get("zfbPrivateKey").toString());
             /** 应用公钥证书路径，下载后保存位置的绝对路径  **/
-            certAlipayRequest.setCertPath(map.get("zfbAppCertPublicKey").toString());
+            certAlipayRequest.setCertPath(filePrefix+map.get("zfbAppCertPublicKey").toString());
             /** 支付宝公钥证书路径，下载后保存位置的绝对路径 **/
-            certAlipayRequest.setAlipayPublicCertPath(map.get("zfbAlipayCertPublicKeyRsa").toString());
+            certAlipayRequest.setAlipayPublicCertPath(filePrefix+map.get("zfbAlipayCertPublicKeyRsa").toString());
             /** 支付宝根证书路径，下载后保存位置的绝对路径 **/
-            certAlipayRequest.setRootCertPath(map.get("zfbAlipayRootCert").toString());
+            certAlipayRequest.setRootCertPath(filePrefix+map.get("zfbAlipayRootCert").toString());
             /** 设置签名类型 **/
             certAlipayRequest.setSignType("RSA2");
             /** 设置请求格式，固定值json **/