From e1f9b0bfbde96ec3a9cdc4d6f63de3e983c8de27 Mon Sep 17 00:00:00 2001 From: scott Date: Mon, 2 Nov 2026 20:54:41 -0500 Subject: [PATCH] =?UTF-8?q?v3.9.6=20=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E5=8F=8A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - nacos:jraft-core 排除 com.alipay.sofa:hessian,解决与 hessian 4.0.66 冲突导致 nacos 启动失败 - system 微服务:默认注释 jeecg-cloud-test-more 示例模块(依赖 rabbitmq,未启动 rabbitmq 时启动慢 7 分钟) - 网关路由:jeecg-system 补充 /jimu/**(积木 ChatBI 页面经网关 404),建库脚本与 3.9.6 升级 SQL 同步修改 - 3.9.6 升级 SQL:「标准权限」及「用户选择查询」授权给 admin;本版新增按钮权限授权给已拥有其上级菜单的所有角色 Co-Authored-By: Claude Opus 5.5 --- jeecg-boot/db/jeecgboot-mysql-5.7.sql | 2 +- .../sql/mysql/V3.9.6_0__all_upgrade.sql | 31 +++++++++++++++++++ .../jeecg-cloud-nacos/pom.xml | 7 +++++ .../jeecg-system-cloud-start/pom.xml | 4 +-- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/jeecg-boot/db/jeecgboot-mysql-5.7.sql b/jeecg-boot/db/jeecgboot-mysql-5.7.sql index 010cbcb69..dfa935adb 100644 --- a/jeecg-boot/db/jeecgboot-mysql-5.7.sql +++ b/jeecg-boot/db/jeecgboot-mysql-5.7.sql @@ -7936,7 +7936,7 @@ INSERT INTO `sys_gateway_route` VALUES ('1331051599401857026', 'jeecg-demo-webso INSERT INTO `sys_gateway_route` VALUES ('1805444036892016641', 'jeecg-erp', 'jeecg-erp', 'lb://jeecg-erp', '[{\"args\":[\"/erp/**\"],\"name\":\"Path\"}]', '[]', NULL, NULL, NULL, NULL, 0, 'admin', '2024-06-25 11:32:57', NULL, NULL, NULL, 0); INSERT INTO `sys_gateway_route` VALUES ('jeecg-cloud-websocket', 'jeecg-system-websocket', 'jeecg-system-websocket', 'lb:ws://jeecg-system', '[{\"args\":[\"/websocket/**\",\"/eoaSocket/**\",\"/newsWebsocket/**\",\"/dragChannelSocket/**\"],\"name\":\"Path\"}]', '[]', NULL, NULL, NULL, NULL, 1, 'admin', '2020-11-16 19:41:51', NULL, NULL, NULL, 0); INSERT INTO `sys_gateway_route` VALUES ('jeecg-demo', 'jeecg-demo', 'jeecg-demo', 'lb://jeecg-demo', '[{\"args\":[\"/mock/**\",\"/bigscreen/template1/**\",\"/bigscreen/template2/**\",\"/test/**\",\"/hello/**\"],\"name\":\"Path\"}]', '[]', NULL, NULL, NULL, NULL, 1, 'admin', '2020-11-16 19:41:51', NULL, NULL, NULL, 0); -INSERT INTO `sys_gateway_route` VALUES ('jeecg-system', 'jeecg-system', 'jeecg-system', 'lb://jeecg-system', '[{\"args\":[\"/sys/**\",\"/online/**\",\"/bigscreen/**\",\"/jmreport/**\",\"/druid/**\",\"/generic/**\",\"/actuator/**\",\"/drag/**\",\"/oauth2/**\",\"/defa/**\",\"/demo/**\",\"/jimubi/**\",\"/airag/**\",\"/openapi/**\"],\"name\":\"Path\"}]', '[]', NULL, NULL, NULL, NULL, 1, 'admin', '2020-11-16 19:41:51', NULL, NULL, NULL, 0); +INSERT INTO `sys_gateway_route` VALUES ('jeecg-system', 'jeecg-system', 'jeecg-system', 'lb://jeecg-system', '[{\"args\":[\"/sys/**\",\"/online/**\",\"/bigscreen/**\",\"/jmreport/**\",\"/druid/**\",\"/generic/**\",\"/actuator/**\",\"/drag/**\",\"/oauth2/**\",\"/defa/**\",\"/demo/**\",\"/jimubi/**\",\"/airag/**\",\"/openapi/**\",\"/jimu/**\"],\"name\":\"Path\"}]', '[]', NULL, NULL, NULL, NULL, 1, 'admin', '2020-11-16 19:41:51', NULL, NULL, NULL, 0); -- ---------------------------- -- Table structure for sys_log diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.6_0__all_upgrade.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.6_0__all_upgrade.sql index 4196bdd68..4a393b37c 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.6_0__all_upgrade.sql +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.6_0__all_upgrade.sql @@ -167,3 +167,34 @@ FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1605906 INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) SELECT '1605906738040217602', 'f6817f48af4fb3af11b9e8bf182f618b', '1605906571316633601', NULL, '2022-12-22 20:42:57', '127.0.0.1' FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_role_permission` WHERE `id` = '1605906738040217602'); + +-- 微服务网关:jeecg-system 路由补充 /jimu/**(积木 ChatBI 页面 /jimu/chat2bi/index 经网关转发 404) +UPDATE `sys_gateway_route` SET `predicates` = REPLACE(`predicates`, '"/openapi/**"]', '"/openapi/**","/jimu/**"]') +WHERE `router_id` = 'jeecg-system' AND `predicates` NOT LIKE '%/jimu/**%'; + +-- 「标准权限」隐藏菜单及「用户选择查询」(system:user:select) 默认授权给 admin 角色 +INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT '2026110300000000001', 'f6817f48af4fb3af11b9e8bf182f618b', '2098348026237030401', NULL, '2026-11-03 10:00:00', '127.0.0.1' +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_role_permission` WHERE `role_id` = 'f6817f48af4fb3af11b9e8bf182f618b' AND `permission_id` = '2098348026237030401'); +INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT '2026110300000000002', 'f6817f48af4fb3af11b9e8bf182f618b', '2098348026237030402', NULL, '2026-11-03 10:00:00', '127.0.0.1' +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_role_permission` WHERE `role_id` = 'f6817f48af4fb3af11b9e8bf182f618b' AND `permission_id` = '2098348026237030402'); + +-- 本版新增的按钮权限,授权给已拥有其上级菜单的所有角色(升级前能用的功能升级后仍可用;可重复执行) +INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), rp.`role_id`, p.`id`, NULL, NOW(), '127.0.0.1' +FROM `sys_permission` p +JOIN (SELECT DISTINCT `role_id`, `permission_id` FROM `sys_role_permission`) rp ON rp.`permission_id` = p.`parent_id` +WHERE p.`id` IN ( + '2098348026237030402', '2026101600000000001', '2112012662790471742', '2112012662790471743', '2112012662790471745', '2112012662790471747', + '2112012662790471748', '2112012662790471741', '2112012662790471749', '2112012662790471746', '2112012662790471681', '2026102600000000001', + '2026102600000000002', '2026102600000000003', '2026102600000000004', '2026102600000000005', '2026102600000000006', '2026102600000000007', + '2026102600000000008', '2026102600000000015', '2026102600000000016', '2026102600000000017', '2026102600000000018', '2026102600000000019', + '2026102600000000020', '2026102600000000021', '2026102600000000024', '2026102600000000025', '2026102600000000026', '2026102600000000027', + '2026102600000000028', '2026102600000000029', '2026102600000000030', '2026102600000000031', '2026102600000000032', '2026102600000000033', + '2026102600000000034', '2026102600000000037', '2026102600000000038', '2026102600000000039', '2026102600000000040', '2026102600000000041', + '2026102600000000042', '2026102600000000043', '2026102600000000044', '2026102600000000045', '2026102600000000046', '2026102600000000047', + '2026102600000000048', '2026102600000000049', '2026102600000000050', '2026102600000000051', '2026102602000000001', '2026102602000000002', + '2026102602000000003', '2026102602000000004', '2026102602000000005', '2026102607000000001', '2026102607000000002', '1605906571316633601' +) +AND NOT EXISTS (SELECT 1 FROM `sys_role_permission` x WHERE x.`role_id` = rp.`role_id` AND x.`permission_id` = p.`id`); diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml index d2ec33d6f..6f424954d 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml +++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml @@ -69,6 +69,13 @@ io.github.pig-mesh.sofa jraft-core ${jraft.version} + + + + com.alipay.sofa + hessian + + diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml b/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml index 185e01a59..1bbff9cf6 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml +++ b/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml @@ -42,12 +42,12 @@ jeecg-boot-starter-job - +