From 148dd4f3681a55774b9aadf6044ec005e82145bf Mon Sep 17 00:00:00 2001
From: zhuxiao <zhuxiao@126.com>
Date: Wed, 2 Mar 2022 09:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=85=8D=E7=BD=AE=E8=AF=81=E4=B9=A6=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?apiclient=5Fcert.pem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/isv/custom/WxpayPayConfig.vue   | 48 +++++++++++++++----
 .../views/mchApp/custom/WxpayPayConfig.vue    | 46 ++++++++++++++----
 .../views/mchApp/custom/WxpayPayConfig.vue    | 46 ++++++++++++++----
 3 files changed, 112 insertions(+), 28 deletions(-)

diff --git a/jeepay-ui-manager/src/views/isv/custom/WxpayPayConfig.vue b/jeepay-ui-manager/src/views/isv/custom/WxpayPayConfig.vue
index ec99759..d22f313 100644
--- a/jeepay-ui-manager/src/views/isv/custom/WxpayPayConfig.vue
+++ b/jeepay-ui-manager/src/views/isv/custom/WxpayPayConfig.vue
@@ -61,11 +61,6 @@
             <a-input v-model="ifParams.oauth2Url" placeholder="请输入" />
           </a-form-model-item>
         </a-col>
-        <a-col span="24">
-          <a-form-model-item label="API密钥" prop="key">
-            <a-input v-model="ifParams.key" :placeholder="ifParams.key_ph" type="textarea" />
-          </a-form-model-item>
-        </a-col>
         <a-col span="12">
           <a-form-model-item label="微信支付API版本" prop="apiVersion">
             <a-radio-group v-model="ifParams.apiVersion" defaultValue="V2">
@@ -75,7 +70,12 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="API V3秘钥" prop="apiV3Key">
+          <a-form-model-item label="APIv2密钥" prop="key">
+            <a-input v-model="ifParams.key" :placeholder="ifParams.key_ph" type="textarea" />
+          </a-form-model-item>
+        </a-col>
+        <a-col span="24">
+          <a-form-model-item label="APIv3密钥" prop="apiV3Key">
             <a-input v-model="ifParams.apiV3Key" :placeholder="ifParams.apiV3Key_ph" type="textarea" />
           </a-form-model-item>
         </a-col>
@@ -85,7 +85,7 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="API证书(.p12格式)" prop="cert">
+          <a-form-model-item label="API证书(apiclient_cert.p12)" prop="cert">
             <a-input v-model="ifParams.cert" disabled="disabled" />
             <JeepayUpload
               :action="action"
@@ -99,7 +99,21 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="私钥文件(.pem格式)" prop="apiClientKey">
+          <a-form-model-item label="证书文件(apiclient_cert.pem)" prop="apiClientCert">
+            <a-input v-model="ifParams.apiClientCert" disabled="disabled" />
+            <JeepayUpload
+              :action="action"
+              :fileUrl="ifParams.apiClientCert"
+              @uploadSuccess="uploadSuccess($event, 'apiClientCert')"
+            >
+              <template slot="uploadSlot" slot-scope="{loading}">
+                <a-button style="marginTop:5px;"> <a-icon :type="loading ? 'loading' : 'upload'" /> {{ loading ? '正在上传' : '点击上传' }} </a-button>
+              </template>
+            </JeepayUpload>
+          </a-form-model-item>
+        </a-col>
+        <a-col span="24">
+          <a-form-model-item label="私钥文件(apiclient_key.pem)" prop="apiClientKey">
             <a-input v-model="ifParams.apiClientKey" disabled="disabled" />
             <JeepayUpload
               :action="action"
@@ -177,10 +191,24 @@ export default {
             }
             callback()
         } }],
