From dcffc60d80fc7efc204dd6e6e7141d9b75aae684 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Fri, 23 Oct 2026 02:31:41 -0400 Subject: [PATCH] =?UTF-8?q?1.=E4=BE=9B=E5=BA=94=E5=95=86=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=98=AFPROXY\=5FSUPPLIER,=E7=A7=9F=E8=B5=81=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=BC=96=E7=A0=81=E6=98=AFPROXY\=5FACCOUNT?= =?UTF-8?q?=EF=BC=8C=E5=B8=AE=E6=88=91=E5=AE=9E=E7=8E=B0=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E8=A7=92=E8=89=B2=E5=92=8C=E7=A7=9F=E8=B5=81=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5=202\.=20=E7=BB=99?= =?UTF-8?q?=E5=87=BA=E4=BE=9B=E5=BA=94=E5=95=86=E8=A7=92=E8=89=B2=E5=92=8C?= =?UTF-8?q?=E7=A7=9F=E8=B5=81=E8=B4=A6=E6=88=B7=E6=89=80=E6=9C=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=8F=92?= =?UTF-8?q?=E5=85=A5sql=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .planning/rental-v22-review/progress.md | 7 +++ docs/rental/implementation.md | 2 + docs/rental/role-permissions.md | 38 +++++++++++++ .../ruoyi/system/rental/RentalController.java | 4 +- .../rental/RentalRolePermissionTest.java | 55 +++++++++++++++++++ sql/rent_role_permissions.sql | 42 ++++++++++++++ 6 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 docs/rental/role-permissions.md create mode 100644 ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalRolePermissionTest.java create mode 100644 sql/rent_role_permissions.sql diff --git a/.planning/rental-v22-review/progress.md b/.planning/rental-v22-review/progress.md index 95e40a3..641c513 100644 --- a/.planning/rental-v22-review/progress.md +++ b/.planning/rental-v22-review/progress.md @@ -47,6 +47,13 @@ ## 三端业务实现完成(2026-10-22) +### 后续:角色首页及权限配置 + +- 供应商PROXY_SUPPLIER及租赁账户PROXY_ACCOUNT分别展示专属首页,双角色支持切换,其他用户保留支付首页。 +- 拆分app/node/wallet创建及account开通权限,保留旧运营注册权限兼容;新增真实注解SpEL权限隔离测试2项通过,原租赁专项23项通过。 +- 新增sql/rent_role_permissions.sql,包含幂等角色、首页菜单、按钮及角色菜单插入;未执行数据库写入,不分配用户,不授予运营财务权限。 +- 新增docs/rental/role-permissions.md,记录全部业务角色接口映射、执行顺序和验证边界。 + - 新增租赁后端业务服务、JWT/HMAC入口、WSS任务通道、资金事务及独立链上核验;旧通用CRUD入口禁用,防止绕过业务规则。 - Vue统一业务组件接入16个运营及3个用户菜单;本地Node24 Agent实现加密持久化、先落盘再广播、原交易恢复及默认禁广播。 - 最终修正调度主键轮转及恢复失败退避,避免故障记录阻塞后续扫描;Java四空格格式整理,拆分多变量声明。 diff --git a/docs/rental/implementation.md b/docs/rental/implementation.md index 9e113da..5766e04 100644 --- a/docs/rental/implementation.md +++ b/docs/rental/implementation.md @@ -18,6 +18,8 @@ ### 角色配置与资金账户 +角色编码、专属首页及完整接口授权 SQL 见 [角色首页与权限配置](role-permissions.md)。 + | 角色 | 需要配置的业务主体 | 资金账户用途 | | --- | --- | --- | | 供应商(仅出租) | `rent_node`、节点凭证、本地 Agent 及 `rent_wallet`;无需 `rent_app` | 通过 `rent_account` 记录净待结算收入、退款冲正和结算 | diff --git a/docs/rental/role-permissions.md b/docs/rental/role-permissions.md new file mode 100644 index 0000000..3b265f8 --- /dev/null +++ b/docs/rental/role-permissions.md @@ -0,0 +1,38 @@ +# 供应商与租赁账户:首页及接口权限 + +角色编码严格区分大小写:供应商为 `PROXY_SUPPLIER`,购买资源的租赁账户为 `PROXY_ACCOUNT`。登录后的 `/index` 根据角色展示首页,同时拥有两种角色时可切换;其他用户保留支付首页。菜单入口分别为 `/rental/supplier`、`/rental/account-home`。 + +## 安装 SQL + +先执行 [rent_menu.sql](../../sql/rent_menu.sql),再执行 [rent_role_permissions.sql](../../sql/rent_role_permissions.sql)。后者包含角色、首页菜单、细分按钮权限和 `sys_role_menu` 关联插入,可重复执行,不给任何用户自动绑定角色。请通过若依用户管理分配角色,重新登录以刷新权限。 + +脚本保留原角色状态、已有授权及用户绑定,不自动恢复停用/软删除角色。已有角色若含运营或历史通用注册权限,应通过角色管理复核,插入脚本不会删除原授权。脚本末尾提供实际授权查询。 + +## 角色权限及对应接口 + +| 权限 | 接口 | 供应商 | 租赁账户 | +| --- | --- | --- | --- | +| `rent:supplier:home` | 供应商首页菜单(无独立HTTP统计接口) | 是 | 否 | +| `rent:account:home` | 租赁账户首页菜单(无独立HTTP统计接口) | 否 | 是 | +| `rent:portal:view` | `GET /rental/mine/{resource}?page=1` | 是 | 是 | +| `rent:node:create` | `POST /rental/register/node` | 是 | 否 | +| `rent:wallet:create` | `POST /rental/register/wallet` | 是 | 否 | +| `rent:wallet:bind` | `POST /rental/wallet/{id}/challenge`、`prove`、`policy` | 是 | 否 | +| `rent:app:create` | `POST /rental/register/app` | 否 | 是 | +| `rent:account:open` | `POST /rental/account/open` | 否 | 是 | +| `rent:credential:issue` | `POST /rental/credential/issue`、`/credential/{id}/revoke` | 是 | 是 | +| `rent:order:create` | `POST /rental/order`、`/order/{id}/cancel` | 否 | 是 | + +查询权限覆盖本人关联记录,仍由服务端检查归属;供应节点和应用凭证也只能操作本人主体。角色首页按业务侧重点展示不同标签,查询返回分页实际记录,不把最近50条伪装成全量统计。 + +供应商首页包含节点、钱包、任务、履约订单、收入账户、流水、结算记录及凭证。供应商资金账户在派单时自动创建或复用,无需手动开通,不需要商户应用。租赁账户首页包含套餐、订单、应用、账户、流水、退款记录及凭证。 + +两个角色均不授予 `rent:manage:*`、`rent:account:topup`、`rent:refund:create`、`rent:refund:approve`、`rent:settlement:create`、`rent:settlement:approve`、`rent:package:edit`。充值审核、退款申请/审批、结算申请/审批及付款由独立运营财务角色处理。外部商户API与Agent WSS分别使用APP/NODE HMAC凭证,不使用若依菜单权限替代协议认证。 + +旧 `rent:portal:register` 保留兼容既有运营配置;新角色脚本不授予此宽权限,前端根据细分权限显示创建按钮。未执行本脚本或未获 `rent:portal:view` 时,首页提示联系管理员,不调用支付统计接口。 + +## 本次验证 + +JDK8下租赁业务23项测试通过;新增2项权限测试从真实控制器注解读取并执行SpEL,验证应用、节点、钱包创建权限隔离及旧权限兼容。新页面ESLint通过,生产构建通过。构建仍提示其他模块既有的3处API导出缺失、Browserslist数据过旧及资源体积警告,未将其扩大为本次修改范围。 + +未对真实数据库执行权限SQL,未绑定实际用户角色,尚需部署环境验证登录后的菜单及页面操作。数据库权限更新后应重新登录,避免使用旧会话权限。 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java index 37322a4..279e6f6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java @@ -76,7 +76,7 @@ public class RentalController { } @PostMapping("/register/{resource}") - @PreAuthorize("@ss.hasPermi('rent:portal:register')") + @PreAuthorize("@ss.hasPermi('rent:portal:register') or @ss.hasPermi('rent:' + #resource + ':create')") public AjaxResult register( @PathVariable String resource, @RequestBody Map body) { return AjaxResult.success(provisioning.create(resource, body, user())); @@ -155,7 +155,7 @@ public class RentalController { } @PostMapping("/account/open") - @PreAuthorize("@ss.hasPermi('rent:portal:register')") + @PreAuthorize("@ss.hasPermi('rent:portal:register') or @ss.hasPermi('rent:account:open')") public AjaxResult account(@RequestBody Map body) { return AjaxResult.success(funds.account(user(), input(body, "network", 16))); } diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalRolePermissionTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalRolePermissionTest.java new file mode 100644 index 0000000..a397146 --- /dev/null +++ b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalRolePermissionTest.java @@ -0,0 +1,55 @@ +package com.ruoyi.system.rental; + +import org.junit.Test; +import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; +import org.springframework.security.access.prepost.PreAuthorize; + +import java.util.Collections; +import java.util.Map; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +/** 验证实际入口的权限表达式,防止细分创建权限重新扩大为通用注册权限。 */ +public class RentalRolePermissionTest { + @Test + public void supplierCannotCreateMerchantApp() throws Exception { + assertTrue(register("rent:node:create", "node")); + assertTrue(register("rent:wallet:create", "wallet")); + assertFalse(register("rent:node:create", "app")); + assertFalse(register("rent:wallet:create", "app")); + } + + @Test + public void merchantCannotCreateSupplierNode() throws Exception { + assertTrue(register("rent:app:create", "app")); + assertFalse(register("rent:app:create", "node")); + assertFalse(register("rent:account:open", "wallet")); + assertTrue(register("rent:portal:register", "app")); + } + + private boolean register(String permission, String resource) throws Exception { + String expression = RentalController.class + .getMethod("register", String.class, Map.class) + .getAnnotation(PreAuthorize.class).value(); + StandardEvaluationContext context = new StandardEvaluationContext(); + context.setVariable("resource", resource); + context.setBeanResolver((evaluationContext, beanName) -> new PermissionProbe(permission)); + return Boolean.TRUE.equals(new SpelExpressionParser() + .parseExpression(expression).getValue(context, Boolean.class)); + } + + /** 仅替代权限查询,不复制控制器表达式;表达式始终读取真实注解。 */ + public static class PermissionProbe { + private final String permission; + + public PermissionProbe(String permission) { + this.permission = permission; + } + + public boolean hasPermi(String requested) { + return Collections.singleton(permission).contains(requested); + } + } +} diff --git a/sql/rent_role_permissions.sql b/sql/rent_role_permissions.sql new file mode 100644 index 0000000..21b4cd1 --- /dev/null +++ b/sql/rent_role_permissions.sql @@ -0,0 +1,42 @@ +-- 先执行 rent_menu.sql,再执行本文件。仅配置两个业务角色,不分配用户、不执行充值或出金。 +-- 可重复执行;保留现有角色状态及已有授权,不自动恢复停用角色。 +START TRANSACTION; +INSERT INTO sys_role(role_name,role_key,role_sort,data_scope,menu_check_strictly,dept_check_strictly,status,del_flag,create_by,create_time,remark) +SELECT '租赁供应商','PROXY_SUPPLIER',20,'5',1,1,'0','0','admin',NOW(),'资源供应节点、钱包及本人收入查询' +WHERE NOT EXISTS(SELECT 1 FROM sys_role WHERE role_key='PROXY_SUPPLIER'); +INSERT INTO sys_role(role_name,role_key,role_sort,data_scope,menu_check_strictly,dept_check_strictly,status,del_flag,create_by,create_time,remark) +SELECT '租赁账户','PROXY_ACCOUNT',21,'5',1,1,'0','0','admin',NOW(),'购买资源、商户应用及本人资金查询' +WHERE NOT EXISTS(SELECT 1 FROM sys_role WHERE role_key='PROXY_ACCOUNT'); +SET @rent_parent=(SELECT menu_id FROM sys_menu WHERE parent_id=0 AND path='proxyRent' LIMIT 1); +INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time) +SELECT '供应商首页',@rent_parent,0,'supplier','rental/supplier',1,0,'C','0','0','rent:supplier:home','dashboard','admin',NOW() + WHERE @rent_parent IS NOT NULL AND NOT EXISTS(SELECT 1 FROM sys_menu WHERE perms='rent:supplier:home'); +INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time) +SELECT '租赁账户首页',@rent_parent,1,'account-home','rental/account',1,0,'C','0','0','rent:account:home','dashboard','admin',NOW() + WHERE @rent_parent IS NOT NULL AND NOT EXISTS(SELECT 1 FROM sys_menu WHERE perms='rent:account:home'); +INSERT INTO sys_menu(menu_name,parent_id,order_num,path,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time) +SELECT p.label,@rent_parent,99,'#',1,0,'F','0','0',p.perm,'#','admin',NOW() +FROM ( + SELECT '创建本人商户应用' label,'rent:app:create' perm + UNION ALL SELECT '注册本人供应节点','rent:node:create' + UNION ALL SELECT '绑定本人供应钱包','rent:wallet:create' + UNION ALL SELECT '开通本人网络账户','rent:account:open' + ) p WHERE @rent_parent IS NOT NULL AND NOT EXISTS(SELECT 1 FROM sys_menu m WHERE m.perms=p.perm); + +-- 只授予本人业务权限,不授予 rent:manage:*、充值审核、退款审批、结算审批及全表CRUD。 +-- rent:portal:view 对应 /rental/mine/{resource},服务端按本人关联关系过滤。 +INSERT INTO sys_role_menu(role_id,menu_id) +SELECT r.role_id,m.menu_id FROM sys_role r JOIN sys_menu m ON + (m.menu_id=@rent_parent OR + (r.role_key='PROXY_SUPPLIER' AND m.perms IN + ('rent:supplier:home','rent:portal:view','rent:node:create','rent:wallet:create','rent:credential:issue','rent:wallet:bind')) OR + (r.role_key='PROXY_ACCOUNT' AND m.perms IN + ('rent:account:home','rent:portal:view','rent:app:create','rent:account:open','rent:credential:issue','rent:order:create'))) +WHERE r.role_key IN ('PROXY_SUPPLIER','PROXY_ACCOUNT') AND r.del_flag='0' + AND NOT EXISTS(SELECT 1 FROM sys_role_menu rm WHERE rm.role_id=r.role_id AND rm.menu_id=m.menu_id); +COMMIT; + +-- 核对实际权限;若原角色已有超出本脚本的授权,本脚本不会擅自删除,请由管理员复核。 +SELECT r.role_key,m.menu_name,m.perms FROM sys_role r +JOIN sys_role_menu rm ON rm.role_id=r.role_id JOIN sys_menu m ON m.menu_id=rm.menu_id +WHERE r.role_key IN ('PROXY_SUPPLIER','PROXY_ACCOUNT') ORDER BY r.role_key,m.menu_id;