From 3ea3811922670926c6b1e29161ea77dea4ed12b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=9D=B0?= Date: Fri, 21 Sep 2018 11:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E5=BA=8A=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=A6=81=E7=94=A8=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E5=90=8E=E4=BE=9D=E7=84=B6=E8=83=BD=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=9A=84Bug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=87=92=E5=8A=A0=E8=BD=BD=E7=9A=84Bug?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8Csql=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 + sql/aurora.sql | 278 ++++++++++++++++++ .../app/rest/system/MenuController.java | 2 +- .../app/rest/system/PermissionController.java | 2 +- .../app/rest/system/RoleController.java | 2 +- .../aurora/app/rest/user/UserController.java | 2 - .../app/rest/web/PictureController.java | 107 +++++++ .../handler/GlobalExceptionHandler.java | 4 +- .../me/aurora/config/shiro/ShiroConfig.java | 1 + .../me/aurora/config/shiro/ShiroRealm.java | 2 +- src/main/java/me/aurora/domain/Picture.java | 43 ++- src/main/java/me/aurora/domain/User.java | 5 + .../me/aurora/repository/PictureRepo.java | 12 + .../java/me/aurora/repository/RoleRepo.java | 12 + .../aurora/repository/spec/PictureSpec.java | 55 ++++ .../java/me/aurora/service/MenuService.java | 5 +- .../me/aurora/service/PermissionService.java | 4 +- .../me/aurora/service/PictureService.java | 53 ++++ .../java/me/aurora/service/RoleService.java | 4 +- .../me/aurora/service/dto/PictureDto.java | 32 ++ .../aurora/service/impl/MenuServiceImpl.java | 15 +- .../service/impl/PermissionServiceImpl.java | 12 +- .../service/impl/PictureServiceImpl.java | 110 +++++++ .../aurora/service/impl/RoleServiceImpl.java | 13 +- .../aurora/service/impl/UserServiceImpl.java | 6 +- .../aurora/service/mapper/PictureMapper.java | 18 ++ src/main/java/me/aurora/util/FileUtil.java | 79 +++++ src/main/java/me/aurora/util/SizeUtil.java | 48 +++ .../java/me/aurora/util/ValidationUtil.java | 23 ++ src/main/resources/application.yml | 6 +- src/main/resources/sql/aurora.sql | 139 ++++++--- .../templates/system/menu/index.html | 2 +- .../templates/system/permission/index.html | 4 +- .../templates/system/role/index.html | 2 +- src/main/resources/templates/user/add.html | 1 - .../resources/templates/web/picture/add.html | 95 ++++++ .../templates/web/picture/index.html | 180 ++++++++++++ 37 files changed, 1292 insertions(+), 92 deletions(-) create mode 100644 sql/aurora.sql create mode 100644 src/main/java/me/aurora/app/rest/web/PictureController.java create mode 100644 src/main/java/me/aurora/repository/PictureRepo.java create mode 100644 src/main/java/me/aurora/repository/spec/PictureSpec.java create mode 100644 src/main/java/me/aurora/service/PictureService.java create mode 100644 src/main/java/me/aurora/service/dto/PictureDto.java create mode 100644 src/main/java/me/aurora/service/impl/PictureServiceImpl.java create mode 100644 src/main/java/me/aurora/service/mapper/PictureMapper.java create mode 100644 src/main/java/me/aurora/util/FileUtil.java create mode 100644 src/main/java/me/aurora/util/SizeUtil.java create mode 100644 src/main/java/me/aurora/util/ValidationUtil.java create mode 100644 src/main/resources/templates/web/picture/add.html create mode 100644 src/main/resources/templates/web/picture/index.html diff --git a/pom.xml b/pom.xml index 08e8295..fa82a23 100644 --- a/pom.xml +++ b/pom.xml @@ -157,6 +157,12 @@ hutool-all 4.1.8 + + + org.apache.httpcomponents + httpmime + 4.5.3 + com.alibaba diff --git a/sql/aurora.sql b/sql/aurora.sql new file mode 100644 index 0000000..e6fe2ec --- /dev/null +++ b/sql/aurora.sql @@ -0,0 +1,278 @@ +/* + Navicat MySQL Data Transfer + + Source Server : 本地 + Source Server Type : MySQL + Source Server Version : 50559 + Source Host : localhost:3306 + Source Schema : aurora + + Target Server Type : MySQL + Target Server Version : 50559 + File Encoding : 65001 + + Date: 21/09/2018 11:40:53 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for zj_menu +-- ---------------------------- +DROP TABLE IF EXISTS `zj_menu`; +CREATE TABLE `zj_menu` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `ico` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `pid` int(11) NOT NULL, + `level` int(11) NOT NULL, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `soft` bigint(20) NOT NULL, + `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `createTime` datetime NULL DEFAULT NULL, + `updateTime` datetime NULL DEFAULT NULL, + `level_number` int(11) NOT NULL, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `UK_cbhg0bi3f1emxkhqqtvca9btx`(`soft`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of zj_menu +-- ---------------------------- +INSERT INTO `zj_menu` VALUES (1, 'layui-icon-unlink', 0, 1, '异常页', 40, '', '2018-08-29 11:40:17', '2018-09-20 11:44:06', 3); +INSERT INTO `zj_menu` VALUES (2, 'layui-icon-tree', 1, 2, '403', 41, '/exception/403', '2018-08-29 11:40:17', '2018-09-20 11:36:24', 0); +INSERT INTO `zj_menu` VALUES (3, 'layui-icon-tree', 1, 2, '404', 42, '/exception/404', '2018-08-29 11:40:17', '2018-09-20 11:36:32', 0); +INSERT INTO `zj_menu` VALUES (4, 'layui-icon-tree', 1, 2, '500', 43, '/exception/500', '2018-08-29 11:40:17', '2018-09-20 11:36:40', 0); +INSERT INTO `zj_menu` VALUES (5, 'layui-icon-chart', 0, 1, '系统监控', 10, '', '2018-08-29 11:40:17', '2018-09-20 11:42:49', 1); +INSERT INTO `zj_menu` VALUES (6, 'layui-icon-tree', 7, 2, '用户管理', 2, '/user/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); +INSERT INTO `zj_menu` VALUES (7, 'layui-icon-util', 0, 1, '系统管理', 1, '', '2018-08-29 11:40:17', '2018-09-20 19:02:05', 4); +INSERT INTO `zj_menu` VALUES (8, 'layui-icon-tree', 7, 2, '菜单管理', 6, '/menu/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); +INSERT INTO `zj_menu` VALUES (9, 'layui-icon-tree', 5, 2, '日志管理', 11, '/sysLog/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); +INSERT INTO `zj_menu` VALUES (10, 'layui-icon-tree', 7, 2, '权限管理', 4, '/permission/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); +INSERT INTO `zj_menu` VALUES (11, 'layui-icon-tree', 7, 2, '角色管理', 3, '/role/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); +INSERT INTO `zj_menu` VALUES (12, 'layui-icon-website', 0, 1, '网络资源', 30, '', '2018-09-20 11:35:56', '2018-09-20 11:40:53', 1); +INSERT INTO `zj_menu` VALUES (13, 'layui-icon-tree', 12, 2, '图床管理', 31, '/picture/index', '2018-09-20 11:40:53', '2018-09-20 11:40:53', 0); + +-- ---------------------------- +-- Table structure for zj_menus_roles +-- ---------------------------- +DROP TABLE IF EXISTS `zj_menus_roles`; +CREATE TABLE `zj_menus_roles` ( + `menu_id` bigint(20) NOT NULL, + `role_id` bigint(20) NOT NULL, + PRIMARY KEY (`menu_id`, `role_id`) USING BTREE, + INDEX `role_id`(`role_id`) USING BTREE, + CONSTRAINT `zj_menus_roles_ibfk_1` FOREIGN KEY (`menu_id`) REFERENCES `zj_menu` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, + CONSTRAINT `zj_menus_roles_ibfk_2` FOREIGN KEY (`role_id`) REFERENCES `zj_role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of zj_menus_roles +-- ---------------------------- +INSERT INTO `zj_menus_roles` VALUES (1, 1); +INSERT INTO `zj_menus_roles` VALUES (2, 1); +INSERT INTO `zj_menus_roles` VALUES (3, 1); +INSERT INTO `zj_menus_roles` VALUES (4, 1); +INSERT INTO `zj_menus_roles` VALUES (5, 1); +INSERT INTO `zj_menus_roles` VALUES (6, 1); +INSERT INTO `zj_menus_roles` VALUES (7, 1); +INSERT INTO `zj_menus_roles` VALUES (8, 1); +INSERT INTO `zj_menus_roles` VALUES (9, 1); +INSERT INTO `zj_menus_roles` VALUES (10, 1); +INSERT INTO `zj_menus_roles` VALUES (11, 1); +INSERT INTO `zj_menus_roles` VALUES (12, 1); +INSERT INTO `zj_menus_roles` VALUES (13, 1); +INSERT INTO `zj_menus_roles` VALUES (1, 2); +INSERT INTO `zj_menus_roles` VALUES (2, 2); +INSERT INTO `zj_menus_roles` VALUES (3, 2); +INSERT INTO `zj_menus_roles` VALUES (4, 2); +INSERT INTO `zj_menus_roles` VALUES (5, 2); +INSERT INTO `zj_menus_roles` VALUES (6, 2); +INSERT INTO `zj_menus_roles` VALUES (7, 2); +INSERT INTO `zj_menus_roles` VALUES (8, 2); +INSERT INTO `zj_menus_roles` VALUES (9, 2); +INSERT INTO `zj_menus_roles` VALUES (10, 2); +INSERT INTO `zj_menus_roles` VALUES (11, 2); +INSERT INTO `zj_menus_roles` VALUES (5, 3); +INSERT INTO `zj_menus_roles` VALUES (7, 3); +INSERT INTO `zj_menus_roles` VALUES (9, 3); +INSERT INTO `zj_menus_roles` VALUES (11, 3); +INSERT INTO `zj_menus_roles` VALUES (12, 3); +INSERT INTO `zj_menus_roles` VALUES (13, 3); + +-- ---------------------------- +-- Table structure for zj_permission +-- ---------------------------- +DROP TABLE IF EXISTS `zj_permission`; +CREATE TABLE `zj_permission` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `perms` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `createTime` datetime NULL DEFAULT NULL, + `updateTime` datetime NULL DEFAULT NULL, + `pid` int(11) NOT NULL, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `UK_djtxn2vldlgrkfk21d155b48i`(`perms`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of zj_permission +-- ---------------------------- +INSERT INTO `zj_permission` VALUES (1, 'admin', '超级管理员', '2018-08-29 15:15:12', '2018-08-31 00:00:00', 0); +INSERT INTO `zj_permission` VALUES (2, 'user:select', '用户查询', '2018-08-29 15:15:12', '2018-08-31 00:00:00', 4); +INSERT INTO `zj_permission` VALUES (3, 'log:select', '日志管理', '2018-08-29 15:15:12', '2018-09-02 23:11:37', 0); +INSERT INTO `zj_permission` VALUES (4, 'user:all', '用户管理', '2018-08-29 15:15:12', '2018-09-02 23:11:31', 0); +INSERT INTO `zj_permission` VALUES (5, 'user:add', '新增用户', '2018-08-31 15:15:12', '2018-08-31 00:00:00', 4); +INSERT INTO `zj_permission` VALUES (6, 'user:update', '更新用户', '2018-08-31 15:15:12', '2018-08-31 00:00:00', 4); +INSERT INTO `zj_permission` VALUES (7, 'user:lock', '禁用用户', '2018-08-29 15:15:12', '2018-09-02 12:36:31', 4); +INSERT INTO `zj_permission` VALUES (8, 'permission:all', '权限管理', '2018-08-29 15:15:12', '2018-09-02 23:11:04', 0); +INSERT INTO `zj_permission` VALUES (9, 'permission:select', '权限查询', '2018-08-31 14:03:40', '2018-08-31 14:03:40', 8); +INSERT INTO `zj_permission` VALUES (10, 'permission:add', '权限新增', '2018-08-31 14:03:52', '2018-08-31 14:03:52', 8); +INSERT INTO `zj_permission` VALUES (11, 'permission:update', '权限更新', '2018-08-31 14:04:05', '2018-08-31 14:04:05', 8); +INSERT INTO `zj_permission` VALUES (13, 'role:all', '角色管理', '2018-08-29 15:15:12', '2018-09-02 23:10:58', 0); +INSERT INTO `zj_permission` VALUES (14, 'role:select', '角色查询', '2018-08-31 23:19:34', '2018-08-31 23:19:34', 13); +INSERT INTO `zj_permission` VALUES (15, 'role:add', '角色新增', '2018-08-31 23:20:09', '2018-08-31 23:20:09', 13); +INSERT INTO `zj_permission` VALUES (16, 'role:update', '角色更新', '2018-08-31 23:20:25', '2018-08-31 23:20:25', 13); +INSERT INTO `zj_permission` VALUES (17, 'role:delete', '角色删除', '2018-08-31 23:20:40', '2018-08-31 23:20:40', 13); +INSERT INTO `zj_permission` VALUES (19, 'menu:all', '菜单管理', '2018-09-12 13:11:27', '2018-09-12 13:11:27', 0); +INSERT INTO `zj_permission` VALUES (20, 'menu:add', '新增菜单', '2018-09-12 13:11:58', '2018-09-12 13:11:58', 19); +INSERT INTO `zj_permission` VALUES (21, 'menu:update', '更新菜单', '2018-09-12 13:12:21', '2018-09-12 13:12:21', 19); +INSERT INTO `zj_permission` VALUES (22, 'menu:delete', '删除菜单', '2018-09-12 13:12:43', '2018-09-12 13:12:43', 19); +INSERT INTO `zj_permission` VALUES (23, 'menu:select', '菜单搜索', '2018-09-12 13:15:02', '2018-09-12 13:15:02', 19); + +-- ---------------------------- +-- Table structure for zj_permissions_roles +-- ---------------------------- +DROP TABLE IF EXISTS `zj_permissions_roles`; +CREATE TABLE `zj_permissions_roles` ( + `role_id` bigint(20) NOT NULL, + `permission_id` bigint(20) NOT NULL, + PRIMARY KEY (`role_id`, `permission_id`) USING BTREE, + INDEX `FKoj69ypls2picwdvsx1n0j0rp6`(`permission_id`) USING BTREE, + CONSTRAINT `FKcdlfc70vro7wbnajmn50wix7w` FOREIGN KEY (`role_id`) REFERENCES `zj_role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, + CONSTRAINT `FKoj69ypls2picwdvsx1n0j0rp6` FOREIGN KEY (`permission_id`) REFERENCES `zj_permission` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of zj_permissions_roles +-- ---------------------------- +INSERT INTO `zj_permissions_roles` VALUES (1, 1); +INSERT INTO `zj_permissions_roles` VALUES (2, 2); +INSERT INTO `zj_permissions_roles` VALUES (2, 3); +INSERT INTO `zj_permissions_roles` VALUES (3, 4); +INSERT INTO `zj_permissions_roles` VALUES (3, 8); +INSERT INTO `zj_permissions_roles` VALUES (2, 9); +INSERT INTO `zj_permissions_roles` VALUES (2, 14); + +-- ---------------------------- +-- Table structure for zj_picture +-- ---------------------------- +DROP TABLE IF EXISTS `zj_picture`; +CREATE TABLE `zj_picture` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createTime` datetime NULL DEFAULT NULL, + `deleteUrl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `height` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `size` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `width` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `user_id` bigint(20) NULL DEFAULT NULL, + `filename` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `FK5qtt7wql9517j0e2read2pdus`(`user_id`) USING BTREE, + CONSTRAINT `FK5qtt7wql9517j0e2read2pdus` FOREIGN KEY (`user_id`) REFERENCES `zj_user` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Table structure for zj_role +-- ---------------------------- +DROP TABLE IF EXISTS `zj_role`; +CREATE TABLE `zj_role` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createDateTime` datetime NULL DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `updateDateTime` datetime NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of zj_role +-- ---------------------------- +INSERT INTO `zj_role` VALUES (1, '2018-08-23 09:13:54', '超级管理员', NULL, '2018-08-23 09:14:02'); +INSERT INTO `zj_role` VALUES (2, '2018-08-27 19:31:03', '普通用户', '', '2018-09-01 08:31:08'); +INSERT INTO `zj_role` VALUES (3, '2018-09-03 15:17:31', '测试', '1', '2018-09-20 17:28:03'); + +-- ---------------------------- +-- Table structure for zj_syslog +-- ---------------------------- +DROP TABLE IF EXISTS `zj_syslog`; +CREATE TABLE `zj_syslog` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createTime` datetime NULL DEFAULT NULL, + `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `method` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `operation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `time` int(11) NULL DEFAULT NULL, + `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Table structure for zj_user +-- ---------------------------- +DROP TABLE IF EXISTS `zj_user`; +CREATE TABLE `zj_user` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `createDateTime` datetime NULL DEFAULT NULL, + `email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `enabled` bigint(20) NULL DEFAULT NULL, + `lastLoginTime` datetime NULL DEFAULT NULL, + `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `UK_kpubos9gc2cvtkb0thktkbkes`(`email`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of zj_user +-- ---------------------------- +INSERT INTO `zj_user` VALUES (1, 'https://www.zhengjie.me/images/avatar.jpg', '2018-08-23 09:11:56', 'zhengjie@tom.com', 1, '2018-09-21 08:47:20', '65a674ce6632479005ea7a9071234cfb', 'aurora'); +INSERT INTO `zj_user` VALUES (6, 'https://i.loli.net/2018/08/16/5b75166b3157a.jpg', '2018-09-20 17:27:43', '11@qq.com', 0, '2018-09-21 08:45:26', '36318d4cc46eb68050b8b81ebc620f05', '测试'); + +-- ---------------------------- +-- Table structure for zj_user_pictures +-- ---------------------------- +DROP TABLE IF EXISTS `zj_user_pictures`; +CREATE TABLE `zj_user_pictures` ( + `User_id` bigint(20) NOT NULL, + `pictures_id` bigint(20) NOT NULL, + PRIMARY KEY (`User_id`, `pictures_id`) USING BTREE, + UNIQUE INDEX `UK_su439svglheh4cpcy3h15de8`(`pictures_id`) USING BTREE, + CONSTRAINT `FK11v8vnaup1q9xvsb66xjw7qjs` FOREIGN KEY (`pictures_id`) REFERENCES `zj_picture` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, + CONSTRAINT `FKk0qsq0yn0r0644b8p0gw9tkh9` FOREIGN KEY (`User_id`) REFERENCES `zj_user` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Table structure for zj_users_roles +-- ---------------------------- +DROP TABLE IF EXISTS `zj_users_roles`; +CREATE TABLE `zj_users_roles` ( + `user_id` bigint(20) NOT NULL, + `role_id` bigint(20) NOT NULL, + PRIMARY KEY (`user_id`, `role_id`) USING BTREE, + INDEX `role_id`(`role_id`) USING BTREE, + CONSTRAINT `zj_users_roles_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `zj_user` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, + CONSTRAINT `zj_users_roles_ibfk_2` FOREIGN KEY (`role_id`) REFERENCES `zj_role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of zj_users_roles +-- ---------------------------- +INSERT INTO `zj_users_roles` VALUES (1, 1); +INSERT INTO `zj_users_roles` VALUES (6, 3); + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/src/main/java/me/aurora/app/rest/system/MenuController.java b/src/main/java/me/aurora/app/rest/system/MenuController.java index aea9351..4a58f91 100644 --- a/src/main/java/me/aurora/app/rest/system/MenuController.java +++ b/src/main/java/me/aurora/app/rest/system/MenuController.java @@ -170,7 +170,7 @@ public class MenuController { @DeleteMapping(value = "/delete") public ResponseEntity delete(@RequestParam Long id){ log.warn("REST request to delete menu"); - menuService.delete(id); + menuService.delete(menuService.findById(id)); return ResponseEntity.ok(); } } diff --git a/src/main/java/me/aurora/app/rest/system/PermissionController.java b/src/main/java/me/aurora/app/rest/system/PermissionController.java index 91437b8..27af86d 100644 --- a/src/main/java/me/aurora/app/rest/system/PermissionController.java +++ b/src/main/java/me/aurora/app/rest/system/PermissionController.java @@ -146,7 +146,7 @@ public class PermissionController { @DeleteMapping(value = "/delete") public ResponseEntity delete(@RequestParam Long id) { log.warn("REST request to deletePermission"); - permissionService.delete(id); + permissionService.delete(permissionService.findById(id)); return ResponseEntity.ok(); } } diff --git a/src/main/java/me/aurora/app/rest/system/RoleController.java b/src/main/java/me/aurora/app/rest/system/RoleController.java index ee03e4b..58da60e 100644 --- a/src/main/java/me/aurora/app/rest/system/RoleController.java +++ b/src/main/java/me/aurora/app/rest/system/RoleController.java @@ -144,7 +144,7 @@ public class RoleController { @DeleteMapping(value = "/delete") public ResponseEntity delete(@RequestParam Long id) { log.warn("REST request to deleteRole"); - roleService.delete(id); + roleService.delete(roleService.findById(id)); return ResponseEntity.ok(); } } diff --git a/src/main/java/me/aurora/app/rest/user/UserController.java b/src/main/java/me/aurora/app/rest/user/UserController.java index 69843e1..ced3025 100644 --- a/src/main/java/me/aurora/app/rest/user/UserController.java +++ b/src/main/java/me/aurora/app/rest/user/UserController.java @@ -11,8 +11,6 @@ import me.aurora.service.RoleService; import me.aurora.service.UserService; import me.aurora.service.mapper.UserMapper; import me.aurora.util.HttpContextUtils; -import me.aurora.config.exception.AuroraException; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/me/aurora/app/rest/web/PictureController.java b/src/main/java/me/aurora/app/rest/web/PictureController.java new file mode 100644 index 0000000..e42c890 --- /dev/null +++ b/src/main/java/me/aurora/app/rest/web/PictureController.java @@ -0,0 +1,107 @@ +package me.aurora.app.rest.web; + +import lombok.extern.slf4j.Slf4j; +import me.aurora.annotation.Log; +import me.aurora.domain.ResponseEntity; +import me.aurora.domain.User; +import me.aurora.repository.spec.PictureSpec; +import me.aurora.service.PictureService; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import java.sql.Timestamp; +import java.util.Map; + +/** + * @author 郑杰 + * @date 2018/09/20 14:13:32 + */ +@Slf4j +@RestController +@RequestMapping("/picture") +public class PictureController { + + @Autowired + private PictureService pictureService; + + /** + * 去图床页面 + * @return + */ + @GetMapping(value = "/index") + public ModelAndView index(){ + log.warn("REST request to PicturePage"); + return new ModelAndView("/web/picture/index"); + } + + /** + * 查询全部图片 + * @param username + * @param createTime + * @param endTime + * @param page + * @param limit + * @return + */ + @RequiresPermissions(value={"admin", "picture:all","picture:select"}, logical= Logical.OR) + @GetMapping(value = "/getPictureInfo") + public Map getLogInfo(@RequestParam(value = "username",required = false) String username, + @RequestParam(value = "createTime",required = false) Timestamp createTime, + @RequestParam(value = "endTime",required = false) Timestamp endTime, + @RequestParam(value = "page",defaultValue = "1")Integer page, + @RequestParam(value = "limit",defaultValue = "10")Integer limit){ + + log.warn("REST request to findAll Log"); + Sort sort = new Sort(Sort.Direction.DESC,"createTime"); + Pageable pageable = PageRequest.of(page-1,limit,sort); + return pictureService.getPictureInfo(new PictureSpec(username,createTime,endTime),pageable); + } + + /** + * 去上传页面 + * @return + */ + @RequiresPermissions (value={"admin", "picture:all","picture:add"}, logical= Logical.OR) + @GetMapping(value = "/toAddPage") + public ModelAndView toAddPage(){ + log.warn("REST request to addPicturePage"); + return new ModelAndView("/web/picture/add"); + } + + /** + * 上传图片 + * @param file + * @return + * @throws Exception + */ + @RequiresPermissions (value={"admin", "picture:all","picture:upload"}, logical= Logical.OR) + @PostMapping(value = "/upload") + public ResponseEntity uploadAccessory(@RequestParam MultipartFile file) throws Exception { + User user = (User) SecurityUtils.getSubject().getPrincipal(); + pictureService.upload(file,user); + return ResponseEntity.ok(); + } + + /** + * 删除图片 + * @param id + * @return + */ + @Log("删除图片") + @RequiresPermissions (value={"admin", "picture:all","picture:delete"}, logical= Logical.OR) + @DeleteMapping(value = "/delete") + public ResponseEntity delete(@RequestParam Long id) { + log.warn("REST request to delete picture"); + pictureService.delete(pictureService.findById(id)); + return ResponseEntity.ok(); + } +} diff --git a/src/main/java/me/aurora/config/exception/handler/GlobalExceptionHandler.java b/src/main/java/me/aurora/config/exception/handler/GlobalExceptionHandler.java index 63fd90b..0900f8d 100644 --- a/src/main/java/me/aurora/config/exception/handler/GlobalExceptionHandler.java +++ b/src/main/java/me/aurora/config/exception/handler/GlobalExceptionHandler.java @@ -22,9 +22,9 @@ public class GlobalExceptionHandler { * @return */ @ExceptionHandler(value = AuthorizationException.class) - public ModelAndView handleAuthorizationException() { + public String handleAuthorizationException() { log.error("没有权限访问"); - return new ModelAndView("exception/403"); + return "/exception/403"; } /** diff --git a/src/main/java/me/aurora/config/shiro/ShiroConfig.java b/src/main/java/me/aurora/config/shiro/ShiroConfig.java index 113ca9c..11a432e 100644 --- a/src/main/java/me/aurora/config/shiro/ShiroConfig.java +++ b/src/main/java/me/aurora/config/shiro/ShiroConfig.java @@ -174,6 +174,7 @@ public class ShiroConfig { cookie.setMaxAge(auroraProperties.getShiro().getCookieTimeout()); return cookie; } + /** * cookie管理对象 * @return diff --git a/src/main/java/me/aurora/config/shiro/ShiroRealm.java b/src/main/java/me/aurora/config/shiro/ShiroRealm.java index 43ee4d7..30844ab 100644 --- a/src/main/java/me/aurora/config/shiro/ShiroRealm.java +++ b/src/main/java/me/aurora/config/shiro/ShiroRealm.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; @Slf4j public class ShiroRealm extends AuthorizingRealm { - private final String enabled = "0"; + private final Integer enabled = 0; @Autowired private UserService userService; diff --git a/src/main/java/me/aurora/domain/Picture.java b/src/main/java/me/aurora/domain/Picture.java index be91466..f43a5fc 100644 --- a/src/main/java/me/aurora/domain/Picture.java +++ b/src/main/java/me/aurora/domain/Picture.java @@ -2,18 +2,59 @@ package me.aurora.domain; import lombok.Getter; import lombok.Setter; +import org.checkerframework.checker.units.qual.C; +import org.hibernate.annotations.CreationTimestamp; import javax.persistence.*; import java.io.Serializable; +import java.sql.Timestamp; +/** + * @author 郑杰 + * @date 2018/09/20 14:08:31 + */ @Getter @Setter @Entity -@Table(name = "picture") +@Table(name = "zj_picture") public class Picture implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + private String filename; + private String url; + + private String size; + + private String height; + + private String width; + + /** + * delete URl + */ + @Column(name = "deleteUrl") + private String delete; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @CreationTimestamp + private Timestamp createTime; + + @Override + public String toString() { + return "Picture{" + + "id=" + id + + ", url='" + url + '\'' + + ", size='" + size + '\'' + + ", height='" + height + '\'' + + ", width='" + width + '\'' + + ", deleteUrl='" + delete + '\'' + + ", createTime=" + createTime + + '}'; + } } diff --git a/src/main/java/me/aurora/domain/User.java b/src/main/java/me/aurora/domain/User.java index ffa0a6c..f625b61 100644 --- a/src/main/java/me/aurora/domain/User.java +++ b/src/main/java/me/aurora/domain/User.java @@ -1,5 +1,6 @@ package me.aurora.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -53,6 +54,10 @@ public class User implements Serializable { @JoinTable(name = "zj_users_roles", joinColumns = {@JoinColumn(name = "user_id",referencedColumnName = "id")}, inverseJoinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "id")}) private Set roles; + @OneToMany(cascade = CascadeType.ALL) + @JsonIgnore + private Set pictures; + public interface New{}; public interface Update{}; diff --git a/src/main/java/me/aurora/repository/PictureRepo.java b/src/main/java/me/aurora/repository/PictureRepo.java new file mode 100644 index 0000000..0bab891 --- /dev/null +++ b/src/main/java/me/aurora/repository/PictureRepo.java @@ -0,0 +1,12 @@ +package me.aurora.repository; + +import me.aurora.domain.Picture; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +/** + * @author 郑杰 + * @date 2018/09/20 14:16:05 + */ +public interface PictureRepo extends JpaRepository, JpaSpecificationExecutor { +} diff --git a/src/main/java/me/aurora/repository/RoleRepo.java b/src/main/java/me/aurora/repository/RoleRepo.java index 969ddce..9aa1072 100644 --- a/src/main/java/me/aurora/repository/RoleRepo.java +++ b/src/main/java/me/aurora/repository/RoleRepo.java @@ -4,9 +4,12 @@ import me.aurora.domain.Role; import me.aurora.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Optional; import java.util.Set; /** @@ -29,4 +32,13 @@ public interface RoleRepo extends JpaRepository,JpaSpecificationExecu * @return */ List findByUsers(Set users); + + /** + * 解决懒加载异常 + * @param id + * @return + */ + @Override + @Query("from Role r join fetch r.permissions where r.id = :id") + Optional findById(@Param("id") Long id); } diff --git a/src/main/java/me/aurora/repository/spec/PictureSpec.java b/src/main/java/me/aurora/repository/spec/PictureSpec.java new file mode 100644 index 0000000..fafc4a7 --- /dev/null +++ b/src/main/java/me/aurora/repository/spec/PictureSpec.java @@ -0,0 +1,55 @@ +package me.aurora.repository.spec; + +import cn.hutool.core.util.StrUtil; +import me.aurora.domain.Picture; +import me.aurora.domain.User; +import org.springframework.data.jpa.domain.Specification; +import javax.persistence.criteria.*; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; + + +/** + * @author 郑杰 + * @date 2018/09/20 14:30:21 + */ +public class PictureSpec implements Specification { + + private String username; + private Timestamp createTime; + private Timestamp endTime; + + public PictureSpec(String username, Timestamp createTime, Timestamp endTime) { + this.username = username; + this.createTime = createTime; + this.endTime = endTime; + } + + @Override + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder cb) { + List list = new ArrayList(); + Join userJoin = root.join("user",JoinType.LEFT); + if (!StrUtil.isEmpty(username)) { + list.add(cb.like(userJoin.get("username").as(String.class), "%" + username + "%" )); + } + + if(null!=createTime && null != endTime){ + list.add(cb.greaterThanOrEqualTo(root.get("createTime").as(Timestamp.class),createTime)); + list.add(cb.lessThanOrEqualTo(root.get("createTime").as(Timestamp.class),endTime)); + + } + + Predicate[] p = new Predicate[list.size()]; + return cb.and(list.toArray(p)); + } + + @Override + public String toString() { + return "PictureSpec{" + + "username='" + username + '\'' + + ", createTime=" + createTime + + ", endTime=" + endTime + + '}'; + } +} diff --git a/src/main/java/me/aurora/service/MenuService.java b/src/main/java/me/aurora/service/MenuService.java index 8b74bca..c6f00ed 100644 --- a/src/main/java/me/aurora/service/MenuService.java +++ b/src/main/java/me/aurora/service/MenuService.java @@ -5,7 +5,6 @@ import me.aurora.domain.Role; import me.aurora.domain.vo.MenuVo; import me.aurora.repository.spec.MenuSpec; import me.aurora.service.dto.MenuDTO; -import me.aurora.config.exception.AuroraException; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -70,10 +69,10 @@ public interface MenuService { /** * 删除菜单 - * @param id + * @param menu */ @CacheEvict(allEntries = true) - void delete(Long id); + void delete(Menu menu); /** * 根据ID查询 diff --git a/src/main/java/me/aurora/service/PermissionService.java b/src/main/java/me/aurora/service/PermissionService.java index 9d8d4dc..4f63daf 100644 --- a/src/main/java/me/aurora/service/PermissionService.java +++ b/src/main/java/me/aurora/service/PermissionService.java @@ -54,11 +54,11 @@ public interface PermissionService { /** * 删除权限 - * @param id + * @param permission * @return */ @CacheEvict(allEntries = true) - void delete(Long id); + void delete(Permission permission); /** * 查询所有的权限 diff --git a/src/main/java/me/aurora/service/PictureService.java b/src/main/java/me/aurora/service/PictureService.java new file mode 100644 index 0000000..871d149 --- /dev/null +++ b/src/main/java/me/aurora/service/PictureService.java @@ -0,0 +1,53 @@ +package me.aurora.service; + +import me.aurora.domain.Picture; +import me.aurora.domain.User; +import me.aurora.repository.spec.PictureSpec; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Map; + +/** + * @author 郑杰 + * @date 2018/09/20 14:14:16 + */ +@CacheConfig(cacheNames = "picture") +public interface PictureService { + + /** + * 查询图床 + * @param pictureSpec + * @param pageable + * @return + */ + @Cacheable(keyGenerator = "keyGenerator") + Map getPictureInfo(PictureSpec pictureSpec, Pageable pageable); + + /** + * 上传图片 + * @param file + * @param user + * @return + */ + @CacheEvict(allEntries = true) + void upload(MultipartFile file, User user); + + /** + * 根据ID查询 + * @param id + * @return + */ + @Cacheable(key = "#p0") + Picture findById(Long id); + + /** + * 删除图片 + * @param picture + */ + @CacheEvict(allEntries = true) + void delete(Picture picture); +} diff --git a/src/main/java/me/aurora/service/RoleService.java b/src/main/java/me/aurora/service/RoleService.java index 355d1a4..f690ef8 100644 --- a/src/main/java/me/aurora/service/RoleService.java +++ b/src/main/java/me/aurora/service/RoleService.java @@ -71,11 +71,11 @@ public interface RoleService { /** * 删除角色 - * @param id + * @param role * @return */ @CacheEvict(allEntries = true) - void delete(Long id); + void delete(Role role); /** * 组装树形结构数据 diff --git a/src/main/java/me/aurora/service/dto/PictureDto.java b/src/main/java/me/aurora/service/dto/PictureDto.java new file mode 100644 index 0000000..20675ec --- /dev/null +++ b/src/main/java/me/aurora/service/dto/PictureDto.java @@ -0,0 +1,32 @@ +package me.aurora.service.dto; + +import lombok.Data; +import me.aurora.domain.User; +import org.hibernate.annotations.CreationTimestamp; +import javax.persistence.*; +import java.io.Serializable; +import java.sql.Timestamp; + +/** + * @author 郑杰 + * @date 2018/09/20 14:08:31 + */ +@Data +public class PictureDto implements Serializable { + + private Long id; + + private String filename; + + private String url; + + private String size; + + private String height; + + private String width; + + private String userName; + + private Timestamp createTime; +} diff --git a/src/main/java/me/aurora/service/impl/MenuServiceImpl.java b/src/main/java/me/aurora/service/impl/MenuServiceImpl.java index d930cd6..5343171 100644 --- a/src/main/java/me/aurora/service/impl/MenuServiceImpl.java +++ b/src/main/java/me/aurora/service/impl/MenuServiceImpl.java @@ -13,6 +13,7 @@ import me.aurora.service.mapper.MenuMapper; import me.aurora.util.ListSortUtil; import me.aurora.util.PageUtil; import me.aurora.config.exception.AuroraException; +import me.aurora.util.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -72,7 +73,9 @@ public class MenuServiceImpl implements MenuService { @Override public Menu findByPId(Integer pid) { - return menuRepo.findById(pid.longValue()).get(); + Menu menu = menuRepo.findById(pid.longValue()).get(); + ValidationUtil.isNull(menu,"pid:"+pid+"is not find"); + return menu; } @Override @@ -96,18 +99,20 @@ public class MenuServiceImpl implements MenuService { } @Override - public void delete(Long id) { - List menus = menuRepo.findByPid(Integer.parseInt(id.toString())); + public void delete(Menu menu) { + List menus = menuRepo.findByPid(menu.getPid()); if(menus !=null && menus.size()!=0){ menuRepo.deleteAll(menus); } - menuRepo.deleteById(id); + menuRepo.delete(menu); } @Override public Menu findById(Long id) { - return menuRepo.findById(id).get(); + Menu menu = menuRepo.findById(id).get(); + ValidationUtil.isNull(menu,"id:"+id+"is not find"); + return menu; } @Override diff --git a/src/main/java/me/aurora/service/impl/PermissionServiceImpl.java b/src/main/java/me/aurora/service/impl/PermissionServiceImpl.java index 81ba667..b88371d 100644 --- a/src/main/java/me/aurora/service/impl/PermissionServiceImpl.java +++ b/src/main/java/me/aurora/service/impl/PermissionServiceImpl.java @@ -11,6 +11,7 @@ import me.aurora.service.dto.PermissionDTO; import me.aurora.service.mapper.PerMissionMapper; import me.aurora.util.PageUtil; import me.aurora.config.exception.AuroraException; +import me.aurora.util.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -50,8 +51,9 @@ public class PermissionServiceImpl implements PermissionService { @Override public Permission findById(Long id) { - Optional permission = permissionRepo.findById(id); - return permission.get(); + Permission permission = permissionRepo.findById(id).get(); + ValidationUtil.isNull(permission,"id:"+id+"is not find"); + return permission; } @Override @@ -70,11 +72,7 @@ public class PermissionServiceImpl implements PermissionService { } @Override - public void delete(Long id) { - Permission permission = permissionRepo.findById(id).get(); - if(permission == null){ - throw new AuroraException(HttpStatus.HTTP_NOT_FOUND,"ID为"+id+"的权限没有找到"); - } + public void delete(Permission permission) { if(permission.getRoles() != null && permission.getRoles().size()!=0){ throw new AuroraException(HttpStatus.HTTP_BAD_REQUEST,"暂不支持删除使用中的权限,请先与角色解绑"); } diff --git a/src/main/java/me/aurora/service/impl/PictureServiceImpl.java b/src/main/java/me/aurora/service/impl/PictureServiceImpl.java new file mode 100644 index 0000000..80f5277 --- /dev/null +++ b/src/main/java/me/aurora/service/impl/PictureServiceImpl.java @@ -0,0 +1,110 @@ +package me.aurora.service.impl; + +import cn.hutool.http.HttpStatus; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; +import me.aurora.config.exception.AuroraException; +import me.aurora.domain.Picture; +import me.aurora.domain.User; +import me.aurora.repository.PictureRepo; +import me.aurora.repository.spec.PictureSpec; +import me.aurora.service.PictureService; +import me.aurora.service.dto.PictureDto; +import me.aurora.service.mapper.PictureMapper; +import me.aurora.util.FileUtil; +import me.aurora.util.PageUtil; +import me.aurora.util.SizeUtil; +import me.aurora.util.ValidationUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.FileSystemResource; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.*; +import org.springframework.stereotype.Service; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; +import java.io.File; +import java.util.Map; + +/** + * @author 郑杰 + * @date 2018/09/20 14:14:43 + */ +@Slf4j +@Service +public class PictureServiceImpl implements PictureService { + + private final String uploadUrl = "https://sm.ms/api/upload"; + + private final String SUCCESS = "success"; + + private final String CODE = "code"; + + private final String MSG = "msg"; + + @Autowired + private PictureRepo pictureRepo; + + @Autowired + private PictureMapper pictureMapper; + + @Override + public Map getPictureInfo(PictureSpec pictureSpec, Pageable pageable) { + Page picturePage = pictureRepo.findAll(pictureSpec,pageable); + Page pictureDtos = picturePage.map(pictureMapper::toDto); + return PageUtil.buildPage(pictureDtos.getContent(),picturePage.getTotalElements()); + } + + @Override + public void upload(MultipartFile multipartFile, User user) { + File file = FileUtil.toFile(multipartFile); + //将参数合成一个请求 + HttpEntity requestEntity = new HttpEntity<>(file); + RestTemplate rest = new RestTemplate(); + FileSystemResource resource = new FileSystemResource(file); + MultiValueMap param = new LinkedMultiValueMap<>(); + //sm.ms 固定格式 + param.add("smfile", resource); + //执行HTTP请求 + String str = rest.postForObject(uploadUrl, param, String.class); + JSONObject jsonObject = JSONUtil.parseObj(str); + Picture picture = null; + if(!jsonObject.get(CODE).toString().equals(SUCCESS)){ + throw new AuroraException(HttpStatus.HTTP_BAD_REQUEST,jsonObject.get(MSG).toString()); + } + //转成实体类 + picture = JSON.parseObject(jsonObject.get("data").toString(), Picture.class); + picture.setSize(SizeUtil.getSize(Integer.valueOf(picture.getSize()))); + picture.setUser(user); + picture.setFilename(FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename())); + pictureRepo.save(picture); + //删除临时文件 + FileUtil.deleteFile(file); + } + + @Override + public Picture findById(Long id) { + Picture picture = pictureRepo.findById(id).get(); + ValidationUtil.isNull(picture,"id:"+id+"is not find"); + return picture; + } + + @Override + public void delete(Picture picture) { + RestTemplate rest = new RestTemplate(); + try { + ResponseEntity str = rest.getForEntity(picture.getDelete(), String.class); + if(str.getStatusCode().is2xxSuccessful()){ + pictureRepo.delete(picture); + } + //如果删除的地址出错,直接删除数据库数据 + } catch(Exception e){ + pictureRepo.delete(picture); + } + + } +} diff --git a/src/main/java/me/aurora/service/impl/RoleServiceImpl.java b/src/main/java/me/aurora/service/impl/RoleServiceImpl.java index e8a3ebb..59cd00c 100644 --- a/src/main/java/me/aurora/service/impl/RoleServiceImpl.java +++ b/src/main/java/me/aurora/service/impl/RoleServiceImpl.java @@ -11,6 +11,7 @@ import me.aurora.service.dto.RoleDTO; import me.aurora.service.mapper.RoleMapper; import me.aurora.util.PageUtil; import me.aurora.config.exception.AuroraException; +import me.aurora.util.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -70,7 +71,9 @@ public class RoleServiceImpl implements RoleService { @Override public Role findById(Long id) { - return roleRepo.findById(id).get(); + Role role = roleRepo.findById(id).get(); + ValidationUtil.isNull(role,"id:"+id+"is not find"); + return role; } @Override @@ -92,15 +95,11 @@ public class RoleServiceImpl implements RoleService { } @Override - public void delete(Long id) { - Role role = roleRepo.findById(id).get(); - if(role == null){ - throw new AuroraException(404,"ID为"+id+"的角色未找到"); - } + public void delete(Role role) { if(role.getUsers() != null && role.getUsers().size() != 0){ throw new AuroraException(400,"角色使用中,请先解绑用户"); } - roleRepo.deleteById(id); + roleRepo.delete(role); } @Override diff --git a/src/main/java/me/aurora/service/impl/UserServiceImpl.java b/src/main/java/me/aurora/service/impl/UserServiceImpl.java index 34dbb74..b0f88fe 100644 --- a/src/main/java/me/aurora/service/impl/UserServiceImpl.java +++ b/src/main/java/me/aurora/service/impl/UserServiceImpl.java @@ -14,6 +14,7 @@ import me.aurora.service.mapper.UserMapper; import me.aurora.util.MD5Utils; import me.aurora.util.PageUtil; import me.aurora.config.exception.AuroraException; +import me.aurora.util.ValidationUtil; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -44,8 +45,9 @@ public class UserServiceImpl implements UserService { @Override public User findById(Long id) { - Optional user = userRepo.findById(id); - return user.get(); + User user = userRepo.findById(id).get(); + ValidationUtil.isNull(user,"id:"+id+"is not find"); + return user; } @Override diff --git a/src/main/java/me/aurora/service/mapper/PictureMapper.java b/src/main/java/me/aurora/service/mapper/PictureMapper.java new file mode 100644 index 0000000..8f4664a --- /dev/null +++ b/src/main/java/me/aurora/service/mapper/PictureMapper.java @@ -0,0 +1,18 @@ +package me.aurora.service.mapper; + +import me.aurora.domain.Picture; +import me.aurora.service.dto.PictureDto; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.ReportingPolicy; + +/** + * @author 郑杰 + * @date 2018/09/20 14:09:43 + */ +@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface PictureMapper extends EntityMapper{ + + @Mapping(target = "userName",source = "picture.user.username") + PictureDto toDto(Picture picture); +} diff --git a/src/main/java/me/aurora/util/FileUtil.java b/src/main/java/me/aurora/util/FileUtil.java new file mode 100644 index 0000000..94c62ed --- /dev/null +++ b/src/main/java/me/aurora/util/FileUtil.java @@ -0,0 +1,79 @@ +package me.aurora.util; + +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.util.UUID; + +/** + * File工具类 + * @author 郑杰 + * @date 2018/09/20 16:55:45 + */ +public class FileUtil { + + /** + * MultipartFile转File + * @param multipartFile + * @return + */ + public static File toFile(MultipartFile multipartFile){ + // 获取文件名 + String fileName = multipartFile.getOriginalFilename(); + // 获取文件后缀 + String prefix=getExtensionName(fileName); + File file = null; + try { + // 用uuid作为文件名,防止生成的临时文件重复 + file = File.createTempFile(UUID.randomUUID().toString(), prefix); + // MultipartFile to File + multipartFile.transferTo(file); + } catch (IOException e) { + e.printStackTrace(); + } + return file; + } + + /** + * 删除 + * @param files + */ + public static void deleteFile(File... files) { + for (File file : files) { + if (file.exists()) { + file.delete(); + } + } + } + + /** + * 获取文件扩展名 + * @param filename + * @return + */ + public static String getExtensionName(String filename) { + if ((filename != null) && (filename.length() > 0)) { + int dot = filename.lastIndexOf('.'); + if ((dot >-1) && (dot < (filename.length() - 1))) { + return filename.substring(dot + 1); + } + } + return filename; + } + + /** + * Java文件操作 获取不带扩展名的文件名 + * @param filename + * @return + */ + public static String getFileNameNoEx(String filename) { + if ((filename != null) && (filename.length() > 0)) { + int dot = filename.lastIndexOf('.'); + if ((dot >-1) && (dot < (filename.length()))) { + return filename.substring(0, dot); + } + } + return filename; + } +} diff --git a/src/main/java/me/aurora/util/SizeUtil.java b/src/main/java/me/aurora/util/SizeUtil.java new file mode 100644 index 0000000..a9468f6 --- /dev/null +++ b/src/main/java/me/aurora/util/SizeUtil.java @@ -0,0 +1,48 @@ +package me.aurora.util; + +import java.text.DecimalFormat; + +/** + * 字节转换工具 + * @author 郑杰 + * @date 2018/09/20 14:01:28 + */ +public class SizeUtil { + + /** + * 定义GB的计算常量 + */ + private static final int GB = 1024 * 1024 * 1024; + /** + * 定义MB的计算常量 + */ + private static final int MB = 1024 * 1024; + /** + * 定义KB的计算常量 + */ + private static final int KB = 1024; + + /** + * 格式化小数 + */ + private static final DecimalFormat df = new DecimalFormat("0.00"); + + public static String getSize(int size){ + String resultSize = ""; + if (size / GB >= 1) { + //如果当前Byte的值大于等于1GB + resultSize = df.format(size / (float) GB) + "GB "; + } else if (size / MB >= 1) { + //如果当前Byte的值大于等于1MB + resultSize = df.format(size / (float) MB) + "MB "; + } else if (size / KB >= 1) { + //如果当前Byte的值大于等于1KB + resultSize = df.format(size / (float) KB) + "KB "; + } else { + resultSize = size + "B "; + } + return resultSize; + } + + +} diff --git a/src/main/java/me/aurora/util/ValidationUtil.java b/src/main/java/me/aurora/util/ValidationUtil.java new file mode 100644 index 0000000..db194e9 --- /dev/null +++ b/src/main/java/me/aurora/util/ValidationUtil.java @@ -0,0 +1,23 @@ +package me.aurora.util; + +import cn.hutool.http.HttpStatus; +import me.aurora.config.exception.AuroraException; + +/** + * 验证工具 + * @author 郑杰 + * @date 2018/09/21 10:35:03 + */ +public class ValidationUtil { + + /** + * 验证空 + * @param object + */ + public static void isNull(Object object,String msg){ + System.out.println(msg); + if(object == null){ + throw new AuroraException(HttpStatus.HTTP_NOT_FOUND,msg); + } + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e7f25ec..404cf0e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,10 +8,10 @@ spring: # 数据库访问配置, 使用druid数据源 type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://118.25.192.171:3306/aurora?useUnicode=true&characterEncoding=utf8 -# url: jdbc:log4jdbc:mysql://localhost:3306/aurora?useUnicode=true&characterEncoding=utf8 +# url: jdbc:log4jdbc:mysql://118.25.192.171:3306/aurora?useUnicode=true&characterEncoding=utf8 + url: jdbc:log4jdbc:mysql://localhost:3306/aurora?useUnicode=true&characterEncoding=utf8 username: root - password: dqjdda@1996@. + password: 123456 # 连接池配置 initial-size: 5 min-idle: 5 diff --git a/src/main/resources/sql/aurora.sql b/src/main/resources/sql/aurora.sql index b156f76..e6fe2ec 100644 --- a/src/main/resources/sql/aurora.sql +++ b/src/main/resources/sql/aurora.sql @@ -1,17 +1,17 @@ /* Navicat MySQL Data Transfer - Source Server : 腾讯云 + Source Server : 本地 Source Server Type : MySQL - Source Server Version : 100208 - Source Host : 118.25.192.171:3306 + Source Server Version : 50559 + Source Host : localhost:3306 Source Schema : aurora Target Server Type : MySQL - Target Server Version : 100208 + Target Server Version : 50559 File Encoding : 65001 - Date: 18/09/2018 23:18:39 + Date: 21/09/2018 11:40:53 */ SET NAMES utf8mb4; @@ -29,27 +29,29 @@ CREATE TABLE `zj_menu` ( `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, `soft` bigint(20) NOT NULL, `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `createTime` datetime(0) NULL DEFAULT NULL, - `updateTime` datetime(0) NULL DEFAULT NULL, + `createTime` datetime NULL DEFAULT NULL, + `updateTime` datetime NULL DEFAULT NULL, `level_number` int(11) NOT NULL, PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `UK_cbhg0bi3f1emxkhqqtvca9btx`(`soft`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 19 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of zj_menu -- ---------------------------- -INSERT INTO `zj_menu` VALUES (1, 'layui-icon-util', 0, 1, '异常页', 20, '', '2018-08-29 11:40:17', '2018-09-18 20:26:14', 3); -INSERT INTO `zj_menu` VALUES (2, 'layui-icon-tree', 1, 2, '403', 21, '/exception/403', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); -INSERT INTO `zj_menu` VALUES (3, 'layui-icon-tree', 1, 2, '404', 22, '/exception/404', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); -INSERT INTO `zj_menu` VALUES (4, 'layui-icon-tree', 1, 2, '500', 23, '/exception/500', '2018-08-29 11:40:17', '2018-09-18 20:26:14', 0); -INSERT INTO `zj_menu` VALUES (5, 'layui-icon-util', 0, 1, '系统监控', 10, NULL, '2018-08-29 11:40:17', '2018-09-04 07:40:25', 1); +INSERT INTO `zj_menu` VALUES (1, 'layui-icon-unlink', 0, 1, '异常页', 40, '', '2018-08-29 11:40:17', '2018-09-20 11:44:06', 3); +INSERT INTO `zj_menu` VALUES (2, 'layui-icon-tree', 1, 2, '403', 41, '/exception/403', '2018-08-29 11:40:17', '2018-09-20 11:36:24', 0); +INSERT INTO `zj_menu` VALUES (3, 'layui-icon-tree', 1, 2, '404', 42, '/exception/404', '2018-08-29 11:40:17', '2018-09-20 11:36:32', 0); +INSERT INTO `zj_menu` VALUES (4, 'layui-icon-tree', 1, 2, '500', 43, '/exception/500', '2018-08-29 11:40:17', '2018-09-20 11:36:40', 0); +INSERT INTO `zj_menu` VALUES (5, 'layui-icon-chart', 0, 1, '系统监控', 10, '', '2018-08-29 11:40:17', '2018-09-20 11:42:49', 1); INSERT INTO `zj_menu` VALUES (6, 'layui-icon-tree', 7, 2, '用户管理', 2, '/user/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); -INSERT INTO `zj_menu` VALUES (7, 'layui-icon-util', 0, 1, '系统管理', 1, NULL, '2018-08-29 11:40:17', '2018-09-04 07:40:25', 4); +INSERT INTO `zj_menu` VALUES (7, 'layui-icon-util', 0, 1, '系统管理', 1, '', '2018-08-29 11:40:17', '2018-09-20 19:02:05', 4); INSERT INTO `zj_menu` VALUES (8, 'layui-icon-tree', 7, 2, '菜单管理', 6, '/menu/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); INSERT INTO `zj_menu` VALUES (9, 'layui-icon-tree', 5, 2, '日志管理', 11, '/sysLog/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); INSERT INTO `zj_menu` VALUES (10, 'layui-icon-tree', 7, 2, '权限管理', 4, '/permission/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); INSERT INTO `zj_menu` VALUES (11, 'layui-icon-tree', 7, 2, '角色管理', 3, '/role/index', '2018-08-29 11:40:17', '2018-09-04 07:40:25', 0); +INSERT INTO `zj_menu` VALUES (12, 'layui-icon-website', 0, 1, '网络资源', 30, '', '2018-09-20 11:35:56', '2018-09-20 11:40:53', 1); +INSERT INTO `zj_menu` VALUES (13, 'layui-icon-tree', 12, 2, '图床管理', 31, '/picture/index', '2018-09-20 11:40:53', '2018-09-20 11:40:53', 0); -- ---------------------------- -- Table structure for zj_menus_roles @@ -62,33 +64,41 @@ CREATE TABLE `zj_menus_roles` ( INDEX `role_id`(`role_id`) USING BTREE, CONSTRAINT `zj_menus_roles_ibfk_1` FOREIGN KEY (`menu_id`) REFERENCES `zj_menu` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, CONSTRAINT `zj_menus_roles_ibfk_2` FOREIGN KEY (`role_id`) REFERENCES `zj_role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of zj_menus_roles -- ---------------------------- INSERT INTO `zj_menus_roles` VALUES (1, 1); -INSERT INTO `zj_menus_roles` VALUES (1, 2); INSERT INTO `zj_menus_roles` VALUES (2, 1); -INSERT INTO `zj_menus_roles` VALUES (2, 2); INSERT INTO `zj_menus_roles` VALUES (3, 1); -INSERT INTO `zj_menus_roles` VALUES (3, 2); INSERT INTO `zj_menus_roles` VALUES (4, 1); -INSERT INTO `zj_menus_roles` VALUES (4, 2); INSERT INTO `zj_menus_roles` VALUES (5, 1); -INSERT INTO `zj_menus_roles` VALUES (5, 2); INSERT INTO `zj_menus_roles` VALUES (6, 1); -INSERT INTO `zj_menus_roles` VALUES (6, 2); INSERT INTO `zj_menus_roles` VALUES (7, 1); -INSERT INTO `zj_menus_roles` VALUES (7, 2); INSERT INTO `zj_menus_roles` VALUES (8, 1); -INSERT INTO `zj_menus_roles` VALUES (8, 2); INSERT INTO `zj_menus_roles` VALUES (9, 1); -INSERT INTO `zj_menus_roles` VALUES (9, 2); INSERT INTO `zj_menus_roles` VALUES (10, 1); -INSERT INTO `zj_menus_roles` VALUES (10, 2); INSERT INTO `zj_menus_roles` VALUES (11, 1); +INSERT INTO `zj_menus_roles` VALUES (12, 1); +INSERT INTO `zj_menus_roles` VALUES (13, 1); +INSERT INTO `zj_menus_roles` VALUES (1, 2); +INSERT INTO `zj_menus_roles` VALUES (2, 2); +INSERT INTO `zj_menus_roles` VALUES (3, 2); +INSERT INTO `zj_menus_roles` VALUES (4, 2); +INSERT INTO `zj_menus_roles` VALUES (5, 2); +INSERT INTO `zj_menus_roles` VALUES (6, 2); +INSERT INTO `zj_menus_roles` VALUES (7, 2); +INSERT INTO `zj_menus_roles` VALUES (8, 2); +INSERT INTO `zj_menus_roles` VALUES (9, 2); +INSERT INTO `zj_menus_roles` VALUES (10, 2); INSERT INTO `zj_menus_roles` VALUES (11, 2); +INSERT INTO `zj_menus_roles` VALUES (5, 3); +INSERT INTO `zj_menus_roles` VALUES (7, 3); +INSERT INTO `zj_menus_roles` VALUES (9, 3); +INSERT INTO `zj_menus_roles` VALUES (11, 3); +INSERT INTO `zj_menus_roles` VALUES (12, 3); +INSERT INTO `zj_menus_roles` VALUES (13, 3); -- ---------------------------- -- Table structure for zj_permission @@ -98,28 +108,28 @@ CREATE TABLE `zj_permission` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `perms` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `createTime` datetime(0) NULL DEFAULT NULL, - `updateTime` datetime(0) NULL DEFAULT NULL, + `createTime` datetime NULL DEFAULT NULL, + `updateTime` datetime NULL DEFAULT NULL, `pid` int(11) NOT NULL, PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `UK_djtxn2vldlgrkfk21d155b48i`(`perms`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of zj_permission -- ---------------------------- INSERT INTO `zj_permission` VALUES (1, 'admin', '超级管理员', '2018-08-29 15:15:12', '2018-08-31 00:00:00', 0); INSERT INTO `zj_permission` VALUES (2, 'user:select', '用户查询', '2018-08-29 15:15:12', '2018-08-31 00:00:00', 4); -INSERT INTO `zj_permission` VALUES (3, 'log:select', '日志管理', NULL, '2018-09-02 23:11:37', 0); -INSERT INTO `zj_permission` VALUES (4, 'user:all', '用户管理', NULL, '2018-09-02 23:11:31', 0); +INSERT INTO `zj_permission` VALUES (3, 'log:select', '日志管理', '2018-08-29 15:15:12', '2018-09-02 23:11:37', 0); +INSERT INTO `zj_permission` VALUES (4, 'user:all', '用户管理', '2018-08-29 15:15:12', '2018-09-02 23:11:31', 0); INSERT INTO `zj_permission` VALUES (5, 'user:add', '新增用户', '2018-08-31 15:15:12', '2018-08-31 00:00:00', 4); INSERT INTO `zj_permission` VALUES (6, 'user:update', '更新用户', '2018-08-31 15:15:12', '2018-08-31 00:00:00', 4); -INSERT INTO `zj_permission` VALUES (7, 'user:lock', '禁用用户', NULL, '2018-09-02 12:36:31', 4); -INSERT INTO `zj_permission` VALUES (8, 'permission:all', '权限管理', NULL, '2018-09-02 23:11:04', 0); +INSERT INTO `zj_permission` VALUES (7, 'user:lock', '禁用用户', '2018-08-29 15:15:12', '2018-09-02 12:36:31', 4); +INSERT INTO `zj_permission` VALUES (8, 'permission:all', '权限管理', '2018-08-29 15:15:12', '2018-09-02 23:11:04', 0); INSERT INTO `zj_permission` VALUES (9, 'permission:select', '权限查询', '2018-08-31 14:03:40', '2018-08-31 14:03:40', 8); INSERT INTO `zj_permission` VALUES (10, 'permission:add', '权限新增', '2018-08-31 14:03:52', '2018-08-31 14:03:52', 8); INSERT INTO `zj_permission` VALUES (11, 'permission:update', '权限更新', '2018-08-31 14:04:05', '2018-08-31 14:04:05', 8); -INSERT INTO `zj_permission` VALUES (13, 'role:all', '角色管理', NULL, '2018-09-02 23:10:58', 0); +INSERT INTO `zj_permission` VALUES (13, 'role:all', '角色管理', '2018-08-29 15:15:12', '2018-09-02 23:10:58', 0); INSERT INTO `zj_permission` VALUES (14, 'role:select', '角色查询', '2018-08-31 23:19:34', '2018-08-31 23:19:34', 13); INSERT INTO `zj_permission` VALUES (15, 'role:add', '角色新增', '2018-08-31 23:20:09', '2018-08-31 23:20:09', 13); INSERT INTO `zj_permission` VALUES (16, 'role:update', '角色更新', '2018-08-31 23:20:25', '2018-08-31 23:20:25', 13); @@ -141,7 +151,7 @@ CREATE TABLE `zj_permissions_roles` ( INDEX `FKoj69ypls2picwdvsx1n0j0rp6`(`permission_id`) USING BTREE, CONSTRAINT `FKcdlfc70vro7wbnajmn50wix7w` FOREIGN KEY (`role_id`) REFERENCES `zj_role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, CONSTRAINT `FKoj69ypls2picwdvsx1n0j0rp6` FOREIGN KEY (`permission_id`) REFERENCES `zj_permission` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of zj_permissions_roles @@ -149,9 +159,29 @@ CREATE TABLE `zj_permissions_roles` ( INSERT INTO `zj_permissions_roles` VALUES (1, 1); INSERT INTO `zj_permissions_roles` VALUES (2, 2); INSERT INTO `zj_permissions_roles` VALUES (2, 3); +INSERT INTO `zj_permissions_roles` VALUES (3, 4); +INSERT INTO `zj_permissions_roles` VALUES (3, 8); INSERT INTO `zj_permissions_roles` VALUES (2, 9); INSERT INTO `zj_permissions_roles` VALUES (2, 14); -INSERT INTO `zj_permissions_roles` VALUES (3, 1); + +-- ---------------------------- +-- Table structure for zj_picture +-- ---------------------------- +DROP TABLE IF EXISTS `zj_picture`; +CREATE TABLE `zj_picture` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createTime` datetime NULL DEFAULT NULL, + `deleteUrl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `height` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `size` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `width` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `user_id` bigint(20) NULL DEFAULT NULL, + `filename` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `FK5qtt7wql9517j0e2read2pdus`(`user_id`) USING BTREE, + CONSTRAINT `FK5qtt7wql9517j0e2read2pdus` FOREIGN KEY (`user_id`) REFERENCES `zj_user` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for zj_role @@ -159,19 +189,19 @@ INSERT INTO `zj_permissions_roles` VALUES (3, 1); DROP TABLE IF EXISTS `zj_role`; CREATE TABLE `zj_role` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, - `createDateTime` datetime(0) NULL DEFAULT NULL, + `createDateTime` datetime NULL DEFAULT NULL, `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `updateDateTime` datetime(0) NULL DEFAULT NULL, + `updateDateTime` datetime NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of zj_role -- ---------------------------- INSERT INTO `zj_role` VALUES (1, '2018-08-23 09:13:54', '超级管理员', NULL, '2018-08-23 09:14:02'); INSERT INTO `zj_role` VALUES (2, '2018-08-27 19:31:03', '普通用户', '', '2018-09-01 08:31:08'); -INSERT INTO `zj_role` VALUES (3, '2018-09-03 15:17:31', '测试', '1', '2018-09-03 15:17:31'); +INSERT INTO `zj_role` VALUES (3, '2018-09-03 15:17:31', '测试', '1', '2018-09-20 17:28:03'); -- ---------------------------- -- Table structure for zj_syslog @@ -179,16 +209,16 @@ INSERT INTO `zj_role` VALUES (3, '2018-09-03 15:17:31', '测试', '1', '2018-09- DROP TABLE IF EXISTS `zj_syslog`; CREATE TABLE `zj_syslog` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, - `createTime` datetime(0) NULL DEFAULT NULL, + `createTime` datetime NULL DEFAULT NULL, `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `method` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `operation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `time` int(11) NULL DEFAULT NULL, `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 807 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for zj_user @@ -197,20 +227,34 @@ DROP TABLE IF EXISTS `zj_user`; CREATE TABLE `zj_user` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `createDateTime` datetime(0) NULL DEFAULT NULL, + `createDateTime` datetime NULL DEFAULT NULL, `email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `enabled` bigint(20) NULL DEFAULT NULL, - `lastLoginTime` datetime(0) NULL DEFAULT NULL, + `lastLoginTime` datetime NULL DEFAULT NULL, `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `UK_kpubos9gc2cvtkb0thktkbkes`(`email`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of zj_user -- ---------------------------- -INSERT INTO `zj_user` VALUES (1, 'https://www.zhengjie.me/images/avatar.jpg', '2018-08-23 09:11:56', 'zhengjie@tom.com', 1, '2018-09-18 20:55:29', '65a674ce6632479005ea7a9071234cfb', 'aurora'); +INSERT INTO `zj_user` VALUES (1, 'https://www.zhengjie.me/images/avatar.jpg', '2018-08-23 09:11:56', 'zhengjie@tom.com', 1, '2018-09-21 08:47:20', '65a674ce6632479005ea7a9071234cfb', 'aurora'); +INSERT INTO `zj_user` VALUES (6, 'https://i.loli.net/2018/08/16/5b75166b3157a.jpg', '2018-09-20 17:27:43', '11@qq.com', 0, '2018-09-21 08:45:26', '36318d4cc46eb68050b8b81ebc620f05', '测试'); + +-- ---------------------------- +-- Table structure for zj_user_pictures +-- ---------------------------- +DROP TABLE IF EXISTS `zj_user_pictures`; +CREATE TABLE `zj_user_pictures` ( + `User_id` bigint(20) NOT NULL, + `pictures_id` bigint(20) NOT NULL, + PRIMARY KEY (`User_id`, `pictures_id`) USING BTREE, + UNIQUE INDEX `UK_su439svglheh4cpcy3h15de8`(`pictures_id`) USING BTREE, + CONSTRAINT `FK11v8vnaup1q9xvsb66xjw7qjs` FOREIGN KEY (`pictures_id`) REFERENCES `zj_picture` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, + CONSTRAINT `FKk0qsq0yn0r0644b8p0gw9tkh9` FOREIGN KEY (`User_id`) REFERENCES `zj_user` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for zj_users_roles @@ -223,11 +267,12 @@ CREATE TABLE `zj_users_roles` ( INDEX `role_id`(`role_id`) USING BTREE, CONSTRAINT `zj_users_roles_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `zj_user` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, CONSTRAINT `zj_users_roles_ibfk_2` FOREIGN KEY (`role_id`) REFERENCES `zj_role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of zj_users_roles -- ---------------------------- INSERT INTO `zj_users_roles` VALUES (1, 1); +INSERT INTO `zj_users_roles` VALUES (6, 3); SET FOREIGN_KEY_CHECKS = 1; diff --git a/src/main/resources/templates/system/menu/index.html b/src/main/resources/templates/system/menu/index.html index 986ea7a..b626d07 100644 --- a/src/main/resources/templates/system/menu/index.html +++ b/src/main/resources/templates/system/menu/index.html @@ -86,7 +86,7 @@ ,height:'full-140' ,isFilter:false ,iconOpen:false//是否显示图标【默认显示】 - ,isOpenDefault:false//节点默认是展开还是折叠【默认展开】 + ,isOpenDefault:true//节点默认是展开还是折叠【默认展开】 ,cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 新增 ,cols: [ [ diff --git a/src/main/resources/templates/system/permission/index.html b/src/main/resources/templates/system/permission/index.html index b75bb03..d4b458d 100644 --- a/src/main/resources/templates/system/permission/index.html +++ b/src/main/resources/templates/system/permission/index.html @@ -93,7 +93,7 @@ ,height:'full-140' ,isFilter:false ,iconOpen:false//是否显示图标【默认显示】 - ,isOpenDefault:false//节点默认是展开还是折叠【默认展开】 + ,isOpenDefault:true//节点默认是展开还是折叠【默认展开】 ,cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 新增 ,cols: [ [ @@ -148,7 +148,7 @@ ,area: ['500px', '450px'] ,btnAlign: 'c' ,shade: 0.8 - ,title: '新增权限' + ,title: '编辑权限' ,maxmin: true ,btn: ['确认', '取消'] ,yes: function(){ diff --git a/src/main/resources/templates/system/role/index.html b/src/main/resources/templates/system/role/index.html index bb3029e..255c589 100644 --- a/src/main/resources/templates/system/role/index.html +++ b/src/main/resources/templates/system/role/index.html @@ -136,7 +136,7 @@ ,area: ['500px', '450px'] ,btnAlign: 'c' ,shade: 0.8 - ,title: '新增角色' + ,title: '编辑角色' ,maxmin: true ,btn: ['确认', '取消'] ,yes: function(){ diff --git a/src/main/resources/templates/user/add.html b/src/main/resources/templates/user/add.html index 20dfcdd..3867fc6 100644 --- a/src/main/resources/templates/user/add.html +++ b/src/main/resources/templates/user/add.html @@ -1,6 +1,5 @@ - diff --git a/src/main/resources/templates/web/picture/add.html b/src/main/resources/templates/web/picture/add.html new file mode 100644 index 0000000..ea379fc --- /dev/null +++ b/src/main/resources/templates/web/picture/add.html @@ -0,0 +1,95 @@ + + + + + + Aurora- 上传图片 + + + + + + +
+
+ +
+ + + + + + + + +
文件名大小状态操作
+
+ +
+
+ + + + + + + diff --git a/src/main/resources/templates/web/picture/index.html b/src/main/resources/templates/web/picture/index.html new file mode 100644 index 0000000..e65b76a --- /dev/null +++ b/src/main/resources/templates/web/picture/index.html @@ -0,0 +1,180 @@ +
+
+
+
+
图床管理
+
+ +
+ +
+
+
+
+
+ + \ No newline at end of file