+        cert: [{ trigger: 'blur',
+          validator: (rule, value, callback) => {
+            if (this.ifParams.apiVersion === 'V3' && this.isAdd && !value) {
+              callback(new Error('请上传API证书(apiclient_cert.p12)'))
+            }
+            callback()
+          } }],
+        apiClientCert: [{ trigger: 'blur',
+          validator: (rule, value, callback) => {
+            if (this.ifParams.apiVersion === 'V3' && this.isAdd && !value) {
+              callback(new Error('请上传证书文件(apiclient_cert.pem)'))
+            }
+            callback()
+          } }],
         apiClientKey: [{ trigger: 'blur',
           validator: (rule, value, callback) => {
-            if (this.ifParams.apiVersion === 'V3' && !this.ifParams.apiClientKey) {
-              callback(new Error('请上传私钥文件'))
+            if (this.ifParams.apiVersion === 'V3' && !value) {
+              callback(new Error('请上传私钥文件(apiclient_key.pem)'))
             }
             callback()
         } }]
diff --git a/jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue b/jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue
index dd7566d..1e9febe 100644
--- a/jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue
+++ b/jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue
@@ -56,11 +56,6 @@
             <a-input v-model="ifParams.oauth2Url" placeholder="请输入" />
           </a-form-model-item>
         </a-col>
-        <a-col span="24">
-          <a-form-model-item label="API密钥" prop="key">
-            <a-input v-model="ifParams.key" :placeholder="ifParams.key_ph" type="textarea" />
-          </a-form-model-item>
-        </a-col>
         <a-col span="12">
           <a-form-model-item label="微信支付API版本" prop="apiVersion">
             <a-radio-group v-model="ifParams.apiVersion" defaultValue="V2">
@@ -70,7 +65,12 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="API V3秘钥" prop="apiV3Key">
+          <a-form-model-item label="APIv2密钥" prop="key">
+            <a-input v-model="ifParams.key" :placeholder="ifParams.key_ph" type="textarea" />
+          </a-form-model-item>
+        </a-col>
+        <a-col span="24">
+          <a-form-model-item label="APIv3秘钥" prop="apiV3Key">
             <a-input v-model="ifParams.apiV3Key" :placeholder="ifParams.apiV3Key_ph" type="textarea" />
           </a-form-model-item>
         </a-col>
@@ -80,7 +80,7 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="API证书(.p12格式)" prop="cert">
+          <a-form-model-item label="API证书(apiclient_cert.p12)" prop="cert">
             <a-input v-model="ifParams.cert" disabled="disabled" />
             <JeepayUpload
               :action="action"
@@ -94,7 +94,21 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="私钥文件(.pem格式)" prop="apiClientKey">
+          <a-form-model-item label="证书文件(apiclient_cert.pem)" prop="apiClientCert">
+            <a-input v-model="ifParams.apiClientCert" disabled="disabled" />
+            <JeepayUpload
+              :action="action"
+              :fileUrl="ifParams.apiClientCert"
+              @uploadSuccess="uploadSuccess($event, 'apiClientCert')"
+            >
+              <template slot="uploadSlot" slot-scope="{loading}">
+                <a-button style="marginTop:5px;"> <a-icon :type="loading ? 'loading' : 'upload'" /> {{ loading ? '正在上传' : '点击上传' }} </a-button>
+              </template>
+            </JeepayUpload>
+          </a-form-model-item>
+        </a-col>
+        <a-col span="24">
+          <a-form-model-item label="私钥文件(apiclient_key.pem)" prop="apiClientKey">
             <a-input v-model="ifParams.apiClientKey" disabled="disabled" />
             <JeepayUpload
               :action="action"
@@ -197,10 +211,24 @@ export default {
             }
             callback()
         } }],
+        cert: [{ trigger: 'blur',
+          validator: (rule, value, callback) => {
+            if (this.ifParams.apiVersion === 'V3' && this.isAdd && !value) {
+              callback(new Error('请上传API证书(apiclient_cert.p12)'))
+            }
+            callback()
+          } }],
+        apiClientCert: [{ trigger: 'blur',
+          validator: (rule, value, callback) => {
+            if (this.ifParams.apiVersion === 'V3' && this.isAdd && !value) {
+              callback(new Error('请上传证书文件(apiclient_cert.pem)'))
+            }
+            callback()
+          } }],
         apiClientKey: [{ trigger: 'blur',
           validator: (rule, value, callback) => {
             if (this.ifParams.apiVersion === 'V3' && this.mchType === 1 && !this.ifParams.apiClientKey) {
-              callback(new Error('请上传私钥文件'))
+              callback(new Error('请上传私钥文件(apiclient_key.pem)'))
             }
             callback()
         } }],
