diff --git a/_config/sql/update-datas.sql b/_config/sql/update-datas.sql index c72f2a5f5..e69de29bb 100644 --- a/_config/sql/update-datas.sql +++ b/_config/sql/update-datas.sql @@ -1,116 +0,0 @@ --- ---------------------------- --- 数据升级：菜单展示与 IA 调整 + i18n 改造数据回填 --- 执行顺序：update-tables.sql → update-datas.sql --- ---------------------------- - --- ---------------------------- --- 管理端菜单 IA：支付管理扁平 + 微信域名验证迁系统配置 --- ---------------------------- - --- 支付产品配置 → 通道产品配置，升为支付管理二级 -UPDATE "public"."iam_perm_menu" -SET "pid" = 4, - "sort_no" = 2, - "last_modified_time" = NOW() -WHERE "id" = 40105; - --- 微信域名验证：支付配置 → 系统配置 -UPDATE "public"."iam_perm_menu" -SET "pid" = 304, - "sort_no" = 7, - "last_modified_time" = NOW() -WHERE "id" = 40507; - --- 支付配置 catalog 已无可见子菜单，隐藏 -UPDATE "public"."iam_perm_menu" -SET "hidden" = true, - "last_modified_time" = NOW() -WHERE "id" = 405; - --- 一级菜单顺序 -UPDATE "public"."iam_perm_menu" -SET "sort_no" = 3.5, - "last_modified_time" = NOW() -WHERE "id" = 404; - -UPDATE "public"."iam_perm_menu" -SET "sort_no" = 4, - "last_modified_time" = NOW() -WHERE "id" = 6; - --- 系统配置排序 -UPDATE "public"."iam_perm_menu" -SET "sort_no" = 1, - "last_modified_time" = NOW() -WHERE "id" = 30402; - -UPDATE "public"."iam_perm_menu" -SET "sort_no" = 2, - "last_modified_time" = NOW() -WHERE "id" = 30401; - --- ---------------------------- --- 商户管理：全局「通道商户」侧栏菜单（占位） --- ---------------------------- -INSERT INTO "public"."iam_perm_menu" ( - "id", "pid", "menu_code", "client_code", "name", - "i18n_key", "icon", - "hidden", "hide_children_menu", "component", "path", "redirect", - "sort_no", "root", "keep_alive", "affix_tab", - "creator", "last_modifier", "version", "deleted", - "menu_type", "active_icon", "badge", "badge_type", "badge_variants", - "iframe_src", "link", "create_time", "last_modified_time" -) -SELECT - 40402, - 404, - 'channel:merchant', - 'admin', - 'ChannelMerchantGlobal', - 'menu.payment.merchant.channelMerchant.global', - 'lucide:repeat', - false, - false, - '/_core/fallback/coming-soon', - '/payment/merchant/channel-merchants', - NULL, - 2, - false, - true, - false, - 1, - 1, - 0, - false, - 'menu', - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NOW(), - NOW() -WHERE NOT EXISTS ( - SELECT 1 FROM "public"."iam_perm_menu" WHERE "id" = 40402 -); - --- ============================================================ --- i18n 改造：批量回填 i18n_key --- 规则：角色 role.{code}，字典项 dict.{dictCode}.{itemCode} --- 语言包翻译在前端 locales/langs/{locale}/dict.json 中维护 --- ============================================================ - --- 角色表：按 code 生成 i18n_key -UPDATE iam_role -SET i18n_key = 'role.' || code, - last_modified_time = NOW() -WHERE i18n_key IS NULL - AND deleted = false; - --- 字典项表：按 dictCode.code 生成 i18n_key -UPDATE system_dict_item -SET i18n_key = 'dict.' || dict_code || '.' || code, - last_modified_time = NOW() -WHERE i18n_key IS NULL - AND deleted = false; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/auth/package-info.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/auth/package-info.java deleted file mode 100644 index 30886b35f..000000000 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/auth/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/// # 支付通道 OAuth 认证(Channel OAuth) -/// -/// **本包不是 IAM 登录**。职责仅为支付场景获取用户标识(微信 openId / 支付宝 userId 等)。 -/// 与 [cn.daxpay.open.platform.capability.auth](Sa-Token 登录)、社交登录(capability-social) 无关。 -/// -/// ## 类职责 -/// | 类 | 职责 | -/// |----|------| -/// | [AuthSession] | H5 OAuth 重定向的会话上下文 POJO(product/channelMchNo/source/queryCode 等) | -/// | [AuthSessionStore] | Redis: authToken→session、queryCode→AuthResult, TTL 5 分钟 | -/// | [ChannelAuthService] | **商户级**: 按支付产品路由 [cn.daxpay.open.payment.strategy.auth.AbsChannelAuthStrategy] | -/// | [PlatformAuthService] | **平台级**: 平台支付宝 / 系统公众号 / 抖音 H5 配置驱动的 OAuth | -/// | [ChannelAuthFacade] | 统一分发入口(generate / auth), Controller 只做协议适配 | -/// -/// ## 时序 -/// 1. generateAuthUrl → 写 session(authToken) + WAITING(queryCode) → 返回 OAuth URL -/// 2. 用户授权, 第三方回调 H5 固定路径(`/auth/wechat|alipay|douyin`), state=authToken -/// 3. H5 调 auth → Facade 按 source 分流 → code 换 openId → 写轮询结果 → 删除 session -/// 4. (调试) 管理端用 queryCode 轮询 AuthResult -/// -/// ## 平台级 vs 商户级 -/// - 平台级: 不读商户通道配置, session.source = platform_alipay / platform_mp / platform_douyin -/// - 商户级: 按 product + channelMchNo/capability 定位通道应用, source 为空 -package cn.daxpay.open.payment.auth; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/auth/DaxUserInfoStatusCheck.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/handler/DaxUserInfoStatusCheck.java similarity index 98% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/auth/DaxUserInfoStatusCheck.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/handler/DaxUserInfoStatusCheck.java index 077cae6ae..40351f0f8 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/auth/DaxUserInfoStatusCheck.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/handler/DaxUserInfoStatusCheck.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.common.auth; +package cn.daxpay.open.payment.common.handler; import cn.daxpay.open.platform.core.enums.client.ClientEnum; import cn.daxpay.open.platform.core.enums.merchant.MerchantStatusEnum; diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/enum/role_code.json index e8b5aa2f7..9801f783b 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/enum/role_code.json @@ -1,3 +1,4 @@ { + "admin_admin": "Operations Admin", "merchant_admin": "Merchant Admin" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/id-ID/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/id-ID/enum/role_code.json index 7bc66b3df..fd7991ca6 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/id-ID/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/id-ID/enum/role_code.json @@ -1,3 +1,4 @@ { + "admin_admin": "Admin Operasi", "merchant_admin": "Admin Pedagang" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ja-JP/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ja-JP/enum/role_code.json index 7837c9064..6248360ff 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ja-JP/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ja-JP/enum/role_code.json @@ -1,3 +1,4 @@ { + "admin_admin": "運営管理者", "merchant_admin": "販売者管理者" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ko-KR/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ko-KR/enum/role_code.json index 6eb9444c6..41d5855c2 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ko-KR/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ko-KR/enum/role_code.json @@ -1,3 +1,4 @@ { + "admin_admin": "운영 관리자", "merchant_admin": "판매자 관리자" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ms-MY/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ms-MY/enum/role_code.json index d6bd6d3c1..bc6a94fd3 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ms-MY/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ms-MY/enum/role_code.json @@ -1,3 +1,4 @@ { - "merchant_admin": "Admin saudagar" + "admin_admin": "Pentadbir Operasi", + "merchant_admin": "Admin Saudagar" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/th-TH/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/th-TH/enum/role_code.json index d2798dcbe..dc51147b5 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/th-TH/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/th-TH/enum/role_code.json @@ -1,3 +1,4 @@ { + "admin_admin": "ผู้ดูแลระบบปฏิบัติการ", "merchant_admin": "ผู้ดูแลระบบร้านค้า" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/vi-VN/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/vi-VN/enum/role_code.json index 7ae3abf92..268100572 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/vi-VN/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/vi-VN/enum/role_code.json @@ -1,3 +1,4 @@ { + "admin_admin": "Quản trị vận hành", "merchant_admin": "Quản trị viên người bán" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/enum/role_code.json index a4873c9f9..10d521d1a 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/enum/role_code.json @@ -1,3 +1,4 @@ { + "admin_admin": "运营管理员", "merchant_admin": "商户管理员" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-HK/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-HK/enum/role_code.json index de7c5fc35..a1274c06c 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-HK/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-HK/enum/role_code.json @@ -1,3 +1,4 @@ { - "merchant_admin": "商户管理員" + "admin_admin": "運營管理員", + "merchant_admin": "商戶管理員" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-TW/enum/role_code.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-TW/enum/role_code.json index 84bce3ed5..a1274c06c 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-TW/enum/role_code.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-TW/enum/role_code.json @@ -1,3 +1,4 @@ { + "admin_admin": "運營管理員", "merchant_admin": "商戶管理員" } diff --git a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/enums/role/RoleCodeEnum.java b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/enums/role/RoleCodeEnum.java index 2282a5459..f31ef06a0 100644 --- a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/enums/role/RoleCodeEnum.java +++ b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/enums/role/RoleCodeEnum.java @@ -6,10 +6,13 @@ import lombok.RequiredArgsConstructor; /// # 角色编码枚举 /// +/// 开源版身份域仅 admin / merchant；内置角色与之对称。 @Getter @RequiredArgsConstructor public enum RoleCodeEnum implements I18nSupport { + /// 运营管理员 + ADMIN_ADMIN("admin_admin"), /// 商户管理员 MERCHANT_ADMIN("merchant_admin");