From b642417e21351be37bf0a6178b21b85baadb454e Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Mon, 6 Jul 2026 18:40:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(lakala):=20=E8=AF=81=E4=B9=A6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=94=BE=E5=AE=BD=E6=A0=BC=E5=BC=8F(.pem/.cer/.crt/.k?=
 =?UTF-8?q?ey)=20+=20=E6=96=87=E6=A1=88=E6=A0=87=E6=B3=A8PKCS#8/X.509?=
 =?UTF-8?q?=E4=B8=8E=E5=B7=B2=E4=B8=8A=E4=BC=A0=E6=80=81i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../locales/langs/en-US/payment/channel/lakalaIsv.json | 10 ++++++----
 .../locales/langs/zh-CN/payment/channel/lakalaIsv.json | 10 ++++++----
 .../channel/lakala/config/LakalaIsvConfigEdit.vue      |  8 ++++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/lakalaIsv.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/lakalaIsv.json
index f5e386dee..c323eccbf 100644
--- a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/lakalaIsv.json
+++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/lakalaIsv.json
@@ -13,10 +13,12 @@
   "orgCodePlaceholder": "Please enter organization code",
   "mchSerialNo": "Merchant Certificate Serial Number",
   "mchSerialNoPlaceholder": "Please enter merchant certificate serial number",
-  "privateKey": "Private Key Certificate (.pem)",
-  "privateKeyTooltip": "The private_key.pem file provided by Lakala",
-  "publicKey": "Lakala Public Key (.cer)",
-  "publicKeyTooltip": "The publicKey.cer file provided by Lakala",
+  "privateKey": "Application Private Key",
+  "privateKeyTooltip": "The application private key file (PKCS#8 PEM) provided by Lakala. Common filenames include private_key.pem, 应用私钥.cer, apiclient_key.pem, etc. Content must contain the -----BEGIN PRIVATE KEY----- marker",
+  "publicKey": "Lakala Public Key",
+  "publicKeyTooltip": "The public key certificate file (X.509 PEM) provided by Lakala. Common filenames include publicKey.cer, lakala_pub.pem, etc. Content must contain the -----BEGIN CERTIFICATE----- marker",
+  "privateKeyUploaded": "Uploaded (PKCS#8 PEM)",
+  "publicKeyUploaded": "Uploaded (X.509 PEM)",
   "sm4Key": "Lakala SM4 Key",
   "sm4KeyPlaceholder": "Please enter SM4 key (for onboarding sensitive fields, optional)",
   "uploadPublicKey": "Upload Public Key Cert",
diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/lakalaIsv.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/lakalaIsv.json
index 1d816fe65..f87838468 100644
--- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/lakalaIsv.json
+++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/lakalaIsv.json
@@ -13,10 +13,12 @@
   "orgCodePlaceholder": "请输入机构代码",
   "mchSerialNo": "商户证书序列号",
   "mchSerialNoPlaceholder": "请输入商户证书序列号",
-  "privateKey": "私钥证书(.pem格式)",
-  "privateKeyTooltip": "拉卡拉提供的 private_key.pem 文件",
-  "publicKey": "拉卡拉公钥(.cer格式)",
-  "publicKeyTooltip": "拉卡拉提供的 publicKey.cer 文件",
+  "privateKey": "应用私钥",
+  "privateKeyTooltip": "拉卡拉提供的应用私钥文件（PKCS#8 PEM 格式），常见文件名如 private_key.pem、应用私钥.cer、apiclient_key.pem 等，内容需含 -----BEGIN PRIVATE KEY----- 标记",
+  "publicKey": "拉卡拉公钥",
+  "publicKeyTooltip": "拉卡拉提供的公钥证书文件（X.509 PEM 格式），常见文件名如 publicKey.cer、lakala_pub.pem 等，内容需含 -----BEGIN CERTIFICATE----- 标记",
+  "privateKeyUploaded": "已上传私钥（PKCS#8 PEM）",
+  "publicKeyUploaded": "已上传公钥（X.509 PEM）",
   "sm4Key": "拉卡拉SM4密钥",
   "sm4KeyPlaceholder": "请输入SM4密钥(进件敏感字段加密用, 选填)",
   "uploadPublicKey": "公钥证书上传",
diff --git a/apps/daxpay-admin/src/views/payment/channel/lakala/config/LakalaIsvConfigEdit.vue b/apps/daxpay-admin/src/views/payment/channel/lakala/config/LakalaIsvConfigEdit.vue
index e39603aa6..13d9d4e3a 100644
--- a/apps/daxpay-admin/src/views/payment/channel/lakala/config/LakalaIsvConfigEdit.vue
+++ b/apps/daxpay-admin/src/views/payment/channel/lakala/config/LakalaIsvConfigEdit.vue
@@ -166,7 +166,7 @@
             :disabled="!canEdit"
             :multiple="false"
             :show-upload-list="false"
-            accept=".cer"
+            accept=".pem,.cer,.crt"
             :before-upload="() => false"
             @change="(info: any) => handleUpload(info, 'publicKey')"
           >
@@ -175,7 +175,7 @@
               {{ $t('payment.channel.lakalaIsv.uploadPublicKey') }}
             </a-button>
           </a-upload>
-          <a-input v-else value="publicKey.cer" disabled>
+          <a-input v-else :value="$t('payment.channel.lakalaIsv.publicKeyUploaded')" disabled>
             <template #suffix>
               <span v-if="canEdit" class="cursor-pointer text-gray-400" @click="form.publicKey = ''">
                 <IconifyIcon icon="ant-design:close-circle-outlined" class="text-lg" />
@@ -194,7 +194,7 @@
             :disabled="!canEdit"
             :multiple="false"
             :show-upload-list="false"
-            accept=".pem"
+            accept=".pem,.cer,.crt,.key"
             :before-upload="() => false"
             @change="(info: any) => handleUpload(info, 'privateKey')"
           >
@@ -203,7 +203,7 @@
               {{ $t('payment.channel.lakalaIsv.uploadKey') }}
             </a-button>
           </a-upload>
-          <a-input v-else value="private_key.pem" disabled>
+          <a-input v-else :value="$t('payment.channel.lakalaIsv.privateKeyUploaded')" disabled>
             <template #suffix>
               <span v-if="canEdit" class="cursor-pointer text-gray-400" @click="form.privateKey = ''">
                 <IconifyIcon icon="ant-design:close-circle-outlined" class="text-lg" />