diff --git a/jeepay-ui-merchant/src/views/mchApp/custom/WxpayPayConfig.vue b/jeepay-ui-merchant/src/views/mchApp/custom/WxpayPayConfig.vue
index dd7566d..1e9febe 100644
--- a/jeepay-ui-merchant/src/views/mchApp/custom/WxpayPayConfig.vue
+++ b/jeepay-ui-merchant/src/views/mchApp/custom/WxpayPayConfig.vue
@@ -56,11 +56,6 @@
             <a-input v-model="ifParams.oauth2Url" placeholder="请输入" />
           </a-form-model-item>
         </a-col>
-        <a-col span="24">
-          <a-form-model-item label="API密钥" prop="key">
-            <a-input v-model="ifParams.key" :placeholder="ifParams.key_ph" type="textarea" />
-          </a-form-model-item>
-        </a-col>
         <a-col span="12">
           <a-form-model-item label="微信支付API版本" prop="apiVersion">
             <a-radio-group v-model="ifParams.apiVersion" defaultValue="V2">
@@ -70,7 +65,12 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="API V3秘钥" prop="apiV3Key">
+          <a-form-model-item label="APIv2密钥" prop="key">
+            <a-input v-model="ifParams.key" :placeholder="ifParams.key_ph" type="textarea" />
+          </a-form-model-item>
+        </a-col>
+        <a-col span="24">
+          <a-form-model-item label="APIv3秘钥" prop="apiV3Key">
             <a-input v-model="ifParams.apiV3Key" :placeholder="ifParams.apiV3Key_ph" type="textarea" />
           </a-form-model-item>
         </a-col>
@@ -80,7 +80,7 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="API证书(.p12格式)" prop="cert">
+          <a-form-model-item label="API证书(apiclient_cert.p12)" prop="cert">
             <a-input v-model="ifParams.cert" disabled="disabled" />
             <JeepayUpload
               :action="action"
@@ -94,7 +94,21 @@
           </a-form-model-item>
         </a-col>
         <a-col span="24">
-          <a-form-model-item label="私钥文件(.pem格式)" prop="apiClientKey">
+          <a-form-model-item label="证书文件(apiclient_cert.pem)" prop="apiClientCert">
+            <a-input v-model="ifParams.apiClientCert" disabled="disabled" />
+            <JeepayUpload
+              :action="action"
+              :fileUrl="ifParams.apiClientCert"
+              @uploadSuccess="uploadSuccess($event, 'apiClientCert')"
+            >
+              <template slot="uploadSlot" slot-scope="{loading}">
+                <a-button style="marginTop:5px;"> <a-icon :type="loading ? 'loading' : 'upload'" /> {{ loading ? '正在上传' : '点击上传' }} </a-button>
+              </template>
+            </JeepayUpload>
+          </a-form-model-item>
+        </a-col>
+        <a-col span="24">
+          <a-form-model-item label="私钥文件(apiclient_key.pem)" prop="apiClientKey">
             <a-input v-model="ifParams.apiClientKey" disabled="disabled" />
             <JeepayUpload
               :action="action"
@@ -197,10 +211,24 @@ export default {
             }
             callback()
         } }],
+        cert: [{ trigger: 'blur',
+          validator: (rule, value, callback) => {
+            if (this.ifParams.apiVersion === 'V3' && this.isAdd && !value) {
+              callback(new Error('请上传API证书(apiclient_cert.p12)'))
+            }
+            callback()
+          } }],
+        apiClientCert: [{ trigger: 'blur',
+          validator: (rule, value, callback) => {
+            if (this.ifParams.apiVersion === 'V3' && this.isAdd && !value) {
+              callback(new Error('请上传证书文件(apiclient_cert.pem)'))
+            }
+            callback()
+          } }],
         apiClientKey: [{ trigger: 'blur',
           validator: (rule, value, callback) => {
             if (this.ifParams.apiVersion === 'V3' && this.mchType === 1 && !this.ifParams.apiClientKey) {
-              callback(new Error('请上传私钥文件'))
+              callback(new Error('请上传私钥文件(apiclient_key.pem)'))
             }
             callback()
         } }],