From eecccd16014c9b14eb5c74e95a3ee5f3ba9b36b0 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 16:18:16 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E3=80=90fix=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E8=BF=9E=E6=8E=A5=E6=97=A0=E6=B3=95=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/utils/util.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jero-web/src/utils/util.js b/jero-web/src/utils/util.js index 43cb650b..23f06c77 100644 --- a/jero-web/src/utils/util.js +++ b/jero-web/src/utils/util.js @@ -84,7 +84,7 @@ export function formatDate(value, fmt) { // 生成首页路由 export function generateIndexRouter(data) { const redirectPath = findFirstRoute(data) -let indexRouter = [{ + let indexRouter = [{ path: '/', name: 'dashboard', //component: () => import('@/components/layouts/BasicLayout'), @@ -111,10 +111,9 @@ function generateChildRouters (data) { }else{ component = "views/"+item.component; } - // eslint-disable-next-line let URL = (item.meta.url|| '').replace(/{{([^}}]+)?}}/g, (s1, s2) => eval(s2)) // URL支持{{ window.xxx }}占位符变量 - if (isURL(URL)) { + if (isURL(URL) || (item.meta.url && item.meta.url.indexOf("{{") == 0)) { item.meta.url = URL; } From 8b72ea3c149f79e5f4b6fc006fa2b6c246220123 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 16:24:16 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91sql?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E3=80=81=E5=9C=A8=E7=BA=BF=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/Dockerfile | 2 +- ...mysql-5.7-20220331.sql => jeroboot-mysql-5.7-20220417.sql} | 4 ++-- jero-boot/db/jeroboot-oracle11g.sql | 4 ++-- jero-boot/db/jeroboot-sqlserver2017.sql | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename jero-boot/db/{jeroboot-mysql-5.7-20220331.sql => jeroboot-mysql-5.7-20220417.sql} (99%) diff --git a/jero-boot/db/Dockerfile b/jero-boot/db/Dockerfile index c893343a..97cccf21 100644 --- a/jero-boot/db/Dockerfile +++ b/jero-boot/db/Dockerfile @@ -8,6 +8,6 @@ RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone COPY ./tables_nacos.sql /docker-entrypoint-initdb.d -COPY jeroboot-mysql-5.7-20220331.sql /docker-entrypoint-initdb.d +COPY jeroboot-mysql-5.7-20220417.sql /docker-entrypoint-initdb.d COPY ./tables_xxl_job.sql /docker-entrypoint-initdb.d \ No newline at end of file diff --git a/jero-boot/db/jeroboot-mysql-5.7-20220331.sql b/jero-boot/db/jeroboot-mysql-5.7-20220417.sql similarity index 99% rename from jero-boot/db/jeroboot-mysql-5.7-20220331.sql rename to jero-boot/db/jeroboot-mysql-5.7-20220417.sql index 1fdf4d8b..92b7d11a 100644 --- a/jero-boot/db/jeroboot-mysql-5.7-20220331.sql +++ b/jero-boot/db/jeroboot-mysql-5.7-20220417.sql @@ -1604,7 +1604,7 @@ INSERT INTO `sys_permission` VALUES ('265de841c58907954b8877fb85212622', '2a470f INSERT INTO `sys_permission` VALUES ('277bfabef7d76e89b33062b16a9a5020', 'e3c13679c73a4f829bcff2aba8fd68b1', '基础表单', '/form/base-form', 'demo/form/BasicForm', null, null, '1', null, null, '1.00', '0', null, '1', '0', null, '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-02-26 17:02:08', '0', '0', null, null); INSERT INTO `sys_permission` VALUES ('2a470fc0c3954d9dbb61de6d80846549', '', '开发示例Demo', '/jero', 'layouts/RouteView', null, null, '0', null, null, '20.00', '0', 'qrcode', '1', '0', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2021-03-16 22:31:20', '0', '0', null, '0'); INSERT INTO `sys_permission` VALUES ('2aeddae571695cd6380f6d6d334d6e7d', 'f0675b52d89100ee88472b6800754a08', '布局统计报表', '/report/ArchivesStatisticst', 'demo/report/ArchivesStatisticst', null, null, '1', null, null, '1.00', '0', null, '1', '1', null, '0', null, 'admin', '2019-04-03 18:32:48', null, null, '0', '0', null, null); -INSERT INTO `sys_permission` VALUES ('2dbbafa22cda07fa5d169d741b81fe12', 'e41b69c57a941a3bbcce45032fe57605', '在线文档', '{{ window._CONFIG[\'domianURL\'] }}/doc.html', 'layouts/IframePageView', null, null, '1', null, null, '8.00', '0', null, '1', '1', '0', '0', null, 'admin', '2019-01-30 10:00:01', 'admin', '2021-03-16 22:33:43', '0', '0', null, '0'); +INSERT INTO `sys_permission` VALUES ('2dbbafa22cda07fa5d169d741b81fe12', 'e41b69c57a941a3bbcce45032fe57605', '在线文档', '{{ window._CONFIG[\'domianURL\'] }}/doc.html', 'layouts/IframePageView', null, null, '1', null, null, '8.00', '0', null, '1', '1', '0', '0', null, 'admin', '2019-01-30 10:00:01', 'admin', '2021-03-16 22:33:43', '0', '0', null, '1'); INSERT INTO `sys_permission` VALUES ('2e42e3835c2b44ec9f7bc26c146ee531', '2a470fc0c3954d9dbb61de6d80846549', '结果页', '/result', 'layouts/PageView', null, null, '1', null, null, '20.00', '0', 'check-circle-o', '1', '0', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2021-03-16 22:22:54', '0', '0', null, '0'); INSERT INTO `sys_permission` VALUES ('3f915b2769fc80648e92d04e84ca059d', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '用户管理', '/isystem/user', 'system/UserList', null, null, '1', 'sys:user:list', '1', '1.10', '0', null, '1', '0', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-12-25 09:36:24', '0', '0', '1', '0'); INSERT INTO `sys_permission` VALUES ('3fac0d3c9cd40fa53ab70d4c583821f8', '2a470fc0c3954d9dbb61de6d80846549', '分屏', '/demo/splitPanel', 'demo/SplitPanel', null, null, '1', null, null, '6.00', '0', null, '1', '1', null, '0', null, 'admin', '2019-04-25 16:27:06', null, null, '0', '0', null, null); @@ -1643,7 +1643,7 @@ INSERT INTO `sys_permission` VALUES ('9502685863ab87f0ad1134142788a385', '', ' INSERT INTO `sys_permission` VALUES ('97c8629abc7848eccdb6d77c24bb3ebb', '700b7f95165c46cc7a78bf227aa8fed3', '磁盘监控', '/monitor/Disk', 'modules/monitor/DiskMonitoring', null, null, '1', null, null, '6.00', '0', null, '1', '1', null, '0', null, 'admin', '2019-04-25 14:30:06', 'admin', '2019-05-05 14:37:14', '0', '0', null, null); INSERT INTO `sys_permission` VALUES ('9a90363f216a6a08f32eecb3f0bf12a3', '2a470fc0c3954d9dbb61de6d80846549', 'Jero组件示例', '/demo/SelectDemo', 'demo/SelectDemo', null, null, '1', null, null, '0.00', '0', null, '1', '1', '0', '0', null, 'admin', '2019-03-19 11:19:05', 'admin', '2021-03-16 22:15:28', '0', '0', null, '0'); INSERT INTO `sys_permission` VALUES ('ae4fed059f67086fd52a73d913cf473d', '540a2936940846cb98114ffb0d145cb8', '内联编辑表格', '/list/edit-table', 'demo/list/TableInnerEditList', null, null, '1', null, null, '2.00', null, null, '1', '1', null, null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null, null); -INSERT INTO `sys_permission` VALUES ('aedbf679b5773c1f25e9f7b10111da73', '08e6b9dc3c04489c8e1ff2ce6f105aa4', 'SQL监控', '{{ window._CONFIG[\'domianURL\'] }}/druid/', 'layouts/IframePageView', null, null, '1', null, null, '3.00', '0', null, '1', '1', '0', '0', null, 'admin', '2019-01-30 09:43:22', 'admin', '2020-09-09 14:48:38', '0', '0', null, '0'); +INSERT INTO `sys_permission` VALUES ('aedbf679b5773c1f25e9f7b10111da73', '08e6b9dc3c04489c8e1ff2ce6f105aa4', 'SQL监控', '{{ window._CONFIG[\'domianURL\'] }}/druid/', 'layouts/IframePageView', null, null, '1', null, null, '3.00', '0', null, '1', '1', '0', '0', null, 'admin', '2019-01-30 09:43:22', 'admin', '2020-09-09 14:48:38', '0', '0', null, '1'); INSERT INTO `sys_permission` VALUES ('b1cb0a3fedf7ed0e4653cb5a229837ee', 'e41b69c57a941a3bbcce45032fe57605', '定时任务', '/isystem/QuartzJobList', 'system/QuartzJobList', null, null, '1', null, null, '10.00', '0', null, '1', '1', '0', '0', null, null, '2019-01-03 09:38:52', 'admin', '2021-03-16 22:42:39', '0', '0', null, '0'); INSERT INTO `sys_permission` VALUES ('b3c824fc22bd953e2eb16ae6914ac8f9', '4875ebe289344e14844d8e3ea1edd73f', '高级详情页', '/profile/advanced', 'demo/profile/advanced/Advanced', null, null, '1', null, null, '2.00', null, null, '1', '1', null, null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null, null); INSERT INTO `sys_permission` VALUES ('b4dfc7d5dd9e8d5b6dd6d4579b1aa559', 'c65321e57b7949b7a975313220de0422', '500', '/exception/500', 'exception/500', null, null, '1', null, null, '3.00', null, null, '1', '1', null, null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null, null); diff --git a/jero-boot/db/jeroboot-oracle11g.sql b/jero-boot/db/jeroboot-oracle11g.sql index 1cfb0f8c..dd7a9d87 100644 --- a/jero-boot/db/jeroboot-oracle11g.sql +++ b/jero-boot/db/jeroboot-oracle11g.sql @@ -2140,7 +2140,7 @@ INSERT INTO "SYS_PERMISSION" VALUES ('9502685863ab87f0ad1134142788a385', null, ' INSERT INTO "SYS_PERMISSION" VALUES ('97c8629abc7848eccdb6d77c24bb3ebb', '700b7f95165c46cc7a78bf227aa8fed3', '磁盘监控', '/monitor/Disk', 'modules/monitor/DiskMonitoring', null, null, '1', null, null, '6', '0', null, '1', '1', null, '0', null, 'admin', TO_DATE('2019-04-25 14:30:06', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-05 14:37:14', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, null); INSERT INTO "SYS_PERMISSION" VALUES ('9a90363f216a6a08f32eecb3f0bf12a3', '2a470fc0c3954d9dbb61de6d80846549', 'Jero组件示例', '/demo/SelectDemo', 'demo/SelectDemo', null, null, '1', null, null, '0', '0', null, '1', '1', '0', '0', null, 'admin', TO_DATE('2019-03-19 11:19:05', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-03-16 22:15:28', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '0'); INSERT INTO "SYS_PERMISSION" VALUES ('ae4fed059f67086fd52a73d913cf473d', '540a2936940846cb98114ffb0d145cb8', '内联编辑表格', '/list/edit-table', 'demo/list/TableInnerEditList', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null, null); -INSERT INTO "SYS_PERMISSION" VALUES ('aedbf679b5773c1f25e9f7b10111da73', '08e6b9dc3c04489c8e1ff2ce6f105aa4', 'SQL监控', '{{ window._CONFIG[''domianURL''] }}/druid/', 'layouts/IframePageView', null, null, '1', null, null, '3', '0', null, '1', '1', '0', '0', null, 'admin', TO_DATE('2019-01-30 09:43:22', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-09-09 14:48:38', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '0'); +INSERT INTO "SYS_PERMISSION" VALUES ('aedbf679b5773c1f25e9f7b10111da73', '08e6b9dc3c04489c8e1ff2ce6f105aa4', 'SQL监控', '{{ window._CONFIG[''domianURL''] }}/druid/', 'layouts/IframePageView', null, null, '1', null, null, '3', '0', null, '1', '1', '0', '0', null, 'admin', TO_DATE('2019-01-30 09:43:22', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-09-09 14:48:38', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '1'); INSERT INTO "SYS_PERMISSION" VALUES ('b1cb0a3fedf7ed0e4653cb5a229837ee', 'e41b69c57a941a3bbcce45032fe57605', '定时任务', '/isystem/QuartzJobList', 'system/QuartzJobList', null, null, '1', null, null, '10', '0', null, '1', '1', '0', '0', null, null, TO_DATE('2019-01-03 09:38:52', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-03-16 22:42:39', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '0'); INSERT INTO "SYS_PERMISSION" VALUES ('b3c824fc22bd953e2eb16ae6914ac8f9', '4875ebe289344e14844d8e3ea1edd73f', '高级详情页', '/profile/advanced', 'demo/profile/advanced/Advanced', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null, null); INSERT INTO "SYS_PERMISSION" VALUES ('b4dfc7d5dd9e8d5b6dd6d4579b1aa559', 'c65321e57b7949b7a975313220de0422', '500', '/exception/500', 'exception/500', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null, null); @@ -2181,7 +2181,7 @@ INSERT INTO "SYS_PERMISSION" VALUES ('265de841c58907954b8877fb85212622', '2a470f INSERT INTO "SYS_PERMISSION" VALUES ('277bfabef7d76e89b33062b16a9a5020', 'e3c13679c73a4f829bcff2aba8fd68b1', '基础表单', '/form/base-form', 'demo/form/BasicForm', null, null, '1', null, null, '1', '0', null, '1', '0', null, '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-26 17:02:08', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, null); INSERT INTO "SYS_PERMISSION" VALUES ('2a470fc0c3954d9dbb61de6d80846549', null, '开发示例Demo', '/jero', 'layouts/RouteView', null, null, '0', null, null, '20', '0', 'qrcode', '1', '0', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-03-16 22:31:20', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '0'); INSERT INTO "SYS_PERMISSION" VALUES ('2aeddae571695cd6380f6d6d334d6e7d', 'f0675b52d89100ee88472b6800754a08', '布局统计报表', '/report/ArchivesStatisticst', 'demo/report/ArchivesStatisticst', null, null, '1', null, null, '1', '0', null, '1', '1', null, '0', null, 'admin', TO_DATE('2019-04-03 18:32:48', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null, null); -INSERT INTO "SYS_PERMISSION" VALUES ('2dbbafa22cda07fa5d169d741b81fe12', 'e41b69c57a941a3bbcce45032fe57605', '在线文档', '{{ window._CONFIG[''domianURL''] }}/doc.html', 'layouts/IframePageView', null, null, '1', null, null, '8', '0', null, '1', '1', '0', '0', null, 'admin', TO_DATE('2019-01-30 10:00:01', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-03-16 22:33:43', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '0'); +INSERT INTO "SYS_PERMISSION" VALUES ('2dbbafa22cda07fa5d169d741b81fe12', 'e41b69c57a941a3bbcce45032fe57605', '在线文档', '{{ window._CONFIG[''domianURL''] }}/doc.html', 'layouts/IframePageView', null, null, '1', null, null, '8', '0', null, '1', '1', '0', '0', null, 'admin', TO_DATE('2019-01-30 10:00:01', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-03-16 22:33:43', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '1'); INSERT INTO "SYS_PERMISSION" VALUES ('1383952003393466369', '190c2b43bec6a5f7a4194a85db67d96a', '角色添加', NULL, NULL, NULL, NULL, 2, 'sys:role:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', TO_DATE('2021-04-19 09:14:05', 'YYYY-MM-DD HH24:MI:SS'), NULL, NULL, 0, 0, '1', 0); INSERT INTO "SYS_PERMISSION" VALUES ('1383952499906785282', '190c2b43bec6a5f7a4194a85db67d96a', '角色编辑', NULL, NULL, NULL, NULL, 2, 'sys:role:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', TO_DATE('2021-04-19 09:14:05', 'YYYY-MM-DD HH24:MI:SS'), NULL, NULL, 0, 0, '1', 0); INSERT INTO "SYS_PERMISSION" VALUES ('1383952680177971201', '190c2b43bec6a5f7a4194a85db67d96a', '角色删除', NULL, NULL, NULL, NULL, 2, 'sys:role:del', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', TO_DATE('2021-04-19 09:14:05', 'YYYY-MM-DD HH24:MI:SS'), NULL, NULL, 0, 0, '1', 0); diff --git a/jero-boot/db/jeroboot-sqlserver2017.sql b/jero-boot/db/jeroboot-sqlserver2017.sql index e8dbf071..2611c0ea 100644 --- a/jero-boot/db/jeroboot-sqlserver2017.sql +++ b/jero-boot/db/jeroboot-sqlserver2017.sql @@ -5675,7 +5675,7 @@ GO INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'2aeddae571695cd6380f6d6d334d6e7d', N'f0675b52d89100ee88472b6800754a08', N'布局统计报表', N'/report/ArchivesStatisticst', N'demo/report/ArchivesStatisticst', NULL, NULL, N'1', NULL, NULL, N'1', N'0', NULL, N'1', N'1', NULL, N'0', NULL, N'admin', N'2019-04-03 18:32:48.0000000', NULL, NULL, N'0', N'0', NULL, NULL) GO -INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'2dbbafa22cda07fa5d169d741b81fe12', N'e41b69c57a941a3bbcce45032fe57605', N'在线文档', N'{{ window._CONFIG[''domianURL''] }}/doc.html', N'layouts/IframePageView', NULL, NULL, N'1', NULL, NULL, N'8', N'0', NULL, N'1', N'1', N'0', N'0', NULL, N'admin', N'2019-01-30 10:00:01.0000000', N'admin', N'2021-03-16 22:33:43.0000000', N'0', N'0', NULL, N'0') +INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'2dbbafa22cda07fa5d169d741b81fe12', N'e41b69c57a941a3bbcce45032fe57605', N'在线文档', N'{{ window._CONFIG[''domianURL''] }}/doc.html', N'layouts/IframePageView', NULL, NULL, N'1', NULL, NULL, N'8', N'0', NULL, N'1', N'1', N'0', N'0', NULL, N'admin', N'2019-01-30 10:00:01.0000000', N'admin', N'2021-03-16 22:33:43.0000000', N'0', N'0', NULL, N'1') GO INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'2e42e3835c2b44ec9f7bc26c146ee531', N'2a470fc0c3954d9dbb61de6d80846549', N'结果页', N'/result', N'layouts/PageView', NULL, NULL, N'1', NULL, NULL, N'20', N'0', N'check-circle-o', N'1', N'0', N'0', N'0', NULL, NULL, N'2018-12-25 20:34:38.0000000', N'admin', N'2021-03-16 22:22:54.0000000', N'0', N'0', NULL, N'0') @@ -5792,7 +5792,7 @@ GO INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'ae4fed059f67086fd52a73d913cf473d', N'540a2936940846cb98114ffb0d145cb8', N'内联编辑表格', N'/list/edit-table', N'demo/list/TableInnerEditList', NULL, NULL, N'1', NULL, NULL, N'2', NULL, NULL, N'1', N'1', NULL, NULL, NULL, NULL, N'2018-12-25 20:34:38.0000000', NULL, NULL, N'0', N'0', NULL, NULL) GO -INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'aedbf679b5773c1f25e9f7b10111da73', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'SQL监控', N'{{ window._CONFIG[''domianURL''] }}/druid/', N'layouts/IframePageView', NULL, NULL, N'1', NULL, NULL, N'3', N'0', NULL, N'1', N'1', N'0', N'0', NULL, N'admin', N'2019-01-30 09:43:22.0000000', N'admin', N'2020-09-09 14:48:38.0000000', N'0', N'0', NULL, N'0') +INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'aedbf679b5773c1f25e9f7b10111da73', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'SQL监控', N'{{ window._CONFIG[''domianURL''] }}/druid/', N'layouts/IframePageView', NULL, NULL, N'1', NULL, NULL, N'3', N'0', NULL, N'1', N'1', N'0', N'0', NULL, N'admin', N'2019-01-30 09:43:22.0000000', N'admin', N'2020-09-09 14:48:38.0000000', N'0', N'0', NULL, N'1') GO INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'b1cb0a3fedf7ed0e4653cb5a229837ee', N'e41b69c57a941a3bbcce45032fe57605', N'定时任务', N'/isystem/QuartzJobList', N'system/QuartzJobList', NULL, NULL, N'1', NULL, NULL, N'10', N'0', NULL, N'1', N'1', N'0', N'0', NULL, NULL, N'2019-01-03 09:38:52.0000000', N'admin', N'2021-03-16 22:42:39.0000000', N'0', N'0', NULL, N'0') From c79efc06ed9dfa26b7a99d30290a67db3d47bf65 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 17:40:14 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89=E5=92=8C=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=20=E3=80=90fix=E3=80=91=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=92=8C=E8=A7=92=E8=89=B2=E5=A4=84=E7=94=A8=E6=88=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E8=83=BD=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysDepartPermissionController.java | 82 +-- .../controller/SysDepartRoleController.java | 588 +++++++++--------- .../system/controller/SysUserController.java | 40 +- .../modules/system/entity/SysDepartRole.java | 150 ++--- .../entity/SysDepartRolePermission.java | 134 ++-- .../system/entity/SysDepartRoleUser.java | 104 ++-- .../system/mapper/SysDepartRoleMapper.java | 46 +- .../mapper/SysDepartRolePermissionMapper.java | 34 +- .../mapper/SysDepartRoleUserMapper.java | 34 +- .../system/mapper/xml/SysDepartRoleMapper.xml | 12 - .../xml/SysDepartRolePermissionMapper.xml | 5 - .../mapper/xml/SysDepartRoleUserMapper.xml | 5 - .../ISysDepartRolePermissionService.java | 40 +- .../system/service/ISysDepartRoleService.java | 48 +- .../service/ISysDepartRoleUserService.java | 48 +- .../impl/SysDepartPermissionServiceImpl.java | 26 +- .../SysDepartRolePermissionServiceImpl.java | 174 +++--- .../impl/SysDepartRoleServiceImpl.java | 50 +- .../impl/SysDepartRoleUserServiceImpl.java | 186 +++--- .../service/impl/SysDepartServiceImpl.java | 62 +- .../impl/SysPermissionServiceImpl.java | 10 +- .../service/impl/SysUserServiceImpl.java | 16 +- jero-web/src/api/api.js | 4 +- .../system/modules/DeptRoleAuthModal.vue | 412 ++++++------ .../system/modules/DeptRoleDataruleModal.vue | 226 +++---- .../views/system/modules/SelectUserModal.vue | 2 +- .../system/modules/SysDepartRoleModal.vue | 300 ++++----- 27 files changed, 1408 insertions(+), 1430 deletions(-) delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java index e5bc5e51..2e3c8408 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java @@ -13,7 +13,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepartPermission; -import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.jero.modules.system.entity.SysDepartRolePermission; import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.model.TreeModel; @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import com.jero.modules.system.service.ISysDepartRolePermissionService; +//import com.jero.modules.system.service.ISysDepartRolePermissionService; import com.jero.modules.system.service.ISysPermissionDataRuleService; import com.jero.modules.system.service.ISysPermissionService; @@ -52,8 +52,8 @@ public class SysDepartPermissionController extends JeroController> queryDeptRolePermission(@RequestParam(name = "roleId", required = true) String roleId) { - Result> result = new Result<>(); - try { - List list = sysDepartRolePermissionService.list(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId)); - result.setResult(list.stream().map(SysDepartRolePermission -> String.valueOf(SysDepartRolePermission.getPermissionId())).collect(Collectors.toList())); - result.setSuccess(true); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return result; - } +// /** +// * 查询角色授权 +// * +// * @return +// */ +// @RequestMapping(value = "/queryDeptRolePermission", method = RequestMethod.GET) +// public Result> queryDeptRolePermission(@RequestParam(name = "roleId", required = true) String roleId) { +// Result> result = new Result<>(); +// try { +// List list = sysDepartRolePermissionService.list(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId)); +// result.setResult(list.stream().map(SysDepartRolePermission -> String.valueOf(SysDepartRolePermission.getPermissionId())).collect(Collectors.toList())); +// result.setSuccess(true); +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// } +// return result; +// } - /** - * 保存角色授权 - * - * @return - */ - @RequestMapping(value = "/saveDeptRolePermission", method = RequestMethod.POST) - public Result saveDeptRolePermission(@RequestBody JSONObject json) { - long start = System.currentTimeMillis(); - try { - String roleId = json.getString("roleId"); - String permissionIds = json.getString("permissionIds"); - String lastPermissionIds = json.getString("lastpermissionIds"); - this.sysDepartRolePermissionService.saveDeptRolePermission(roleId, permissionIds, lastPermissionIds); - log.info("======部门角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); - return Result.OK("保存成功！"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error500("授权失败！"); - } - } +// /** +// * 保存角色授权 +// * +// * @return +// */ +// @RequestMapping(value = "/saveDeptRolePermission", method = RequestMethod.POST) +// public Result saveDeptRolePermission(@RequestBody JSONObject json) { +// long start = System.currentTimeMillis(); +// try { +// String roleId = json.getString("roleId"); +// String permissionIds = json.getString("permissionIds"); +// String lastPermissionIds = json.getString("lastpermissionIds"); +// this.sysDepartRolePermissionService.saveDeptRolePermission(roleId, permissionIds, lastPermissionIds); +// log.info("======部门角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); +// return Result.OK("保存成功！"); +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// return Result.error500("授权失败！"); +// } +// } /** * 用户角色授权功能，查询菜单权限树 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java index 3e486e16..6b8a4f97 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java @@ -1,294 +1,294 @@ -package com.jero.modules.system.controller; - -import java.util.*; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.common.system.base.controller.JeroController; -import org.apache.shiro.SecurityUtils; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.oConvertUtils; -import com.jero.modules.system.entity.*; -import com.jero.modules.system.service.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - - /** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Slf4j -@Api(tags="部门角色") -@RestController -@RequestMapping("/sys/sysDepartRole") -public class SysDepartRoleController extends JeroController { - @Autowired - private ISysDepartRoleService sysDepartRoleService; - - @Autowired - private ISysDepartRoleUserService departRoleUserService; - - @Autowired - private ISysDepartPermissionService sysDepartPermissionService; - - @Autowired - private ISysDepartRolePermissionService sysDepartRolePermissionService; - - @Autowired - private ISysDepartService sysDepartService; - - /** - * 分页列表查询 - * - * @param sysDepartRole - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @ApiOperation(value="部门角色-分页列表查询", notes="部门角色-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(SysDepartRole sysDepartRole, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - @RequestParam(name="deptId",required=false) String deptId, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepartRole, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - List deptIds = null; -// if(oConvertUtils.isEmpty(deptId)){ -// if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){ -// deptIds = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); -// }else{ -// return Result.OK(null); -// } -// }else{ -// deptIds = sysDepartService.getSubDepIdsByDepId(deptId); -// } -// queryWrapper.in("depart_id",deptIds); - - //我的部门，选中部门只能看当前部门下的角色 - queryWrapper.eq("depart_id",deptId); - IPage pageList = sysDepartRoleService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param sysDepartRole - * @return - */ - //@RequiresRoles({"admin"}) - @ApiOperation(value="部门角色-添加", notes="部门角色-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody SysDepartRole sysDepartRole) { - sysDepartRoleService.save(sysDepartRole); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param sysDepartRole - * @return - */ - //@RequiresRoles({"admin"}) - @ApiOperation(value="部门角色-编辑", notes="部门角色-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody SysDepartRole sysDepartRole) { - sysDepartRoleService.updateById(sysDepartRole); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - //@RequiresRoles({"admin"}) - @AutoLog(value = "部门角色-通过id删除") - @ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - sysDepartRoleService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - //@RequiresRoles({"admin"}) - @AutoLog(value = "部门角色-批量删除") - @ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功！"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @ApiOperation(value="部门角色-通过id查询", notes="部门角色-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); - return Result.OK(sysDepartRole); - } - - /** - * 获取部门下角色 - * @param departId - * @return - */ - @RequestMapping(value = "/getDeptRoleList", method = RequestMethod.GET) - public Result> getDeptRoleList(@RequestParam(value = "departId") String departId,@RequestParam(value = "userId") String userId){ - Result> result = new Result<>(); - //查询选中部门的角色 - List deptRoleList = sysDepartRoleService.list(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); - result.setSuccess(true); - result.setResult(deptRoleList); - return result; - } - - /** - * 设置 - * @param json - * @return - */ - //@RequiresRoles({"admin"}) - @RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST) - public Result deptRoleAdd(@RequestBody JSONObject json) { - String newRoleId = json.getString("newRoleId"); - String oldRoleId = json.getString("oldRoleId"); - String userId = json.getString("userId"); - departRoleUserService.deptRoleUserAdd(userId,newRoleId,oldRoleId); - return Result.OK("添加成功！"); - } - - /** - * 根据用户id获取已设置部门角色 - * @param userId - * @return - */ - @RequestMapping(value = "/getDeptRoleByUserId", method = RequestMethod.GET) - public Result> getDeptRoleByUserId(@RequestParam(value = "userId") String userId,@RequestParam(value = "departId") String departId){ - Result> result = new Result<>(); - //查询部门下角色 - List roleList = sysDepartRoleService.list(new QueryWrapper().eq("depart_id",departId)); - List roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - //根据角色id,用户id查询已授权角色 - List roleUserList = null; - if(roleIds!=null && roleIds.size()>0){ - roleUserList = departRoleUserService.list(new QueryWrapper().eq("user_id",userId).in("drole_id",roleIds)); - } - result.setSuccess(true); - result.setResult(roleUserList); - return result; - } - - /** - * 查询数据规则数据 - */ - @GetMapping(value = "/datarule/{permissionId}/{departId}/{roleId}") - public Result loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId,@PathVariable("roleId") String roleId) { - //查询已授权的部门规则 - List list = sysDepartPermissionService.getPermRuleListByDeptIdAndPermId(departId,permissionId); - if(list==null || list.size()==0) { - return Result.error("未找到权限配置信息"); - }else { - Map map = new HashMap<>(); - map.put("datarule", list); - LambdaQueryWrapper query = new LambdaQueryWrapper() - .eq(SysDepartRolePermission::getPermissionId, permissionId) - .eq(SysDepartRolePermission::getRoleId,roleId); - SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); - if(sysRolePermission==null) { - //return Result.error("未找到角色菜单配置信息"); - }else { - String drChecked = sysRolePermission.getDataRuleIds(); - if(oConvertUtils.isNotEmpty(drChecked)) { - map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); - } - } - return Result.OK(map); - //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key - } - } - - /** - * 保存数据规则至角色菜单关联表 - */ - @PostMapping(value = "/datarule") - public Result saveDatarule(@RequestBody JSONObject jsonObject) { - try { - String permissionId = jsonObject.getString("permissionId"); - String roleId = jsonObject.getString("roleId"); - String dataRuleIds = jsonObject.getString("dataRuleIds"); - log.info("保存数据规则>>"+"菜单ID:"+permissionId+"角色ID:"+ roleId+"数据权限ID:"+dataRuleIds); - LambdaQueryWrapper query = new LambdaQueryWrapper() - .eq(SysDepartRolePermission::getPermissionId, permissionId) - .eq(SysDepartRolePermission::getRoleId,roleId); - SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); - if(sysRolePermission==null) { - return Result.error("请先保存角色菜单权限!"); - }else { - sysRolePermission.setDataRuleIds(dataRuleIds); - this.sysDepartRolePermissionService.updateById(sysRolePermission); - } - } catch (Exception e) { - log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); - return Result.error("保存失败"); - } - return Result.OK("保存成功!"); - } - - /** - * 导出excel - * - * @param request - * @param sysDepartRole - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, SysDepartRole sysDepartRole) { - return super.exportXls(request, sysDepartRole, SysDepartRole.class, "部门角色"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, SysDepartRole.class); - } - -} +//package com.jero.modules.system.controller; +// +//import java.util.*; +//import java.util.stream.Collectors; +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpServletResponse; +// +//import com.alibaba.fastjson.JSONObject; +//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +//import com.jero.common.system.base.controller.JeroController; +//import org.apache.shiro.SecurityUtils; +//import com.jero.common.api.vo.Result; +//import com.jero.common.system.query.QueryGenerator; +//import com.jero.common.aspect.annotation.AutoLog; +//import com.jero.common.system.vo.LoginUser; +//import com.jero.common.util.oConvertUtils; +//import com.jero.modules.system.entity.*; +//import com.jero.modules.system.service.*; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import lombok.extern.slf4j.Slf4j; +// +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.*; +//import org.springframework.web.servlet.ModelAndView; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +// +// /** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Slf4j +//@Api(tags="部门角色") +//@RestController +//@RequestMapping("/sys/sysDepartRole") +//public class SysDepartRoleController extends JeroController { +// @Autowired +// private ISysDepartRoleService sysDepartRoleService; +// +// @Autowired +// private ISysDepartRoleUserService departRoleUserService; +// +// @Autowired +// private ISysDepartPermissionService sysDepartPermissionService; +// +// @Autowired +// private ISysDepartRolePermissionService sysDepartRolePermissionService; +// +// @Autowired +// private ISysDepartService sysDepartService; +// +// /** +// * 分页列表查询 +// * +// * @param sysDepartRole +// * @param pageNo +// * @param pageSize +// * @param req +// * @return +// */ +// @ApiOperation(value="部门角色-分页列表查询", notes="部门角色-分页列表查询") +// @GetMapping(value = "/page") +// public Result queryPageList(SysDepartRole sysDepartRole, +// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, +// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, +// @RequestParam(name="deptId",required=false) String deptId, +// HttpServletRequest req) { +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepartRole, req.getParameterMap()); +// Page page = new Page(pageNo, pageSize); +// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List deptIds = null; +//// if(oConvertUtils.isEmpty(deptId)){ +//// if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){ +//// deptIds = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); +//// }else{ +//// return Result.OK(null); +//// } +//// }else{ +//// deptIds = sysDepartService.getSubDepIdsByDepId(deptId); +//// } +//// queryWrapper.in("depart_id",deptIds); +// +// //我的部门，选中部门只能看当前部门下的角色 +// queryWrapper.eq("depart_id",deptId); +// IPage pageList = sysDepartRoleService.page(page, queryWrapper); +// return Result.OK(pageList); +// } +// +// /** +// * 添加 +// * +// * @param sysDepartRole +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @ApiOperation(value="部门角色-添加", notes="部门角色-添加") +// @PostMapping(value = "/add") +// public Result add(@RequestBody SysDepartRole sysDepartRole) { +// sysDepartRoleService.save(sysDepartRole); +// return Result.OK("添加成功！"); +// } +// +// /** +// * 编辑 +// * +// * @param sysDepartRole +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @ApiOperation(value="部门角色-编辑", notes="部门角色-编辑") +// @PutMapping(value = "/edit") +// public Result edit(@RequestBody SysDepartRole sysDepartRole) { +// sysDepartRoleService.updateById(sysDepartRole); +// return Result.OK("编辑成功!"); +// } +// +// /** +// * 通过id删除 +// * +// * @param id +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @AutoLog(value = "部门角色-通过id删除") +// @ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除") +// @DeleteMapping(value = "/delete") +// public Result delete(@RequestParam(name="id",required=true) String id) { +// sysDepartRoleService.removeById(id); +// return Result.OK("删除成功!"); +// } +// +// /** +// * 批量删除 +// * +// * @param ids +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @AutoLog(value = "部门角色-批量删除") +// @ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除") +// @DeleteMapping(value = "/deleteBatch") +// public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { +// this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(","))); +// return Result.OK("批量删除成功！"); +// } +// +// /** +// * 通过id查询 +// * +// * @param id +// * @return +// */ +// @ApiOperation(value="部门角色-通过id查询", notes="部门角色-通过id查询") +// @GetMapping(value = "/queryById") +// public Result queryById(@RequestParam(name="id",required=true) String id) { +// SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); +// return Result.OK(sysDepartRole); +// } +// +// /** +// * 获取部门下角色 +// * @param departId +// * @return +// */ +// @RequestMapping(value = "/getDeptRoleList", method = RequestMethod.GET) +// public Result> getDeptRoleList(@RequestParam(value = "departId") String departId,@RequestParam(value = "userId") String userId){ +// Result> result = new Result<>(); +// //查询选中部门的角色 +// List deptRoleList = sysDepartRoleService.list(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); +// result.setSuccess(true); +// result.setResult(deptRoleList); +// return result; +// } +// +// /** +// * 设置 +// * @param json +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST) +// public Result deptRoleAdd(@RequestBody JSONObject json) { +// String newRoleId = json.getString("newRoleId"); +// String oldRoleId = json.getString("oldRoleId"); +// String userId = json.getString("userId"); +// departRoleUserService.deptRoleUserAdd(userId,newRoleId,oldRoleId); +// return Result.OK("添加成功！"); +// } +// +// /** +// * 根据用户id获取已设置部门角色 +// * @param userId +// * @return +// */ +// @RequestMapping(value = "/getDeptRoleByUserId", method = RequestMethod.GET) +// public Result> getDeptRoleByUserId(@RequestParam(value = "userId") String userId,@RequestParam(value = "departId") String departId){ +// Result> result = new Result<>(); +// //查询部门下角色 +// List roleList = sysDepartRoleService.list(new QueryWrapper().eq("depart_id",departId)); +// List roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); +// //根据角色id,用户id查询已授权角色 +// List roleUserList = null; +// if(roleIds!=null && roleIds.size()>0){ +// roleUserList = departRoleUserService.list(new QueryWrapper().eq("user_id",userId).in("drole_id",roleIds)); +// } +// result.setSuccess(true); +// result.setResult(roleUserList); +// return result; +// } +// +// /** +// * 查询数据规则数据 +// */ +// @GetMapping(value = "/datarule/{permissionId}/{departId}/{roleId}") +// public Result loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId,@PathVariable("roleId") String roleId) { +// //查询已授权的部门规则 +// List list = sysDepartPermissionService.getPermRuleListByDeptIdAndPermId(departId,permissionId); +// if(list==null || list.size()==0) { +// return Result.error("未找到权限配置信息"); +// }else { +// Map map = new HashMap<>(); +// map.put("datarule", list); +// LambdaQueryWrapper query = new LambdaQueryWrapper() +// .eq(SysDepartRolePermission::getPermissionId, permissionId) +// .eq(SysDepartRolePermission::getRoleId,roleId); +// SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); +// if(sysRolePermission==null) { +// //return Result.error("未找到角色菜单配置信息"); +// }else { +// String drChecked = sysRolePermission.getDataRuleIds(); +// if(oConvertUtils.isNotEmpty(drChecked)) { +// map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); +// } +// } +// return Result.OK(map); +// //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key +// } +// } +// +// /** +// * 保存数据规则至角色菜单关联表 +// */ +// @PostMapping(value = "/datarule") +// public Result saveDatarule(@RequestBody JSONObject jsonObject) { +// try { +// String permissionId = jsonObject.getString("permissionId"); +// String roleId = jsonObject.getString("roleId"); +// String dataRuleIds = jsonObject.getString("dataRuleIds"); +// log.info("保存数据规则>>"+"菜单ID:"+permissionId+"角色ID:"+ roleId+"数据权限ID:"+dataRuleIds); +// LambdaQueryWrapper query = new LambdaQueryWrapper() +// .eq(SysDepartRolePermission::getPermissionId, permissionId) +// .eq(SysDepartRolePermission::getRoleId,roleId); +// SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); +// if(sysRolePermission==null) { +// return Result.error("请先保存角色菜单权限!"); +// }else { +// sysRolePermission.setDataRuleIds(dataRuleIds); +// this.sysDepartRolePermissionService.updateById(sysRolePermission); +// } +// } catch (Exception e) { +// log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); +// return Result.error("保存失败"); +// } +// return Result.OK("保存成功!"); +// } +// +// /** +// * 导出excel +// * +// * @param request +// * @param sysDepartRole +// */ +// @RequestMapping(value = "/exportXls") +// public ModelAndView exportXls(HttpServletRequest request, SysDepartRole sysDepartRole) { +// return super.exportXls(request, sysDepartRole, SysDepartRole.class, "部门角色"); +// } +// +// /** +// * 通过excel导入数据 +// * +// * @param request +// * @param response +// * @return +// */ +// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) +// public Result importExcel(HttpServletRequest request, HttpServletResponse response) { +// return super.importExcel(request, response, SysDepartRole.class); +// } +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index a7ca9060..b55e10b7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -82,11 +82,11 @@ public class SysUserController { @Autowired private ISysUserRoleService userRoleService; - @Autowired - private ISysDepartRoleUserService departRoleUserService; +// @Autowired +// private ISysDepartRoleUserService departRoleUserService; - @Autowired - private ISysDepartRoleService departRoleService; +// @Autowired +// private ISysDepartRoleService departRoleService; @Autowired private RedisUtil redisUtil; @@ -779,19 +779,19 @@ public class SysUserController { try { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).eq("user_id",userId); - boolean b = sysUserDepartService.remove(queryWrapper); - if(b){ - List sysDepartRoleList = departRoleService.list(new QueryWrapper().eq("depart_id",depId)); - List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - if(roleIds != null && roleIds.size()>0){ - QueryWrapper query = new QueryWrapper<>(); - query.eq("user_id",userId).in("drole_id",roleIds); - departRoleUserService.remove(query); - } + sysUserDepartService.remove(queryWrapper); +// if(b){ +// List sysDepartRoleList = departRoleService.list(new QueryWrapper().eq("depart_id",depId)); +// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); +// if(roleIds != null && roleIds.size()>0){ +// QueryWrapper query = new QueryWrapper<>(); +// query.eq("user_id",userId).in("drole_id",roleIds); +// departRoleUserService.remove(query); +// } return Result.OK("删除成功!"); - }else{ - return Result.error500("当前选中部门与用户无关联关系!"); - } +// }else{ +// return Result.error500("当前选中部门与用户无关联关系!"); +// } }catch(Exception e) { log.error(e.getMessage(), e); return Result.error500("删除失败！"); @@ -808,10 +808,10 @@ public class SysUserController { try { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(","))); - boolean b = sysUserDepartService.remove(queryWrapper); - if(b){ - departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId); - } + sysUserDepartService.remove(queryWrapper); +// if(b){ +// departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId); +// } return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java index 51f23ae1..cf330749 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java @@ -1,75 +1,75 @@ -package com.jero.modules.system.entity; - -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Data -@TableName("sys_depart_role") -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="sys_depart_role对象", description="部门角色") -public class SysDepartRole { - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.String id; - /**部门id*/ - @Excel(name = "部门id", width = 15) - @ApiModelProperty(value = "部门id") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private java.lang.String departId; - /**部门角色名称*/ - @Excel(name = "部门角色名称", width = 15) - @ApiModelProperty(value = "部门角色名称") - private java.lang.String roleName; - /**部门角色编码*/ - @Excel(name = "部门角色编码", width = 15) - @ApiModelProperty(value = "部门角色编码") - private java.lang.String roleCode; - /**描述*/ - @Excel(name = "描述", width = 15) - @ApiModelProperty(value = "描述") - private java.lang.String description; - /**创建人*/ - @Excel(name = "创建人", width = 15) - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建时间*/ - @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**更新人*/ - @Excel(name = "更新人", width = 15) - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新时间*/ - @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; - - -} +//package com.jero.modules.system.entity; +// +//import java.io.Serializable; +//import java.util.Date; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.baomidou.mybatisplus.annotation.TableName; +//import com.baomidou.mybatisplus.annotation.TableField; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import com.jero.common.aspect.annotation.Dict; +//import org.springframework.format.annotation.DateTimeFormat; +//import org.jeecgframework.poi.excel.annotation.Excel; +// +///** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Data +//@TableName("sys_depart_role") +//@EqualsAndHashCode(callSuper = false) +//@Accessors(chain = true) +//@ApiModel(value="sys_depart_role对象", description="部门角色") +//public class SysDepartRole { +// +// /**id*/ +// @TableId(type = IdType.ASSIGN_ID) +// @ApiModelProperty(value = "id") +// private java.lang.String id; +// /**部门id*/ +// @Excel(name = "部门id", width = 15) +// @ApiModelProperty(value = "部门id") +// @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") +// private java.lang.String departId; +// /**部门角色名称*/ +// @Excel(name = "部门角色名称", width = 15) +// @ApiModelProperty(value = "部门角色名称") +// private java.lang.String roleName; +// /**部门角色编码*/ +// @Excel(name = "部门角色编码", width = 15) +// @ApiModelProperty(value = "部门角色编码") +// private java.lang.String roleCode; +// /**描述*/ +// @Excel(name = "描述", width = 15) +// @ApiModelProperty(value = "描述") +// private java.lang.String description; +// /**创建人*/ +// @Excel(name = "创建人", width = 15) +// @ApiModelProperty(value = "创建人") +// private java.lang.String createBy; +// /**创建时间*/ +// @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// @ApiModelProperty(value = "创建时间") +// private java.util.Date createTime; +// /**更新人*/ +// @Excel(name = "更新人", width = 15) +// @ApiModelProperty(value = "更新人") +// private java.lang.String updateBy; +// /**更新时间*/ +// @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// @ApiModelProperty(value = "更新时间") +// private java.util.Date updateTime; +// +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java index 80e6aeb7..14bad255 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java @@ -1,67 +1,67 @@ -package com.jero.modules.system.entity; - -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @Description: 部门角色权限 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Data -@TableName("sys_depart_role_permission") -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") -public class SysDepartRolePermission { - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.String id; - /**部门id*/ - @Excel(name = "部门id", width = 15) - @ApiModelProperty(value = "部门id") - private java.lang.String departId; - /**角色id*/ - @Excel(name = "角色id", width = 15) - @ApiModelProperty(value = "角色id") - private java.lang.String roleId; - /**权限id*/ - @Excel(name = "权限id", width = 15) - @ApiModelProperty(value = "权限id") - private java.lang.String permissionId; - /**dataRuleIds*/ - @Excel(name = "dataRuleIds", width = 15) - @ApiModelProperty(value = "dataRuleIds") - private java.lang.String dataRuleIds; - /** 操作时间 */ - @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "操作时间") - private java.util.Date operateDate; - /** 操作ip */ - private java.lang.String operateIp; - - public SysDepartRolePermission() { - } - - public SysDepartRolePermission(String roleId, String permissionId) { - this.roleId = roleId; - this.permissionId = permissionId; - } -} +//package com.jero.modules.system.entity; +// +//import java.io.Serializable; +//import java.util.Date; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.baomidou.mybatisplus.annotation.TableName; +//import com.baomidou.mybatisplus.annotation.TableField; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import org.springframework.format.annotation.DateTimeFormat; +//import org.jeecgframework.poi.excel.annotation.Excel; +// +///** +// * @Description: 部门角色权限 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Data +//@TableName("sys_depart_role_permission") +//@EqualsAndHashCode(callSuper = false) +//@Accessors(chain = true) +//@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") +//public class SysDepartRolePermission { +// +// /**id*/ +// @TableId(type = IdType.ASSIGN_ID) +// @ApiModelProperty(value = "id") +// private java.lang.String id; +// /**部门id*/ +// @Excel(name = "部门id", width = 15) +// @ApiModelProperty(value = "部门id") +// private java.lang.String departId; +// /**角色id*/ +// @Excel(name = "角色id", width = 15) +// @ApiModelProperty(value = "角色id") +// private java.lang.String roleId; +// /**权限id*/ +// @Excel(name = "权限id", width = 15) +// @ApiModelProperty(value = "权限id") +// private java.lang.String permissionId; +// /**dataRuleIds*/ +// @Excel(name = "dataRuleIds", width = 15) +// @ApiModelProperty(value = "dataRuleIds") +// private java.lang.String dataRuleIds; +// /** 操作时间 */ +// @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// @ApiModelProperty(value = "操作时间") +// private java.util.Date operateDate; +// /** 操作ip */ +// private java.lang.String operateIp; +// +// public SysDepartRolePermission() { +// } +// +// public SysDepartRolePermission(String roleId, String permissionId) { +// this.roleId = roleId; +// this.permissionId = permissionId; +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java index 7a5b2985..c889109d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java @@ -1,52 +1,52 @@ -package com.jero.modules.system.entity; - -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @Description: 部门角色人员信息 - * @Author: jero-boot - * @Date: 2020-02-13 - * @Version: V1.0 - */ -@Data -@TableName("sys_depart_role_user") -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") -public class SysDepartRoleUser { - - /**主键id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") - private java.lang.String id; - /**用户id*/ - @Excel(name = "用户id", width = 15) - @ApiModelProperty(value = "用户id") - private java.lang.String userId; - /**角色id*/ - @Excel(name = "角色id", width = 15) - @ApiModelProperty(value = "角色id") - private java.lang.String droleId; - - public SysDepartRoleUser() { - - } - - public SysDepartRoleUser(String userId, String droleId) { - this.userId = userId; - this.droleId = droleId; - } -} +//package com.jero.modules.system.entity; +// +//import java.io.Serializable; +//import java.util.Date; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.baomidou.mybatisplus.annotation.TableName; +//import com.baomidou.mybatisplus.annotation.TableField; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import org.springframework.format.annotation.DateTimeFormat; +//import org.jeecgframework.poi.excel.annotation.Excel; +// +///** +// * @Description: 部门角色人员信息 +// * @Author: jero-boot +// * @Date: 2020-02-13 +// * @Version: V1.0 +// */ +//@Data +//@TableName("sys_depart_role_user") +//@EqualsAndHashCode(callSuper = false) +//@Accessors(chain = true) +//@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") +//public class SysDepartRoleUser { +// +// /**主键id*/ +// @TableId(type = IdType.ASSIGN_ID) +// @ApiModelProperty(value = "主键id") +// private java.lang.String id; +// /**用户id*/ +// @Excel(name = "用户id", width = 15) +// @ApiModelProperty(value = "用户id") +// private java.lang.String userId; +// /**角色id*/ +// @Excel(name = "角色id", width = 15) +// @ApiModelProperty(value = "角色id") +// private java.lang.String droleId; +// +// public SysDepartRoleUser() { +// +// } +// +// public SysDepartRoleUser(String userId, String droleId) { +// this.userId = userId; +// this.droleId = droleId; +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java index f828560b..0c48a38d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java @@ -1,23 +1,23 @@ -package com.jero.modules.system.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.system.entity.SysDepartRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -public interface SysDepartRoleMapper extends BaseMapper { - /** - * 根据用户id，部门id查询可授权所有部门角色 - * @param orgCode - * @param userId - * @return - */ - public List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); -} +//package com.jero.modules.system.mapper; +// +//import java.util.List; +// +//import org.apache.ibatis.annotations.Param; +//import com.jero.modules.system.entity.SysDepartRole; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +// +///** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//public interface SysDepartRoleMapper extends BaseMapper { +// /** +// * 根据用户id，部门id查询可授权所有部门角色 +// * @param orgCode +// * @param userId +// * @return +// */ +// public List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java index 66f1f8c9..75c33c20 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java @@ -1,17 +1,17 @@ -package com.jero.modules.system.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.system.entity.SysDepartRolePermission; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 部门角色权限 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -public interface SysDepartRolePermissionMapper extends BaseMapper { - -} +//package com.jero.modules.system.mapper; +// +//import java.util.List; +// +//import org.apache.ibatis.annotations.Param; +//import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +// +///** +// * @Description: 部门角色权限 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//public interface SysDepartRolePermissionMapper extends BaseMapper { +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java index d3796d3d..391624a7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java @@ -1,17 +1,17 @@ -package com.jero.modules.system.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.system.entity.SysDepartRoleUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 部门角色人员信息 - * @Author: jero-boot - * @Date: 2020-02-13 - * @Version: V1.0 - */ -public interface SysDepartRoleUserMapper extends BaseMapper { - -} +//package com.jero.modules.system.mapper; +// +//import java.util.List; +// +//import org.apache.ibatis.annotations.Param; +//import com.jero.modules.system.entity.SysDepartRoleUser; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +// +///** +// * @Description: 部门角色人员信息 +// * @Author: jero-boot +// * @Date: 2020-02-13 +// * @Version: V1.0 +// */ +//public interface SysDepartRoleUserMapper extends BaseMapper { +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml deleted file mode 100644 index ba2e85fc..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml deleted file mode 100644 index 38a6e1df..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml deleted file mode 100644 index acde2573..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java index f434fa60..99ee9a4f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java @@ -1,20 +1,20 @@ -package com.jero.modules.system.service; - -import com.jero.modules.system.entity.SysDepartRolePermission; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 部门角色权限 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -public interface ISysDepartRolePermissionService extends IService { - /** - * 保存授权 将上次的权限和这次作比较 差异处理提高效率 - * @param roleId - * @param permissionIds - * @param lastPermissionIds - */ - public void saveDeptRolePermission(String roleId,String permissionIds,String lastPermissionIds); -} +//package com.jero.modules.system.service; +// +//import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.baomidou.mybatisplus.extension.service.IService; +// +///** +// * @Description: 部门角色权限 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//public interface ISysDepartRolePermissionService extends IService { +// /** +// * 保存授权 将上次的权限和这次作比较 差异处理提高效率 +// * @param roleId +// * @param permissionIds +// * @param lastPermissionIds +// */ +// public void saveDeptRolePermission(String roleId,String permissionIds,String lastPermissionIds); +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java index 1a307ccd..cf506c20 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java @@ -1,24 +1,24 @@ -package com.jero.modules.system.service; - -import com.jero.modules.system.entity.SysDepartRole; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -public interface ISysDepartRoleService extends IService { - - /** - * 根据用户id，部门id查询可授权所有部门角色 - * @param orgCode - * @param userId - * @return - */ - List queryDeptRoleByDeptAndUser(String orgCode, String userId); - -} +//package com.jero.modules.system.service; +// +//import com.jero.modules.system.entity.SysDepartRole; +//import com.baomidou.mybatisplus.extension.service.IService; +// +//import java.util.List; +// +///** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//public interface ISysDepartRoleService extends IService { +// +// /** +// * 根据用户id，部门id查询可授权所有部门角色 +// * @param orgCode +// * @param userId +// * @return +// */ +// List queryDeptRoleByDeptAndUser(String orgCode, String userId); +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java index cc168726..31d14ca6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java @@ -1,24 +1,24 @@ -package com.jero.modules.system.service; - -import com.jero.modules.system.entity.SysDepartRoleUser; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * @Description: 部门角色人员信息 - * @Author: jero-boot - * @Date: 2020-02-13 - * @Version: V1.0 - */ -public interface ISysDepartRoleUserService extends IService { - - void deptRoleUserAdd(String userId,String newRoleId,String oldRoleId); - - /** - * 取消用户与部门关联，删除关联关系 - * @param userIds - * @param depId - */ - void removeDeptRoleUser(List userIds,String depId); -} +//package com.jero.modules.system.service; +// +//import com.jero.modules.system.entity.SysDepartRoleUser; +//import com.baomidou.mybatisplus.extension.service.IService; +// +//import java.util.List; +// +///** +// * @Description: 部门角色人员信息 +// * @Author: jero-boot +// * @Date: 2020-02-13 +// * @Version: V1.0 +// */ +//public interface ISysDepartRoleUserService extends IService { +// +// void deptRoleUserAdd(String userId,String newRoleId,String oldRoleId); +// +// /** +// * 取消用户与部门关联，删除关联关系 +// * @param userIds +// * @param depId +// */ +// void removeDeptRoleUser(List userIds,String depId); +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java index 032b0697..1878bce7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java @@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepartPermission; -import com.jero.modules.system.entity.SysDepartRole; -import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.jero.modules.system.entity.SysDepartRole; +//import com.jero.modules.system.entity.SysDepartRolePermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.mapper.SysDepartPermissionMapper; -import com.jero.modules.system.mapper.SysDepartRoleMapper; -import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; +//import com.jero.modules.system.mapper.SysDepartRoleMapper; +//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; import com.jero.modules.system.mapper.SysPermissionDataRuleMapper; import com.jero.modules.system.service.ISysDepartPermissionService; import org.springframework.stereotype.Service; @@ -32,11 +32,11 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId)); //删除部门权限时，删除部门角色中已授权的权限 - List sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); - List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - if(roleIds != null && roleIds.size()>0){ - departRolePermissionMapper.delete(new LambdaQueryWrapper().eq(SysDepartRolePermission::getPermissionId,permissionId)); - } +// List sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); +// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); +// if(roleIds != null && roleIds.size()>0){ +// departRolePermissionMapper.delete(new LambdaQueryWrapper().eq(SysDepartRolePermission::getPermissionId,permissionId)); +// } } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java index 3bf3d7ef..ea108fb2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java @@ -1,87 +1,87 @@ -package com.jero.modules.system.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.util.IPUtils; -import com.jero.common.util.SpringContextUtils; -import com.jero.common.util.oConvertUtils; -import com.jero.modules.system.entity.SysDepartRolePermission; -import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; -import com.jero.modules.system.service.ISysDepartRolePermissionService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import javax.servlet.http.HttpServletRequest; -import java.util.*; - -/** - * @Description: 部门角色权限 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Service -public class SysDepartRolePermissionServiceImpl extends ServiceImpl implements ISysDepartRolePermissionService { - - @Override - public void saveDeptRolePermission(String roleId, String permissionIds, String lastPermissionIds) { - String ip = ""; - try { - //获取request - HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); - //获取IP地址 - ip = IPUtils.getIpAddr(request); - } catch (Exception e) { - ip = "127.0.0.1"; - } - List add = getDiff(lastPermissionIds,permissionIds); - if(add!=null && add.size()>0) { - List list = new ArrayList(); - for (String p : add) { - if(oConvertUtils.isNotEmpty(p)) { - SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p); - rolepms.setOperateDate(new Date()); - rolepms.setOperateIp(ip); - list.add(rolepms); - } - } - this.saveBatch(list); - } - - List delete = getDiff(permissionIds,lastPermissionIds); - if(delete!=null && delete.size()>0) { - for (String permissionId : delete) { - this.remove(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId).eq(SysDepartRolePermission::getPermissionId, permissionId)); - } - } - } - - /** - * 从diff中找出main中没有的元素 - * @param main - * @param diff - * @return - */ - private List getDiff(String main, String diff){ - if(oConvertUtils.isEmpty(diff)) { - return null; - } - if(oConvertUtils.isEmpty(main)) { - return Arrays.asList(diff.split(",")); - } - - String[] mainArr = main.split(","); - String[] diffArr = diff.split(","); - Map map = new HashMap<>(); - for (String string : mainArr) { - map.put(string, 1); - } - List res = new ArrayList(); - for (String key : diffArr) { - if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { - res.add(key); - } - } - return res; - } -} +//package com.jero.modules.system.service.impl; +// +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.jero.common.util.IPUtils; +//import com.jero.common.util.SpringContextUtils; +//import com.jero.common.util.oConvertUtils; +//import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; +//import com.jero.modules.system.service.ISysDepartRolePermissionService; +//import org.springframework.stereotype.Service; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +// +//import javax.servlet.http.HttpServletRequest; +//import java.util.*; +// +///** +// * @Description: 部门角色权限 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Service +//public class SysDepartRolePermissionServiceImpl extends ServiceImpl implements ISysDepartRolePermissionService { +// +// @Override +// public void saveDeptRolePermission(String roleId, String permissionIds, String lastPermissionIds) { +// String ip = ""; +// try { +// //获取request +// HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); +// //获取IP地址 +// ip = IPUtils.getIpAddr(request); +// } catch (Exception e) { +// ip = "127.0.0.1"; +// } +// List add = getDiff(lastPermissionIds,permissionIds); +// if(add!=null && add.size()>0) { +// List list = new ArrayList(); +// for (String p : add) { +// if(oConvertUtils.isNotEmpty(p)) { +// SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p); +// rolepms.setOperateDate(new Date()); +// rolepms.setOperateIp(ip); +// list.add(rolepms); +// } +// } +// this.saveBatch(list); +// } +// +// List delete = getDiff(permissionIds,lastPermissionIds); +// if(delete!=null && delete.size()>0) { +// for (String permissionId : delete) { +// this.remove(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId).eq(SysDepartRolePermission::getPermissionId, permissionId)); +// } +// } +// } +// +// /** +// * 从diff中找出main中没有的元素 +// * @param main +// * @param diff +// * @return +// */ +// private List getDiff(String main, String diff){ +// if(oConvertUtils.isEmpty(diff)) { +// return null; +// } +// if(oConvertUtils.isEmpty(main)) { +// return Arrays.asList(diff.split(",")); +// } +// +// String[] mainArr = main.split(","); +// String[] diffArr = diff.split(","); +// Map map = new HashMap<>(); +// for (String string : mainArr) { +// map.put(string, 1); +// } +// List res = new ArrayList(); +// for (String key : diffArr) { +// if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { +// res.add(key); +// } +// } +// return res; +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java index a3f859a2..146ea66b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java @@ -1,25 +1,25 @@ -package com.jero.modules.system.service.impl; - -import com.jero.modules.system.entity.SysDepartRole; -import com.jero.modules.system.mapper.SysDepartRoleMapper; -import com.jero.modules.system.service.ISysDepartRoleService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.List; - -/** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Service -public class SysDepartRoleServiceImpl extends ServiceImpl implements ISysDepartRoleService { - - @Override - public List queryDeptRoleByDeptAndUser(String orgCode, String userId) { - return this.baseMapper.queryDeptRoleByDeptAndUser(orgCode,userId); - } -} +//package com.jero.modules.system.service.impl; +// +//import com.jero.modules.system.entity.SysDepartRole; +//import com.jero.modules.system.mapper.SysDepartRoleMapper; +//import com.jero.modules.system.service.ISysDepartRoleService; +//import org.springframework.stereotype.Service; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +// +//import java.util.List; +// +///** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Service +//public class SysDepartRoleServiceImpl extends ServiceImpl implements ISysDepartRoleService { +// +// @Override +// public List queryDeptRoleByDeptAndUser(String orgCode, String userId) { +// return this.baseMapper.queryDeptRoleByDeptAndUser(orgCode,userId); +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java index 900a850d..96006b0a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java @@ -1,93 +1,93 @@ -package com.jero.modules.system.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.util.oConvertUtils; -import com.jero.modules.system.entity.SysDepartRole; -import com.jero.modules.system.entity.SysDepartRoleUser; -import com.jero.modules.system.mapper.SysDepartRoleMapper; -import com.jero.modules.system.mapper.SysDepartRoleUserMapper; -import com.jero.modules.system.service.ISysDepartRoleUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Description: 部门角色人员信息 - * @Author: jero-boot - * @Date: 2020-02-13 - * @Version: V1.0 - */ -@Service -public class SysDepartRoleUserServiceImpl extends ServiceImpl implements ISysDepartRoleUserService { - @Autowired - private SysDepartRoleMapper sysDepartRoleMapper; - - @Override - public void deptRoleUserAdd(String userId, String newRoleId, String oldRoleId) { - List add = getDiff(oldRoleId,newRoleId); - if(add!=null && add.size()>0) { - List list = new ArrayList<>(); - for (String roleId : add) { - if(oConvertUtils.isNotEmpty(roleId)) { - SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId); - list.add(rolepms); - } - } - this.saveBatch(list); - } - List remove = getDiff(newRoleId,oldRoleId); - if(remove!=null && remove.size()>0) { - for (String roleId : remove) { - this.remove(new QueryWrapper().lambda().eq(SysDepartRoleUser::getUserId, userId).eq(SysDepartRoleUser::getDroleId, roleId)); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void removeDeptRoleUser(List userIds, String depId) { - for(String userId : userIds){ - List sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper().eq("depart_id",depId)); - List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - if(roleIds != null && roleIds.size()>0){ - QueryWrapper query = new QueryWrapper<>(); - query.eq("user_id",userId).in("drole_id",roleIds); - this.remove(query); - } - } - } - - /** - * 从diff中找出main中没有的元素 - * @param main - * @param diff - * @return - */ - private List getDiff(String main, String diff){ - if(oConvertUtils.isEmpty(diff)) { - return null; - } - if(oConvertUtils.isEmpty(main)) { - return Arrays.asList(diff.split(",")); - } - - String[] mainArr = main.split(","); - String[] diffArr = diff.split(","); - Map map = new HashMap<>(); - for (String string : mainArr) { - map.put(string, 1); - } - List res = new ArrayList(); - for (String key : diffArr) { - if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { - res.add(key); - } - } - return res; - } -} +//package com.jero.modules.system.service.impl; +// +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.jero.common.util.oConvertUtils; +//import com.jero.modules.system.entity.SysDepartRole; +//import com.jero.modules.system.entity.SysDepartRoleUser; +//import com.jero.modules.system.mapper.SysDepartRoleMapper; +//import com.jero.modules.system.mapper.SysDepartRoleUserMapper; +//import com.jero.modules.system.service.ISysDepartRoleUserService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import org.springframework.transaction.annotation.Transactional; +// +//import java.util.*; +//import java.util.stream.Collectors; +// +///** +// * @Description: 部门角色人员信息 +// * @Author: jero-boot +// * @Date: 2020-02-13 +// * @Version: V1.0 +// */ +//@Service +//public class SysDepartRoleUserServiceImpl extends ServiceImpl implements ISysDepartRoleUserService { +// @Autowired +// private SysDepartRoleMapper sysDepartRoleMapper; +// +// @Override +// public void deptRoleUserAdd(String userId, String newRoleId, String oldRoleId) { +// List add = getDiff(oldRoleId,newRoleId); +// if(add!=null && add.size()>0) { +// List list = new ArrayList<>(); +// for (String roleId : add) { +// if(oConvertUtils.isNotEmpty(roleId)) { +// SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId); +// list.add(rolepms); +// } +// } +// this.saveBatch(list); +// } +// List remove = getDiff(newRoleId,oldRoleId); +// if(remove!=null && remove.size()>0) { +// for (String roleId : remove) { +// this.remove(new QueryWrapper().lambda().eq(SysDepartRoleUser::getUserId, userId).eq(SysDepartRoleUser::getDroleId, roleId)); +// } +// } +// } +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public void removeDeptRoleUser(List userIds, String depId) { +// for(String userId : userIds){ +// List sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper().eq("depart_id",depId)); +// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); +// if(roleIds != null && roleIds.size()>0){ +// QueryWrapper query = new QueryWrapper<>(); +// query.eq("user_id",userId).in("drole_id",roleIds); +// this.remove(query); +// } +// } +// } +// +// /** +// * 从diff中找出main中没有的元素 +// * @param main +// * @param diff +// * @return +// */ +// private List getDiff(String main, String diff){ +// if(oConvertUtils.isEmpty(diff)) { +// return null; +// } +// if(oConvertUtils.isEmpty(main)) { +// return Arrays.asList(diff.split(",")); +// } +// +// String[] mainArr = main.split(","); +// String[] diffArr = diff.split(","); +// Map map = new HashMap<>(); +// for (String string : mainArr) { +// map.put(string, 1); +// } +// List res = new ArrayList(); +// for (String key : diffArr) { +// if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { +// res.add(key); +// } +// } +// return res; +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index 379185f5..ada18292 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -41,14 +41,14 @@ public class SysDepartServiceImpl extends ServiceImpl roleIdList = new ArrayList<>(); - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); - List depRoleList = sysDepartRoleMapper.selectList(query); - for(SysDepartRole deptRole : depRoleList){ - roleIdList.add(deptRole.getId()); - } +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); +// List depRoleList = sysDepartRoleMapper.selectList(query); +// for(SysDepartRole deptRole : depRoleList){ +// roleIdList.add(deptRole.getId()); +// } //根据部门id删除用户与部门关系 userDepartMapper.delete(new LambdaQueryWrapper().in(SysUserDepart::getDepId,idList)); //根据部门id删除部门授权 departPermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartPermission::getDepartId,idList)); //根据部门id删除部门角色 - sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); - if(roleIdList != null && roleIdList.size()>0){ +// sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); +// if(roleIdList != null && roleIdList.size()>0){ //根据角色id删除部门角色授权 - departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); +// departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); //根据角色id删除部门角色用户信息 - departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); - } +// departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); +// } } @Override @@ -329,25 +329,25 @@ public class SysDepartServiceImpl extends ServiceImpl roleIdList = new ArrayList<>(); - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); - List depRoleList = sysDepartRoleMapper.selectList(query); - for(SysDepartRole deptRole : depRoleList){ - roleIdList.add(deptRole.getId()); - } +// List roleIdList = new ArrayList<>(); +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); +// List depRoleList = sysDepartRoleMapper.selectList(query); +// for(SysDepartRole deptRole : depRoleList){ +// roleIdList.add(deptRole.getId()); +// } //根据部门id删除用户与部门关系 userDepartMapper.delete(new LambdaQueryWrapper().in(SysUserDepart::getDepId,idList)); //根据部门id删除部门授权 departPermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartPermission::getDepartId,idList)); //根据部门id删除部门角色 - sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); - if(roleIdList != null && roleIdList.size()>0){ - //根据角色id删除部门角色授权 - departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); - //根据角色id删除部门角色用户信息 - departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); - } +// sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); +// if(roleIdList != null && roleIdList.size()>0){ +// 根据角色id删除部门角色授权 +// departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); +// 根据角色id删除部门角色用户信息 +// departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); +// } return ok; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java index 042ce05d..fda747cc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java @@ -14,7 +14,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.mapper.SysDepartPermissionMapper; -import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; +//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; import com.jero.modules.system.mapper.SysPermissionMapper; import com.jero.modules.system.mapper.SysRolePermissionMapper; import com.jero.modules.system.model.TreeModel; @@ -52,8 +52,8 @@ public class SysPermissionServiceImpl extends ServiceImpl queryListByParentId(String parentId) { @@ -92,7 +92,7 @@ public class SysPermissionServiceImpl extends ServiceImpl().eq(SysPermission::getParentId, id)); // 如果有, 则递归 if (num > 0) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 3af7dc15..60c6ffd4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -56,10 +56,10 @@ public class SysUserServiceImpl extends ServiceImpl impl private SysDepartMapper sysDepartMapper; @Autowired private SysRoleMapper sysRoleMapper; - @Autowired - private SysDepartRoleUserMapper departRoleUserMapper; - @Autowired - private SysDepartRoleMapper sysDepartRoleMapper; +// @Autowired +// private SysDepartRoleUserMapper departRoleUserMapper; +// @Autowired +// private SysDepartRoleMapper sysDepartRoleMapper; @Resource private BaseCommonService baseCommonService; @@ -321,7 +321,7 @@ public class SysUserServiceImpl extends ServiceImpl impl arr = departs.split(","); } //查询已关联部门 - List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); +/* List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(userDepartList != null && userDepartList.size()>0){ for(SysUserDepart depart : userDepartList ){ //修改已关联部门删除部门用户角色关系 @@ -335,7 +335,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } } - } + }*/ //先删后加 sysUserDepartMapper.delete(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(oConvertUtils.isNotEmpty(departs)) { @@ -485,7 +485,7 @@ public class SysUserServiceImpl extends ServiceImpl impl arr = departs.split(","); } //查询已关联部门 - List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); + /*List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(userDepartList != null && userDepartList.size()>0){ for(SysUserDepart depart : userDepartList ){ //修改已关联部门删除部门用户角色关系 @@ -499,7 +499,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } } - } + }*/ //先删后加 sysUserDepartMapper.delete(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(oConvertUtils.isNotEmpty(departs)) { diff --git a/jero-web/src/api/api.js b/jero-web/src/api/api.js index 5ec91fb7..9cd8bb71 100644 --- a/jero-web/src/api/api.js +++ b/jero-web/src/api/api.js @@ -49,7 +49,7 @@ const queryDepartPermission = (params)=>getAction("/sys/permission/queryDepartPe const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params); const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params); const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/queryDeptRolePermission",params); -const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params); +// const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params); const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params); //日志管理 @@ -151,7 +151,7 @@ export { saveDepartPermission, queryTreeListForDeptRole, queryDeptRolePermission, - saveDeptRolePermission, + // saveDeptRolePermission, queryMyDepartTreeList, getUserNoticeInfo, getDictItemsFromCache diff --git a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue b/jero-web/src/views/system/modules/DeptRoleAuthModal.vue index d84845de..8449b8a8 100644 --- a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue +++ b/jero-web/src/views/system/modules/DeptRoleAuthModal.vue @@ -1,213 +1,213 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue b/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue index f3a12115..01ff78a5 100644 --- a/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue +++ b/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue @@ -1,122 +1,122 @@ - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/jero-web/src/views/system/modules/SelectUserModal.vue b/jero-web/src/views/system/modules/SelectUserModal.vue index 1ff0239c..9e1d8d55 100644 --- a/jero-web/src/views/system/modules/SelectUserModal.vue +++ b/jero-web/src/views/system/modules/SelectUserModal.vue @@ -17,7 +17,7 @@ - + diff --git a/jero-web/src/views/system/modules/SysDepartRoleModal.vue b/jero-web/src/views/system/modules/SysDepartRoleModal.vue index 2a5ebb18..79d7b4b4 100644 --- a/jero-web/src/views/system/modules/SysDepartRoleModal.vue +++ b/jero-web/src/views/system/modules/SysDepartRoleModal.vue @@ -1,157 +1,157 @@ - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file From 37d277e8725c7584616addfa40850853d8559d73 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 17:42:11 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=83=A8=E9=97=A8=E8=A7=92=E8=89=B2=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/mapper/SysUserMapper.java | 1 - .../mapper/xml/SysPermissionDataRuleMapper.xml | 10 ---------- .../system/mapper/xml/SysPermissionMapper.xml | 14 -------------- .../modules/system/mapper/xml/SysUserMapper.xml | 4 ++-- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index db14aad4..d66267b6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -62,7 +62,6 @@ public interface SysUserMapper extends BaseMapper { /** * 根据用户名设置部门ID * @param username - * @param departId */ void updateUserDepart(@Param("username") String username,@Param("orgCode") String orgCode); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml index 9efbab1f..8bce4d07 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml @@ -11,16 +11,6 @@ join sys_user_role d on d.role_id = c.id join sys_user e on d.user_id = e.id where e.username = #{username} and b.id = #{permissionId} - - union - select data_rule_ids - from sys_depart_role_permission a - join sys_permission b on a.permission_id = b.id - join sys_depart_role c on a.role_id = c.id - join sys_depart_role_user d on d.drole_id = c.id - join sys_user e on d.user_id = e.id - where e.username = #{username} and b.id = #{permissionId} - diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml index 51666a11..71c5930c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml @@ -86,20 +86,6 @@ and b.url = #{permission.url} - union all - select count(*) as cnt - from sys_permission z - join sys_depart_role_permission y on z.id = y.permission_id - join sys_depart_role x on y.role_id = x.id - join sys_depart_role_user w on w.drole_id = x.id - join sys_user v on w.user_id = v.id - where v.username = #{username} - - and z.id = #{permission.id} - - - and z.url = #{permission.url} - ) temp diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 4166c093..97ba3771 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -34,7 +34,7 @@ ) - and username = #{username} + and username LIKE concat(concat('%',#{username}),'%') @@ -42,7 +42,7 @@ From eee4218021c2078988f75cbe06a7c9f07c06b2fe Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 17:53:25 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=83=A8=E9=97=A8=E8=A7=92=E8=89=B2=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/jeroboot-mysql-5.7-20220417.sql | 61 ---- jero-boot/db/jeroboot-oracle11g.sql | 144 ---------- jero-boot/db/jeroboot-sqlserver2017.sql | 283 ------------------- 3 files changed, 488 deletions(-) diff --git a/jero-boot/db/jeroboot-mysql-5.7-20220417.sql b/jero-boot/db/jeroboot-mysql-5.7-20220417.sql index 92b7d11a..0906799f 100644 --- a/jero-boot/db/jeroboot-mysql-5.7-20220417.sql +++ b/jero-boot/db/jeroboot-mysql-5.7-20220417.sql @@ -1166,67 +1166,6 @@ CREATE TABLE `sys_depart_permission` ( -- Records of sys_depart_permission -- ---------------------------- --- ---------------------------- --- Table structure for sys_depart_role --- ---------------------------- -DROP TABLE IF EXISTS `sys_depart_role`; -CREATE TABLE `sys_depart_role` ( - `id` varchar(32) NOT NULL, - `depart_id` varchar(32) DEFAULT NULL COMMENT '部门id', - `role_name` varchar(200) DEFAULT NULL COMMENT '部门角色名称', - `role_code` varchar(100) DEFAULT NULL COMMENT '部门角色编码', - `description` varchar(255) DEFAULT NULL COMMENT '描述', - `create_by` varchar(32) DEFAULT NULL COMMENT '创建人', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(32) DEFAULT NULL COMMENT '更新人', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='部门角色表'; - --- ---------------------------- --- Records of sys_depart_role --- ---------------------------- - --- ---------------------------- --- Table structure for sys_depart_role_permission --- ---------------------------- -DROP TABLE IF EXISTS `sys_depart_role_permission`; -CREATE TABLE `sys_depart_role_permission` ( - `id` varchar(32) NOT NULL, - `depart_id` varchar(32) DEFAULT NULL COMMENT '部门id', - `role_id` varchar(32) DEFAULT NULL COMMENT '角色id', - `permission_id` varchar(32) DEFAULT NULL COMMENT '权限id', - `data_rule_ids` varchar(1000) DEFAULT NULL COMMENT '数据权限ids', - `operate_date` datetime DEFAULT NULL COMMENT '操作时间', - `operate_ip` varchar(20) DEFAULT NULL COMMENT '操作ip', - PRIMARY KEY (`id`) USING BTREE, - KEY `index_group_role_per_id` (`role_id`,`permission_id`) USING BTREE, - KEY `index_group_role_id` (`role_id`) USING BTREE, - KEY `index_group_per_id` (`permission_id`) USING BTREE, - KEY `idx_sdrp_role_per_id` (`role_id`,`permission_id`) USING BTREE, - KEY `idx_sdrp_role_id` (`role_id`) USING BTREE, - KEY `idx_sdrp_per_id` (`permission_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='部门角色权限表'; - --- ---------------------------- --- Records of sys_depart_role_permission --- ---------------------------- - --- ---------------------------- --- Table structure for sys_depart_role_user --- ---------------------------- -DROP TABLE IF EXISTS `sys_depart_role_user`; -CREATE TABLE `sys_depart_role_user` ( - `id` varchar(32) NOT NULL COMMENT '主键id', - `user_id` varchar(32) DEFAULT NULL COMMENT '用户id', - `drole_id` varchar(32) DEFAULT NULL COMMENT '角色id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='部门角色用户表'; - --- ---------------------------- --- Records of sys_depart_role_user --- ---------------------------- - -- ---------------------------- -- Table structure for sys_dict -- ---------------------------- diff --git a/jero-boot/db/jeroboot-oracle11g.sql b/jero-boot/db/jeroboot-oracle11g.sql index dd7a9d87..00555aa7 100644 --- a/jero-boot/db/jeroboot-oracle11g.sql +++ b/jero-boot/db/jeroboot-oracle11g.sql @@ -1605,93 +1605,6 @@ COMMENT ON COLUMN "SYS_DEPART_PERMISSION"."DATA_RULE_IDS" IS '数据规则id'; -- Records of SYS_DEPART_PERMISSION -- ---------------------------- --- ---------------------------- --- Table structure for SYS_DEPART_ROLE --- ---------------------------- -DROP TABLE "SYS_DEPART_ROLE"; -CREATE TABLE "SYS_DEPART_ROLE" ( -"ID" NVARCHAR2(32) NOT NULL , -"DEPART_ID" NVARCHAR2(32) NULL , -"ROLE_NAME" NVARCHAR2(200) NULL , -"ROLE_CODE" NVARCHAR2(100) NULL , -"DESCRIPTION" NVARCHAR2(255) NULL , -"CREATE_BY" NVARCHAR2(32) NULL , -"CREATE_TIME" DATE NULL , -"UPDATE_BY" NVARCHAR2(32) NULL , -"UPDATE_TIME" DATE NULL -) -LOGGING -NOCOMPRESS -NOCACHE - -; -COMMENT ON TABLE "SYS_DEPART_ROLE" IS '部门角色表'; -COMMENT ON COLUMN "SYS_DEPART_ROLE"."DEPART_ID" IS '部门id'; -COMMENT ON COLUMN "SYS_DEPART_ROLE"."ROLE_NAME" IS '部门角色名称'; -COMMENT ON COLUMN "SYS_DEPART_ROLE"."ROLE_CODE" IS '部门角色编码'; -COMMENT ON COLUMN "SYS_DEPART_ROLE"."DESCRIPTION" IS '描述'; -COMMENT ON COLUMN "SYS_DEPART_ROLE"."CREATE_BY" IS '创建人'; -COMMENT ON COLUMN "SYS_DEPART_ROLE"."CREATE_TIME" IS '创建时间'; -COMMENT ON COLUMN "SYS_DEPART_ROLE"."UPDATE_BY" IS '更新人'; -COMMENT ON COLUMN "SYS_DEPART_ROLE"."UPDATE_TIME" IS '更新时间'; - --- ---------------------------- --- Records of SYS_DEPART_ROLE --- ---------------------------- - --- ---------------------------- --- Table structure for SYS_DEPART_ROLE_PERMISSION --- ---------------------------- -DROP TABLE "SYS_DEPART_ROLE_PERMISSION"; -CREATE TABLE "SYS_DEPART_ROLE_PERMISSION" ( -"ID" NVARCHAR2(32) NOT NULL , -"DEPART_ID" NVARCHAR2(32) NULL , -"ROLE_ID" NVARCHAR2(32) NULL , -"PERMISSION_ID" NVARCHAR2(32) NULL , -"DATA_RULE_IDS" NVARCHAR2(1000) NULL , -"OPERATE_DATE" DATE NULL , -"OPERATE_IP" NVARCHAR2(20) NULL -) -LOGGING -NOCOMPRESS -NOCACHE - -; -COMMENT ON TABLE "SYS_DEPART_ROLE_PERMISSION" IS '部门角色权限表'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_PERMISSION"."DEPART_ID" IS '部门id'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_PERMISSION"."ROLE_ID" IS '角色id'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_PERMISSION"."PERMISSION_ID" IS '权限id'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_PERMISSION"."DATA_RULE_IDS" IS '数据权限ids'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_PERMISSION"."OPERATE_DATE" IS '操作时间'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_PERMISSION"."OPERATE_IP" IS '操作ip'; - --- ---------------------------- --- Records of SYS_DEPART_ROLE_PERMISSION --- ---------------------------- - --- ---------------------------- --- Table structure for SYS_DEPART_ROLE_USER --- ---------------------------- -DROP TABLE "SYS_DEPART_ROLE_USER"; -CREATE TABLE "SYS_DEPART_ROLE_USER" ( -"ID" NVARCHAR2(32) NOT NULL , -"USER_ID" NVARCHAR2(32) NULL , -"DROLE_ID" NVARCHAR2(32) NULL -) -LOGGING -NOCOMPRESS -NOCACHE - -; -COMMENT ON TABLE "SYS_DEPART_ROLE_USER" IS '部门角色用户表'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_USER"."ID" IS '主键id'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_USER"."USER_ID" IS '用户id'; -COMMENT ON COLUMN "SYS_DEPART_ROLE_USER"."DROLE_ID" IS '角色id'; - --- ---------------------------- --- Records of SYS_DEPART_ROLE_USER --- ---------------------------- - -- ---------------------------- -- Table structure for SYS_DICT -- ---------------------------- @@ -3786,63 +3699,6 @@ ALTER TABLE "SYS_DEPART_PERMISSION" ADD CHECK ("ID" IS NOT NULL); -- ---------------------------- ALTER TABLE "SYS_DEPART_PERMISSION" ADD PRIMARY KEY ("ID"); --- ---------------------------- --- Indexes structure for table SYS_DEPART_ROLE --- ---------------------------- - --- ---------------------------- --- Checks structure for table SYS_DEPART_ROLE --- ---------------------------- -ALTER TABLE "SYS_DEPART_ROLE" ADD CHECK ("ID" IS NOT NULL); -ALTER TABLE "SYS_DEPART_ROLE" ADD CHECK ("ID" IS NOT NULL); - --- ---------------------------- --- Primary Key structure for table SYS_DEPART_ROLE --- ---------------------------- -ALTER TABLE "SYS_DEPART_ROLE" ADD PRIMARY KEY ("ID"); - --- ---------------------------- --- Indexes structure for table SYS_DEPART_ROLE_PERMISSION --- ---------------------------- -CREATE INDEX "IDX_SDRP_PER_ID" -ON "SYS_DEPART_ROLE_PERMISSION" ("PERMISSION_ID" ASC) -LOGGING -VISIBLE; -CREATE INDEX "IDX_SDRP_ROLE_ID" -ON "SYS_DEPART_ROLE_PERMISSION" ("ROLE_ID" ASC) -LOGGING -VISIBLE; -CREATE INDEX "IDX_SDRP_ROLE_PER_ID" -ON "SYS_DEPART_ROLE_PERMISSION" ("ROLE_ID" ASC, "PERMISSION_ID" ASC) -LOGGING -VISIBLE; - --- ---------------------------- --- Checks structure for table SYS_DEPART_ROLE_PERMISSION --- ---------------------------- -ALTER TABLE "SYS_DEPART_ROLE_PERMISSION" ADD CHECK ("ID" IS NOT NULL); -ALTER TABLE "SYS_DEPART_ROLE_PERMISSION" ADD CHECK ("ID" IS NOT NULL); - --- ---------------------------- --- Primary Key structure for table SYS_DEPART_ROLE_PERMISSION --- ---------------------------- -ALTER TABLE "SYS_DEPART_ROLE_PERMISSION" ADD PRIMARY KEY ("ID"); - --- ---------------------------- --- Indexes structure for table SYS_DEPART_ROLE_USER --- ---------------------------- - --- ---------------------------- --- Checks structure for table SYS_DEPART_ROLE_USER --- ---------------------------- -ALTER TABLE "SYS_DEPART_ROLE_USER" ADD CHECK ("ID" IS NOT NULL); -ALTER TABLE "SYS_DEPART_ROLE_USER" ADD CHECK ("ID" IS NOT NULL); - --- ---------------------------- --- Primary Key structure for table SYS_DEPART_ROLE_USER --- ---------------------------- -ALTER TABLE "SYS_DEPART_ROLE_USER" ADD PRIMARY KEY ("ID"); - -- ---------------------------- -- Indexes structure for table SYS_DICT -- ---------------------------- diff --git a/jero-boot/db/jeroboot-sqlserver2017.sql b/jero-boot/db/jeroboot-sqlserver2017.sql index 2611c0ea..13a4062c 100644 --- a/jero-boot/db/jeroboot-sqlserver2017.sql +++ b/jero-boot/db/jeroboot-sqlserver2017.sql @@ -4204,219 +4204,6 @@ GO -- Records of sys_depart_permission -- ---------------------------- --- ---------------------------- --- Table structure for sys_depart_role --- ---------------------------- -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[sys_depart_role]') AND type IN ('U')) - DROP TABLE [dbo].[sys_depart_role] -GO - -CREATE TABLE [dbo].[sys_depart_role] ( - [id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, - [depart_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [role_name] nvarchar(200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [role_code] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [description] nvarchar(255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [create_by] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [create_time] datetime2(7) NULL, - [update_by] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [update_time] datetime2(7) NULL -) -GO - -ALTER TABLE [dbo].[sys_depart_role] SET (LOCK_ESCALATION = TABLE) -GO - -EXEC sp_addextendedproperty -'MS_Description', N'部门id', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role', -'COLUMN', N'depart_id' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'部门角色名称', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role', -'COLUMN', N'role_name' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'部门角色编码', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role', -'COLUMN', N'role_code' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'描述', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role', -'COLUMN', N'description' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'创建人', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role', -'COLUMN', N'create_by' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'创建时间', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role', -'COLUMN', N'create_time' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'更新人', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role', -'COLUMN', N'update_by' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'更新时间', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role', -'COLUMN', N'update_time' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'部门角色表', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role' -GO - - --- ---------------------------- --- Records of sys_depart_role --- ---------------------------- - --- ---------------------------- --- Table structure for sys_depart_role_permission --- ---------------------------- -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[sys_depart_role_permission]') AND type IN ('U')) - DROP TABLE [dbo].[sys_depart_role_permission] -GO - -CREATE TABLE [dbo].[sys_depart_role_permission] ( - [id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, - [depart_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [role_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [permission_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [data_rule_ids] nvarchar(1000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [operate_date] datetime2(7) NULL, - [operate_ip] nvarchar(20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL -) -GO - -ALTER TABLE [dbo].[sys_depart_role_permission] SET (LOCK_ESCALATION = TABLE) -GO - -EXEC sp_addextendedproperty -'MS_Description', N'部门id', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_permission', -'COLUMN', N'depart_id' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'角色id', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_permission', -'COLUMN', N'role_id' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'权限id', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_permission', -'COLUMN', N'permission_id' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'数据权限ids', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_permission', -'COLUMN', N'data_rule_ids' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'操作时间', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_permission', -'COLUMN', N'operate_date' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'操作ip', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_permission', -'COLUMN', N'operate_ip' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'部门角色权限表', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_permission' -GO - - --- ---------------------------- --- Records of sys_depart_role_permission --- ---------------------------- - --- ---------------------------- --- Table structure for sys_depart_role_user --- ---------------------------- -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[sys_depart_role_user]') AND type IN ('U')) - DROP TABLE [dbo].[sys_depart_role_user] -GO - -CREATE TABLE [dbo].[sys_depart_role_user] ( - [id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, - [user_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [drole_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL -) -GO - -ALTER TABLE [dbo].[sys_depart_role_user] SET (LOCK_ESCALATION = TABLE) -GO - -EXEC sp_addextendedproperty -'MS_Description', N'主键id', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_user', -'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'用户id', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_user', -'COLUMN', N'user_id' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'角色id', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_user', -'COLUMN', N'drole_id' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'部门角色用户表', -'SCHEMA', N'dbo', -'TABLE', N'sys_depart_role_user' -GO - - --- ---------------------------- --- Records of sys_depart_role_user --- ---------------------------- - -- ---------------------------- -- Table structure for sys_dict -- ---------------------------- @@ -8557,76 +8344,6 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW ON [PRIMARY] GO - --- ---------------------------- --- Primary Key structure for table sys_depart_role --- ---------------------------- -ALTER TABLE [dbo].[sys_depart_role] ADD CONSTRAINT [PK__sys_depa__3213E83FD3FE48EB] PRIMARY KEY CLUSTERED ([id]) -WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) -ON [PRIMARY] -GO - - --- ---------------------------- --- Indexes structure for table sys_depart_role_permission --- ---------------------------- -CREATE NONCLUSTERED INDEX [index_group_role_per_id] -ON [dbo].[sys_depart_role_permission] ( - [role_id] ASC, - [permission_id] ASC -) -GO - -CREATE NONCLUSTERED INDEX [index_group_role_id] -ON [dbo].[sys_depart_role_permission] ( - [role_id] ASC -) -GO - -CREATE NONCLUSTERED INDEX [index_group_per_id] -ON [dbo].[sys_depart_role_permission] ( - [permission_id] ASC -) -GO - -CREATE NONCLUSTERED INDEX [idx_sdrp_role_per_id] -ON [dbo].[sys_depart_role_permission] ( - [role_id] ASC, - [permission_id] ASC -) -GO - -CREATE NONCLUSTERED INDEX [idx_sdrp_role_id] -ON [dbo].[sys_depart_role_permission] ( - [role_id] ASC -) -GO - -CREATE NONCLUSTERED INDEX [idx_sdrp_per_id] -ON [dbo].[sys_depart_role_permission] ( - [permission_id] ASC -) -GO - - --- ---------------------------- --- Primary Key structure for table sys_depart_role_permission --- ---------------------------- -ALTER TABLE [dbo].[sys_depart_role_permission] ADD CONSTRAINT [PK__sys_depa__3213E83F1D8B962B] PRIMARY KEY CLUSTERED ([id]) -WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) -ON [PRIMARY] -GO - - --- ---------------------------- --- Primary Key structure for table sys_depart_role_user --- ---------------------------- -ALTER TABLE [dbo].[sys_depart_role_user] ADD CONSTRAINT [PK__sys_depa__3213E83FA05CDB64] PRIMARY KEY CLUSTERED ([id]) -WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) -ON [PRIMARY] -GO - - -- ---------------------------- -- Indexes structure for table sys_dict -- ---------------------------- From 7ad8d6792e168efbe3439f8d4e577149a3bef194 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 17:59:04 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9B=B4=E6=8E=A5=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysDepartPermissionController.java | 44 --- .../controller/SysDepartRoleController.java | 294 ------------------ .../system/controller/SysUserController.java | 34 +- .../modules/system/entity/SysDepartRole.java | 75 ----- .../entity/SysDepartRolePermission.java | 67 ---- .../system/entity/SysDepartRoleUser.java | 52 ---- .../system/mapper/SysDepartRoleMapper.java | 23 -- .../mapper/SysDepartRolePermissionMapper.java | 17 - .../mapper/SysDepartRoleUserMapper.java | 17 - .../ISysDepartRolePermissionService.java | 20 -- .../system/service/ISysDepartRoleService.java | 24 -- .../service/ISysDepartRoleUserService.java | 24 -- .../impl/SysDepartPermissionServiceImpl.java | 17 +- .../SysDepartRolePermissionServiceImpl.java | 87 ------ .../impl/SysDepartRoleServiceImpl.java | 25 -- .../impl/SysDepartRoleUserServiceImpl.java | 93 ------ .../service/impl/SysDepartServiceImpl.java | 53 ---- .../impl/SysPermissionServiceImpl.java | 10 +- .../service/impl/SysUserServiceImpl.java | 45 +-- 19 files changed, 4 insertions(+), 1017 deletions(-) delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java index 2e3c8408..4a0a2f0c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java @@ -13,7 +13,6 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepartPermission; -//import com.jero.modules.system.entity.SysDepartRolePermission; import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.model.TreeModel; @@ -22,7 +21,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -//import com.jero.modules.system.service.ISysDepartRolePermissionService; import com.jero.modules.system.service.ISysPermissionDataRuleService; import com.jero.modules.system.service.ISysPermissionService; @@ -52,9 +50,6 @@ public class SysDepartPermissionController extends JeroController> queryDeptRolePermission(@RequestParam(name = "roleId", required = true) String roleId) { -// Result> result = new Result<>(); -// try { -// List list = sysDepartRolePermissionService.list(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId)); -// result.setResult(list.stream().map(SysDepartRolePermission -> String.valueOf(SysDepartRolePermission.getPermissionId())).collect(Collectors.toList())); -// result.setSuccess(true); -// } catch (Exception e) { -// log.error(e.getMessage(), e); -// } -// return result; -// } - -// /** -// * 保存角色授权 -// * -// * @return -// */ -// @RequestMapping(value = "/saveDeptRolePermission", method = RequestMethod.POST) -// public Result saveDeptRolePermission(@RequestBody JSONObject json) { -// long start = System.currentTimeMillis(); -// try { -// String roleId = json.getString("roleId"); -// String permissionIds = json.getString("permissionIds"); -// String lastPermissionIds = json.getString("lastpermissionIds"); -// this.sysDepartRolePermissionService.saveDeptRolePermission(roleId, permissionIds, lastPermissionIds); -// log.info("======部门角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); -// return Result.OK("保存成功！"); -// } catch (Exception e) { -// log.error(e.getMessage(), e); -// return Result.error500("授权失败！"); -// } -// } - /** * 用户角色授权功能，查询菜单权限树 * @param request diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java deleted file mode 100644 index 6b8a4f97..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java +++ /dev/null @@ -1,294 +0,0 @@ -//package com.jero.modules.system.controller; -// -//import java.util.*; -//import java.util.stream.Collectors; -//import javax.servlet.http.HttpServletRequest; -//import javax.servlet.http.HttpServletResponse; -// -//import com.alibaba.fastjson.JSONObject; -//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -//import com.jero.common.system.base.controller.JeroController; -//import org.apache.shiro.SecurityUtils; -//import com.jero.common.api.vo.Result; -//import com.jero.common.system.query.QueryGenerator; -//import com.jero.common.aspect.annotation.AutoLog; -//import com.jero.common.system.vo.LoginUser; -//import com.jero.common.util.oConvertUtils; -//import com.jero.modules.system.entity.*; -//import com.jero.modules.system.service.*; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import lombok.extern.slf4j.Slf4j; -// -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.bind.annotation.*; -//import org.springframework.web.servlet.ModelAndView; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -// -// /** -// * @Description: 部门角色 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//@Slf4j -//@Api(tags="部门角色") -//@RestController -//@RequestMapping("/sys/sysDepartRole") -//public class SysDepartRoleController extends JeroController { -// @Autowired -// private ISysDepartRoleService sysDepartRoleService; -// -// @Autowired -// private ISysDepartRoleUserService departRoleUserService; -// -// @Autowired -// private ISysDepartPermissionService sysDepartPermissionService; -// -// @Autowired -// private ISysDepartRolePermissionService sysDepartRolePermissionService; -// -// @Autowired -// private ISysDepartService sysDepartService; -// -// /** -// * 分页列表查询 -// * -// * @param sysDepartRole -// * @param pageNo -// * @param pageSize -// * @param req -// * @return -// */ -// @ApiOperation(value="部门角色-分页列表查询", notes="部门角色-分页列表查询") -// @GetMapping(value = "/page") -// public Result queryPageList(SysDepartRole sysDepartRole, -// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, -// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, -// @RequestParam(name="deptId",required=false) String deptId, -// HttpServletRequest req) { -// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepartRole, req.getParameterMap()); -// Page page = new Page(pageNo, pageSize); -// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// List deptIds = null; -//// if(oConvertUtils.isEmpty(deptId)){ -//// if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){ -//// deptIds = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); -//// }else{ -//// return Result.OK(null); -//// } -//// }else{ -//// deptIds = sysDepartService.getSubDepIdsByDepId(deptId); -//// } -//// queryWrapper.in("depart_id",deptIds); -// -// //我的部门，选中部门只能看当前部门下的角色 -// queryWrapper.eq("depart_id",deptId); -// IPage pageList = sysDepartRoleService.page(page, queryWrapper); -// return Result.OK(pageList); -// } -// -// /** -// * 添加 -// * -// * @param sysDepartRole -// * @return -// */ -// //@RequiresRoles({"admin"}) -// @ApiOperation(value="部门角色-添加", notes="部门角色-添加") -// @PostMapping(value = "/add") -// public Result add(@RequestBody SysDepartRole sysDepartRole) { -// sysDepartRoleService.save(sysDepartRole); -// return Result.OK("添加成功！"); -// } -// -// /** -// * 编辑 -// * -// * @param sysDepartRole -// * @return -// */ -// //@RequiresRoles({"admin"}) -// @ApiOperation(value="部门角色-编辑", notes="部门角色-编辑") -// @PutMapping(value = "/edit") -// public Result edit(@RequestBody SysDepartRole sysDepartRole) { -// sysDepartRoleService.updateById(sysDepartRole); -// return Result.OK("编辑成功!"); -// } -// -// /** -// * 通过id删除 -// * -// * @param id -// * @return -// */ -// //@RequiresRoles({"admin"}) -// @AutoLog(value = "部门角色-通过id删除") -// @ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除") -// @DeleteMapping(value = "/delete") -// public Result delete(@RequestParam(name="id",required=true) String id) { -// sysDepartRoleService.removeById(id); -// return Result.OK("删除成功!"); -// } -// -// /** -// * 批量删除 -// * -// * @param ids -// * @return -// */ -// //@RequiresRoles({"admin"}) -// @AutoLog(value = "部门角色-批量删除") -// @ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除") -// @DeleteMapping(value = "/deleteBatch") -// public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { -// this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(","))); -// return Result.OK("批量删除成功！"); -// } -// -// /** -// * 通过id查询 -// * -// * @param id -// * @return -// */ -// @ApiOperation(value="部门角色-通过id查询", notes="部门角色-通过id查询") -// @GetMapping(value = "/queryById") -// public Result queryById(@RequestParam(name="id",required=true) String id) { -// SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); -// return Result.OK(sysDepartRole); -// } -// -// /** -// * 获取部门下角色 -// * @param departId -// * @return -// */ -// @RequestMapping(value = "/getDeptRoleList", method = RequestMethod.GET) -// public Result> getDeptRoleList(@RequestParam(value = "departId") String departId,@RequestParam(value = "userId") String userId){ -// Result> result = new Result<>(); -// //查询选中部门的角色 -// List deptRoleList = sysDepartRoleService.list(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); -// result.setSuccess(true); -// result.setResult(deptRoleList); -// return result; -// } -// -// /** -// * 设置 -// * @param json -// * @return -// */ -// //@RequiresRoles({"admin"}) -// @RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST) -// public Result deptRoleAdd(@RequestBody JSONObject json) { -// String newRoleId = json.getString("newRoleId"); -// String oldRoleId = json.getString("oldRoleId"); -// String userId = json.getString("userId"); -// departRoleUserService.deptRoleUserAdd(userId,newRoleId,oldRoleId); -// return Result.OK("添加成功！"); -// } -// -// /** -// * 根据用户id获取已设置部门角色 -// * @param userId -// * @return -// */ -// @RequestMapping(value = "/getDeptRoleByUserId", method = RequestMethod.GET) -// public Result> getDeptRoleByUserId(@RequestParam(value = "userId") String userId,@RequestParam(value = "departId") String departId){ -// Result> result = new Result<>(); -// //查询部门下角色 -// List roleList = sysDepartRoleService.list(new QueryWrapper().eq("depart_id",departId)); -// List roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); -// //根据角色id,用户id查询已授权角色 -// List roleUserList = null; -// if(roleIds!=null && roleIds.size()>0){ -// roleUserList = departRoleUserService.list(new QueryWrapper().eq("user_id",userId).in("drole_id",roleIds)); -// } -// result.setSuccess(true); -// result.setResult(roleUserList); -// return result; -// } -// -// /** -// * 查询数据规则数据 -// */ -// @GetMapping(value = "/datarule/{permissionId}/{departId}/{roleId}") -// public Result loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId,@PathVariable("roleId") String roleId) { -// //查询已授权的部门规则 -// List list = sysDepartPermissionService.getPermRuleListByDeptIdAndPermId(departId,permissionId); -// if(list==null || list.size()==0) { -// return Result.error("未找到权限配置信息"); -// }else { -// Map map = new HashMap<>(); -// map.put("datarule", list); -// LambdaQueryWrapper query = new LambdaQueryWrapper() -// .eq(SysDepartRolePermission::getPermissionId, permissionId) -// .eq(SysDepartRolePermission::getRoleId,roleId); -// SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); -// if(sysRolePermission==null) { -// //return Result.error("未找到角色菜单配置信息"); -// }else { -// String drChecked = sysRolePermission.getDataRuleIds(); -// if(oConvertUtils.isNotEmpty(drChecked)) { -// map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); -// } -// } -// return Result.OK(map); -// //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key -// } -// } -// -// /** -// * 保存数据规则至角色菜单关联表 -// */ -// @PostMapping(value = "/datarule") -// public Result saveDatarule(@RequestBody JSONObject jsonObject) { -// try { -// String permissionId = jsonObject.getString("permissionId"); -// String roleId = jsonObject.getString("roleId"); -// String dataRuleIds = jsonObject.getString("dataRuleIds"); -// log.info("保存数据规则>>"+"菜单ID:"+permissionId+"角色ID:"+ roleId+"数据权限ID:"+dataRuleIds); -// LambdaQueryWrapper query = new LambdaQueryWrapper() -// .eq(SysDepartRolePermission::getPermissionId, permissionId) -// .eq(SysDepartRolePermission::getRoleId,roleId); -// SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); -// if(sysRolePermission==null) { -// return Result.error("请先保存角色菜单权限!"); -// }else { -// sysRolePermission.setDataRuleIds(dataRuleIds); -// this.sysDepartRolePermissionService.updateById(sysRolePermission); -// } -// } catch (Exception e) { -// log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); -// return Result.error("保存失败"); -// } -// return Result.OK("保存成功!"); -// } -// -// /** -// * 导出excel -// * -// * @param request -// * @param sysDepartRole -// */ -// @RequestMapping(value = "/exportXls") -// public ModelAndView exportXls(HttpServletRequest request, SysDepartRole sysDepartRole) { -// return super.exportXls(request, sysDepartRole, SysDepartRole.class, "部门角色"); -// } -// -// /** -// * 通过excel导入数据 -// * -// * @param request -// * @param response -// * @return -// */ -// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) -// public Result importExcel(HttpServletRequest request, HttpServletResponse response) { -// return super.importExcel(request, response, SysDepartRole.class); -// } -// -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index b55e10b7..f4c4c3dc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -4,7 +4,6 @@ package com.jero.modules.system.controller; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -31,8 +30,6 @@ import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.*; import com.jero.modules.system.vo.SysDepartUsersVO; import com.jero.modules.system.vo.SysUserRoleVO; -import org.apache.shiro.subject.Subject; -import org.checkerframework.framework.qual.RequiresQualifier; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -79,15 +76,6 @@ public class SysUserController { @Autowired private ISysUserDepartService sysUserDepartService; - @Autowired - private ISysUserRoleService userRoleService; - -// @Autowired -// private ISysDepartRoleUserService departRoleUserService; - -// @Autowired -// private ISysDepartRoleService departRoleService; - @Autowired private RedisUtil redisUtil; @@ -146,13 +134,11 @@ public class SysUserController { try { if (StrUtil.isNotEmpty(user.getEmail())){ String email = CommonUtils.decryptBtRsaPriKey(user.getEmail(), rsaPrivateKey); -// email = PasswordUtil.encrypt(email); user.setEmail(email); } if (StrUtil.isNotEmpty(user.getPhone())){ String phone = CommonUtils.decryptBtRsaPriKey(user.getPhone(), rsaPrivateKey); -// phone = PasswordUtil.encrypt(phone); user.setPhone(phone); } @@ -207,12 +193,9 @@ public class SysUserController { throw new JeroBootException("解密失败！", e); } // 3:把数据加密在放回来 -// email = PasswordUtil.encrypt(email); -// phone = PasswordUtil.encrypt(phone); user.setEmail(email); user.setPhone(phone); user.setUpdateTime(new Date()); - //String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt()); user.setPassword(sysUser.getPassword()); // 修改用户走一个service 保证事务 sysUserService.editUser(user, roles, departs); @@ -780,18 +763,7 @@ public class SysUserController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).eq("user_id",userId); sysUserDepartService.remove(queryWrapper); -// if(b){ -// List sysDepartRoleList = departRoleService.list(new QueryWrapper().eq("depart_id",depId)); -// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); -// if(roleIds != null && roleIds.size()>0){ -// QueryWrapper query = new QueryWrapper<>(); -// query.eq("user_id",userId).in("drole_id",roleIds); -// departRoleUserService.remove(query); -// } - return Result.OK("删除成功!"); -// }else{ -// return Result.error500("当前选中部门与用户无关联关系!"); -// } + return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); return Result.error500("删除失败！"); @@ -809,9 +781,6 @@ public class SysUserController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(","))); sysUserDepartService.remove(queryWrapper); -// if(b){ -// departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId); -// } return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); @@ -1043,7 +1012,6 @@ public class SysUserController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name = "syncFlow", required = false) String syncFlow) { try { - //TODO 从查询效率上将不要用mp的封装的page分页查询 建议自己写分页语句 LambdaQueryWrapper query = new LambdaQueryWrapper(); if(oConvertUtils.isNotEmpty(syncFlow)){ query.eq(SysUser::getActivitiSync, CommonConstant.ACT_SYNC_1); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java deleted file mode 100644 index cf330749..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java +++ /dev/null @@ -1,75 +0,0 @@ -//package com.jero.modules.system.entity; -// -//import java.io.Serializable; -//import java.util.Date; -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.baomidou.mybatisplus.annotation.TableName; -//import com.baomidou.mybatisplus.annotation.TableField; -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.experimental.Accessors; -//import com.fasterxml.jackson.annotation.JsonFormat; -//import com.jero.common.aspect.annotation.Dict; -//import org.springframework.format.annotation.DateTimeFormat; -//import org.jeecgframework.poi.excel.annotation.Excel; -// -///** -// * @Description: 部门角色 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//@Data -//@TableName("sys_depart_role") -//@EqualsAndHashCode(callSuper = false) -//@Accessors(chain = true) -//@ApiModel(value="sys_depart_role对象", description="部门角色") -//public class SysDepartRole { -// -// /**id*/ -// @TableId(type = IdType.ASSIGN_ID) -// @ApiModelProperty(value = "id") -// private java.lang.String id; -// /**部门id*/ -// @Excel(name = "部门id", width = 15) -// @ApiModelProperty(value = "部门id") -// @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") -// private java.lang.String departId; -// /**部门角色名称*/ -// @Excel(name = "部门角色名称", width = 15) -// @ApiModelProperty(value = "部门角色名称") -// private java.lang.String roleName; -// /**部门角色编码*/ -// @Excel(name = "部门角色编码", width = 15) -// @ApiModelProperty(value = "部门角色编码") -// private java.lang.String roleCode; -// /**描述*/ -// @Excel(name = "描述", width = 15) -// @ApiModelProperty(value = "描述") -// private java.lang.String description; -// /**创建人*/ -// @Excel(name = "创建人", width = 15) -// @ApiModelProperty(value = "创建人") -// private java.lang.String createBy; -// /**创建时间*/ -// @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// @ApiModelProperty(value = "创建时间") -// private java.util.Date createTime; -// /**更新人*/ -// @Excel(name = "更新人", width = 15) -// @ApiModelProperty(value = "更新人") -// private java.lang.String updateBy; -// /**更新时间*/ -// @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// @ApiModelProperty(value = "更新时间") -// private java.util.Date updateTime; -// -// -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java deleted file mode 100644 index 14bad255..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java +++ /dev/null @@ -1,67 +0,0 @@ -//package com.jero.modules.system.entity; -// -//import java.io.Serializable; -//import java.util.Date; -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.baomidou.mybatisplus.annotation.TableName; -//import com.baomidou.mybatisplus.annotation.TableField; -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.experimental.Accessors; -//import com.fasterxml.jackson.annotation.JsonFormat; -//import org.springframework.format.annotation.DateTimeFormat; -//import org.jeecgframework.poi.excel.annotation.Excel; -// -///** -// * @Description: 部门角色权限 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//@Data -//@TableName("sys_depart_role_permission") -//@EqualsAndHashCode(callSuper = false) -//@Accessors(chain = true) -//@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") -//public class SysDepartRolePermission { -// -// /**id*/ -// @TableId(type = IdType.ASSIGN_ID) -// @ApiModelProperty(value = "id") -// private java.lang.String id; -// /**部门id*/ -// @Excel(name = "部门id", width = 15) -// @ApiModelProperty(value = "部门id") -// private java.lang.String departId; -// /**角色id*/ -// @Excel(name = "角色id", width = 15) -// @ApiModelProperty(value = "角色id") -// private java.lang.String roleId; -// /**权限id*/ -// @Excel(name = "权限id", width = 15) -// @ApiModelProperty(value = "权限id") -// private java.lang.String permissionId; -// /**dataRuleIds*/ -// @Excel(name = "dataRuleIds", width = 15) -// @ApiModelProperty(value = "dataRuleIds") -// private java.lang.String dataRuleIds; -// /** 操作时间 */ -// @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// @ApiModelProperty(value = "操作时间") -// private java.util.Date operateDate; -// /** 操作ip */ -// private java.lang.String operateIp; -// -// public SysDepartRolePermission() { -// } -// -// public SysDepartRolePermission(String roleId, String permissionId) { -// this.roleId = roleId; -// this.permissionId = permissionId; -// } -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java deleted file mode 100644 index c889109d..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java +++ /dev/null @@ -1,52 +0,0 @@ -//package com.jero.modules.system.entity; -// -//import java.io.Serializable; -//import java.util.Date; -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.baomidou.mybatisplus.annotation.TableName; -//import com.baomidou.mybatisplus.annotation.TableField; -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.experimental.Accessors; -//import com.fasterxml.jackson.annotation.JsonFormat; -//import org.springframework.format.annotation.DateTimeFormat; -//import org.jeecgframework.poi.excel.annotation.Excel; -// -///** -// * @Description: 部门角色人员信息 -// * @Author: jero-boot -// * @Date: 2020-02-13 -// * @Version: V1.0 -// */ -//@Data -//@TableName("sys_depart_role_user") -//@EqualsAndHashCode(callSuper = false) -//@Accessors(chain = true) -//@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") -//public class SysDepartRoleUser { -// -// /**主键id*/ -// @TableId(type = IdType.ASSIGN_ID) -// @ApiModelProperty(value = "主键id") -// private java.lang.String id; -// /**用户id*/ -// @Excel(name = "用户id", width = 15) -// @ApiModelProperty(value = "用户id") -// private java.lang.String userId; -// /**角色id*/ -// @Excel(name = "角色id", width = 15) -// @ApiModelProperty(value = "角色id") -// private java.lang.String droleId; -// -// public SysDepartRoleUser() { -// -// } -// -// public SysDepartRoleUser(String userId, String droleId) { -// this.userId = userId; -// this.droleId = droleId; -// } -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java deleted file mode 100644 index 0c48a38d..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -//package com.jero.modules.system.mapper; -// -//import java.util.List; -// -//import org.apache.ibatis.annotations.Param; -//import com.jero.modules.system.entity.SysDepartRole; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -// * @Description: 部门角色 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//public interface SysDepartRoleMapper extends BaseMapper { -// /** -// * 根据用户id，部门id查询可授权所有部门角色 -// * @param orgCode -// * @param userId -// * @return -// */ -// public List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java deleted file mode 100644 index 75c33c20..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -//package com.jero.modules.system.mapper; -// -//import java.util.List; -// -//import org.apache.ibatis.annotations.Param; -//import com.jero.modules.system.entity.SysDepartRolePermission; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -// * @Description: 部门角色权限 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//public interface SysDepartRolePermissionMapper extends BaseMapper { -// -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java deleted file mode 100644 index 391624a7..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -//package com.jero.modules.system.mapper; -// -//import java.util.List; -// -//import org.apache.ibatis.annotations.Param; -//import com.jero.modules.system.entity.SysDepartRoleUser; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -// * @Description: 部门角色人员信息 -// * @Author: jero-boot -// * @Date: 2020-02-13 -// * @Version: V1.0 -// */ -//public interface SysDepartRoleUserMapper extends BaseMapper { -// -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java deleted file mode 100644 index 99ee9a4f..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java +++ /dev/null @@ -1,20 +0,0 @@ -//package com.jero.modules.system.service; -// -//import com.jero.modules.system.entity.SysDepartRolePermission; -//import com.baomidou.mybatisplus.extension.service.IService; -// -///** -// * @Description: 部门角色权限 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//public interface ISysDepartRolePermissionService extends IService { -// /** -// * 保存授权 将上次的权限和这次作比较 差异处理提高效率 -// * @param roleId -// * @param permissionIds -// * @param lastPermissionIds -// */ -// public void saveDeptRolePermission(String roleId,String permissionIds,String lastPermissionIds); -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java deleted file mode 100644 index cf506c20..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java +++ /dev/null @@ -1,24 +0,0 @@ -//package com.jero.modules.system.service; -// -//import com.jero.modules.system.entity.SysDepartRole; -//import com.baomidou.mybatisplus.extension.service.IService; -// -//import java.util.List; -// -///** -// * @Description: 部门角色 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//public interface ISysDepartRoleService extends IService { -// -// /** -// * 根据用户id，部门id查询可授权所有部门角色 -// * @param orgCode -// * @param userId -// * @return -// */ -// List queryDeptRoleByDeptAndUser(String orgCode, String userId); -// -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java deleted file mode 100644 index 31d14ca6..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java +++ /dev/null @@ -1,24 +0,0 @@ -//package com.jero.modules.system.service; -// -//import com.jero.modules.system.entity.SysDepartRoleUser; -//import com.baomidou.mybatisplus.extension.service.IService; -// -//import java.util.List; -// -///** -// * @Description: 部门角色人员信息 -// * @Author: jero-boot -// * @Date: 2020-02-13 -// * @Version: V1.0 -// */ -//public interface ISysDepartRoleUserService extends IService { -// -// void deptRoleUserAdd(String userId,String newRoleId,String oldRoleId); -// -// /** -// * 取消用户与部门关联，删除关联关系 -// * @param userIds -// * @param depId -// */ -// void removeDeptRoleUser(List userIds,String depId); -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java index 1878bce7..5c312971 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java @@ -4,12 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepartPermission; -//import com.jero.modules.system.entity.SysDepartRole; -//import com.jero.modules.system.entity.SysDepartRolePermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.mapper.SysDepartPermissionMapper; -//import com.jero.modules.system.mapper.SysDepartRoleMapper; -//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; import com.jero.modules.system.mapper.SysPermissionDataRuleMapper; import com.jero.modules.system.service.ISysDepartPermissionService; import org.springframework.stereotype.Service; @@ -29,15 +25,10 @@ import java.util.stream.Collectors; */ @Service public class SysDepartPermissionServiceImpl extends ServiceImpl implements ISysDepartPermissionService { + @Resource private SysPermissionDataRuleMapper ruleMapper; -// @Resource -// private SysDepartRoleMapper sysDepartRoleMapper; - -// @Resource -// private SysDepartRolePermissionMapper departRolePermissionMapper; - @Override @Transactional(rollbackFor = Exception.class) public void saveDepartPermission(String departId, String permissionIds, String lastPermissionIds) { @@ -56,12 +47,6 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl0) { for (String permissionId : delete) { this.remove(new QueryWrapper().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId)); - //删除部门权限时，删除部门角色中已授权的权限 -// List sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); -// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); -// if(roleIds != null && roleIds.size()>0){ -// departRolePermissionMapper.delete(new LambdaQueryWrapper().eq(SysDepartRolePermission::getPermissionId,permissionId)); -// } } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java deleted file mode 100644 index ea108fb2..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -//package com.jero.modules.system.service.impl; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.jero.common.util.IPUtils; -//import com.jero.common.util.SpringContextUtils; -//import com.jero.common.util.oConvertUtils; -//import com.jero.modules.system.entity.SysDepartRolePermission; -//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; -//import com.jero.modules.system.service.ISysDepartRolePermissionService; -//import org.springframework.stereotype.Service; -// -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -// -//import javax.servlet.http.HttpServletRequest; -//import java.util.*; -// -///** -// * @Description: 部门角色权限 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//@Service -//public class SysDepartRolePermissionServiceImpl extends ServiceImpl implements ISysDepartRolePermissionService { -// -// @Override -// public void saveDeptRolePermission(String roleId, String permissionIds, String lastPermissionIds) { -// String ip = ""; -// try { -// //获取request -// HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); -// //获取IP地址 -// ip = IPUtils.getIpAddr(request); -// } catch (Exception e) { -// ip = "127.0.0.1"; -// } -// List add = getDiff(lastPermissionIds,permissionIds); -// if(add!=null && add.size()>0) { -// List list = new ArrayList(); -// for (String p : add) { -// if(oConvertUtils.isNotEmpty(p)) { -// SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p); -// rolepms.setOperateDate(new Date()); -// rolepms.setOperateIp(ip); -// list.add(rolepms); -// } -// } -// this.saveBatch(list); -// } -// -// List delete = getDiff(permissionIds,lastPermissionIds); -// if(delete!=null && delete.size()>0) { -// for (String permissionId : delete) { -// this.remove(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId).eq(SysDepartRolePermission::getPermissionId, permissionId)); -// } -// } -// } -// -// /** -// * 从diff中找出main中没有的元素 -// * @param main -// * @param diff -// * @return -// */ -// private List getDiff(String main, String diff){ -// if(oConvertUtils.isEmpty(diff)) { -// return null; -// } -// if(oConvertUtils.isEmpty(main)) { -// return Arrays.asList(diff.split(",")); -// } -// -// String[] mainArr = main.split(","); -// String[] diffArr = diff.split(","); -// Map map = new HashMap<>(); -// for (String string : mainArr) { -// map.put(string, 1); -// } -// List res = new ArrayList(); -// for (String key : diffArr) { -// if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { -// res.add(key); -// } -// } -// return res; -// } -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java deleted file mode 100644 index 146ea66b..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -//package com.jero.modules.system.service.impl; -// -//import com.jero.modules.system.entity.SysDepartRole; -//import com.jero.modules.system.mapper.SysDepartRoleMapper; -//import com.jero.modules.system.service.ISysDepartRoleService; -//import org.springframework.stereotype.Service; -// -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -// -//import java.util.List; -// -///** -// * @Description: 部门角色 -// * @Author: jero-boot -// * @Date: 2020-02-12 -// * @Version: V1.0 -// */ -//@Service -//public class SysDepartRoleServiceImpl extends ServiceImpl implements ISysDepartRoleService { -// -// @Override -// public List queryDeptRoleByDeptAndUser(String orgCode, String userId) { -// return this.baseMapper.queryDeptRoleByDeptAndUser(orgCode,userId); -// } -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java deleted file mode 100644 index 96006b0a..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -//package com.jero.modules.system.service.impl; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.jero.common.util.oConvertUtils; -//import com.jero.modules.system.entity.SysDepartRole; -//import com.jero.modules.system.entity.SysDepartRoleUser; -//import com.jero.modules.system.mapper.SysDepartRoleMapper; -//import com.jero.modules.system.mapper.SysDepartRoleUserMapper; -//import com.jero.modules.system.service.ISysDepartRoleUserService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import org.springframework.transaction.annotation.Transactional; -// -//import java.util.*; -//import java.util.stream.Collectors; -// -///** -// * @Description: 部门角色人员信息 -// * @Author: jero-boot -// * @Date: 2020-02-13 -// * @Version: V1.0 -// */ -//@Service -//public class SysDepartRoleUserServiceImpl extends ServiceImpl implements ISysDepartRoleUserService { -// @Autowired -// private SysDepartRoleMapper sysDepartRoleMapper; -// -// @Override -// public void deptRoleUserAdd(String userId, String newRoleId, String oldRoleId) { -// List add = getDiff(oldRoleId,newRoleId); -// if(add!=null && add.size()>0) { -// List list = new ArrayList<>(); -// for (String roleId : add) { -// if(oConvertUtils.isNotEmpty(roleId)) { -// SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId); -// list.add(rolepms); -// } -// } -// this.saveBatch(list); -// } -// List remove = getDiff(newRoleId,oldRoleId); -// if(remove!=null && remove.size()>0) { -// for (String roleId : remove) { -// this.remove(new QueryWrapper().lambda().eq(SysDepartRoleUser::getUserId, userId).eq(SysDepartRoleUser::getDroleId, roleId)); -// } -// } -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void removeDeptRoleUser(List userIds, String depId) { -// for(String userId : userIds){ -// List sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper().eq("depart_id",depId)); -// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); -// if(roleIds != null && roleIds.size()>0){ -// QueryWrapper query = new QueryWrapper<>(); -// query.eq("user_id",userId).in("drole_id",roleIds); -// this.remove(query); -// } -// } -// } -// -// /** -// * 从diff中找出main中没有的元素 -// * @param main -// * @param diff -// * @return -// */ -// private List getDiff(String main, String diff){ -// if(oConvertUtils.isEmpty(diff)) { -// return null; -// } -// if(oConvertUtils.isEmpty(main)) { -// return Arrays.asList(diff.split(",")); -// } -// -// String[] mainArr = main.split(","); -// String[] diffArr = diff.split(","); -// Map map = new HashMap<>(); -// for (String string : mainArr) { -// map.put(string, 1); -// } -// List res = new ArrayList(); -// for (String key : diffArr) { -// if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { -// res.add(key); -// } -// } -// return res; -// } -//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index ada18292..cb496739 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -41,16 +41,8 @@ public class SysDepartServiceImpl extends ServiceImpl queryMyDeptTreeList(String departIds) { @@ -199,19 +191,6 @@ public class SysDepartServiceImpl extends ServiceImpl>>>>"+id); boolean - * flag = this.removeById(id); return flag; } - */ - /** * updateDepartDataById 对应 edit 根据部门主键来更新对应的部门数据 */ @@ -238,26 +217,10 @@ public class SysDepartServiceImpl extends ServiceImpl roleIdList = new ArrayList<>(); -// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); -// query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); -// List depRoleList = sysDepartRoleMapper.selectList(query); -// for(SysDepartRole deptRole : depRoleList){ -// roleIdList.add(deptRole.getId()); -// } //根据部门id删除用户与部门关系 userDepartMapper.delete(new LambdaQueryWrapper().in(SysUserDepart::getDepId,idList)); //根据部门id删除部门授权 departPermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartPermission::getDepartId,idList)); - //根据部门id删除部门角色 -// sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); -// if(roleIdList != null && roleIdList.size()>0){ - //根据角色id删除部门角色授权 -// departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); - //根据角色id删除部门角色用户信息 -// departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); -// } } @Override @@ -328,26 +291,10 @@ public class SysDepartServiceImpl extends ServiceImpl roleIdList = new ArrayList<>(); -// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); -// query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); -// List depRoleList = sysDepartRoleMapper.selectList(query); -// for(SysDepartRole deptRole : depRoleList){ -// roleIdList.add(deptRole.getId()); -// } //根据部门id删除用户与部门关系 userDepartMapper.delete(new LambdaQueryWrapper().in(SysUserDepart::getDepId,idList)); //根据部门id删除部门授权 departPermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartPermission::getDepartId,idList)); - //根据部门id删除部门角色 -// sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); -// if(roleIdList != null && roleIdList.size()>0){ -// 根据角色id删除部门角色授权 -// departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); -// 根据角色id删除部门角色用户信息 -// departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); -// } return ok; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java index fda747cc..a419935d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java @@ -14,7 +14,6 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.mapper.SysDepartPermissionMapper; -//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; import com.jero.modules.system.mapper.SysPermissionMapper; import com.jero.modules.system.mapper.SysRolePermissionMapper; import com.jero.modules.system.model.TreeModel; @@ -52,9 +51,6 @@ public class SysPermissionServiceImpl extends ServiceImpl queryListByParentId(String parentId) { return sysPermissionMapper.queryListByParentId(parentId); @@ -91,8 +87,6 @@ public class SysPermissionServiceImpl extends ServiceImpl().eq(SysPermission::getParentId, id)); // 如果有, 则递归 if (num > 0) { @@ -138,7 +131,6 @@ public class SysPermissionServiceImpl extends ServiceImpl impl private SysDepartMapper sysDepartMapper; @Autowired private SysRoleMapper sysRoleMapper; -// @Autowired -// private SysDepartRoleUserMapper departRoleUserMapper; -// @Autowired -// private SysDepartRoleMapper sysDepartRoleMapper; @Resource private BaseCommonService baseCommonService; @@ -177,10 +173,6 @@ public class SysUserServiceImpl extends ServiceImpl impl Set permissionSet = new HashSet<>(); List permissionList = sysPermissionMapper.queryByUser(username); for (SysPermission po : permissionList) { -// // TODO URL规则有问题？ -// if (oConvertUtils.isNotEmpty(po.getUrl())) { -// permissionSet.add(po.getUrl()); -// } if (oConvertUtils.isNotEmpty(po.getPerms())) { permissionSet.add(po.getPerms()); } @@ -193,10 +185,6 @@ public class SysUserServiceImpl extends ServiceImpl impl public SysUserCacheInfo getCacheUser(String username) { SysUserCacheInfo info = new SysUserCacheInfo(); info.setOneDepart(true); -// SysUser user = userMapper.getUserByName(username); -// info.setSysUserCode(user.getUsername()); -// info.setSysUserName(user.getRealname()); - LoginUser user = sysBaseAPI.getUserByName(username); if(user!=null) { @@ -320,22 +308,6 @@ public class SysUserServiceImpl extends ServiceImpl impl if(oConvertUtils.isNotEmpty(departs)){ arr = departs.split(","); } - //查询已关联部门 -/* List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); - if(userDepartList != null && userDepartList.size()>0){ - for(SysUserDepart depart : userDepartList ){ - //修改已关联部门删除部门用户角色关系 - if(!Arrays.asList(arr).contains(depart.getDepId())){ - List sysDepartRoleList = sysDepartRoleMapper.selectList( - new QueryWrapper().lambda().eq(SysDepartRole::getDepartId,depart.getDepId())); - List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - if(roleIds != null && roleIds.size()>0){ - departRoleUserMapper.delete(new QueryWrapper().lambda().eq(SysDepartRoleUser::getUserId, user.getId()) - .in(SysDepartRoleUser::getDroleId,roleIds)); - } - } - } - }*/ //先删后加 sysUserDepartMapper.delete(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(oConvertUtils.isNotEmpty(departs)) { @@ -484,22 +456,7 @@ public class SysUserServiceImpl extends ServiceImpl impl if(oConvertUtils.isNotEmpty(departs)){ arr = departs.split(","); } - //查询已关联部门 - /*List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); - if(userDepartList != null && userDepartList.size()>0){ - for(SysUserDepart depart : userDepartList ){ - //修改已关联部门删除部门用户角色关系 - if(!Arrays.asList(arr).contains(depart.getDepId())){ - List sysDepartRoleList = sysDepartRoleMapper.selectList( - new QueryWrapper().lambda().eq(SysDepartRole::getDepartId,depart.getDepId())); - List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - if(roleIds != null && roleIds.size()>0){ - departRoleUserMapper.delete(new QueryWrapper().lambda().eq(SysDepartRoleUser::getUserId, user.getId()) - .in(SysDepartRoleUser::getDroleId,roleIds)); - } - } - } - }*/ + //先删后加 sysUserDepartMapper.delete(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(oConvertUtils.isNotEmpty(departs)) { From 80f0921d60f1fcaaa741ad47083c26883c07b125 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 18:01:45 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=83=A8=E9=97=A8=E8=A7=92=E8=89=B2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9A=84=E4=BB=A3=E7=A0=81=E7=9B=B4=E6=8E=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/api/api.js | 2 - jero-web/src/views/system/DepartUserList.vue | 17 -- .../system/modules/DeptRoleAuthModal.vue | 213 ------------------ .../system/modules/DeptRoleDataruleModal.vue | 122 ---------- .../src/views/system/modules/DeptRoleInfo.vue | 191 ---------------- .../system/modules/DeptRoleUserModal.vue | 200 ---------------- .../src/views/system/modules/DeptUserInfo.vue | 15 -- 7 files changed, 760 deletions(-) delete mode 100644 jero-web/src/views/system/modules/DeptRoleAuthModal.vue delete mode 100644 jero-web/src/views/system/modules/DeptRoleDataruleModal.vue delete mode 100644 jero-web/src/views/system/modules/DeptRoleInfo.vue delete mode 100644 jero-web/src/views/system/modules/DeptRoleUserModal.vue diff --git a/jero-web/src/api/api.js b/jero-web/src/api/api.js index 9cd8bb71..969c1443 100644 --- a/jero-web/src/api/api.js +++ b/jero-web/src/api/api.js @@ -49,7 +49,6 @@ const queryDepartPermission = (params)=>getAction("/sys/permission/queryDepartPe const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params); const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params); const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/queryDeptRolePermission",params); -// const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params); const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params); //日志管理 @@ -151,7 +150,6 @@ export { saveDepartPermission, queryTreeListForDeptRole, queryDeptRolePermission, - // saveDeptRolePermission, queryMyDepartTreeList, getUserNoticeInfo, getDictItemsFromCache diff --git a/jero-web/src/views/system/DepartUserList.vue b/jero-web/src/views/system/DepartUserList.vue index 61394f94..798f6220 100644 --- a/jero-web/src/views/system/DepartUserList.vue +++ b/jero-web/src/views/system/DepartUserList.vue @@ -38,9 +38,6 @@ - - - @@ -51,7 +48,6 @@ import DeptUserInfo from './modules/DeptUserInfo' import { queryMyDepartTreeList, searchByKeywords } from '@/api/api' import { JeroListMixin } from '@/mixins/JeroListMixin' - // import DeptRoleInfo from './modules/DeptRoleInfo' export default { name: 'DepartUserList', @@ -111,7 +107,6 @@ this.selectedKeys = []; this.currentDeptId = ''; this.$refs.DeptUserInfo.currentDeptId=''; - // this.$refs.DeptRoleInfo.currentDeptId=''; }, loadTree() { var that = this @@ -177,24 +172,14 @@ }, onCheck(checkedKeys, e) { let record = e.node.dataRef; - // console.log('onCheck', checkedKeys, e); this.checkedKeys = []; - // if (e.checked === true) { this.currentDeptId = record.id; this.checkedKeys.push(record.id); this.$refs.DeptBaseInfo.open(record); this.$refs.DeptUserInfo.open(record); - // this.$refs.DeptRoleInfo.open(record); - // } - // else { - // this.checkedKeys = []; - // this.$refs.DeptBaseInfo.clearForm(); - // this.$refs.DeptUserInfo.clearList(); - // } this.hiding = false; - // this.checkedKeys = checkedKeys.checked }, onSelect(selectedKeys, e) { if (this.selectedKeys[0] !== selectedKeys[0]) { @@ -205,8 +190,6 @@ this.$refs.DeptBaseInfo.open(record); this.$refs.DeptUserInfo.onClearSelected(); this.$refs.DeptUserInfo.open(record); - // this.$refs.DeptRoleInfo.onClearSelected(); - // this.$refs.DeptRoleInfo.open(record); }, }, created() { diff --git a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue b/jero-web/src/views/system/modules/DeptRoleAuthModal.vue deleted file mode 100644 index 8449b8a8..00000000 --- a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue b/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue deleted file mode 100644 index 01ff78a5..00000000 --- a/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jero-web/src/views/system/modules/DeptRoleInfo.vue b/jero-web/src/views/system/modules/DeptRoleInfo.vue deleted file mode 100644 index a20401d8..00000000 --- a/jero-web/src/views/system/modules/DeptRoleInfo.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jero-web/src/views/system/modules/DeptRoleUserModal.vue b/jero-web/src/views/system/modules/DeptRoleUserModal.vue deleted file mode 100644 index bfdc7ecf..00000000 --- a/jero-web/src/views/system/modules/DeptRoleUserModal.vue +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue index 96e74176..2016739b 100644 --- a/jero-web/src/views/system/modules/DeptUserInfo.vue +++ b/jero-web/src/views/system/modules/DeptUserInfo.vue @@ -70,9 +70,6 @@ 更多 - - - 用户详情 @@ -95,7 +92,6 @@ - @@ -104,13 +100,11 @@ import {getAction, postAction, deleteAction} from '@/api/manage' import SelectUserModal from './SelectUserModal' import UserModal from './UserModal' - // import DeptRoleUserModal from './DeptRoleUserModal' export default { name: "DeptUserInfo", mixins: [JeroListMixin], components: { - // DeptRoleUserModal, SelectUserModal, UserModal }, @@ -254,7 +248,6 @@ }); }, open(record) { - //console.log(record); this.currentDeptId = record.id; this.currentDept = record; this.loadData(1); @@ -311,14 +304,6 @@ } }) }, - // handleDeptRole(record){ - // if(this.currentDeptId != ''){ - // this.$refs.deptRoleUser.add(record,this.currentDeptId); - // this.$refs.deptRoleUser.title = "部门角色分配"; - // }else{ - // this.$message.warning("请先选择一个部门!"); - // } - // } } } From 2ebb7bd20a251ee8879bd25a1fda925a0703a7a9 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 19:18:19 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9D=83=E9=99=90=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=EF=BC=8C=E5=88=99tab=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E4=BF=A1=E6=81=AF=20=E3=80=90=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E4=B8=8D=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/layouts/TabLayout.vue | 42 ++----------------- jero-web/src/components/tools/UserMenu.vue | 5 +-- jero-web/src/views/user/Login.vue | 2 +- 3 files changed, 5 insertions(+), 44 deletions(-) diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index f1dca771..f9907aa0 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -14,7 +14,7 @@ @change="changePage" @tabClick="tabCallBack" @edit="editPage"> - + {{ page.meta.title }} @@ -39,7 +39,7 @@ import { triggerWindowResizeEvent } from '@/utils/util' import Vue from 'vue' import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types' -const indexKey = '/dashboard/analysis' +const indexKey = '/' export default { name: 'TabLayout', @@ -81,9 +81,6 @@ const indexKey = '/dashboard/analysis' } }, created() { - if (this.$route.path != indexKey) { - this.addIndexToFirst() - } // 复制一个route对象出来，不能影响原route let currentRoute = Object.assign({}, this.$route) currentRoute.meta = Object.assign({}, currentRoute.meta) @@ -138,31 +135,8 @@ const indexKey = '/dashboard/analysis' } } }, - // update-begin-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG - device() { - if (this.multipage && this.linkList.indexOf(indexKey) === -1) { - this.addIndexToFirst() - } - }, - // update-end-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG }, methods: { - // update-begin-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG - // 将首页添加到第一位 - addIndexToFirst() { - this.pageList.splice(0, 0, { - name: 'dashboard-analysis', - path: indexKey, - fullPath: indexKey, - meta: { - icon: 'dashboard', - title: '首页' - } - }) - this.linkList.splice(0, 0, indexKey) - }, - // update-end-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG - // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题 changeTitle(title) { let projectTitle = "Jero-Boot 企业级快速开发平台" @@ -192,10 +166,6 @@ const indexKey = '/dashboard/analysis' this[action](key) }, remove(key) { - if (key == indexKey) { - this.$message.warning('首页不能关闭!') - return - } if (this.pageList.length === 1) { this.$message.warning('这是最后一页，不能再关闭了啦') return @@ -264,17 +234,14 @@ const indexKey = '/dashboard/analysis' }, /* update_end author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */ closeOthers(pageKey) { - let index = this.linkList.indexOf(pageKey) + let index = this.linkList.indexOf(pageKey) if (pageKey == indexKey || pageKey.indexOf('?ticke=')>=0) { this.linkList = this.linkList.slice(index, index + 1) this.pageList = this.pageList.slice(index, index + 1) this.activePage = this.linkList[0] } else { - let indexContent = this.pageList.slice(0, 1)[0] this.linkList = this.linkList.slice(index, index + 1) this.pageList = this.pageList.slice(index, index + 1) - this.linkList.unshift(indexContent.fullPath) - this.pageList.unshift(indexContent) this.activePage = this.linkList[1] } }, @@ -283,12 +250,9 @@ const indexKey = '/dashboard/analysis' return } let tempList = [...this.pageList] - let indexContent = tempList.slice(0, 1)[0] let index = this.linkList.indexOf(pageKey) this.linkList = this.linkList.slice(index) this.pageList = this.pageList.slice(index) - this.linkList.unshift(indexContent.fullPath) - this.pageList.unshift(indexContent) if (this.linkList.indexOf(this.activePage) < 0) { this.activePage = this.linkList[0] } diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index c25a0b0a..d0f23974 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -183,10 +183,7 @@ content: '真的要注销登录吗 ?', onOk() { return that.Logout({}).then(() => { - // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面 - that.$router.push({ path: '/user/login' }); - window.location.reload() - // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面 + window.location.replace("/user/login") }).catch(err => { that.$message.error({ title: '错误', diff --git a/jero-web/src/views/user/Login.vue b/jero-web/src/views/user/Login.vue index ea1fc996..d3476e3f 100644 --- a/jero-web/src/views/user/Login.vue +++ b/jero-web/src/views/user/Login.vue @@ -332,7 +332,7 @@ }) }, loginSuccess () { - this.$router.push({ path: "/dashboard/analysis" }).catch((res)=>{}) + this.$router.push({ path: "/" }).catch((res)=>{}) this.$notification.success({ message: '欢迎', description: `${timeFix()}，欢迎回来`, From 7ce4d0547c50858d17ef2fde043db01177531c95 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 20:36:12 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94=E6=88=96?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E9=97=A8=EF=BC=8C=E4=BD=86=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E9=83=A8=E9=97=A8=E6=9C=AA=E5=90=8C=E6=AD=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/system/query/QueryGenerator.java | 5 +- .../controller/SysDepartController.java | 24 ++++---- .../system/controller/SysUserController.java | 18 ++++-- .../system/service/ISysDepartService.java | 16 +++++- .../service/impl/SysDepartServiceImpl.java | 55 ++++++++++++++++++- 5 files changed, 93 insertions(+), 25 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java index a902e202..4c01d834 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java @@ -215,7 +215,7 @@ public class QueryGenerator { } } - //多字段排序 TODO 需要修改前端 + //多字段排序 public static void doMultiFieldsOrder(QueryWrapper queryWrapper,Map parameterMap) { String column=null,order=null; if(parameterMap!=null&& parameterMap.containsKey(ORDER_COLUMN)) { @@ -224,7 +224,6 @@ public class QueryGenerator { if(parameterMap!=null&& parameterMap.containsKey(ORDER_TYPE)) { order = parameterMap.get(ORDER_TYPE)[0]; } - log.info("排序规则>>列:" + column + ",排序方式:" + order); if (oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) { //字典字段，去掉字典翻译文本后缀 if(column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) { @@ -238,12 +237,10 @@ public class QueryGenerator { // 将现有排序 _ 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1,column2 desc" // 修改为 _ 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1 desc,column2 desc" if (order.toUpperCase().indexOf(ORDER_TYPE_ASC)>=0) { -// queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column)); String columnStr = oConvertUtils.camelToUnderline(column); String[] columnArray = columnStr.split(","); queryWrapper.orderByAsc(Arrays.asList(columnArray)); } else { -// queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column)); String columnStr = oConvertUtils.camelToUnderline(column); String[] columnArray = columnStr.split(","); queryWrapper.orderByDesc(Arrays.asList(columnArray)); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index ae2d237a..a8e23312 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -217,21 +217,21 @@ public class SysDepartController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:depart:del") - @RequestMapping(value = "/delete", method = RequestMethod.DELETE) + @RequiresPermissions("sys:depart:del") + @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) - public Result delete(@RequestParam(name="id",required=true) String id) { - SysDepart sysDepart = sysDepartService.getById(id); - if(sysDepart==null) { + public Result delete(@RequestParam(name="id",required=true) String id) { + SysDepart sysDepart = sysDepartService.getById(id); + if(sysDepart==null) { return Result.error500("未找到对应实体"); - }else { - boolean ok = sysDepartService.delete(id); - if(ok) { + }else { + boolean ok = sysDepartService.delete(id); + if(ok) { return Result.OK("删除成功!"); - } - } - return Result.OK(); - } + } + } + return Result.OK(); + } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index f4c4c3dc..c3420add 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -37,6 +37,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -100,8 +101,6 @@ public class SysUserController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); - //TODO 外部模拟登陆临时账号，列表不显示 - queryWrapper.ne("username","_reserve_user_external"); Page page = new Page(pageNo, pageSize); IPage pageList = sysUserService.page(page, queryWrapper); @@ -500,7 +499,7 @@ public class SysUserController { log.error(e.getMessage(), e); } } - // 批量将部门和用户信息建立关联关系 + // 批量将部门和用户信息建立关联关系 TODO 错误需修改 String departIds = sysUserExcel.getDepartIds(); if (StringUtils.isNotBlank(departIds)) { String userId = sysUserExcel.getId(); @@ -763,6 +762,7 @@ public class SysUserController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).eq("user_id",userId); sysUserDepartService.remove(queryWrapper); + sysDepartService.deleteHeadDeptAndUserRelatedByUser(depId, userId); return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); @@ -774,13 +774,19 @@ public class SysUserController { * 批量删除指定机构的用户关系 */ @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE) + @Transactional public Result deleteUserInDepartBatch( @RequestParam(name="depId") String depId, @RequestParam(name="userIds",required=true) String userIds) { try { + List userIdList = new ArrayList<>(Arrays.asList(userIds.split(","))); + QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(","))); + queryWrapper.eq("dep_id", depId).in("user_id", userIdList); sysUserDepartService.remove(queryWrapper); + for (String userId : userIdList){ + sysDepartService.deleteHeadDeptAndUserRelatedByUser(depId, userId); + } return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); @@ -1170,6 +1176,7 @@ public class SysUserController { } return result; } + /** * 根据userid获取用户信息和部门员工信息 * @@ -1185,7 +1192,7 @@ public class SysUserController { Integer identity = sysUser.getUserIdentity(); map.put("sysUser",sysUser); if(identity!=null && identity==2){ - //获取部门用户信息 + //获取部门用户信息 TODO错误，需修改 String departIds = sysUser.getDepartIds(); if(StringUtils.isNotBlank(departIds)){ List departIdList = Arrays.asList(departIds.split(",")); @@ -1195,6 +1202,7 @@ public class SysUserController { } return Result.OK(map); } + /** * 移动端查询部门用户信息 * @param departId diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java index f27d5aec..2672718f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java @@ -1,10 +1,16 @@ package com.jero.modules.system.service; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.model.DepartIdModel; + +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -69,12 +75,18 @@ public interface ISysDepartService extends IService{ */ boolean delete(String id); + /** + * 删除部门的时候同步删除用户对应的负责部门 + * @param id + */ + void deleteHeadDeptAndUserRelatedByUser(String id, String userIds); + /** * 查询SysDepart集合 * @param userId * @return */ - public List queryUserDeparts(String userId); + List queryUserDeparts(String userId); /** * 根据用户名查询部门 @@ -86,7 +98,7 @@ public interface ISysDepartService extends IService{ /** * 根据部门id批量删除并删除其可能存在的子级部门 - * @param id + * @param ids * @return */ void deleteBatchWithChildren(List ids); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index cb496739..8e922644 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.system.service.impl; import java.util.*; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -41,9 +42,13 @@ public class SysDepartServiceImpl extends ServiceImpl queryMyDeptTreeList(String departIds) { //根据部门id获取所负责部门 @@ -221,6 +226,10 @@ public class SysDepartServiceImpl extends ServiceImpl().in(SysUserDepart::getDepId,idList)); //根据部门id删除部门授权 departPermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartPermission::getDepartId,idList)); + //删除人员负责部门 + for (String id : ids){ + deleteHeadDeptAndUserRelated(id); + } } @Override @@ -288,16 +297,58 @@ public class SysDepartServiceImpl extends ServiceImpl idList = new ArrayList<>(); idList.add(id); this.checkChildrenExists(id, idList); - //清空部门树内存 - //FindsDepartsChildrenUtil.clearDepartIdModel(); boolean ok = this.removeByIds(idList); //根据部门id删除用户与部门关系 userDepartMapper.delete(new LambdaQueryWrapper().in(SysUserDepart::getDepId,idList)); //根据部门id删除部门授权 departPermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartPermission::getDepartId,idList)); + //查找用户中的上级部门关联的数据并删除 + deleteHeadDeptAndUserRelated(id); + return ok; } + /** + * 删除部门的时候同步删除用户对应的负责部门 + * @param id + */ + private void deleteHeadDeptAndUserRelated(String id) { + List containParentDeptUser = userMapper.selectList(new LambdaQueryWrapper().like(SysUser::getDepartIds, id)); + this.deleteHeadDpetFromUserInfo(id, containParentDeptUser); + } + + /** + * 删除部门的时候同步删除用户对应的负责部门 + * @param id + */ + public void deleteHeadDeptAndUserRelatedByUser(String id, String userIds) { + List containParentDeptUser = userMapper.selectList(new LambdaQueryWrapper().like(SysUser::getDepartIds, id).in(SysUser::getId, userIds)); + this.deleteHeadDpetFromUserInfo(id, containParentDeptUser); + } + + /** + * 根据部门id和用户信息进行数据的删除处理 + * @param id + * @param containParentDeptUser + */ + private void deleteHeadDpetFromUserInfo(String id, List containParentDeptUser) { + for (SysUser sysUser : containParentDeptUser) { + List headDepartList = new ArrayList(Arrays.asList(sysUser.getDepartIds().split(","))); + // 遍历负责部门的list，如果存在本次删除id，则从list中移除 + int headDepartNum = headDepartList.size(); + for (int i = 0; i < headDepartNum; i++) { + String next = headDepartList.get(i); + if (next.equals(id)) { + headDepartList.remove(i); + break; + } + } + + sysUser.setDepartIds(StrUtil.join(",", headDepartList)); + userMapper.updateById(sysUser); + } + } + /** * delete 方法调用 * @param id From 613ce9d31cbb223c77b0c81e24f67127f23e20d5 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 21:46:28 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8=E5=A4=9A=E9=80=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81=E4=B8=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/dict/JMultiSelectTag.vue | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue index b089ccbc..84ab369b 100644 --- a/jero-web/src/components/dict/JMultiSelectTag.vue +++ b/jero-web/src/components/dict/JMultiSelectTag.vue @@ -13,15 +13,16 @@ :getPopupContainer="getParentContainer" optionFilterProp="children" :filterOption="filterOption" - allowClear> - - - {{ item.text || item.label }} - - + allowClear + :options="dictOptions"> + + + + + + + + @@ -62,11 +63,13 @@ this.tagType = this.type } //获取字典数据 - //this.initDictData(); + // this.initDictData(); }, watch:{ - options: function(val){ - this.setCurrentDictOptions(val); + options (val) { + val.forEach((item, index) => { + this.$set(this.dictOptions, index, item) + }) }, dictCode:{ immediate:true, @@ -103,14 +106,8 @@ }, onChange (selectedValue) { - this.value = selectedValue.join(this.spliter); - this.$emit('change', this.value); - }, - setCurrentDictOptions(dictOptions){ - this.dictOptions = dictOptions - }, - getCurrentDictOptions(){ - return this.dictOptions + this.arrayValue = selectedValue; + this.$emit('change', selectedValue.join(this.spliter)); }, getParentContainer(node){ if(!this.popContainer){ From 725a72a1783f2417bc77f912614e57cc2f394dfe Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 21:47:16 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/dict/JMultiSelectTag.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue index 84ab369b..f762487d 100644 --- a/jero-web/src/components/dict/JMultiSelectTag.vue +++ b/jero-web/src/components/dict/JMultiSelectTag.vue @@ -15,14 +15,6 @@ :filterOption="filterOption" allowClear :options="dictOptions"> - - - - - - - - From b5ac2c4a1b971b2fa645a3ca2033839b217b23c3 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 22:44:29 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=8E=BB=E9=99=A4error500=E6=96=B9=E6=B3=95=EF=BC=8C=E5=85=A8?= =?UTF-8?q?=E9=83=BD=E6=9B=BF=E6=8D=A2=E4=B8=BAerror=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91=E4=BF=AE=E6=94=B9token=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E6=8E=A5=E5=8F=A3=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E4=BE=9D=E7=84=B6=E4=B8=8D=E8=BF=94=E5=9B=9E=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/api/vo/Result.java | 7 ---- .../controller/OnlCgformAuthController.java | 8 ++--- .../controller/OnlCgformButtonController.java | 12 +++---- .../controller/OnlCgformFieldController.java | 10 +++--- .../controller/OnlCgformHeadController.java | 8 ++--- .../controller/OnlCgformIndexController.java | 10 +++--- .../controller/OnlCgreportHeadController.java | 2 +- .../modules/demo/mock/MockController.java | 2 +- .../test/controller/JoaDemoController.java | 10 +++--- .../SysMessageTemplateController.java | 4 +-- .../controller/ActuatorRedisController.java | 2 +- .../oss/controller/OSSFileController.java | 6 ++-- .../controller/SysAnnouncementController.java | 16 ++++----- .../SysAnnouncementSendController.java | 10 +++--- .../controller/SysCategoryController.java | 10 +++--- .../controller/SysDepartController.java | 8 ++--- .../system/controller/SysDictController.java | 31 +++++++--------- .../controller/SysDictItemController.java | 8 ++--- .../system/controller/SysLogController.java | 4 +-- .../controller/SysPermissionController.java | 26 +++++++------- .../system/controller/SysRoleController.java | 10 +++--- .../controller/SysTenantController.java | 12 +++---- .../controller/SysUserAgentController.java | 12 +++---- .../system/controller/SysUserController.java | 35 +++++++++---------- .../system/service/impl/LoginServiceImpl.java | 33 +++++++---------- .../service/impl/SysUserServiceImpl.java | 9 ++--- jero-web/src/utils/request.js | 15 ++------ 27 files changed, 141 insertions(+), 179 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java index 1336e08e..77e85e83 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java @@ -107,13 +107,6 @@ public class Result implements Serializable { return r; } - public static Result error500(String message) { - Result r = new Result(); - r.message = message; - r.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500; - r.success = false; - return r; - } /** * 无权限访问返回结果 */ diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java index 9cced1dc..8f52e432 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java @@ -82,7 +82,7 @@ public class OnlCgformAuthController { return Result.OK("添加成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -146,7 +146,7 @@ public class OnlCgformAuthController { return Result.OK("操作成功！", paramOnlAuthPage); } catch (Exception exception) { log.error(exception.getMessage(), exception); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -224,7 +224,7 @@ public class OnlCgformAuthController { return Result.OK("操作成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -236,7 +236,7 @@ public class OnlCgformAuthController { return Result.OK("操作成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java index b3222a92..62861c1d 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java @@ -54,7 +54,7 @@ public class OnlCgformButtonController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -69,7 +69,7 @@ public class OnlCgformButtonController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -77,7 +77,7 @@ public class OnlCgformButtonController { public Result edit(@RequestBody OnlCgformButton cgformButton) { OnlCgformButton existCgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(cgformButton.getId()); if (existCgformButton == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean flag = this.onlCgformButtonService.updateById(cgformButton); if (flag) { @@ -92,7 +92,7 @@ public class OnlCgformButtonController { public Result delete(@RequestParam(name = "id",required = true) String id) { OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id); if (cgformButton == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean flag = this.onlCgformButtonService.removeById(id); if (flag) { @@ -109,7 +109,7 @@ public class OnlCgformButtonController { this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); } else { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } } @@ -117,7 +117,7 @@ public class OnlCgformButtonController { public Result queryById(@RequestParam(name = "id",required = true) String id) { OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id); if (cgformButton == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(cgformButton); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java index 01fa57a8..7de989fd 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java @@ -72,7 +72,7 @@ public class OnlCgformFieldController { return Result.OK("添加成功！"); } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -80,7 +80,7 @@ public class OnlCgformFieldController { public Result edit(@RequestBody OnlCgformField var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1.getId()); if (var3 == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean var4 = this.onlCgformFieldService.updateById(var1); if (var4) { @@ -94,7 +94,7 @@ public class OnlCgformFieldController { public Result delete(@RequestParam(name = "id",required = true) String var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1); if (var3 == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean var4 = this.onlCgformFieldService.removeById(var1); if (var4) { @@ -111,7 +111,7 @@ public class OnlCgformFieldController { this.onlCgformFieldService.removeByIds(Arrays.asList(var1.split(","))); return Result.OK("删除成功!"); } else { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } } @@ -119,7 +119,7 @@ public class OnlCgformFieldController { public Result queryById(@RequestParam(name = "id",required = true) String var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1); if (var3 == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(var3); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java index 283eaa86..92f299d7 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java @@ -92,7 +92,7 @@ public class OnlCgformHeadController { return Result.OK("添加成功！"); } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -100,7 +100,7 @@ public class OnlCgformHeadController { public Result edit(@RequestBody OnlCgformHead var1) { OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1.getId()); if (var3 == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean var4 = this.onlCgformHeadService.updateById(var1); if (var4) { @@ -142,7 +142,7 @@ public class OnlCgformHeadController { this.onlCgformHeadService.deleteBatch(var1, var2); return Result.OK("删除成功!"); } else { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } } @@ -150,7 +150,7 @@ public class OnlCgformHeadController { public Result queryById(@RequestParam(name = "id",required = true) String id) { OnlCgformHead cgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(id); if (cgformHead == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(cgformHead); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java index 05f124bf..826f4590 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java @@ -61,7 +61,7 @@ public class OnlCgformIndexController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -69,7 +69,7 @@ public class OnlCgformIndexController { public Result edit(@RequestBody OnlCgformIndex cgformIndex) { OnlCgformIndex existCgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(cgformIndex.getId()); if (existCgformIndex == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean flag = this.onlCgformIndexService.updateById(cgformIndex); if (flag) { @@ -84,7 +84,7 @@ public class OnlCgformIndexController { public Result delete(@RequestParam(name = "id",required = true) String id) { OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(id); if (cgformIndex == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean flag = this.onlCgformIndexService.removeById(id); if (flag) { @@ -101,7 +101,7 @@ public class OnlCgformIndexController { this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); } else { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } } @@ -109,7 +109,7 @@ public class OnlCgformIndexController { public Result queryById(@RequestParam(name = "id",required = true) String var1) { OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(var1); if (cgformIndex == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(cgformIndex); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java index 353256af..92a42840 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java @@ -167,7 +167,7 @@ public class OnlCgreportHeadController { return Result.OK("添加成功！"); } catch (Exception var9) { log.error(var9.getMessage(), var9); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java index d48741e8..f32cae46 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java @@ -144,7 +144,7 @@ public class MockController { res.setResult(list); res.setMessage("查询成功"); } catch (Exception e) { - res.error500("查询失败"+e.getMessage()); + return Result.error("查询失败"+e.getMessage()); } return res; } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java index f45ef921..78a123b6 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java @@ -88,7 +88,7 @@ public class JoaDemoController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -101,7 +101,7 @@ public class JoaDemoController { public Result edit(@RequestBody JoaDemo joaDemo) { JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId()); if(joaDemoEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = joaDemoService.updateById(joaDemo); if(ok) { @@ -121,7 +121,7 @@ public class JoaDemoController { public Result delete(@RequestParam(name="id",required=true) String id) { JoaDemo joaDemo = joaDemoService.getById(id); if(joaDemo==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = joaDemoService.removeById(id); if(ok) { @@ -139,7 +139,7 @@ public class JoaDemoController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.joaDemoService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); @@ -155,7 +155,7 @@ public class JoaDemoController { public Result queryById(@RequestParam(name="id",required=true) String id) { JoaDemo joaDemo = joaDemoService.getById(id); if(joaDemo==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(joaDemo); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java index 38a80960..d9b8a26f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java @@ -155,13 +155,13 @@ public class SysMessageTemplateController extends JeroController) JSON.parse(msgParams.getTestData()); } catch (Exception e) { - return Result.error500("解析Json出错！"); + return Result.error("解析Json出错！"); } boolean is_sendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map, msgParams.getReceiver()); if (is_sendSuccess) { return Result.OK("发送消息任务添加成功！"); } else { - return Result.error500("发送消息任务添加失败！"); + return Result.error("发送消息任务添加失败！"); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java index 15047492..4a8d5495 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java @@ -111,7 +111,7 @@ public class ActuatorRedisController { res.setResult(list); res.setMessage("查询成功"); } catch (Exception e) { - return Result.error500("查询失败"+e.getMessage()); + return Result.error("查询失败"+e.getMessage()); } return res; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java index 1cdc46ab..c7e65634 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java @@ -53,7 +53,7 @@ public class OSSFileController { } catch (Exception ex) { log.info(ex.getMessage(), ex); - return Result.error500("上传失败"); + return Result.error("上传失败"); } } @@ -62,7 +62,7 @@ public class OSSFileController { public Result delete(@RequestParam(name = "id") String id) { OSSFile file = ossFileService.getById(id); if (file == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean ok = ossFileService.delete(file); if (ok) { @@ -81,7 +81,7 @@ public class OSSFileController { Result result = new Result<>(); OSSFile file = ossFileService.getById(id); if (file == null) { - result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { result.setResult(file); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java index 2f34be16..c9ed68d3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java @@ -126,7 +126,7 @@ public class SysAnnouncementController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -139,7 +139,7 @@ public class SysAnnouncementController { public Result eidt(@RequestBody SysAnnouncement sysAnnouncement) { SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId()); if(sysAnnouncementEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { // update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题 String title = XSSUtils.striptXSS(sysAnnouncement.getTitile()); @@ -163,7 +163,7 @@ public class SysAnnouncementController { public Result delete(@RequestParam(name="id",required=true) String id) { SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString()); boolean ok = sysAnnouncementService.updateById(sysAnnouncement); @@ -183,7 +183,7 @@ public class SysAnnouncementController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { String[] id = ids.split(","); for(int i=0;i result = new Result(); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysAnnouncement); } @@ -220,7 +220,7 @@ public class SysAnnouncementController { public Result doReleaseData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysAnnouncement.setSendStatus(CommonSendStatus.PUBLISHED_STATUS_1);//发布中 sysAnnouncement.setSendTime(new Date()); @@ -262,7 +262,7 @@ public class SysAnnouncementController { public Result doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布 sysAnnouncement.setCancelTime(new Date()); @@ -401,7 +401,7 @@ public class SysAnnouncementController { if(StringUtils.isNotBlank(anntId)){ SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(anntId); if(sysAnnouncement==null) { - result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) { obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index 7b184e95..ae7243a7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -94,7 +94,7 @@ public class SysAnnouncementSendController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -107,7 +107,7 @@ public class SysAnnouncementSendController { public Result edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) { SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId()); if(sysAnnouncementSendEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend); if(ok) { @@ -127,7 +127,7 @@ public class SysAnnouncementSendController { public Result delete(@RequestParam(name="id",required=true) String id) { SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysAnnouncementSendService.removeById(id); if(ok) { @@ -146,7 +146,7 @@ public class SysAnnouncementSendController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids == null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.sysAnnouncementSendService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); @@ -163,7 +163,7 @@ public class SysAnnouncementSendController { Result result = new Result(); SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysAnnouncementSend); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 6648cdfc..bd94e192 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -104,7 +104,7 @@ public class SysCategoryController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -118,7 +118,7 @@ public class SysCategoryController { public Result edit(@RequestBody SysCategory sysCategory) { SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId()); if(sysCategoryEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysCategoryService.updateSysCategory(sysCategory); return Result.OK("修改成功!"); @@ -135,7 +135,7 @@ public class SysCategoryController { public Result delete(@RequestParam(name="id",required=true) String id) { SysCategory sysCategory = sysCategoryService.getById(id); if(sysCategory==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { this.sysCategoryService.deleteSysCategory(id); return Result.OK("删除成功!"); @@ -151,7 +151,7 @@ public class SysCategoryController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.sysCategoryService.deleteSysCategory(ids); return Result.OK("删除成功!"); @@ -168,7 +168,7 @@ public class SysCategoryController { public Result queryById(@RequestParam(name="id",required=true) String id) { SysCategory sysCategory = sysCategoryService.getById(id); if(sysCategory==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysCategory); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index a8e23312..37ac69b7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -182,7 +182,7 @@ public class SysDepartController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -201,7 +201,7 @@ public class SysDepartController { sysDepart.setUpdateBy(username); SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId()); if (sysDepartEntity == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean ok = sysDepartService.updateDepartDataById(sysDepart, username); if (ok) { @@ -223,7 +223,7 @@ public class SysDepartController { public Result delete(@RequestParam(name="id",required=true) String id) { SysDepart sysDepart = sysDepartService.getById(id); if(sysDepart==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysDepartService.delete(id); if(ok) { @@ -246,7 +246,7 @@ public class SysDepartController { @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { if (ids == null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } else { this.sysDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 5627712a..91f1abad 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -146,8 +146,7 @@ public class SysDictController { result.setResult(text); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } return result; } @@ -165,16 +164,14 @@ public class SysDictController { try { List ls = sysDictService.getDictItems(dictCode); if (ls == null) { - result.error500("字典Code格式不正确！"); - return result; + return Result.error("字典Code格式不正确！"); } result.setSuccess(true); result.setResult(ls); log.debug(result.toString()); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } return result; } @@ -196,8 +193,7 @@ public class SysDictController { try { List ls = sysDictService.loadDict(dictCode, keyword, pageSize); if (ls == null) { - result.error500("字典Code格式不正确！"); - return result; + return Result.error("字典Code格式不正确！"); } result.setSuccess(true); result.setResult(ls); @@ -205,8 +201,7 @@ public class SysDictController { return result; } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } } @@ -267,8 +262,7 @@ public class SysDictController { if(dictCode.indexOf(",")!=-1) { String[] params = dictCode.split(","); if(params.length!=3) { - result.error500("字典Code格式不正确！"); - return result; + return Result.error("字典Code格式不正确！"); } List texts = sysDictService.queryTableDictByKeys(params[0], params[1], params[2], keys, delNotExist); @@ -276,12 +270,11 @@ public class SysDictController { result.setResult(texts); log.info(result.toString()); }else { - result.error500("字典Code格式不正确！"); + return Result.error("字典Code格式不正确！"); } } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } return result; @@ -348,7 +341,7 @@ public class SysDictController { return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -362,7 +355,7 @@ public class SysDictController { public Result edit(@RequestBody SysDict sysDict) { SysDict sysdict = sysDictService.getById(sysDict.getId()); if(sysdict==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysDict.setUpdateTime(new Date()); boolean ok = sysDictService.updateById(sysDict); @@ -388,7 +381,7 @@ public class SysDictController { if(ok) { return Result.OK("删除成功!"); }else{ - return Result.error500("删除失败!"); + return Result.error("删除失败!"); } } @@ -402,7 +395,7 @@ public class SysDictController { @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { sysDictService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 5e27d093..2241ab9b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -84,7 +84,7 @@ public class SysDictItemController { return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -100,7 +100,7 @@ public class SysDictItemController { public Result edit(@RequestBody SysDictItem sysDictItem) { SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); if(sysdict==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysDictItem.setUpdateTime(new Date()); boolean ok = sysDictItemService.updateById(sysDictItem); @@ -123,7 +123,7 @@ public class SysDictItemController { public Result delete(@RequestParam(name="id",required=true) String id) { SysDictItem joinSystem = sysDictItemService.getById(id); if(joinSystem==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysDictItemService.removeById(id); if(ok) { @@ -144,7 +144,7 @@ public class SysDictItemController { @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java index 8ef59466..95bc46d8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java @@ -78,7 +78,7 @@ public class SysLogController { public Result delete(@RequestParam(name="id",required=true) String id) { SysLog sysLog = sysLogService.getById(id); if(sysLog==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysLogService.removeById(id); if(ok) { @@ -96,7 +96,7 @@ public class SysLogController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { if("allclear".equals(ids)) { this.sysLogService.removeAll(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index cdd625e4..1d11e42f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -187,7 +187,7 @@ public class SysPermissionController { // result.setResult(jsonArray); // result.success("查询成功"); // } catch (Exception e) { -// result.error500("查询失败:" + e.getMessage()); +// result.error("查询失败:" + e.getMessage()); // log.error(e.getMessage(), e); // } // return result; @@ -231,8 +231,8 @@ public class SysPermissionController { result.setResult(json); result.setMessage("查询成功"); } catch (Exception e) { - result.error500("查询失败:" + e.getMessage()); log.error(e.getMessage(), e); + return Result.error("查询失败:" + e.getMessage()); } return result; } @@ -251,7 +251,7 @@ public class SysPermissionController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -269,7 +269,7 @@ public class SysPermissionController { return Result.OK("修改成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -286,7 +286,7 @@ public class SysPermissionController { return Result.OK("删除成功!"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500(e.getMessage()); + return Result.error(e.getMessage()); } } @@ -308,7 +308,7 @@ public class SysPermissionController { return Result.OK("删除成功!"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除成功!"); + return Result.error("删除成功!"); } } @@ -355,7 +355,7 @@ public class SysPermissionController { try { List list = sysPermissionService.queryListByParentId(parentId); if (list == null || list.size() <= 0) { - result.error500("未找到角色信息"); + return Result.error("未找到角色信息"); } else { result.setResult(list); result.setSuccess(true); @@ -403,7 +403,7 @@ public class SysPermissionController { return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("授权失败！"); + return Result.error("授权失败！"); } } @@ -687,7 +687,7 @@ public class SysPermissionController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -699,7 +699,7 @@ public class SysPermissionController { return Result.OK("更新成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -717,7 +717,7 @@ public class SysPermissionController { return Result.OK("删除成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -734,7 +734,7 @@ public class SysPermissionController { return Result.OK("查询成功", permRuleList); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -774,7 +774,7 @@ public class SysPermissionController { return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("授权失败！"); + return Result.error("授权失败！"); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 35901c3e..ed91abaa 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -120,7 +120,7 @@ public class SysRoleController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -135,7 +135,7 @@ public class SysRoleController { public Result edit(@RequestBody SysRole role) { SysRole sysrole = sysRoleService.getById(role.getId()); if(sysrole==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { role.setUpdateTime(new Date()); boolean ok = sysRoleService.updateById(role); @@ -170,7 +170,7 @@ public class SysRoleController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { - return Result.error500("未选中角色！"); + return Result.error("未选中角色！"); }else { sysRoleService.deleteBatchRole(ids.split(",")); return Result.OK("删除角色成功!"); @@ -187,7 +187,7 @@ public class SysRoleController { public Result queryById(@RequestParam(name="id",required=true) String id) { SysRole sysRole = sysRoleService.getById(id); if(sysRole==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysRole); } @@ -197,7 +197,7 @@ public class SysRoleController { public Result> queryall() { List list = sysRoleService.list(); if(list==null||list.size()<=0) { - return Result.error500("未找到角色信息"); + return Result.error("未找到角色信息"); }else { return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java index feb914ce..d051ebf6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java @@ -60,7 +60,7 @@ public class SysTenantController { @RequestMapping(value = "/add", method = RequestMethod.POST) public Result add(@RequestBody SysTenant sysTenant) { if(sysTenantService.getById(sysTenant.getId())!=null){ - return Result.error500("该编号已存在!"); + return Result.error("该编号已存在!"); } try { @@ -68,7 +68,7 @@ public class SysTenantController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -81,7 +81,7 @@ public class SysTenantController { public Result edit(@RequestBody SysTenant tenant) { SysTenant sysTenant = sysTenantService.getById(tenant.getId()); if(sysTenant==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysTenantService.updateById(tenant); if(ok) { @@ -110,7 +110,7 @@ public class SysTenantController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { - return Result.error500("未选中租户！"); + return Result.error("未选中租户！"); }else { String[] ls = ids.split(","); // 过滤掉已被引用的租户 @@ -130,7 +130,7 @@ public class SysTenantController { return Result.OK("部分删除成功！（被引用的租户无法删除）"); } }else { - return Result.error500("选择的租户都已被引用，无法删除！"); + return Result.error("选择的租户都已被引用，无法删除！"); } } } @@ -144,7 +144,7 @@ public class SysTenantController { public Result queryById(@RequestParam(name="id",required=true) String id) { SysTenant sysTenant = sysTenantService.getById(id); if(sysTenant==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysTenant); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java index eef39e9d..efc876c5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java @@ -96,7 +96,7 @@ public class SysUserAgentController { return Result.OK("代理人设置成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -109,7 +109,7 @@ public class SysUserAgentController { public Result edit(@RequestBody SysUserAgent sysUserAgent) { SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId()); if(sysUserAgentEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysUserAgentService.updateById(sysUserAgent); if(ok) { @@ -129,7 +129,7 @@ public class SysUserAgentController { public Result delete(@RequestParam(name="id",required=true) String id) { SysUserAgent sysUserAgent = sysUserAgentService.getById(id); if(sysUserAgent==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysUserAgentService.removeById(id); if(ok) { @@ -147,7 +147,7 @@ public class SysUserAgentController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.sysUserAgentService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); @@ -163,7 +163,7 @@ public class SysUserAgentController { public Result queryById(@RequestParam(name="id",required=true) String id) { SysUserAgent sysUserAgent = sysUserAgentService.getById(id); if(sysUserAgent==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysUserAgent); } @@ -180,7 +180,7 @@ public class SysUserAgentController { queryWrapper.eq(SysUserAgent::getUserName, userName); SysUserAgent sysUserAgent = sysUserAgentService.getOne(queryWrapper); if(sysUserAgent==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysUserAgent); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index c3420add..504dbe92 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -159,7 +159,7 @@ public class SysUserController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -174,7 +174,7 @@ public class SysUserController { SysUser sysUser = sysUserService.getById(jsonObject.getString("id")); baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2); if(sysUser==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); String email = null; @@ -202,7 +202,7 @@ public class SysUserController { } } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -236,7 +236,7 @@ public class SysUserController { } } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"+e.getMessage()); + return Result.error("操作失败"+e.getMessage()); } return Result.OK("操作成功!"); @@ -246,7 +246,7 @@ public class SysUserController { public Result queryById(@RequestParam(name = "id", required = true) String id) { SysUser sysUser = sysUserService.getById(id); if (sysUser == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(sysUser); } @@ -258,7 +258,7 @@ public class SysUserController { List list = new ArrayList(); List userRole = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, userid)); if (userRole == null || userRole.size() <= 0) { - return Result.error500("未找到用户相关角色信息"); + return Result.error("未找到用户相关角色信息"); } else { for (SysUserRole sysUserRole : userRole) { list.add(sysUserRole.getRoleId()); @@ -636,7 +636,7 @@ public class SysUserController { return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除失败！"); + return Result.error("删除失败！"); } } @@ -657,7 +657,7 @@ public class SysUserController { return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除失败！"); + return Result.error("删除失败！"); } } @@ -766,7 +766,7 @@ public class SysUserController { return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除失败！"); + return Result.error("删除失败！"); } } @@ -790,7 +790,7 @@ public class SysUserController { return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除失败！"); + return Result.error("删除失败！"); } } @@ -810,7 +810,7 @@ public class SysUserController { return Result.OK(map); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("查询失败！"); + return Result.error("查询失败！"); } } @@ -889,7 +889,7 @@ public class SysUserController { sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test result.setMessage("注册成功"); } catch (Exception e) { - result.error500("注册失败"); + return Result.error("注册失败"); } return result; } @@ -1117,13 +1117,12 @@ public class SysUserController { Date birthday=jsonObject.getDate("birthday"); SysUser userPhone = sysUserService.getUserByPhone(phone); if(sysUser==null) { - result.error500("未找到对应用户!"); + return Result.error("未找到对应用户!"); }else { if(userPhone!=null){ String userPhonename = userPhone.getUsername(); if(!userPhonename.equals(username)){ - result.error500("手机号已存在!"); - return result; + return Result.error("手机号已存在!"); } } if(StringUtils.isNotBlank(realname)){ @@ -1149,7 +1148,7 @@ public class SysUserController { } } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败!"); + return Result.error("操作失败!"); } return result; } @@ -1165,14 +1164,14 @@ public class SysUserController { String username = JwtUtil.getUserNameByToken(request); SysUser sysUser = sysUserService.getUserByName(username); if(sysUser==null) { - result.error500("未找到对应用户!"); + return Result.error("未找到对应用户!"); }else { sysUser.setClientId(clientId); sysUserService.updateById(sysUser); } } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败!"); + return Result.error("操作失败!"); } return result; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java index 3c6e36ff..e391fe39 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java @@ -75,7 +75,7 @@ public class LoginServiceImpl implements ILoginService { String rsaPrivateKey = redisUtil.get(rsaPublicKey) != null ? String.valueOf(redisUtil.get(rsaPublicKey)) : null; if(StrUtil.isEmpty(rsaPrivateKey)){ - return result.error500("页面过期，请刷新页面"); + return Result.error("页面过期，请刷新页面"); } //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题 @@ -85,16 +85,14 @@ public class LoginServiceImpl implements ILoginService { //update-begin-author:taoyan date:20190828 for:校验验证码 String captcha = sysLoginModel.getCaptcha(); if(captcha==null){ - result.error500("验证码无效"); - return result; + return Result.error("验证码无效"); } String lowerCaseCaptcha = captcha.toLowerCase(); String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), "utf-8"); Object checkCode = redisUtil.get(realKey); //当进入登录页时，有一定几率出现验证码错误 #1714 if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) { - result.error500("验证码错误"); - return result; + return Result.error("验证码错误"); } try { //解密获取密码和用户名 @@ -120,8 +118,7 @@ public class LoginServiceImpl implements ILoginService { retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username); } if (retryCount >= RETRY_LOGIN_MAX_COUNT){ - result.error500("密码错误次数过多，请稍后重试"); - return result; + return Result.error("密码错误次数过多，请稍后重试"); } //2. 校验用户名或密码是否正确 String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); @@ -135,8 +132,7 @@ public class LoginServiceImpl implements ILoginService { redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); } String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试":"用户名或密码错误，剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount); - result.error500(msg); - return result; + return Result.error(msg); } //登录成功，清除错误登录次数 redisUtil.del(RETRY_LOGIN_PREFIX + username); @@ -273,9 +269,8 @@ public class LoginServiceImpl implements ILoginService { if (CommonConstant.SMS_TPL_TYPE_1.equals(smsmode)) { SysUser sysUser = sysUserService.getUserByPhone(mobile); if(sysUser!=null) { - result.error500(" 手机号已经注册，请直接登录！"); baseCommonService.addLog("手机号已经注册，请直接登录！", CommonConstant.LOG_TYPE_1, null); - return result; + return Result.error(" 手机号已经注册，请直接登录！"); } b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.REGISTER_TEMPLATE_CODE); }else { @@ -285,7 +280,7 @@ public class LoginServiceImpl implements ILoginService { if(!result.isSuccess()) { String message = result.getMessage(); if("该用户不存在，请注册".equals(message)){ - result.error500("该用户不存在或未绑定手机号"); + return Result.error("该用户不存在或未绑定手机号"); } return result; } @@ -316,8 +311,7 @@ public class LoginServiceImpl implements ILoginService { } catch (ClientException e) { e.printStackTrace(); - result.error500(" 短信接口未配置，请联系管理员！"); - return result; + return Result.error(" 短信接口未配置，请联系管理员！"); } return result; } @@ -370,7 +364,7 @@ public class LoginServiceImpl implements ILoginService { res.setSuccess(true); res.setResult(base64); } catch (Exception e) { - res.error500("获取验证码出错"+e.getMessage()); + res.error("获取验证码出错"+e.getMessage()); e.printStackTrace(); } return res; @@ -393,8 +387,7 @@ public class LoginServiceImpl implements ILoginService { String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); String syspassword = sysUser.getPassword(); if (!syspassword.equals(userpassword)) { - result.error500("用户名或密码错误"); - return result; + return Result.error("用户名或密码错误"); } String orgCode = sysUser.getOrgCode(); @@ -402,8 +395,7 @@ public class LoginServiceImpl implements ILoginService { //如果当前用户无选择部门 查看部门关联信息 List departs = sysDepartService.queryUserDeparts(sysUser.getId()); if (departs == null || departs.size() == 0) { - result.error500("用户暂未归属部门,不可登录!"); - return result; + return Result.error("用户暂未归属部门,不可登录!"); } orgCode = departs.get(0).getOrgCode(); sysUser.setOrgCode(orgCode); @@ -494,8 +486,7 @@ public class LoginServiceImpl implements ILoginService { // 该方法仅查询有效的租户，如果返回0个就说明所有的租户均无效。 List tenantList = sysTenantService.queryEffectiveTenant(tenantIdList); if (tenantList.size() == 0) { - result.error500("与该用户关联的租户均已被冻结，无法登录！"); - return result; + return Result.error("与该用户关联的租户均已被冻结，无法登录！"); } else { obj.put("tenantList", tenantList); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index ded17dc2..edeccd1f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -329,23 +329,20 @@ public class SysUserServiceImpl extends ServiceImpl impl Result result = new Result(); //情况1：根据用户信息查询，该用户不存在 if (sysUser == null) { - result.error500("该用户不存在，请注册"); baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null); - return result; + return Result.error("该用户不存在，请注册"); } //情况2：根据用户信息查询，该用户已注销 //update-begin---author:王帅 Date:20200601 for：if条件永远为falsebug------------ if (CommonConstant.DEL_FLAG_1.equals(sysUser.getDelFlag())) { //update-end---author:王帅 Date:20200601 for：if条件永远为falsebug------------ baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已注销！", CommonConstant.LOG_TYPE_1, null); - result.error500("该用户已注销"); - return result; + return Result.error("该用户已注销"); } //情况3：根据用户信息查询，该用户已冻结 if (CommonConstant.USER_FREEZE.equals(sysUser.getStatus())) { baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已冻结！", CommonConstant.LOG_TYPE_1, null); - result.error500("该用户已冻结"); - return result; + return Result.error("该用户已冻结"); } return result; } diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index d36f3cfb..76d34c3a 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -39,7 +39,7 @@ const err = (error) => { break; } // update-end- --- author:liusq ------ date:20200910 ---- for:处理Blob情况---- - if(token && data.message.includes("Token失效")){ + if(token && data.includes("Token失效")){ // update-begin- --- author:scott ------ date:20190225 ---- for:Token失效采用弹框模式，不直接跳转---- if (/wxwork|dingtalk/i.test(navigator.userAgent)) { Vue.prototype.$Jmessage.loading('登录已过期，正在重新登陆', 0) @@ -50,18 +50,7 @@ const err = (error) => { okText: '重新登录', mask: false, onOk: () => { - store.dispatch('Logout').then(() => { - Vue.ls.remove(ACCESS_TOKEN) - try { - let path = window.document.location.pathname - console.log('location pathname -> ' + path) - if (path != '/' && path.indexOf('/user/login') == -1) { - window.location.reload() - } - } catch (e) { - window.location.reload() - } - }) + store.dispatch('Logout') } }) } From 4dcbaf5b578fdfbcae74bb1ee221146064ee7e5a Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 23:13:28 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=B8=82=E5=9C=BA=E5=92=8C=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/JeroBootExceptionHandler.java | 4 ++-- .../com/jero/common/system/util/JwtUtil.java | 5 +++-- .../controller/OnlCgformApiController.java | 14 ++++++-------- .../cas/controller/CasClientController.java | 2 +- .../ngalain/controller/NgAlainController.java | 3 +-- .../system/controller/SysDataLogController.java | 2 +- .../system/service/impl/LoginServiceImpl.java | 8 ++++---- jero-web/src/permission.js | 9 +-------- jero-web/src/store/modules/user.js | 16 ++++++++++------ 9 files changed, 29 insertions(+), 34 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java index f8ac4228..46bc525b 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java @@ -1,6 +1,6 @@ package com.jero.common.exception; -import io.lettuce.core.RedisConnectionException; +import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.UnauthorizedException; import com.jero.common.api.vo.Result; @@ -29,7 +29,7 @@ public class JeroBootExceptionHandler { * 处理自定义异常 */ @ExceptionHandler(JeroBootException.class) - public Result handleRRException(JeroBootException e){ + public Result handleJeroBootException(JeroBootException e){ log.error(e.getMessage(), e); return Result.error(e.getMessage()); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java index fe375ad2..d8012a79 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java @@ -28,8 +28,9 @@ import com.jero.common.util.oConvertUtils; **/ public class JwtUtil { - // Token过期时间30分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准） - public static final long EXPIRE_TIME = 60 * 60 * 1000; + // Token过期时间180分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准） + public static final long EXPIRE_TIME = 180 * 60 * 1000; +// public static final long EXPIRE_TIME = 2000; /** * 校验token是否正确 diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java index 3cd30682..85ccffbd 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java @@ -143,8 +143,7 @@ public class OnlCgformApiController { Result var2 = new Result(); OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); if (var3 == null) { - var2.error500("实体不存在"); - return var2; + return Result.error("实体不存在"); } else { OnlComplexModel var4 = this.onlineService.queryOnlineConfig(var3); var4.setIsDesForm(var3.getIsDesForm()); @@ -167,8 +166,7 @@ public class OnlCgformApiController { Result var3 = new Result(); OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); if (var4 == null) { - var3.error500("实体不存在"); - return var3; + return Result.error("实体不存在"); } else { try { String var5 = var4.getTableName(); @@ -178,7 +176,7 @@ public class OnlCgformApiController { var3.setResult(var7); } catch (Exception var8) { log.error(var8.getMessage(), var8); - var3.error500("数据库查询失败，" + var8.getMessage()); + return Result.error("数据库查询失败，" + var8.getMessage()); } var3.setOnlTable(var4.getTableName()); @@ -1100,7 +1098,7 @@ public class OnlCgformApiController { Result var3 = new Result(); OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); if (var4 == null) { - var3.error500("实体不存在"); + var3.error("实体不存在"); return var3; } else { try { @@ -1127,7 +1125,7 @@ public class OnlCgformApiController { var3.setResult(var11); } catch (Exception var12) { log.error(var12.getMessage(), var12); - var3.error500("数据库查询失败" + var12.getMessage()); + var3.error("数据库查询失败" + var12.getMessage()); } var3.setOnlTable(var4.getTableName()); @@ -1183,7 +1181,7 @@ public class OnlCgformApiController { Result var2 = new Result(); OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); if (var3 == null) { - var2.error500("实体不存在"); + var2.error("实体不存在"); return var2; } else { HashMap var4 = new HashMap(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java index 3a13662a..503f70fa 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java @@ -85,7 +85,7 @@ public class CasClientController { String token = JwtUtil.sign(sysUser.getUsername(), sysUser.getPassword()); // 设置超时时间 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000); //获取用户部门信息 JSONObject obj = new JSONObject(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java index 69b77313..2583e907 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java @@ -63,8 +63,7 @@ public class NgAlainController { result.setResult(ls); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } List dictlist=new ArrayList<>(); for (DictModel l : ls) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java index b0f14c12..5201f802 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java @@ -83,7 +83,7 @@ public class SysDataLogController { queryWrapper.eq("data_id", dataId); List list = service.list(queryWrapper); if(list==null||list.size()<=0) { - result.error500("未找到版本信息"); + return Result.error("未找到版本信息"); }else { result.setResult(list); result.setSuccess(true); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java index e391fe39..aa7393bb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java @@ -118,7 +118,7 @@ public class LoginServiceImpl implements ILoginService { retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username); } if (retryCount >= RETRY_LOGIN_MAX_COUNT){ - return Result.error("密码错误次数过多，请稍后重试"); + return Result.error("密码错误次数过多，请15分钟后重试"); } //2. 校验用户名或密码是否正确 String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); @@ -127,7 +127,7 @@ public class LoginServiceImpl implements ILoginService { // 重试登录次数加一 retryCount++; if( retryCount == 1){ - redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,60 * 30); + redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,60 * 15); }else { redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); } @@ -409,7 +409,7 @@ public class LoginServiceImpl implements ILoginService { String token = JwtUtil.sign(username, syspassword); // 设置超时时间 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000); //token 信息 obj.put("token", token); @@ -496,7 +496,7 @@ public class LoginServiceImpl implements ILoginService { String token = JwtUtil.sign(username, syspassword); // 设置token缓存有效时间 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000); obj.put("token", token); obj.put("userInfo", sysUser); diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index c1fd2fa9..97e8d2c5 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -14,7 +14,6 @@ whiteList.push(OAUTH2_LOGIN_PAGE_PATH) router.beforeEach((to, from, next) => { NProgress.start() // start progress bar - if (Vue.ls.get(ACCESS_TOKEN)) { /* has token */ if (to.path === '/user/login' || to.path === OAUTH2_LOGIN_PAGE_PATH) { @@ -66,13 +65,7 @@ router.beforeEach((to, from, next) => { }) }) .catch(() => { - /* notification.error({ - message: '系统提示', - description: '请求用户信息失败，请重试！' - })*/ - store.dispatch('Logout').then(() => { - next({ path: '/user/login', query: { redirect: to.fullPath } }) - }) + return Promise.reject() }) } else { next() diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 187fa3c8..882a431e 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -1,6 +1,7 @@ import Vue from 'vue' import { login, logout, phoneLogin, thirdLogin } from "@/api/login" import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES } from "@/store/mutation-types" +import store from '@/store' import { welcome } from "@/utils/util" import { queryPermissionsByUser } from '@/api/api' import { getAction } from '@/api/manage' @@ -140,9 +141,14 @@ const user = { //update--end--autor:qinfeng-----date:20200109------for： 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------ commit('SET_PERMISSIONLIST', menuData) } else { - notification.error({ - message: '系统提示', - description: '该用户无权限,请联系管理员！' + Vue.prototype.$Jmodal.error({ + title: '无权限', + content: '该用户无权限,请联系管理员！', + okText: '确认', + mask: false, + onOk: () => { + store.dispatch('Logout') + } }) reject('getPermissionList: permissions must be a non-null array !') } @@ -173,9 +179,7 @@ const user = { window.location.href = process.env.VUE_APP_CAS_BASE_URL + '/logout?service=' + serviceUrl } resolve() - setTimeout (() => { - location.reload(); - }, 1000) + window.location.replace("/user/login") }).catch(() => { resolve() }) From 51c33d21182817d0497615b813900a4b4889ee5f Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 23:18:59 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E5=A4=84=E7=90=86redis=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/util/TokenUtils.java | 2 +- .../src/main/java/com/jero/config/shiro/ShiroRealm.java | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/TokenUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/TokenUtils.java index 810f8e95..277c37ab 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/TokenUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/TokenUtils.java @@ -81,7 +81,7 @@ public class TokenUtils { String newAuthorization = JwtUtil.sign(userName, passWord); // 设置Toekn缓存有效时间 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, newAuthorization); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000); } //update-begin--Author:scott Date:20191005 for：解决每次请求，都重写redis中 token缓存问题 // else { diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java index 5e2f6522..ce003abc 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java @@ -162,16 +162,9 @@ public class ShiroRealm extends AuthorizingRealm { String newAuthorization = JwtUtil.sign(userName, passWord); // 设置超时时间 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, newAuthorization); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME *2 / 1000); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000); log.debug("——————————用户在线操作，更新token保证不掉线—————————jwtTokenRefresh——————— "+ token); } - //update-begin--Author:scott Date:20191005 for：解决每次请求，都重写redis中 token缓存问题 -// else { -// // 设置超时时间 -// redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, cacheToken); -// redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000); -// } - //update-end--Author:scott Date:20191005 for：解决每次请求，都重写redis中 token缓存问题 return true; } return false; From ea0b60319eeedaccb039f7d55ee2c80e38930cf8 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 23:19:14 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DJVXEDemo=E7=9A=84=E5=BC=95=E5=85=A5Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/demo/JVXETableDemo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/demo/JVXETableDemo.vue b/jero-web/src/views/demo/JVXETableDemo.vue index 877704da..9f485616 100644 --- a/jero-web/src/views/demo/JVXETableDemo.vue +++ b/jero-web/src/views/demo/JVXETableDemo.vue @@ -25,7 +25,7 @@ export default { name: 'JVXETableDemo', - components: {JVxeDemo2, JVxeDemo1}, + components: {JVxeDemo2, JVxeDemo1, JVxeDemo3}, data() { return {} }, From 01ef29c5d7fb681b2ce49fa3fddf62e92e80a95a Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 23:40:39 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA10s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index 76d34c3a..af22d562 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -17,7 +17,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/jero-boot"; const service = axios.create({ //baseURL: '/jero-boot', baseURL: apiBaseUrl, // api base_url - timeout: 9000 // 请求超时时间 + timeout: 10000 // 请求超时时间 }) const err = (error) => { From 24dfbecca8a96e13743119134f233c9f05382b55 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 23:51:54 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E3=80=90=E8=BF=81=E7=A7=BB=E3=80=91?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BB=A3=E7=A0=81=E8=B5=84=E6=BA=90=E5=88=B0?= =?UTF-8?q?system=E6=A8=A1=E5=9D=97=E5=9C=B0=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/code-template-online/common/blob.ftl | 62 +- .../common/init/initValue.ftl | 0 .../common/init/initValueSub.ftl | 0 .../code-template-online/common/utils.ftl | 0 .../common/validatorRulesTemplate/core.ftl | 0 .../common/validatorRulesTemplate/main.ftl | 0 .../common/validatorRulesTemplate/sub.ftl | 0 .../controller/${entityName}Controller.javai | 358 ++++---- .../entity/${entityName}.javai | 178 ++-- .../mapper/${entityName}Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 24 +- .../service/I${entityName}Service.javai | 121 +-- .../impl/${entityName}ServiceImpl.javai | 178 ++-- .../vue/${entityName}List.vuei | 850 +++++++++--------- .../vue/modules/${entityName}Form.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../${entityName}Modal__Style#Drawer.vuei | 0 .../controller/${entityName}Controller.javai | 560 ++++++------ .../entity/${entityName}.javai | 146 +-- .../${entityPackage}/entity/[1-n]Entity.javai | 142 +-- .../mapper/${entityName}Mapper.javai | 0 .../${entityPackage}/mapper/[1-n]Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 24 +- .../mapper/xml/[1-n]Mapper.xml | 66 +- .../service/I${entityName}Service.javai | 0 .../service/[1-n]Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../service/impl/[1-n]ServiceImpl.javai | 0 .../vo/${entityName}Page.javai | 0 .../vue/${entityName}List.vuei | 792 ++++++++-------- .../vue/modules/${entityName}Form.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../vue/modules/[1-n]Form.vuei | 0 .../controller/${entityName}Controller.javai | 0 .../entity/${entityName}.javai | 0 .../mapper/${entityName}Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 0 .../service/I${entityName}Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../vue/${entityName}List.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../controller/${entityName}Controller.javai | 0 .../entity/${entityName}.javai | 0 .../${entityPackage}/entity/[1-n]Entity.javai | 0 .../mapper/${entityName}Mapper.javai | 0 .../${entityPackage}/mapper/[1-n]Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 0 .../mapper/xml/[1-n]Mapper.xml | 0 .../service/I${entityName}Service.javai | 0 .../service/[1-n]Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../service/impl/[1-n]ServiceImpl.javai | 0 .../vue/${entityName}List.vuei | 0 .../${entityPackage}/vue/[1-n]List.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../vue/modules/[1-n]Modal.vuei | 0 .../controller/${entityName}Controller.javai | 0 .../entity/${entityName}.javai | 0 .../${entityPackage}/entity/[1-n]Entity.javai | 0 .../mapper/${entityName}Mapper.javai | 0 .../${entityPackage}/mapper/[1-n]Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 0 .../mapper/xml/[1-n]Mapper.xml | 0 .../service/I${entityName}Service.javai | 0 .../service/[1-n]Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../service/impl/[1-n]ServiceImpl.javai | 0 .../vo/${entityName}Page.javai | 0 .../vue/${entityName}List.vuei | 0 .../vue/modules/${entityName}Form.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../vue/modules/[1-n]Form.vuei | 0 .../vue/subTables/[1-n]SubTable.vuei | 0 .../controller/${entityName}Controller.javai | 0 .../entity/${entityName}.javai | 0 .../${entityPackage}/entity/[1-n]Entity.javai | 0 .../mapper/${entityName}Mapper.javai | 0 .../${entityPackage}/mapper/[1-n]Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 0 .../mapper/xml/[1-n]Mapper.xml | 0 .../service/I${entityName}Service.javai | 0 .../service/[1-n]Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../service/impl/[1-n]ServiceImpl.javai | 0 .../vo/${entityName}Page.javai | 0 .../vue/${entityName}List.vuei | 0 .../vue/modules/${entityName}Form.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../vue/modules/[1-n]Form.vuei | 0 .../controller/${entityName}Controller.javai | 0 .../entity/${entityName}.javai | 0 .../${entityPackage}/entity/[1-n]Entity.javai | 0 .../mapper/${entityName}Mapper.javai | 0 .../${entityPackage}/mapper/[1-n]Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 0 .../mapper/xml/[1-n]Mapper.xml | 0 .../service/I${entityName}Service.javai | 0 .../service/[1-n]Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../service/impl/[1-n]ServiceImpl.javai | 0 .../vo/${entityName}Page.javai | 0 .../vue/${entityName}List.vuei | 0 .../vue/modules/${entityName}Form.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../vue/modules/[1-n]Form.vuei | 0 .../controller/${entityName}Controller.javai | 360 ++++---- .../entity/${entityName}.javai | 0 .../mapper/${entityName}Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 0 .../service/I${entityName}Service.javai | 121 ++- .../impl/${entityName}ServiceImpl.javai | 164 ++-- .../vue/${entityName}List.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../${entityName}Modal__Style#Drawer.vuei | 0 .../${entityName}Controller.javai | 0 .../${entityPackage}/${entityName}.javai | 0 .../${entityName}Mapper.javai | 0 .../xml/${entityName}Mapper.xml | 0 .../I${entityName}Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../${entityPackage}/${entityName}List.vuei | 0 .../modules/${entityName}Modal.vuei | 0 .../${entityName}Modal__Style#Drawer.vuei | 0 .../controller/${entityName}Controller.javai | 0 .../entity/${entityName}.javai | 0 .../${entityPackage}/entity/[1-n]Entity.javai | 0 .../mapper/${entityName}Mapper.javai | 0 .../${entityPackage}/mapper/[1-n]Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 0 .../mapper/xml/[1-n]Mapper.xml | 0 .../service/I${entityName}Service.javai | 0 .../service/[1-n]Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../service/impl/[1-n]ServiceImpl.javai | 0 .../vo/${entityName}Page.javai | 0 .../vue/${entityName}List.vuei | 0 .../vue/modules/${entityName}Form.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../controller/${entityName}Controller.javai | 0 .../entity/${entityName}.javai | 0 .../${entityPackage}/entity/[1-n]Entity.javai | 0 .../mapper/${entityName}Mapper.javai | 0 .../${entityPackage}/mapper/[1-n]Mapper.javai | 0 .../mapper/xml/${entityName}Mapper.xml | 0 .../mapper/xml/[1-n]Mapper.xml | 0 .../service/I${entityName}Service.javai | 0 .../service/[1-n]Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../service/impl/[1-n]ServiceImpl.javai | 0 .../vo/${entityName}Page.javai | 0 .../vue/${entityName}List.vuei | 0 .../${entityPackage}/vue/[1-n]List.vuei | 0 .../vue/modules/${entityName}Modal.vuei | 0 .../vue/modules/[1-n]Modal.vuei | 0 .../resources/jero/jero_config.properties | 0 .../resources/jero/jero_database.properties | 0 .../src/main/resources/static/demo1.html | 0 .../src/main/resources/static/generic/LICENSE | 0 .../resources/static/generic/build/pdf.js | 0 .../static/generic/build/pdf.worker.js | 0 .../static/generic/web/cmaps/78-EUC-H.bcmap | Bin .../static/generic/web/cmaps/78-EUC-V.bcmap | Bin .../static/generic/web/cmaps/78-H.bcmap | Bin .../static/generic/web/cmaps/78-RKSJ-H.bcmap | Bin .../static/generic/web/cmaps/78-RKSJ-V.bcmap | Bin .../static/generic/web/cmaps/78-V.bcmap | Bin .../generic/web/cmaps/78ms-RKSJ-H.bcmap | Bin .../generic/web/cmaps/78ms-RKSJ-V.bcmap | Bin .../generic/web/cmaps/83pv-RKSJ-H.bcmap | Bin .../generic/web/cmaps/90ms-RKSJ-H.bcmap | Bin .../generic/web/cmaps/90ms-RKSJ-V.bcmap | Bin .../generic/web/cmaps/90msp-RKSJ-H.bcmap | Bin .../generic/web/cmaps/90msp-RKSJ-V.bcmap | Bin .../generic/web/cmaps/90pv-RKSJ-H.bcmap | Bin .../generic/web/cmaps/90pv-RKSJ-V.bcmap | Bin .../static/generic/web/cmaps/Add-H.bcmap | Bin .../static/generic/web/cmaps/Add-RKSJ-H.bcmap | Bin .../static/generic/web/cmaps/Add-RKSJ-V.bcmap | Bin .../static/generic/web/cmaps/Add-V.bcmap | Bin .../generic/web/cmaps/Adobe-CNS1-0.bcmap | Bin .../generic/web/cmaps/Adobe-CNS1-1.bcmap | Bin .../generic/web/cmaps/Adobe-CNS1-2.bcmap | Bin .../generic/web/cmaps/Adobe-CNS1-3.bcmap | Bin .../generic/web/cmaps/Adobe-CNS1-4.bcmap | Bin .../generic/web/cmaps/Adobe-CNS1-5.bcmap | Bin .../generic/web/cmaps/Adobe-CNS1-6.bcmap | Bin .../generic/web/cmaps/Adobe-CNS1-UCS2.bcmap | Bin .../generic/web/cmaps/Adobe-GB1-0.bcmap | Bin .../generic/web/cmaps/Adobe-GB1-1.bcmap | Bin .../generic/web/cmaps/Adobe-GB1-2.bcmap | Bin .../generic/web/cmaps/Adobe-GB1-3.bcmap | Bin .../generic/web/cmaps/Adobe-GB1-4.bcmap | Bin .../generic/web/cmaps/Adobe-GB1-5.bcmap | Bin .../generic/web/cmaps/Adobe-GB1-UCS2.bcmap | Bin .../generic/web/cmaps/Adobe-Japan1-0.bcmap | Bin .../generic/web/cmaps/Adobe-Japan1-1.bcmap | Bin .../generic/web/cmaps/Adobe-Japan1-2.bcmap | Bin .../generic/web/cmaps/Adobe-Japan1-3.bcmap | Bin .../generic/web/cmaps/Adobe-Japan1-4.bcmap | Bin .../generic/web/cmaps/Adobe-Japan1-5.bcmap | Bin .../generic/web/cmaps/Adobe-Japan1-6.bcmap | Bin .../generic/web/cmaps/Adobe-Japan1-UCS2.bcmap | Bin .../generic/web/cmaps/Adobe-Korea1-0.bcmap | Bin .../generic/web/cmaps/Adobe-Korea1-1.bcmap | Bin .../generic/web/cmaps/Adobe-Korea1-2.bcmap | Bin .../generic/web/cmaps/Adobe-Korea1-UCS2.bcmap | Bin .../static/generic/web/cmaps/B5-H.bcmap | Bin .../static/generic/web/cmaps/B5-V.bcmap | Bin .../static/generic/web/cmaps/B5pc-H.bcmap | Bin .../static/generic/web/cmaps/B5pc-V.bcmap | Bin .../static/generic/web/cmaps/CNS-EUC-H.bcmap | Bin .../static/generic/web/cmaps/CNS-EUC-V.bcmap | Bin .../static/generic/web/cmaps/CNS1-H.bcmap | Bin .../static/generic/web/cmaps/CNS1-V.bcmap | Bin .../static/generic/web/cmaps/CNS2-H.bcmap | Bin .../static/generic/web/cmaps/CNS2-V.bcmap | 0 .../static/generic/web/cmaps/ETHK-B5-H.bcmap | Bin .../static/generic/web/cmaps/ETHK-B5-V.bcmap | Bin .../static/generic/web/cmaps/ETen-B5-H.bcmap | Bin .../static/generic/web/cmaps/ETen-B5-V.bcmap | Bin .../generic/web/cmaps/ETenms-B5-H.bcmap | 0 .../generic/web/cmaps/ETenms-B5-V.bcmap | Bin .../static/generic/web/cmaps/EUC-H.bcmap | Bin .../static/generic/web/cmaps/EUC-V.bcmap | Bin .../static/generic/web/cmaps/Ext-H.bcmap | Bin .../static/generic/web/cmaps/Ext-RKSJ-H.bcmap | Bin .../static/generic/web/cmaps/Ext-RKSJ-V.bcmap | Bin .../static/generic/web/cmaps/Ext-V.bcmap | Bin .../static/generic/web/cmaps/GB-EUC-H.bcmap | Bin .../static/generic/web/cmaps/GB-EUC-V.bcmap | Bin .../static/generic/web/cmaps/GB-H.bcmap | 0 .../static/generic/web/cmaps/GB-V.bcmap | Bin .../static/generic/web/cmaps/GBK-EUC-H.bcmap | Bin .../static/generic/web/cmaps/GBK-EUC-V.bcmap | Bin .../static/generic/web/cmaps/GBK2K-H.bcmap | Bin .../static/generic/web/cmaps/GBK2K-V.bcmap | Bin .../static/generic/web/cmaps/GBKp-EUC-H.bcmap | Bin .../static/generic/web/cmaps/GBKp-EUC-V.bcmap | Bin .../static/generic/web/cmaps/GBT-EUC-H.bcmap | Bin .../static/generic/web/cmaps/GBT-EUC-V.bcmap | Bin .../static/generic/web/cmaps/GBT-H.bcmap | Bin .../static/generic/web/cmaps/GBT-V.bcmap | Bin .../generic/web/cmaps/GBTpc-EUC-H.bcmap | Bin .../generic/web/cmaps/GBTpc-EUC-V.bcmap | Bin .../static/generic/web/cmaps/GBpc-EUC-H.bcmap | Bin .../static/generic/web/cmaps/GBpc-EUC-V.bcmap | Bin .../static/generic/web/cmaps/H.bcmap | Bin .../static/generic/web/cmaps/HKdla-B5-H.bcmap | Bin .../static/generic/web/cmaps/HKdla-B5-V.bcmap | Bin .../static/generic/web/cmaps/HKdlb-B5-H.bcmap | Bin .../static/generic/web/cmaps/HKdlb-B5-V.bcmap | Bin .../generic/web/cmaps/HKgccs-B5-H.bcmap | Bin .../generic/web/cmaps/HKgccs-B5-V.bcmap | Bin .../generic/web/cmaps/HKm314-B5-H.bcmap | Bin .../generic/web/cmaps/HKm314-B5-V.bcmap | Bin .../generic/web/cmaps/HKm471-B5-H.bcmap | Bin .../generic/web/cmaps/HKm471-B5-V.bcmap | Bin .../static/generic/web/cmaps/HKscs-B5-H.bcmap | Bin .../static/generic/web/cmaps/HKscs-B5-V.bcmap | Bin .../static/generic/web/cmaps/Hankaku.bcmap | Bin .../static/generic/web/cmaps/Hiragana.bcmap | Bin .../static/generic/web/cmaps/KSC-EUC-H.bcmap | Bin .../static/generic/web/cmaps/KSC-EUC-V.bcmap | Bin .../static/generic/web/cmaps/KSC-H.bcmap | Bin .../generic/web/cmaps/KSC-Johab-H.bcmap | Bin .../generic/web/cmaps/KSC-Johab-V.bcmap | Bin .../static/generic/web/cmaps/KSC-V.bcmap | Bin .../generic/web/cmaps/KSCms-UHC-H.bcmap | Bin .../generic/web/cmaps/KSCms-UHC-HW-H.bcmap | Bin .../generic/web/cmaps/KSCms-UHC-HW-V.bcmap | Bin .../generic/web/cmaps/KSCms-UHC-V.bcmap | Bin .../generic/web/cmaps/KSCpc-EUC-H.bcmap | Bin .../generic/web/cmaps/KSCpc-EUC-V.bcmap | Bin .../static/generic/web/cmaps/Katakana.bcmap | Bin .../static/generic/web/cmaps/LICENSE | 0 .../static/generic/web/cmaps/NWP-H.bcmap | Bin .../static/generic/web/cmaps/NWP-V.bcmap | Bin .../static/generic/web/cmaps/RKSJ-H.bcmap | Bin .../static/generic/web/cmaps/RKSJ-V.bcmap | Bin .../static/generic/web/cmaps/Roman.bcmap | Bin .../generic/web/cmaps/UniCNS-UCS2-H.bcmap | Bin .../generic/web/cmaps/UniCNS-UCS2-V.bcmap | Bin .../generic/web/cmaps/UniCNS-UTF16-H.bcmap | Bin .../generic/web/cmaps/UniCNS-UTF16-V.bcmap | Bin .../generic/web/cmaps/UniCNS-UTF32-H.bcmap | Bin .../generic/web/cmaps/UniCNS-UTF32-V.bcmap | Bin .../generic/web/cmaps/UniCNS-UTF8-H.bcmap | Bin .../generic/web/cmaps/UniCNS-UTF8-V.bcmap | Bin .../generic/web/cmaps/UniGB-UCS2-H.bcmap | Bin .../generic/web/cmaps/UniGB-UCS2-V.bcmap | Bin .../generic/web/cmaps/UniGB-UTF16-H.bcmap | Bin .../generic/web/cmaps/UniGB-UTF16-V.bcmap | Bin .../generic/web/cmaps/UniGB-UTF32-H.bcmap | Bin .../generic/web/cmaps/UniGB-UTF32-V.bcmap | Bin .../generic/web/cmaps/UniGB-UTF8-H.bcmap | Bin .../generic/web/cmaps/UniGB-UTF8-V.bcmap | Bin .../generic/web/cmaps/UniJIS-UCS2-H.bcmap | Bin .../generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap | Bin .../generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap | Bin .../generic/web/cmaps/UniJIS-UCS2-V.bcmap | Bin .../generic/web/cmaps/UniJIS-UTF16-H.bcmap | Bin .../generic/web/cmaps/UniJIS-UTF16-V.bcmap | Bin .../generic/web/cmaps/UniJIS-UTF32-H.bcmap | Bin .../generic/web/cmaps/UniJIS-UTF32-V.bcmap | Bin .../generic/web/cmaps/UniJIS-UTF8-H.bcmap | Bin .../generic/web/cmaps/UniJIS-UTF8-V.bcmap | Bin .../web/cmaps/UniJIS2004-UTF16-H.bcmap | Bin .../web/cmaps/UniJIS2004-UTF16-V.bcmap | Bin .../web/cmaps/UniJIS2004-UTF32-H.bcmap | Bin .../web/cmaps/UniJIS2004-UTF32-V.bcmap | Bin .../generic/web/cmaps/UniJIS2004-UTF8-H.bcmap | Bin .../generic/web/cmaps/UniJIS2004-UTF8-V.bcmap | Bin .../web/cmaps/UniJISPro-UCS2-HW-V.bcmap | Bin .../generic/web/cmaps/UniJISPro-UCS2-V.bcmap | Bin .../generic/web/cmaps/UniJISPro-UTF8-V.bcmap | Bin .../web/cmaps/UniJISX0213-UTF32-H.bcmap | Bin .../web/cmaps/UniJISX0213-UTF32-V.bcmap | Bin .../web/cmaps/UniJISX02132004-UTF32-H.bcmap | Bin .../web/cmaps/UniJISX02132004-UTF32-V.bcmap | Bin .../generic/web/cmaps/UniKS-UCS2-H.bcmap | Bin .../generic/web/cmaps/UniKS-UCS2-V.bcmap | Bin .../generic/web/cmaps/UniKS-UTF16-H.bcmap | Bin .../generic/web/cmaps/UniKS-UTF16-V.bcmap | Bin .../generic/web/cmaps/UniKS-UTF32-H.bcmap | Bin .../generic/web/cmaps/UniKS-UTF32-V.bcmap | Bin .../generic/web/cmaps/UniKS-UTF8-H.bcmap | Bin .../generic/web/cmaps/UniKS-UTF8-V.bcmap | Bin .../static/generic/web/cmaps/V.bcmap | Bin .../static/generic/web/cmaps/WP-Symbol.bcmap | Bin .../static/generic/web/compatibility.js | 0 .../web/compressed.tracemonkey-pldi-09.pdf | Bin .../resources/static/generic/web/debugger.js | 0 .../generic/web/images/annotation-check.svg | 0 .../generic/web/images/annotation-comment.svg | 0 .../generic/web/images/annotation-help.svg | 0 .../generic/web/images/annotation-insert.svg | 0 .../generic/web/images/annotation-key.svg | 0 .../web/images/annotation-newparagraph.svg | 0 .../generic/web/images/annotation-noicon.svg | 0 .../generic/web/images/annotation-note.svg | 0 .../web/images/annotation-paragraph.svg | 0 .../web/images/findbarButton-next-rtl.png | Bin .../web/images/findbarButton-next-rtl@2x.png | Bin .../generic/web/images/findbarButton-next.png | Bin .../web/images/findbarButton-next@2x.png | Bin .../web/images/findbarButton-previous-rtl.png | Bin .../images/findbarButton-previous-rtl@2x.png | Bin .../web/images/findbarButton-previous.png | Bin .../web/images/findbarButton-previous@2x.png | Bin .../static/generic/web/images/grab.cur | Bin .../static/generic/web/images/grabbing.cur | Bin .../generic/web/images/loading-icon.gif | Bin .../generic/web/images/loading-small.png | Bin .../generic/web/images/loading-small@2x.png | Bin ...ondaryToolbarButton-documentProperties.png | Bin ...aryToolbarButton-documentProperties@2x.png | Bin .../secondaryToolbarButton-firstPage.png | Bin .../secondaryToolbarButton-firstPage@2x.png | Bin .../secondaryToolbarButton-handTool.png | Bin .../secondaryToolbarButton-handTool@2x.png | Bin .../secondaryToolbarButton-lastPage.png | Bin .../secondaryToolbarButton-lastPage@2x.png | Bin .../secondaryToolbarButton-rotateCcw.png | Bin .../secondaryToolbarButton-rotateCcw@2x.png | Bin .../secondaryToolbarButton-rotateCw.png | Bin .../secondaryToolbarButton-rotateCw@2x.png | Bin .../static/generic/web/images/shadow.png | Bin .../static/generic/web/images/texture.png | Bin .../web/images/toolbarButton-bookmark.png | Bin .../web/images/toolbarButton-bookmark@2x.png | Bin .../web/images/toolbarButton-download.png | Bin .../web/images/toolbarButton-download@2x.png | Bin .../web/images/toolbarButton-menuArrows.png | Bin .../images/toolbarButton-menuArrows@2x.png | Bin .../web/images/toolbarButton-openFile.png | Bin .../web/images/toolbarButton-openFile@2x.png | Bin .../web/images/toolbarButton-pageDown-rtl.png | Bin .../images/toolbarButton-pageDown-rtl@2x.png | Bin .../web/images/toolbarButton-pageDown.png | Bin .../web/images/toolbarButton-pageDown@2x.png | Bin .../web/images/toolbarButton-pageUp-rtl.png | Bin .../images/toolbarButton-pageUp-rtl@2x.png | Bin .../web/images/toolbarButton-pageUp.png | Bin .../web/images/toolbarButton-pageUp@2x.png | Bin .../images/toolbarButton-presentationMode.png | Bin .../toolbarButton-presentationMode@2x.png | Bin .../web/images/toolbarButton-print.png | Bin .../web/images/toolbarButton-print@2x.png | Bin .../web/images/toolbarButton-search.png | Bin .../web/images/toolbarButton-search@2x.png | Bin ...olbarButton-secondaryToolbarToggle-rtl.png | Bin ...arButton-secondaryToolbarToggle-rtl@2x.png | Bin .../toolbarButton-secondaryToolbarToggle.png | Bin ...oolbarButton-secondaryToolbarToggle@2x.png | Bin .../toolbarButton-sidebarToggle-rtl.png | Bin .../toolbarButton-sidebarToggle-rtl@2x.png | Bin .../images/toolbarButton-sidebarToggle.png | Bin .../images/toolbarButton-sidebarToggle@2x.png | Bin .../images/toolbarButton-viewAttachments.png | Bin .../toolbarButton-viewAttachments@2x.png | Bin .../images/toolbarButton-viewOutline-rtl.png | Bin .../toolbarButton-viewOutline-rtl@2x.png | Bin .../web/images/toolbarButton-viewOutline.png | Bin .../images/toolbarButton-viewOutline@2x.png | Bin .../images/toolbarButton-viewThumbnail.png | Bin .../images/toolbarButton-viewThumbnail@2x.png | Bin .../web/images/toolbarButton-zoomIn.png | Bin .../web/images/toolbarButton-zoomIn@2x.png | Bin .../web/images/toolbarButton-zoomOut.png | Bin .../web/images/toolbarButton-zoomOut@2x.png | Bin .../main/resources/static/generic/web/l10n.js | 0 .../generic/web/locale/locale.properties | 0 .../web/locale/zh-CN/viewer.properties | 0 .../resources/static/generic/web/viewer.css | 0 .../resources/static/generic/web/viewer.html | 0 .../resources/static/generic/web/viewer.js | 0 .../main/resources/static/view/userlist.html | 0 .../templates/announcement/showContent.ftl | 0 .../src/main/resources/templates/demo3.ftl | 0 .../resources/templates/pdfPreviewIframe.ftl | 0 .../main/resources/templates/thirdLogin.ftl | 0 421 files changed, 2073 insertions(+), 2073 deletions(-) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/common/blob.ftl (96%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/common/init/initValue.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/common/init/initValueSub.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/common/utils.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/main.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/sub.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany => jero-boot-module-system/src/main/resources/jero/code-template-online/default/one}/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (98%) rename jero-boot/{jero-boot-single-startup/src/main/resources/jero/code-template => jero-boot-module-system/src/main/resources/jero/code-template-online/default}/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (94%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (95%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one => jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany}/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (98%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/subTables/[1-n]SubTable.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (97%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup/src/main/resources/jero/code-template-online/default => jero-boot-module-system/src/main/resources/jero/code-template}/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (94%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (95%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/jero_config.properties (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/jero/jero_database.properties (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/demo1.html (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/LICENSE (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/build/pdf.js (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/build/pdf.worker.js (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/78-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/78-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Add-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Add-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Ext-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Ext-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GB-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GB-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBT-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBT-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Hankaku.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Hiragana.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Katakana.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/LICENSE (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/NWP-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/NWP-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/Roman.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/V.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmap (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/compatibility.js (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/debugger.js (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-check.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-comment.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-help.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-insert.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-key.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-newparagraph.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-noicon.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-note.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/annotation-paragraph.svg (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/findbarButton-next-rtl.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/findbarButton-next.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/findbarButton-next@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/findbarButton-previous.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/findbarButton-previous@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/grab.cur (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/grabbing.cur (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/loading-icon.gif (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/loading-small.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/loading-small@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/shadow.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/texture.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-bookmark.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-download.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-download@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-openFile.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-pageDown.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-pageUp.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-print.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-print@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-search.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-search@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.png (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/l10n.js (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/locale/locale.properties (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/viewer.css (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/viewer.html (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/generic/web/viewer.js (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/static/view/userlist.html (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/templates/announcement/showContent.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/templates/demo3.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/templates/pdfPreviewIframe.ftl (100%) rename jero-boot/{jero-boot-single-startup => jero-boot-module-system}/src/main/resources/templates/thirdLogin.ftl (100%) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/blob.ftl similarity index 96% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/blob.ftl index fd63b325..f6575ac2 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/blob.ftl @@ -1,32 +1,32 @@ -<#if po.fieldDbType=='Blob'> - private transient java.lang.String ${po.fieldName}String; - - private byte[] ${po.fieldName}; - - public byte[] get${po.fieldName?cap_first}(){ - if(${po.fieldName}String==null){ - return null; - } - try { - return ${po.fieldName}String.getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return null; - } - - public String get${po.fieldName?cap_first}String(){ - if(${po.fieldName}==null || ${po.fieldName}.length==0){ - return ""; - } - try { - return new String(${po.fieldName},"UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return ""; - } -<#else> - @ApiModelProperty(value = "${po.filedComment}") - private ${po.fieldType} ${po.fieldName}; +<#if po.fieldDbType=='Blob'> + private transient java.lang.String ${po.fieldName}String; + + private byte[] ${po.fieldName}; + + public byte[] get${po.fieldName?cap_first}(){ + if(${po.fieldName}String==null){ + return null; + } + try { + return ${po.fieldName}String.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return null; + } + + public String get${po.fieldName?cap_first}String(){ + if(${po.fieldName}==null || ${po.fieldName}.length==0){ + return ""; + } + try { + return new String(${po.fieldName},"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return ""; + } +<#else> + @ApiModelProperty(value = "${po.filedComment}") + private ${po.fieldType} ${po.fieldName}; \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/init/initValue.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/init/initValue.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/init/initValue.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/init/initValue.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/init/initValueSub.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/init/initValueSub.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/init/initValueSub.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/init/initValueSub.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/utils.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/utils.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/utils.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/utils.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/main.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/main.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/main.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/main.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/sub.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/sub.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/sub.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/sub.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 7b673aac..d9f14f4d 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -1,179 +1,179 @@ -package ${bussiPackage}.${entityPackage}.controller; - -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import ${bussiPackage}.${entityPackage}.entity.${entityName}; -import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; - -<#assign bpm_flag=false> -<#list originalColumns as po> -<#if po.fieldDbName=='bpm_status'> - <#assign bpm_flag=true> - - - - /** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -@Api(tags="${tableVo.ftlDescription}") -@RestController -@RequestMapping("/${entityPackage}/${entityName?uncap_first}") -@Slf4j -public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> { - @Autowired - private I${entityName}Service ${entityName?uncap_first}Service; - - /** - * 分页列表查询 - * - * @param ${entityName?uncap_first} - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(${entityName} ${entityName?uncap_first}, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); - Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); - IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { - List<${entityName}> list = ${entityName?uncap_first}Service.queryList(); - return Result.OK(list); - } - - /** - * 添加 - * - * @param ${entityName?uncap_first} - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ${entityName} ${entityName?uncap_first}) { - <#if bpm_flag> - ${entityName?uncap_first}.setBpmStatus("1"); - - ${entityName?uncap_first}Service.add(${entityName?uncap_first}); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param ${entityName?uncap_first} - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody ${entityName} ${entityName?uncap_first}) { - ${entityName?uncap_first}Service.editById(${entityName?uncap_first}); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - ${entityName?uncap_first}Service.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.queryById(id); - if(${entityName?uncap_first}==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(${entityName?uncap_first}); - } - - /** - * 导出excel - * - * @param request - * @param ${entityName?uncap_first} - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) { - return super.exportXls(request, ${entityName?uncap_first}, ${entityName}.class, "${tableVo.ftlDescription}"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ${entityName}.class); - } - -} +package ${bussiPackage}.${entityPackage}.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + +<#assign bpm_flag=false> +<#list originalColumns as po> +<#if po.fieldDbName=='bpm_status'> + <#assign bpm_flag=true> + + + + /** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +@Api(tags="${tableVo.ftlDescription}") +@RestController +@RequestMapping("/${entityPackage}/${entityName?uncap_first}") +@Slf4j +public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> { + @Autowired + private I${entityName}Service ${entityName?uncap_first}Service; + + /** + * 分页列表查询 + * + * @param ${entityName?uncap_first} + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") + @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(${entityName} ${entityName?uncap_first}, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); + Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); + IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-列表查询") + @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List<${entityName}> list = ${entityName?uncap_first}Service.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param ${entityName?uncap_first} + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-添加") + @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ${entityName} ${entityName?uncap_first}) { + <#if bpm_flag> + ${entityName?uncap_first}.setBpmStatus("1"); + + ${entityName?uncap_first}Service.add(${entityName?uncap_first}); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param ${entityName?uncap_first} + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-编辑") + @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ${entityName} ${entityName?uncap_first}) { + ${entityName?uncap_first}Service.editById(${entityName?uncap_first}); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") + @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + ${entityName?uncap_first}Service.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-批量删除") + @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") + @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.queryById(id); + if(${entityName?uncap_first}==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(${entityName?uncap_first}); + } + + /** + * 导出excel + * + * @param request + * @param ${entityName?uncap_first} + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) { + return super.exportXls(request, ${entityName?uncap_first}, ${entityName}.class, "${tableVo.ftlDescription}"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ${entityName}.class); + } + +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 8c696b54..c7d9019a 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -1,89 +1,89 @@ -package ${bussiPackage}.${entityPackage}.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - - -/** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -@Data -@TableName("${tableName}") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") -public class ${entityName} implements Serializable { - private static final long serialVersionUID = 1L; - - <#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> - <#list originalColumns as po> - <#-- 生成字典Code --> - <#assign list_field_dictCode=""> - <#if po.classType='sel_user'> - <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'> - <#elseif po.classType='sel_depart'> - <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'> - <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'> - <#if po.dictTable?default("")?trim?length gt 1> - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'> - <#elseif po.dictField?default("")?trim?length gt 1> - <#assign list_field_dictCode=', dicCode = "${po.dictField}"'> - - <#elseif po.classType=='sel_tree'> - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'> - - /**${po.filedComment}*/ - <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ASSIGN_ID) - <#else> - <#if po.fieldDbType =='Date'> - <#if po.classType=='date'> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd") - - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - <#else> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") - - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - - <#else> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode}) - - - <#if list_field_dictCode?length gt 1> - @Dict(${list_field_dictCode?substring(2)}) - - <#-- <#if po.classType!='popup'> - <#if po.dictTable?default("")?trim?length gt 1> - @Dict(dicCode="${po.dictField}",dicText="${po.dictText}",dictTable="${po.dictTable}") - <#elseif po.dictField?default("")?trim?length gt 1> - @Dict(dicCode="${po.dictField}") - - --> - - <#include "/common/blob.ftl"> - -} +package ${bussiPackage}.${entityPackage}.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +@Data +@TableName("${tableName}") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +public class ${entityName} implements Serializable { + private static final long serialVersionUID = 1L; + + <#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> + <#list originalColumns as po> + <#-- 生成字典Code --> + <#assign list_field_dictCode=""> + <#if po.classType='sel_user'> + <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'> + <#elseif po.classType='sel_depart'> + <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'> + <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'> + <#if po.dictTable?default("")?trim?length gt 1> + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'> + <#elseif po.dictField?default("")?trim?length gt 1> + <#assign list_field_dictCode=', dicCode = "${po.dictField}"'> + + <#elseif po.classType=='sel_tree'> + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'> + + /**${po.filedComment}*/ + <#if po.fieldName == primaryKeyField> + @TableId(type = IdType.ASSIGN_ID) + <#else> + <#if po.fieldDbType =='Date'> + <#if po.classType=='date'> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + <#else> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + + <#else> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode}) + + + <#if list_field_dictCode?length gt 1> + @Dict(${list_field_dictCode?substring(2)}) + + <#-- <#if po.classType!='popup'> + <#if po.dictTable?default("")?trim?length gt 1> + @Dict(dicCode="${po.dictField}",dicText="${po.dictText}",dictTable="${po.dictTable}") + <#elseif po.dictField?default("")?trim?length gt 1> + @Dict(dicCode="${po.dictField}") + + --> + + <#include "/common/blob.ftl"> + +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 98% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml index 789d612b..4abb0fee 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml @@ -1,13 +1,13 @@ - - - - - <#list originalColumns as field> - <#if field.fieldDbName=="id"> - - <#else> - - - - + + + + + <#list originalColumns as field> + <#if field.fieldDbName=="id"> + + <#else> + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 94% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai index 60c7f013..51a1a7fb 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai @@ -1,60 +1,61 @@ -package ${bussiPackage}.${entityPackage}.service; - -import ${bussiPackage}.${entityPackage}.entity.${entityName}; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -public interface I${entityName}Service extends IService<${entityName}> { - /** - * 保存 - * - * @param ${entityName?uncap_first} - * @return - */ - void add(${entityName} ${entityName?uncap_first}); - - /** - * 更新 - * - * @param ${entityName?uncap_first} - * @return - */ - void editById(${entityName} ${entityName?uncap_first}); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ${entityName} queryById(String id); - - /** - * 列表查询 - * - * @return - */ - List<${entityName}> queryList(); -} +package ${bussiPackage}.${entityPackage}.service; + +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +public interface I${entityName}Service extends IService<${entityName}> { + + /** + * 保存 + * + * @param ${entityName?uncap_first} + * @return + */ + void add(${entityName} ${entityName?uncap_first}); + + /** + * 更新 + * + * @param ${entityName?uncap_first} + * @return + */ + void editById(${entityName} ${entityName?uncap_first}); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ${entityName} queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List<${entityName}> queryList(); +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 95% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index 1ac68bae..814d7206 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -1,89 +1,89 @@ -package ${bussiPackage}.${entityPackage}.service.impl; - -import ${bussiPackage}.${entityPackage}.entity.${entityName}; -import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper; -import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; -import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -@Service -public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service { - - /** - * 保存 - * - * @param ${entityName?uncap_first} - * @return - */ - @Override - public void add(${entityName} ${entityName?uncap_first}) { - Date now = new Date(); - ${entityName?uncap_first}.setCreateTime(now); - ${entityName?uncap_first}.setUpdateTime(now); - save(${entityName?uncap_first}); - } - - /** - * 更新 - * - * @param ${entityName?uncap_first} - * @return - */ - @Override - public void editById(${entityName} ${entityName?uncap_first}) { - Date now = new Date(); - ${entityName?uncap_first}.setUpdateTime(now); - saveOrUpdate(${entityName?uncap_first}); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ${entityName} queryById(String id) { - return getById(id); - } - - /** - * 列表查询 - * - * @return - */ - @Override - public List<${entityName}> queryList() { - return list(); - } -} +package ${bussiPackage}.${entityPackage}.service.impl; + +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper; +import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +@Service +public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service { + + /** + * 保存 + * + * @param ${entityName?uncap_first} + * @return + */ + @Override + public void add(${entityName} ${entityName?uncap_first}) { + Date now = new Date(); + ${entityName?uncap_first}.setCreateTime(now); + ${entityName?uncap_first}.setUpdateTime(now); + save(${entityName?uncap_first}); + } + + /** + * 更新 + * + * @param ${entityName?uncap_first} + * @return + */ + @Override + public void editById(${entityName} ${entityName?uncap_first}) { + Date now = new Date(); + ${entityName?uncap_first}.setUpdateTime(now); + saveOrUpdate(${entityName?uncap_first}); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ${entityName} queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List<${entityName}> queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei index def62007..b2dc3c79 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei @@ -1,426 +1,426 @@ - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index c6c41e9a..d8886b6c 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -1,280 +1,280 @@ -package ${bussiPackage}.${entityPackage}.controller; - -import java.io.UnsupportedEncodingException; -import java.io.IOException; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import com.jero.common.system.vo.LoginUser; -import org.apache.shiro.SecurityUtils; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.util.oConvertUtils; -<#list subTables as sub> -import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; - -import ${bussiPackage}.${entityPackage}.entity.${entityName}; -import ${bussiPackage}.${entityPackage}.vo.${entityName}Page; -import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; -<#list subTables as sub> -import ${bussiPackage}.${entityPackage}.service.I${sub.entityName}Service; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -<#assign bpm_flag=false> -<#list originalColumns as po> -<#if po.fieldDbName=='bpm_status'> - <#assign bpm_flag=true> - - - - /** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -@Api(tags="${tableVo.ftlDescription}") -@RestController -@RequestMapping("/${entityPackage}/${entityName?uncap_first}") -@Slf4j -public class ${entityName}Controller { - @Autowired - private I${entityName}Service ${entityName?uncap_first}Service; - <#list subTables as sub> - @Autowired - private I${sub.entityName}Service ${sub.entityName?uncap_first}Service; - - - /** - * 分页列表查询 - * - * @param ${entityName?uncap_first} - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(${entityName} ${entityName?uncap_first}, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); - Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); - IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param ${entityName?uncap_first}Page - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { - ${entityName} ${entityName?uncap_first} = new ${entityName}(); - BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); - <#if bpm_flag> - ${entityName?uncap_first}.setBpmStatus("1"); - - ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param ${entityName?uncap_first}Page - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { - ${entityName} ${entityName?uncap_first} = new ${entityName}(); - BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); - ${entityName} ${entityName?uncap_first}Entity = ${entityName?uncap_first}Service.getById(${entityName?uncap_first}.getId()); - if(${entityName?uncap_first}Entity==null) { - return Result.error("未找到对应数据"); - } - ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - ${entityName?uncap_first}Service.delMain(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功！"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); - if(${entityName?uncap_first}==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(${entityName?uncap_first}); - - } - - <#list subTables as sub> - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "${sub.ftlDescription}通过主表ID查询") - @ApiOperation(value="${sub.ftlDescription}主表ID查询", notes="${sub.ftlDescription}-通主表ID查询") - @GetMapping(value = "/query${sub.entityName}ByMainId") - public Result query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { - List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); - return Result.OK(${sub.entityName?uncap_first}List); - } - - - /** - * 导出excel - * - * @param request - * @param ${entityName?uncap_first} - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) { - // Step.1 组装查询条件查询数据 - QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, request.getParameterMap()); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - //Step.2 获取导出数据 - List<${entityName}> queryList = ${entityName?uncap_first}Service.list(queryWrapper); - // 过滤选中数据 - String selections = request.getParameter("selections"); - List<${entityName}> ${entityName?uncap_first}List = new ArrayList<${entityName}>(); - if(oConvertUtils.isEmpty(selections)) { - ${entityName?uncap_first}List = queryList; - }else { - List selectionList = Arrays.asList(selections.split(",")); - ${entityName?uncap_first}List = queryList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); - } - - // Step.3 组装pageList - List<${entityName}Page> pageList = new ArrayList<${entityName}Page>(); - for (${entityName} main : ${entityName?uncap_first}List) { - ${entityName}Page vo = new ${entityName}Page(); - BeanUtils.copyProperties(main, vo); - <#list subTables as sub> - List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(main.getId()); - vo.set${sub.entityName}List(${sub.entityName?uncap_first}List); - - pageList.add(vo); - } - - // Step.4 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "${tableVo.ftlDescription}列表"); - mv.addObject(NormalExcelConstants.CLASS, ${entityName}Page.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("${tableVo.ftlDescription}数据", "导出人:"+sysUser.getRealname(), "${tableVo.ftlDescription}")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List<${entityName}Page> list = ExcelImportUtil.importExcel(file.getInputStream(), ${entityName}Page.class, params); - for (${entityName}Page page : list) { - ${entityName} po = new ${entityName}(); - BeanUtils.copyProperties(page, po); - ${entityName?uncap_first}Service.saveMain(po, <#list subTables as sub>page.get${sub.entityName}List()<#if sub_has_next>,); - } - return Result.OK("文件导入成功！数据行数:" + list.size()); - } catch (Exception e) { - log.error(e.getMessage(),e); - return Result.error("文件导入失败:"+e.getMessage()); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.OK("文件导入失败！"); - } - -} +package ${bussiPackage}.${entityPackage}.controller; + +import java.io.UnsupportedEncodingException; +import java.io.IOException; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import com.jero.common.system.vo.LoginUser; +import org.apache.shiro.SecurityUtils; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.oConvertUtils; +<#list subTables as sub> +import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; + +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.vo.${entityName}Page; +import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; +<#list subTables as sub> +import ${bussiPackage}.${entityPackage}.service.I${sub.entityName}Service; + +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; +<#assign bpm_flag=false> +<#list originalColumns as po> +<#if po.fieldDbName=='bpm_status'> + <#assign bpm_flag=true> + + + + /** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +@Api(tags="${tableVo.ftlDescription}") +@RestController +@RequestMapping("/${entityPackage}/${entityName?uncap_first}") +@Slf4j +public class ${entityName}Controller { + @Autowired + private I${entityName}Service ${entityName?uncap_first}Service; + <#list subTables as sub> + @Autowired + private I${sub.entityName}Service ${sub.entityName?uncap_first}Service; + + + /** + * 分页列表查询 + * + * @param ${entityName?uncap_first} + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") + @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(${entityName} ${entityName?uncap_first}, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); + Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); + IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param ${entityName?uncap_first}Page + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-添加") + @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { + ${entityName} ${entityName?uncap_first} = new ${entityName}(); + BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); + <#if bpm_flag> + ${entityName?uncap_first}.setBpmStatus("1"); + + ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param ${entityName?uncap_first}Page + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-编辑") + @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { + ${entityName} ${entityName?uncap_first} = new ${entityName}(); + BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); + ${entityName} ${entityName?uncap_first}Entity = ${entityName?uncap_first}Service.getById(${entityName?uncap_first}.getId()); + if(${entityName?uncap_first}Entity==null) { + return Result.error("未找到对应数据"); + } + ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") + @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + ${entityName?uncap_first}Service.delMain(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-批量删除") + @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功！"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") + @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); + if(${entityName?uncap_first}==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(${entityName?uncap_first}); + + } + + <#list subTables as sub> + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "${sub.ftlDescription}通过主表ID查询") + @ApiOperation(value="${sub.ftlDescription}主表ID查询", notes="${sub.ftlDescription}-通主表ID查询") + @GetMapping(value = "/query${sub.entityName}ByMainId") + public Result query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { + List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); + return Result.OK(${sub.entityName?uncap_first}List); + } + + + /** + * 导出excel + * + * @param request + * @param ${entityName?uncap_first} + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) { + // Step.1 组装查询条件查询数据 + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + //Step.2 获取导出数据 + List<${entityName}> queryList = ${entityName?uncap_first}Service.list(queryWrapper); + // 过滤选中数据 + String selections = request.getParameter("selections"); + List<${entityName}> ${entityName?uncap_first}List = new ArrayList<${entityName}>(); + if(oConvertUtils.isEmpty(selections)) { + ${entityName?uncap_first}List = queryList; + }else { + List selectionList = Arrays.asList(selections.split(",")); + ${entityName?uncap_first}List = queryList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + } + + // Step.3 组装pageList + List<${entityName}Page> pageList = new ArrayList<${entityName}Page>(); + for (${entityName} main : ${entityName?uncap_first}List) { + ${entityName}Page vo = new ${entityName}Page(); + BeanUtils.copyProperties(main, vo); + <#list subTables as sub> + List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(main.getId()); + vo.set${sub.entityName}List(${sub.entityName?uncap_first}List); + + pageList.add(vo); + } + + // Step.4 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "${tableVo.ftlDescription}列表"); + mv.addObject(NormalExcelConstants.CLASS, ${entityName}Page.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("${tableVo.ftlDescription}数据", "导出人:"+sysUser.getRealname(), "${tableVo.ftlDescription}")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List<${entityName}Page> list = ExcelImportUtil.importExcel(file.getInputStream(), ${entityName}Page.class, params); + for (${entityName}Page page : list) { + ${entityName} po = new ${entityName}(); + BeanUtils.copyProperties(page, po); + ${entityName?uncap_first}Service.saveMain(po, <#list subTables as sub>page.get${sub.entityName}List()<#if sub_has_next>,); + } + return Result.OK("文件导入成功！数据行数:" + list.size()); + } catch (Exception e) { + log.error(e.getMessage(),e); + return Result.error("文件导入失败:"+e.getMessage()); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.OK("文件导入失败！"); + } + +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index bf15cba8..f400edf1 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -1,73 +1,73 @@ -package ${bussiPackage}.${entityPackage}.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") -@Data -@TableName("${tableName}") -public class ${entityName} implements Serializable { - private static final long serialVersionUID = 1L; - -<#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> - <#list originalColumns as po> - <#-- 生成字典Code --> - <#assign list_field_dictCode=""> - <#if po.classType='sel_user'> - <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'> - <#elseif po.classType='sel_depart'> - <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'> - <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'> - <#if po.dictTable?default("")?trim?length gt 1> - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'> - <#elseif po.dictField?default("")?trim?length gt 1> - <#assign list_field_dictCode=', dicCode = "${po.dictField}"'> - - - /**${po.filedComment}*/ - <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ASSIGN_ID) - <#else> - <#if po.fieldDbType =='Date'> - <#if po.classType=='date'> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode}) - - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - <#else> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode}) - - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - - <#else> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode}) - - - <#if list_field_dictCode?length gt 1> - @Dict(${list_field_dictCode?substring(2)}) - - - <#-- 大字段转换 --> - <#include "/common/blob.ftl"> - -} +package ${bussiPackage}.${entityPackage}.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Data +@TableName("${tableName}") +public class ${entityName} implements Serializable { + private static final long serialVersionUID = 1L; + +<#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> + <#list originalColumns as po> + <#-- 生成字典Code --> + <#assign list_field_dictCode=""> + <#if po.classType='sel_user'> + <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'> + <#elseif po.classType='sel_depart'> + <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'> + <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'> + <#if po.dictTable?default("")?trim?length gt 1> + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'> + <#elseif po.dictField?default("")?trim?length gt 1> + <#assign list_field_dictCode=', dicCode = "${po.dictField}"'> + + + /**${po.filedComment}*/ + <#if po.fieldName == primaryKeyField> + @TableId(type = IdType.ASSIGN_ID) + <#else> + <#if po.fieldDbType =='Date'> + <#if po.classType=='date'> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode}) + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + <#else> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode}) + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + + <#else> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode}) + + + <#if list_field_dictCode?length gt 1> + @Dict(${list_field_dictCode?substring(2)}) + + + <#-- 大字段转换 --> + <#include "/common/blob.ftl"> + +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 96551200..df7667ef 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -1,72 +1,72 @@ -<#list subTables as subTab> -#segment#${subTab.entityName}.java -package ${bussiPackage}.${entityPackage}.entity; - -import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.UnsupportedEncodingException; - -/** - * @Description: ${subTab.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}") -@Data -@TableName("${subTab.tableName}") -public class ${subTab.entityName} implements Serializable { - private static final long serialVersionUID = 1L; - -<#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> - <#list subTab.originalColumns as po> - <#-- 生成字典Code --> - <#assign list_field_dictCode=""> - <#if po.classType='sel_user'> - <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'> - <#elseif po.classType='sel_depart'> - <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'> - <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'> - <#if po.dictTable?default("")?trim?length gt 1> - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'> - <#elseif po.dictField?default("")?trim?length gt 1> - <#assign list_field_dictCode=', dicCode = "${po.dictField}"'> - - - /**${po.filedComment}*/ - <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ASSIGN_ID) - <#else> - <#if po.fieldDbType =='Date'> - <#if po.classType=='date'> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode}) - - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - <#else> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode}) - - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - - <#elseif !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode}) - - - - <#-- 大字段转换 --> - <#include "/common/blob.ftl"> - -} +<#list subTables as subTab> +#segment#${subTab.entityName}.java +package ${bussiPackage}.${entityPackage}.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.UnsupportedEncodingException; + +/** + * @Description: ${subTab.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}") +@Data +@TableName("${subTab.tableName}") +public class ${subTab.entityName} implements Serializable { + private static final long serialVersionUID = 1L; + +<#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> + <#list subTab.originalColumns as po> + <#-- 生成字典Code --> + <#assign list_field_dictCode=""> + <#if po.classType='sel_user'> + <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'> + <#elseif po.classType='sel_depart'> + <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'> + <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'> + <#if po.dictTable?default("")?trim?length gt 1> + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'> + <#elseif po.dictField?default("")?trim?length gt 1> + <#assign list_field_dictCode=', dicCode = "${po.dictField}"'> + + + /**${po.filedComment}*/ + <#if po.fieldName == primaryKeyField> + @TableId(type = IdType.ASSIGN_ID) + <#else> + <#if po.fieldDbType =='Date'> + <#if po.classType=='date'> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode}) + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + <#else> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode}) + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + + <#elseif !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode}) + + + + <#-- 大字段转换 --> + <#include "/common/blob.ftl"> + +} \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 98% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml index 789d612b..4abb0fee 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml @@ -1,13 +1,13 @@ - - - - - <#list originalColumns as field> - <#if field.fieldDbName=="id"> - - <#else> - - - - + + + + + <#list originalColumns as field> + <#if field.fieldDbName=="id"> + + <#else> + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml index 13cc71bd..7f60c546 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml @@ -1,34 +1,34 @@ -<#list subTables as subTab> -<#assign originalForeignKeys = subTab.originalForeignKeys> -#segment#${subTab.entityName}Mapper.xml - - - - - <#list subTab.originalColumns as field> - <#if field.fieldDbName=="id"> - - <#else> - - - - - - DELETE - FROM ${subTab.tableName} - WHERE - <#list originalForeignKeys as key> - ${key} = ${r'#'}{mainId} <#rt/> - - - - - +<#list subTables as subTab> +<#assign originalForeignKeys = subTab.originalForeignKeys> +#segment#${subTab.entityName}Mapper.xml + + + + + <#list subTab.originalColumns as field> + <#if field.fieldDbName=="id"> + + <#else> + + + + + + DELETE + FROM ${subTab.tableName} + WHERE + <#list originalForeignKeys as key> + ${key} = ${r'#'}{mainId} <#rt/> + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei index 39ee4e68..f2b7da11 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei @@ -1,397 +1,397 @@ - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/subTables/[1-n]SubTable.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/subTables/[1-n]SubTable.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/subTables/[1-n]SubTable.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/subTables/[1-n]SubTable.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 97% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 333dca6d..75189cbf 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -1,180 +1,180 @@ -package ${bussiPackage}.${entityPackage}.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.util.oConvertUtils; -import ${bussiPackage}.${entityPackage}.entity.${entityName}; -import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; -import java.util.Date; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - - /** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -@Slf4j -@Api(tags="${tableVo.ftlDescription}") -@RestController -@RequestMapping("/${entityPackage}/${entityName?uncap_first}") -public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> { - @Autowired - private I${entityName}Service ${entityName?uncap_first}Service; - - /** - * 分页列表查询 - * - * @param ${entityName?uncap_first} - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(${entityName} ${entityName?uncap_first}, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); - Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); - IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { - List list = ${entityName?uncap_first}Service.queryList(); - return Result.OK(list); - } - - /** - * 添加 - * - * @param ${entityName?uncap_first} - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { - ${entityName?uncap_first}Service.add(${entityName?uncap_first}); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param ${entityName?uncap_first} - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { - ${entityName?uncap_first}Service.editById(${entityName?uncap_first}); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - ${entityName?uncap_first}Service.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功！"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.queryById(id); - return Result.OK(${entityName?uncap_first}); - } - - /** - * 导出excel - * - * @param request - * @param ${entityName?uncap_first} - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) { - return super.exportXls(request, ${entityName?uncap_first}, ${entityName}.class, "${tableVo.ftlDescription}"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ${entityName}.class); - } - -} +package ${bussiPackage}.${entityPackage}.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.util.oConvertUtils; +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; +import java.util.Date; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +@Slf4j +@Api(tags="${tableVo.ftlDescription}") +@RestController +@RequestMapping("/${entityPackage}/${entityName?uncap_first}") +public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> { + @Autowired + private I${entityName}Service ${entityName?uncap_first}Service; + + /** + * 分页列表查询 + * + * @param ${entityName?uncap_first} + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") + @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(${entityName} ${entityName?uncap_first}, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); + Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); + IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-列表查询") + @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = ${entityName?uncap_first}Service.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param ${entityName?uncap_first} + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-添加") + @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { + ${entityName?uncap_first}Service.add(${entityName?uncap_first}); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param ${entityName?uncap_first} + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-编辑") + @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { + ${entityName?uncap_first}Service.editById(${entityName?uncap_first}); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") + @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + ${entityName?uncap_first}Service.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-批量删除") + @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功！"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") + @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.queryById(id); + return Result.OK(${entityName?uncap_first}); + } + + /** + * 导出excel + * + * @param request + * @param ${entityName?uncap_first} + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) { + return super.exportXls(request, ${entityName?uncap_first}, ${entityName}.class, "${tableVo.ftlDescription}"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ${entityName}.class); + } + +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 94% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai index c059a946..4d5472ec 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai @@ -1,61 +1,60 @@ -package ${bussiPackage}.${entityPackage}.service; - -import ${bussiPackage}.${entityPackage}.entity.${entityName}; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -public interface I${entityName}Service extends IService<${entityName}> { - - /** - * 保存 - * - * @param ${entityName?uncap_first} - * @return - */ - void add(${entityName} ${entityName?uncap_first}); - - /** - * 更新 - * - * @param ${entityName?uncap_first} - * @return - */ - void editById(${entityName} ${entityName?uncap_first}); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ${entityName} queryById(String id); - - /** - * 列表查询 - * - * @return - */ - List<${entityName}> queryList(); -} +package ${bussiPackage}.${entityPackage}.service; + +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +public interface I${entityName}Service extends IService<${entityName}> { + /** + * 保存 + * + * @param ${entityName?uncap_first} + * @return + */ + void add(${entityName} ${entityName?uncap_first}); + + /** + * 更新 + * + * @param ${entityName?uncap_first} + * @return + */ + void editById(${entityName} ${entityName?uncap_first}); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ${entityName} queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List<${entityName}> queryList(); +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 95% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index f9fd9c7e..91dcb53b 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -1,82 +1,82 @@ -package ${bussiPackage}.${entityPackage}.service.impl; - -import ${bussiPackage}.${entityPackage}.entity.${entityName}; -import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper; -import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: ${tableVo.ftlDescription} - * @Author: jero-boot - * @Date: ${.now?string["yyyy-MM-dd"]} - * @Version: V1.0 - */ -@Service -public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service { - /** - * 保存 - * - * @param ${entityName?uncap_first} - * @return - */ - @Override - void add(${entityName} ${entityName?uncap_first}) { - save(${entityName?uncap_first}); - } - - /** - * 更新 - * - * @param ${entityName?uncap_first} - * @return - */ - @Override - void editById(${entityName} ${entityName?uncap_first}) { - updateById(${entityName?uncap_first}); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - ${entityName} queryById(String id) { - return getById(id); - } - - /** - * 列表查询 - * - * @return - */ - @Override - List<${entityName}> queryList() { - return list(); - } -} +package ${bussiPackage}.${entityPackage}.service.impl; + +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper; +import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: ${tableVo.ftlDescription} + * @Author: jero-boot + * @Date: ${.now?string["yyyy-MM-dd"]} + * @Version: V1.0 + */ +@Service +public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service { + /** + * 保存 + * + * @param ${entityName?uncap_first} + * @return + */ + @Override + void add(${entityName} ${entityName?uncap_first}) { + save(${entityName?uncap_first}); + } + + /** + * 更新 + * + * @param ${entityName?uncap_first} + * @return + */ + @Override + void editById(${entityName} ${entityName?uncap_first}) { + updateById(${entityName?uncap_first}); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + ${entityName} queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + List<${entityName}> queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei rename to jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties b/jero-boot/jero-boot-module-system/src/main/resources/jero/jero_config.properties similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties rename to jero-boot/jero-boot-module-system/src/main/resources/jero/jero_config.properties diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_database.properties b/jero-boot/jero-boot-module-system/src/main/resources/jero/jero_database.properties similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_database.properties rename to jero-boot/jero-boot-module-system/src/main/resources/jero/jero_database.properties diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/demo1.html b/jero-boot/jero-boot-module-system/src/main/resources/static/demo1.html similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/demo1.html rename to jero-boot/jero-boot-module-system/src/main/resources/static/demo1.html diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/LICENSE b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/LICENSE similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/LICENSE rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/LICENSE diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/build/pdf.js b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/build/pdf.js similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/build/pdf.js rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/build/pdf.js diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/build/pdf.worker.js b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/build/pdf.worker.js similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/build/pdf.worker.js rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/build/pdf.worker.js diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Add-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Add-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Add-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Add-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Ext-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Ext-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Ext-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Ext-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GB-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GB-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GB-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GB-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBT-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBT-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBT-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBT-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Hankaku.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Hankaku.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Hankaku.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Hankaku.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Hiragana.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Hiragana.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Hiragana.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Hiragana.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Katakana.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Katakana.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Katakana.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Katakana.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/LICENSE b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/LICENSE similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/LICENSE rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/LICENSE diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/NWP-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/NWP-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/NWP-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/NWP-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Roman.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Roman.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/Roman.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/Roman.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/V.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/V.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/V.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/V.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmap b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmap similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmap rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmap diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/compatibility.js b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/compatibility.js similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/compatibility.js rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/compatibility.js diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/debugger.js b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/debugger.js similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/debugger.js rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/debugger.js diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-check.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-check.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-check.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-check.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-comment.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-comment.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-comment.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-comment.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-help.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-help.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-help.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-help.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-insert.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-insert.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-insert.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-insert.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-key.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-key.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-key.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-key.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-newparagraph.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-newparagraph.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-newparagraph.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-newparagraph.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-noicon.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-noicon.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-noicon.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-noicon.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-note.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-note.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-note.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-note.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-paragraph.svg b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-paragraph.svg similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/annotation-paragraph.svg rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/annotation-paragraph.svg diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-next-rtl.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-next-rtl.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-next.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-next.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-next@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-next@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-previous.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-previous.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-previous@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/findbarButton-previous@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/grab.cur b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/grab.cur similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/grab.cur rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/grab.cur diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/grabbing.cur b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/grabbing.cur similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/grabbing.cur rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/grabbing.cur diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/loading-icon.gif b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/loading-icon.gif similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/loading-icon.gif rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/loading-icon.gif diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/loading-small.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/loading-small.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/loading-small.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/loading-small.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/loading-small@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/loading-small@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/loading-small@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/loading-small@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/shadow.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/shadow.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/shadow.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/shadow.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/texture.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/texture.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/texture.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/texture.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-bookmark.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-bookmark.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-download.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-download.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-download@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-download@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-openFile.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-openFile.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageDown.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageDown.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageUp.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageUp.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-print.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-print.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-print@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-print@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-search.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-search.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-search@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-search@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.png b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.png similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.png rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/l10n.js b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/l10n.js similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/l10n.js rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/l10n.js diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/locale/locale.properties b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/locale/locale.properties similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/locale/locale.properties rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/locale/locale.properties diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/viewer.css b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/viewer.css similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/viewer.css rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/viewer.css diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/viewer.html b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/viewer.html similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/viewer.html rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/viewer.html diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/viewer.js b/jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/viewer.js similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/generic/web/viewer.js rename to jero-boot/jero-boot-module-system/src/main/resources/static/generic/web/viewer.js diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/view/userlist.html b/jero-boot/jero-boot-module-system/src/main/resources/static/view/userlist.html similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/static/view/userlist.html rename to jero-boot/jero-boot-module-system/src/main/resources/static/view/userlist.html diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/templates/announcement/showContent.ftl b/jero-boot/jero-boot-module-system/src/main/resources/templates/announcement/showContent.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/templates/announcement/showContent.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/templates/announcement/showContent.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/templates/demo3.ftl b/jero-boot/jero-boot-module-system/src/main/resources/templates/demo3.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/templates/demo3.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/templates/demo3.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/templates/pdfPreviewIframe.ftl b/jero-boot/jero-boot-module-system/src/main/resources/templates/pdfPreviewIframe.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/templates/pdfPreviewIframe.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/templates/pdfPreviewIframe.ftl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/templates/thirdLogin.ftl b/jero-boot/jero-boot-module-system/src/main/resources/templates/thirdLogin.ftl similarity index 100% rename from jero-boot/jero-boot-single-startup/src/main/resources/templates/thirdLogin.ftl rename to jero-boot/jero-boot-module-system/src/main/resources/templates/thirdLogin.ftl