From 5fded43b7a4fee7c10732e268f4dfc9c66ddfb4c Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 23 Jul 2025 20:50:24 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../continew/admin/job/DemoEnvironmentJob.java | 18 ++++++++++++++++-- .../resources/db/changelog/mysql/main_data.sql | 8 +++++--- .../db/changelog/postgresql/main_data.sql | 8 +++++--- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/continew-server/src/main/java/top/continew/admin/job/DemoEnvironmentJob.java b/continew-server/src/main/java/top/continew/admin/job/DemoEnvironmentJob.java index ec49f77c..882f7c93 100644 --- a/continew-server/src/main/java/top/continew/admin/job/DemoEnvironmentJob.java +++ b/continew-server/src/main/java/top/continew/admin/job/DemoEnvironmentJob.java @@ -33,6 +33,9 @@ import top.continew.admin.system.mapper.user.UserSocialMapper; import top.continew.admin.system.model.entity.*; import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.entity.user.UserSocialDO; +import top.continew.admin.tenant.mapper.PackageMapper; +import top.continew.admin.tenant.mapper.PackageMenuMapper; +import top.continew.admin.tenant.mapper.TenantMapper; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.extension.tenant.annotation.TenantIgnore; @@ -65,14 +68,18 @@ public class DemoEnvironmentJob { private final RoleMenuMapper roleMenuMapper; private final MenuMapper menuMapper; private final DeptMapper deptMapper; - private final AppMapper appMapper; private final ClientMapper clientsMapper; + private final TenantMapper tenantMapper; + private final PackageMapper packageMapper; + private final PackageMenuMapper packageMenuMapper; private static final Long DELETE_FLAG = 10000L; private static final Long MESSAGE_FLAG = 0L; private static final List USER_FLAG = List - .of(1L, 547889293968801822L, 547889293968801823L, 547889293968801824L, 547889293968801825L, 547889293968801826L, 547889293968801827L, 547889293968801828L, 547889293968801829L, 547889293968801830L, 547889293968801831L); + .of(1L, 547889293968801822L, 547889293968801823L, 547889293968801824L, 547889293968801825L, + 547889293968801826L, 547889293968801827L, 547889293968801828L, 547889293968801829L, + 547889293968801830L, 547889293968801831L, 547889293968801832L, 547889293968801833L, 547889293968801834L); private static final List ROLE_FLAG = List.of(1L, 2L, 547888897925840927L, 547888897925840928L); private static final Long DEPT_FLAG = 547887852587843611L; @@ -109,6 +116,10 @@ public class DemoEnvironmentJob { this.log(appCount, "应用"); Long clientCount = clientsMapper.lambdaQuery().gt(ClientDO::getId, DELETE_FLAG).count(); this.log(clientCount, "客户端"); + Long tenantCount = tenantMapper.lambdaQuery().count(); + this.log(tenantCount, "租户"); + Long packageCount = packageMapper.lambdaQuery().count(); + this.log(packageCount, "套餐"); InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().blockAttack(true).build()); SnailJobLog.REMOTE.info("演示环境待清理数据项检测完成，开始执行清理。"); // 清理关联数据 @@ -119,6 +130,7 @@ public class DemoEnvironmentJob { roleDeptMapper.lambdaUpdate().notIn(RoleDeptDO::getRoleId, ROLE_FLAG).remove(); roleMenuMapper.lambdaUpdate().notIn(RoleMenuDO::getRoleId, ROLE_FLAG).remove(); userSocialMapper.lambdaUpdate().notIn(UserSocialDO::getUserId, USER_FLAG).remove(); + packageMenuMapper.lambdaUpdate().remove(); // 清理具体数据 this.clean(dictItemCount, "字典项", null, () -> dictItemMapper.lambdaUpdate() .gt(DictItemDO::getId, DELETE_FLAG) @@ -145,6 +157,8 @@ public class DemoEnvironmentJob { this.clean(clientCount, "客户端", null, () -> clientsMapper.lambdaUpdate() .gt(ClientDO::getId, DEPT_FLAG) .remove()); + this.clean(tenantCount, "租户", null, () -> tenantMapper.lambdaUpdate().remove()); + this.clean(packageCount, "套餐", null, () -> packageMapper.lambdaUpdate().remove()); SnailJobLog.REMOTE.info("演示环境数据已清理完成。"); SnailJobLog.REMOTE.info("定时任务 [重置演示环境数据] 执行结束。"); } finally { diff --git a/continew-server/src/main/resources/db/changelog/mysql/main_data.sql b/continew-server/src/main/resources/db/changelog/mysql/main_data.sql index eace5051..0ef53e2d 100644 --- a/continew-server/src/main/resources/db/changelog/mysql/main_data.sql +++ b/continew-server/src/main/resources/db/changelog/mysql/main_data.sql @@ -184,8 +184,9 @@ VALUES (547889293968801829, 'Jing', 'MS-Jing', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '路虽远，行则将至。', 2, b'0', NOW(), 547887852587843599, 1, NOW()), (547889293968801830, 'domw', '梓陌', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '胜利是奖赏，挫折是常态。', 1, b'0', NOW(), 547887852587843608, 1, NOW()), (547889293968801831, 'xtanyu', '小熊', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '不想上班。', 1, b'0', NOW(), 547887852587843611, 1, NOW()), -(547889293968801832, 'luoqiz', '老罗', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '行者无疆，丈量四方。', 1, b'0', NOW(), 1, 1, NOW()), -(547889293968801833, 'lishuyanla', '颜如玉', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '书中自有颜如玉，世间多是李莫愁。', 1, b'0', NOW(), 1, 1, NOW()); +(547889293968801832, 'ppxb', '番茄', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, 'one day smile one day cry.', 1, b'0', NOW(), 547887852587843599, 1, NOW()), +(547889293968801833, 'luoqiz', '老罗', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '行者无疆，丈量四方。', 1, b'0', NOW(), 1, 1, NOW()), +(547889293968801834, 'lishuyanla', '颜如玉', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '书中自有颜如玉，世间多是李莫愁。', 1, b'0', NOW(), 1, 1, NOW()); -- 初始化默认参数 INSERT INTO `sys_option` @@ -250,7 +251,8 @@ VALUES (10, 547889293968801830, 547888897925840928), (11, 547889293968801831, 547888897925840928), (12, 547889293968801832, 547888897925840928), -(13, 547889293968801833, 547888897925840928); +(13, 547889293968801833, 547888897925840928), +(14, 547889293968801834, 547888897925840928); -- 初始化默认角色和菜单关联数据 INSERT INTO `sys_role_menu` diff --git a/continew-server/src/main/resources/db/changelog/postgresql/main_data.sql b/continew-server/src/main/resources/db/changelog/postgresql/main_data.sql index 46f44749..a0338fd4 100644 --- a/continew-server/src/main/resources/db/changelog/postgresql/main_data.sql +++ b/continew-server/src/main/resources/db/changelog/postgresql/main_data.sql @@ -184,8 +184,9 @@ VALUES (547889293968801829, 'Jing', 'MS-Jing', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '路虽远，行则将至。', 2, false, NOW(), 547887852587843599, 1, NOW()), (547889293968801830, 'domw', '梓陌', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '胜利是奖赏，挫折是常态。', 1, false, NOW(), 547887852587843608, 1, NOW()), (547889293968801831, 'xtanyu', '小熊', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '不想上班。', 1, false, NOW(), 547887852587843611, 1, NOW()), -(547889293968801832, 'luoqiz', '老罗', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '行者无疆，丈量四方。', 1, false, NOW(), 1, 1, NOW()), -(547889293968801833, 'lishuyanla', '颜如玉', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '书中自有颜如玉，世间多是李莫愁。', 1, false, NOW(), 1, 1, NOW()); +(547889293968801832, 'ppxb', '番茄', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, 'one day smile one day cry.', 1, false, NOW(), 1, 547887852587843599, NOW()), +(547889293968801833, 'luoqiz', '老罗', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '行者无疆，丈量四方。', 1, false, NOW(), 1, 1, NOW()), +(547889293968801834, 'lishuyanla', '颜如玉', '{bcrypt}$2a$10$xAsoeMJ.jc/kSxhviLAg7.j2iFrhi6yYAdniNdjLiIUWU/BRZl2Ti', 1, NULL, NULL, NULL, '书中自有颜如玉，世间多是李莫愁。', 1, false, NOW(), 1, 1, NOW()); -- 初始化默认参数 INSERT INTO "sys_option" @@ -250,7 +251,8 @@ VALUES (10, 547889293968801830, 547888897925840928), (11, 547889293968801831, 547888897925840928), (12, 547889293968801832, 547888897925840928), -(13, 547889293968801833, 547888897925840928); +(13, 547889293968801833, 547888897925840928), +(14, 547889293968801834, 547888897925840928); -- 初始化默认角色和菜单关联数据 INSERT INTO "sys_role_menu"