diff --git a/README.md b/README.md index 50471d69..746dc100 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ 12. 在线构建器:拖动表单元素生成相应的HTML代码 13. 连接池监视:监视当期系统数据库连接池状态,可进行分析SQL找出系统性能瓶颈。 -## 系统演示 ## [www.ruoyi.club](http://www.ruoyi.club) +## 系统演示 [www.ruoyi.club](http://www.ruoyi.club) ![登录界面](https://static.oschina.net/uploads/space/2018/0425/110329_Ftsu_1438828.png) diff --git a/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java b/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java index 14ffe031..01d85645 100644 --- a/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java +++ b/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java @@ -59,9 +59,9 @@ public interface IMenuDao public Menu selectMenuById(Long menuId); /** - * 查询子菜单数量 + * 查询菜单数量 * - * @param menuId 菜单ID + * @param parentId 菜单父ID * @return 结果 */ public int selectCountMenuByParentId(Long parentId); diff --git a/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java b/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java index e1a25a80..c3f120e8 100644 --- a/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java +++ b/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java @@ -77,9 +77,9 @@ public interface IMenuService public Menu selectMenuById(Long menuId); /** - * 查询子菜单数量 + * 查询菜单数量 * - * @param menuId 菜单ID + * @param parentId 菜单父ID * @return 结果 */ public int selectCountMenuByParentId(Long parentId); diff --git a/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java b/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java index 72d1dc4c..82fd29ce 100644 --- a/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java +++ b/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java @@ -81,7 +81,7 @@ public class RoleController extends BaseController @RequiresPermissions("system:role:save") @Log(title = "系统管理", action = "角色管理-保存角色") @PostMapping("/save") - @Transactional + @Transactional(rollbackFor=Exception.class) @ResponseBody public Message save(Role role) { @@ -95,7 +95,7 @@ public class RoleController extends BaseController @RequiresPermissions("system:role:remove") @Log(title = "系统管理", action = "角色管理-删除角色") @RequestMapping("/remove/{roleId}") - @Transactional + @Transactional(rollbackFor=Exception.class) @ResponseBody public Message remove(@PathVariable("roleId") Long roleId) { diff --git a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java index 458c9110..f079bfc5 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java @@ -47,4 +47,11 @@ public class IndexController extends BaseController return "main"; } + // 个人信息 + @GetMapping("/system/profile") + public String profile(Model model) + { + return "system/user/profile"; + } + } diff --git a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java index aa6ed211..7ba1968c 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java @@ -120,7 +120,7 @@ public class UserController extends BaseController @RequiresPermissions("system:user:remove") @Log(title = "系统管理", action = "用户管理-删除用户") @RequestMapping("/remove/{userId}") - @Transactional + @Transactional(rollbackFor=Exception.class) @ResponseBody public Message remove(@PathVariable("userId") Long userId) { @@ -139,7 +139,7 @@ public class UserController extends BaseController @RequiresPermissions("system:user:batchRemove") @Log(title = "系统管理", action = "用户管理-批量删除") @PostMapping("/batchRemove") - @Transactional + @Transactional(rollbackFor=Exception.class) @ResponseBody public Message batchRemove(@RequestParam("ids[]") Long[] ids) { @@ -157,7 +157,7 @@ public class UserController extends BaseController @RequiresPermissions("system:user:save") @Log(title = "系统管理", action = "部门管理-保存部门") @PostMapping("/save") - @Transactional + @Transactional(rollbackFor=Exception.class) @ResponseBody public Message save(User user) { diff --git a/src/main/resources/static/img/a1.jpg b/src/main/resources/static/img/a1.jpg new file mode 100644 index 00000000..4db26bc3 Binary files /dev/null and b/src/main/resources/static/img/a1.jpg differ diff --git a/src/main/resources/static/img/a2.jpg b/src/main/resources/static/img/a2.jpg new file mode 100644 index 00000000..36f7728f Binary files /dev/null and b/src/main/resources/static/img/a2.jpg differ diff --git a/src/main/resources/static/img/a3.jpg b/src/main/resources/static/img/a3.jpg new file mode 100644 index 00000000..64c20499 Binary files /dev/null and b/src/main/resources/static/img/a3.jpg differ diff --git a/src/main/resources/static/img/a4.jpg b/src/main/resources/static/img/a4.jpg new file mode 100644 index 00000000..f82f9f4b Binary files /dev/null and b/src/main/resources/static/img/a4.jpg differ diff --git a/src/main/resources/static/img/a5.jpg b/src/main/resources/static/img/a5.jpg new file mode 100644 index 00000000..56bea692 Binary files /dev/null and b/src/main/resources/static/img/a5.jpg differ diff --git a/src/main/resources/static/img/a6.jpg b/src/main/resources/static/img/a6.jpg new file mode 100644 index 00000000..935ccc7f Binary files /dev/null and b/src/main/resources/static/img/a6.jpg differ diff --git a/src/main/resources/static/img/a7.jpg b/src/main/resources/static/img/a7.jpg new file mode 100644 index 00000000..975ac181 Binary files /dev/null and b/src/main/resources/static/img/a7.jpg differ diff --git a/src/main/resources/static/img/a8.jpg b/src/main/resources/static/img/a8.jpg new file mode 100644 index 00000000..7c89190c Binary files /dev/null and b/src/main/resources/static/img/a8.jpg differ diff --git a/src/main/resources/static/img/a9.jpg b/src/main/resources/static/img/a9.jpg new file mode 100644 index 00000000..508eb092 Binary files /dev/null and b/src/main/resources/static/img/a9.jpg differ diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index ecab3f91..540c376d 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -16,6 +16,9 @@ +
@@ -32,11 +35,11 @@ image RuoYi - 研发部 + 研发部
diff --git a/src/main/resources/templates/system/user/profile.html b/src/main/resources/templates/system/user/profile.html new file mode 100644 index 00000000..43295314 --- /dev/null +++ b/src/main/resources/templates/system/user/profile.html @@ -0,0 +1,49 @@ + + + + + + + 个人信息 + + + + + + + + +
+
+
+
+
+
个人资料
+
+
+
+
+ image +
CEO
+
+
+
+

admin

+

若依 / 管理员

+

15888888888

+

开发一部 / 初级开发

+

+

ruoyi@163.com

+

2018-05-20 13:14:00

+
+
+ +
+
+
+
+
+ + + +