From e18d243961beb3b8194f32de562729d0aca1367e Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Fri, 27 Dec 2024 11:01:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=B8=8D=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E5=AF=86=E9=92=A5=E6=96=87=E4=BB=B6=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E8=AF=BB=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/sys/setting-manage/pay/WECHAT_PAYMENT.vue    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
index bd0e375f..ab11b103 100644
--- a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
+++ b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
@@ -28,14 +28,8 @@
       <FormItem label="APIv3密钥" prop="apiKey3">
         <Input maxlength="300" v-model="formValidate.apiKey3" />
       </FormItem>
-      <FormItem label="apiclient_cert_p12" class="label-item" prop="apiclient_cert_p12">
-        <Input maxlength="300" v-model="formValidate.apiclient_cert_p12" />
-      </FormItem>
-      <FormItem label="apiclient_cert_pem" prop="apiclient_cert_pem">
-        <Input maxlength="300" v-model="formValidate.apiclient_cert_pem" />
-      </FormItem>
-      <FormItem label="apiclient_key" prop="apiclient_key">
-        <Input maxlength="300" v-model="formValidate.apiclient_key" />
+      <FormItem class="form-item-view-el" label="apiclient_key" prop="apiclient_key">
+        <Input v-model="formValidate.apiclient_key" :rows="6" maxlength="2500" show-word-limit type="textarea" placeholder="Enter something..." />
       </FormItem>
       <FormItem label="API证书-证书序列号" prop="serialNumber">
         <Input maxlength="300" v-model="formValidate.serialNumber" />

From 8ef6f944dca8a91ffde330f45dc0fc9c78819ab2 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Wed, 8 Jan 2025 16:14:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=85=AC=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/sys/setting-manage/pay/WECHAT_PAYMENT.vue  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
index ab11b103..f0a30889 100644
--- a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
+++ b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
@@ -28,12 +28,18 @@
       <FormItem label="APIv3密钥" prop="apiKey3">
         <Input maxlength="300" v-model="formValidate.apiKey3" />
       </FormItem>
-      <FormItem class="form-item-view-el" label="apiclient_key" prop="apiclient_key">
-        <Input v-model="formValidate.apiclient_key" :rows="6" maxlength="2500" show-word-limit type="textarea" placeholder="Enter something..." />
-      </FormItem>
       <FormItem label="API证书-证书序列号" prop="serialNumber">
         <Input maxlength="300" v-model="formValidate.serialNumber" />
       </FormItem>
+      <FormItem class="form-item-view-el" label="apiclient_key" prop="apiclient_key">
+        <Input v-model="formValidate.apiclientKey" :rows="6" maxlength="2500" show-word-limit type="textarea" placeholder="Enter something..." />
+      </FormItem>
+      <FormItem label="公钥证书ID" prop="公钥证书ID">
+        <Input maxlength="300" v-model="formValidate.publicId" />
+      </FormItem>
+      <FormItem class="form-item-view-el" label="公钥证书" prop="publicKey">
+        <Input v-model="formValidate.publicKey" :rows="6" maxlength="2500" show-word-limit type="textarea" placeholder="Enter something..." />
+      </FormItem>
       <FormItem label="支付回调域名" prop="callbackUrl">
         <Input maxlength="300" v-model="formValidate.callbackUrl" />
       </FormItem>