diff --git a/README.md b/README.md index cddb927..66b2bb5 100644 --- a/README.md +++ b/README.md @@ -320,6 +320,7 @@ agileboot ## 🌻 注意事项 🌻 - IDEA会自动将.properties文件的编码设置为ISO-8859-1,请在Settings > Editor > File Encodings > Properties Files > 设置为UTF-8 +- 请导入统一的代码格式化模板（Google）: Settings > Editor > Code Style > Java > 设置按钮 > import schema > 选择项目根目录下的GoogleStyle.xml文件 - 如需要生成新的表，请使用CodeGenerator类进行生成。 - 填入数据库地址，账号密码，库名。然后填入所需的表名执行代码即可。（大概看一下代码就知道怎么填啦） - 项目基础环境搭建，请参考docker目录下的指南搭建。保姆级启动说明： diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java index 9f28f33..b0ca11e 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java @@ -108,8 +108,6 @@ public class RoleApplicationService { public void updateStatus(UpdateStatusCommand command, LoginUser loginUser) { RoleModel roleModel = RoleModelFactory.loadFromDb(command.getRoleId(), roleService, roleMenuService); roleModel.setStatus(command.getStatus()); - roleModel.setUpdaterId(loginUser.getUserId()); -// roleModel.setUpdaterName(loginUser.getUsername()); roleModel.updateById(); } diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/mybatisplus/CustomMetaObjectHandler.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/mybatisplus/CustomMetaObjectHandler.java index 11ccd94..f93f473 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/mybatisplus/CustomMetaObjectHandler.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/mybatisplus/CustomMetaObjectHandler.java @@ -27,12 +27,8 @@ public class CustomMetaObjectHandler implements MetaObjectHandler { @Override public void updateFill(MetaObject metaObject) { this.setFieldValByName("updateTime", new Date(), metaObject); - Long newUpdaterId = getUserIdSafely(); -// Long oldUpdaterId = (Long) metaObject.getValue("updaterId"); -// Long updaterId = newUpdaterId == null ? oldUpdaterId : null; -// this.setFieldValByName("updaterId", newUpdaterId, metaObject); this.strictUpdateFill(metaObject, "updaterId", Long.class, newUpdaterId); } diff --git a/agileboot-infrastructure/src/main/resources/h2sql/agileboot_data.sql b/agileboot-infrastructure/src/main/resources/h2sql/agileboot_data.sql index 4105b50..75f6669 100644 --- a/agileboot-infrastructure/src/main/resources/h2sql/agileboot_data.sql +++ b/agileboot-infrastructure/src/main/resources/h2sql/agileboot_data.sql @@ -52,7 +52,7 @@ INSERT INTO `sys_dept` VALUES ('10', '3', '0,1,3', '财务部门', '2', null, 'v INSERT INTO `sys_menu` VALUES ('1', '系统管理', '0', '1', 'system', null, '', '0', '1', '1', '1', '1', '', 'system', '0', '2022-05-21 08:30:54', null, null, '系统管理目录', '0'); INSERT INTO `sys_menu` VALUES ('2', '系统监控', '0', '2', 'monitor', null, '', '0', '1', '1', '1', '1', '', 'monitor', '0', '2022-05-21 08:30:54', null, null, '系统监控目录', '0'); INSERT INTO `sys_menu` VALUES ('3', '系统工具', '0', '3', 'tool', null, '', '0', '1', '1', '1', '1', '', 'tool', '0', '2022-05-21 08:30:54', null, null, '系统工具目录', '0'); -INSERT INTO `sys_menu` VALUES ('4', 'AgileBoot官网', '0', '4', 'http://ruoyi.vip', null, '', '1', '1', '1', '1', '1', '', 'guide', '0', '2022-05-21 08:30:54', null, null, '若依官网地址', '0'); +INSERT INTO `sys_menu` VALUES ('4', 'AgileBoot官网', '0', '4', 'https://juejin.cn/column/7159946528827080734', null, '', '1', '1', '1', '1', '1', '', 'guide', '0', '2022-05-21 08:30:54', null, null, 'Agileboot官网地址', '0'); INSERT INTO `sys_menu` VALUES ('5', '用户管理', '1', '1', 'user', 'system/user/index', '', '0', '1', '2', '1', '1', 'system:user:list', 'user', '0', '2022-05-21 08:30:54', null, null, '用户管理菜单', '0'); INSERT INTO `sys_menu` VALUES ('6', '角色管理', '1', '2', 'role', 'system/role/index', '', '0', '1', '2', '1', '1', 'system:role:list', 'peoples', '0', '2022-05-21 08:30:54', null, null, '角色管理菜单', '0'); INSERT INTO `sys_menu` VALUES ('7', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', '0', '1', '2', '1', '1', 'system:menu:list', 'tree-table', '0', '2022-05-21 08:30:54', null, null, '菜单管理菜单', '0'); diff --git a/sql/agileboot_20221007.sql b/sql/agileboot_20221007.sql index 059171c..af51b7f 100644 --- a/sql/agileboot_20221007.sql +++ b/sql/agileboot_20221007.sql @@ -139,7 +139,7 @@ CREATE TABLE `sys_menu` ( INSERT INTO `sys_menu` VALUES ('1', '系统管理', '0', '1', 'system', null, '', '0', '1', '1', '1', '1', '', 'system', '0', '2022-05-21 08:30:54', null, null, '系统管理目录', '0'); INSERT INTO `sys_menu` VALUES ('2', '系统监控', '0', '2', 'monitor', null, '', '0', '1', '1', '1', '1', '', 'monitor', '0', '2022-05-21 08:30:54', null, null, '系统监控目录', '0'); INSERT INTO `sys_menu` VALUES ('3', '系统工具', '0', '3', 'tool', null, '', '0', '1', '1', '1', '1', '', 'tool', '0', '2022-05-21 08:30:54', null, null, '系统工具目录', '0'); -INSERT INTO `sys_menu` VALUES ('4', 'AgileBoot官网', '0', '4', 'http://ruoyi.vip', null, '', '1', '1', '1', '1', '1', '', 'guide', '0', '2022-05-21 08:30:54', null, null, '若依官网地址', '0'); +INSERT INTO `sys_menu` VALUES ('4', 'AgileBoot官网', '0', '4', 'https://juejin.cn/column/7159946528827080734', null, '', '1', '1', '1', '1', '1', '', 'guide', '0', '2022-05-21 08:30:54', null, null, 'Agileboot官网地址', '0'); INSERT INTO `sys_menu` VALUES ('5', '用户管理', '1', '1', 'user', 'system/user/index', '', '0', '1', '2', '1', '1', 'system:user:list', 'user', '0', '2022-05-21 08:30:54', null, null, '用户管理菜单', '0'); INSERT INTO `sys_menu` VALUES ('6', '角色管理', '1', '2', 'role', 'system/role/index', '', '0', '1', '2', '1', '1', 'system:role:list', 'peoples', '0', '2022-05-21 08:30:54', null, null, '角色管理菜单', '0'); INSERT INTO `sys_menu` VALUES ('7', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', '0', '1', '2', '1', '1', 'system:menu:list', 'tree-table', '0', '2022-05-21 08:30:54', null, null, '菜单管理菜单', '0');