From eb4e06d4397fd4c70852a3038fd665537bd237e3 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 20 Jul 2026 10:09:08 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E6=92=A4=E9=94=80=207138817e=20?= =?UTF-8?q?=E3=80=8Cworkspace=20=E6=B2=99=E7=AE=B1=E5=91=8A=E8=AD=A6=20+?= =?UTF-8?q?=20ProductConfig=20=E6=8F=90=E7=A4=BA=20+=20useEnvStore?= =?UTF-8?q?=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit UI 效果不达预期, 完全回退到只有配置告警一条 alert 的状态: - 删除 store/env.ts (useEnvStore Pinia store) - store/index.ts 移除 env store 导出 - ProductConfig.vue 恢复到 commit 前 (PayEnvApi 局部 ref, 无沙箱提示 a-alert) - 删除 10 语种 payment/common/env.json (sandboxBanner + sandboxProductConfigTip) - workspace/index.vue 的沙箱告警相关代码另行手动清理 (保留 ConfigCheck 在途, 待用户合并) 后端 aad9f2c3b (启动日志沙箱强提示) 不受影响, 保留作为运维巡检辅助 --- .../langs/en-US/payment/common/env.json | 4 -- .../langs/id-ID/payment/common/env.json | 4 -- .../langs/ja-JP/payment/common/env.json | 4 -- .../langs/ko-KR/payment/common/env.json | 4 -- .../langs/ms-MY/payment/common/env.json | 4 -- .../langs/th-TH/payment/common/env.json | 4 -- .../langs/vi-VN/payment/common/env.json | 4 -- .../langs/zh-CN/payment/common/env.json | 4 -- .../langs/zh-HK/payment/common/env.json | 4 -- .../langs/zh-TW/payment/common/env.json | 4 -- apps/daxpay-admin/src/store/env.ts | 40 ------------------- apps/daxpay-admin/src/store/index.ts | 1 - .../payment/config/product/ProductConfig.vue | 36 +++++++---------- 13 files changed, 14 insertions(+), 103 deletions(-) delete mode 100644 apps/daxpay-admin/src/locales/langs/en-US/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/id-ID/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/ja-JP/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/ko-KR/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/ms-MY/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/th-TH/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/vi-VN/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/zh-CN/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/zh-HK/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/locales/langs/zh-TW/payment/common/env.json delete mode 100644 apps/daxpay-admin/src/store/env.ts diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/common/env.json deleted file mode 100644 index eb77b680d..000000000 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "You are in the sandbox environment. No real transactions will occur.", - "sandboxProductConfigTip": "Sandbox features are only available in the test environment. In production deployments, the sandbox switch is forced off and all data is guaranteed to be production data." -} diff --git a/apps/daxpay-admin/src/locales/langs/id-ID/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/id-ID/payment/common/env.json deleted file mode 100644 index f60777fdc..000000000 --- a/apps/daxpay-admin/src/locales/langs/id-ID/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "Ini adalah lingkungan sandbox. Tidak ada transaksi nyata yang akan terjadi.", - "sandboxProductConfigTip": "Fitur sandbox hanya tersedia di lingkungan pengujian. Pada deployment produksi, sakelar sandbox dipaksa mati dan semua data dijamin sebagai data produksi." -} diff --git a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/common/env.json deleted file mode 100644 index cef07f50d..000000000 --- a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "現在はサンドボックス環境です。実際の取引は発生しません。", - "sandboxProductConfigTip": "サンドボックス機能はテスト環境でのみ利用できます。本番デプロイではサンドボックススイッチが強制的にオフになり、すべてのデータは本番データであることが保証されます。" -} diff --git a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/common/env.json deleted file mode 100644 index 8d3f96d3f..000000000 --- a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "현재 샌드박스 환경입니다. 실제 거래가 발생하지 않습니다.", - "sandboxProductConfigTip": "샌드박스 기능은 테스트 환경에서만 사용할 수 있습니다. 프로덕션 배포에서는 샌드박스 스위치가 강제로 꺼지며 모든 데이터는 프로덕션 데이터로 보장됩니다." -} diff --git a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/common/env.json deleted file mode 100644 index c8cb837e3..000000000 --- a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "Ini adalah persekitaran sandbox. Tiada urus niaga sebenar akan berlaku.", - "sandboxProductConfigTip": "Ciri sandbox hanya tersedia di persekitaran ujian. Pada pengeluaran, suis sandbox dipaksa dimatikan dan semua data dijamin sebagai data pengeluaran." -} diff --git a/apps/daxpay-admin/src/locales/langs/th-TH/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/th-TH/payment/common/env.json deleted file mode 100644 index 4ddbe0e93..000000000 --- a/apps/daxpay-admin/src/locales/langs/th-TH/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "นี่คือสภาพแวดล้อมแซนด์บ็อกซ์ จะไม่มีธุรกรรมจริงเกิดขึ้น", - "sandboxProductConfigTip": "คุณสมบัติแซนด์บ็อกซ์ใช้ได้เฉพาะในสภาพแวดล้อมทดสอบ เมื่อปรับใช้งานจริง สวิตช์แซนด์บ็อกซ์จะถูกบังคับปิดและรับประกันว่าข้อมูลทั้งหมดเป็นข้อมูลการผลิต" -} diff --git a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/common/env.json deleted file mode 100644 index 1b92b26e7..000000000 --- a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "Đây là môi trường sandbox. Không có giao dịch thực nào sẽ xảy ra.", - "sandboxProductConfigTip": "Tính năng sandbox chỉ khả dụng trong môi trường thử nghiệm. Khi triển khai sản xuất, công tắc sandbox bị tắt cưỡng bức và mọi dữ liệu được đảm bảo là dữ liệu sản xuất." -} diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/common/env.json deleted file mode 100644 index 9f1364602..000000000 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "当前为测试环境，所有交易不会真实发生", - "sandboxProductConfigTip": "沙箱功能仅在测试环境可用。生产环境部署时，沙箱开关将被强制关闭，所有数据保证为生产数据。" -} diff --git a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/common/env.json deleted file mode 100644 index d7a7b29db..000000000 --- a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "目前為測試環境，所有交易唔會真實發生", - "sandboxProductConfigTip": "沙箱功能僅在測試環境可用。生產環境部署時，沙箱開關將被強制關閉，所有資料保證為生產資料。" -} diff --git a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/common/env.json b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/common/env.json deleted file mode 100644 index d8a08d72e..000000000 --- a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/common/env.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sandboxBanner": "目前為測試環境，所有交易不會真實發生", - "sandboxProductConfigTip": "沙箱功能僅在測試環境可用。生產環境部署時，沙箱開關將被強制關閉，所有資料保證為生產資料。" -} diff --git a/apps/daxpay-admin/src/store/env.ts b/apps/daxpay-admin/src/store/env.ts deleted file mode 100644 index 27cce9b08..000000000 --- a/apps/daxpay-admin/src/store/env.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { ref } from 'vue'; - -import { defineStore } from 'pinia'; - -import { PayEnvApi } from '#/api/payment/masterdata/pay-env.api'; - -/** - * 平台环境状态 store - * - * 全局缓存沙箱开关等平台级配置, 供 Layout 横幅、产品配置页等共享, 避免重复请求。 - * 生命周期: 用户登录后由 basic.vue 触发首次加载, 整个会话内复用。 - */ -export const useEnvStore = defineStore('app-env', () => { - /** 沙箱环境全局开关 (后端 daxpay.platform.config.sandbox-enabled 控制) */ - const sandboxEnabled = ref(false); - - /** 是否已完成首次加载 (避免重复请求) */ - const loaded = ref(false); - - /** - * 加载沙箱开关状态 - * - * 默认仅首次加载, 已加载后调用为 no-op; 如需刷新 (如管理员切换了全局开关) 传 force=true。 - * - * @param force 是否强制刷新 - */ - async function loadSandboxEnabled(force = false) { - if (loaded.value && !force) return; - try { - const { data } = await PayEnvApi.sandboxEnabled(); - sandboxEnabled.value = !!data; - } catch { - // 查询失败按关闭处理, 仅展示生产环境 - sandboxEnabled.value = false; - } - loaded.value = true; - } - - return { sandboxEnabled, loaded, loadSandboxEnabled }; -}); diff --git a/apps/daxpay-admin/src/store/index.ts b/apps/daxpay-admin/src/store/index.ts index 426c1cdac..b6a7763b1 100644 --- a/apps/daxpay-admin/src/store/index.ts +++ b/apps/daxpay-admin/src/store/index.ts @@ -1,3 +1,2 @@ export * from './auth'; export * from './dict'; -export * from './env'; diff --git a/apps/daxpay-admin/src/views/payment/config/product/ProductConfig.vue b/apps/daxpay-admin/src/views/payment/config/product/ProductConfig.vue index c0e2851a9..de1575a05 100644 --- a/apps/daxpay-admin/src/views/payment/config/product/ProductConfig.vue +++ b/apps/daxpay-admin/src/views/payment/config/product/ProductConfig.vue @@ -1,5 +1,5 @@