From a4f1ddae9f7a1d6d4eb35a2391de0ca0db483ea3 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Thu, 7 Nov 2019 17:18:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E8=BE=93=E5=85=A5=20[]{}=20=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-system/src/main/java/me/zhengjie/AppRun.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eladmin-system/src/main/java/me/zhengjie/AppRun.java b/eladmin-system/src/main/java/me/zhengjie/AppRun.java index 1a14e9eb..94582b4f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/AppRun.java +++ b/eladmin-system/src/main/java/me/zhengjie/AppRun.java @@ -3,6 +3,9 @@ package me.zhengjie; import me.zhengjie.utils.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -24,4 +27,11 @@ public class AppRun { public SpringContextHolder springContextHolder() { return new SpringContextHolder(); } + + @Bean + public ServletWebServerFactory webServerFactory() { + TomcatServletWebServerFactory fa = new TomcatServletWebServerFactory(); + fa.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "[]{}")); + return fa; + } } From 3daa826375e9b40a2e24877ed5d880f7f23c12cb Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Fri, 8 Nov 2019 21:22:57 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/eladmin.sql | 96 ++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/sql/eladmin.sql b/sql/eladmin.sql index 45b2dc8f..a150972f 100644 --- a/sql/eladmin.sql +++ b/sql/eladmin.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 31/10/2019 12:24:38 + Date: 08/11/2019 21:19:49 */ SET NAMES utf8mb4; @@ -52,7 +52,7 @@ CREATE TABLE `dept` ( `enabled` bit(1) NOT NULL, `create_time` datetime NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of dept @@ -75,7 +75,7 @@ CREATE TABLE `dict` ( `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述', `create_time` datetime NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of dict @@ -98,7 +98,7 @@ CREATE TABLE `dict_detail` ( PRIMARY KEY (`id`) USING BTREE, INDEX `FK5tpkputc6d9nboxojdbgnpmyb`(`dict_id`) USING BTREE, CONSTRAINT `FK5tpkputc6d9nboxojdbgnpmyb` FOREIGN KEY (`dict_id`) REFERENCES `dict` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of dict_detail @@ -124,6 +124,11 @@ CREATE TABLE `email_config` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +-- ---------------------------- +-- Records of email_config +-- ---------------------------- +INSERT INTO `email_config` VALUES (1, '**', '**', '**', '465', 'eladmin'); + -- ---------------------------- -- Table structure for gen_config -- ---------------------------- @@ -143,7 +148,7 @@ CREATE TABLE `gen_config` ( -- ---------------------------- -- Records of gen_config -- ---------------------------- -INSERT INTO `gen_config` VALUES (1, 'Zheng Jie', b'0', 'eladmin-system', 'me.zhengjie.test', 'E:\\workspace\\me\\front\\eladmin-qt\\src\\views\\test1111', 'E:\\workspace\\me\\front\\eladmin-qt\\src\\api', NULL); +INSERT INTO `gen_config` VALUES (1, 'Zheng Jie', b'0', 'eladmin-system', 'me.zhengjie.test', 'E:\\workspace\\me\\front\\eladmin-web\\src\\views\\test', 'E:\\workspace\\me\\front\\eladmin-web\\src\\api', NULL); -- ---------------------------- -- Table structure for job @@ -159,7 +164,7 @@ CREATE TABLE `job` ( PRIMARY KEY (`id`) USING BTREE, INDEX `FKmvhj0rogastlctflsxf1d6k3i`(`dept_id`) USING BTREE, CONSTRAINT `FKmvhj0rogastlctflsxf1d6k3i` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of job @@ -185,7 +190,7 @@ CREATE TABLE `local_storage` ( `operate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作人', `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for log @@ -205,7 +210,7 @@ CREATE TABLE `log` ( `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `browser` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 17040 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 17373 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for menu @@ -239,8 +244,8 @@ INSERT INTO `menu` VALUES (3, b'0', '角色管理', 'system/role/index', 1, 3, ' INSERT INTO `menu` VALUES (5, b'0', '菜单管理', 'system/menu/index', 1, 5, 'menu', 'menu', b'0', b'0', 'Menu', '2018-12-18 15:17:28', 'menu:list', 1); INSERT INTO `menu` VALUES (6, b'0', '系统监控', NULL, 0, 10, 'monitor', 'monitor', b'0', b'0', NULL, '2018-12-18 15:17:48', NULL, 0); INSERT INTO `menu` VALUES (7, b'0', '操作日志', 'monitor/log/index', 6, 11, 'log', 'logs', b'0', b'0', 'Log', '2018-12-18 15:18:26', NULL, 1); -INSERT INTO `menu` VALUES (8, b'0', '系统缓存', 'monitor/redis/index', 6, 13, 'redis', 'redis', b'0', b'0', 'Redis', '2018-12-18 15:19:01', 'redis:list', 1); -INSERT INTO `menu` VALUES (9, b'0', 'SQL监控', 'monitor/sql/index', 6, 14, 'sqlMonitor', 'druid', b'0', b'0', 'Sql', '2018-12-18 15:19:34', NULL, 1); +INSERT INTO `menu` VALUES (8, b'0', '系统缓存', 'monitor/redis/index', 6, 15, 'redis', 'redis', b'0', b'0', 'Redis', '2018-12-18 15:19:01', 'redis:list', 1); +INSERT INTO `menu` VALUES (9, b'0', 'SQL监控', 'monitor/sql/index', 6, 18, 'sqlMonitor', 'druid', b'0', b'0', 'Sql', '2018-12-18 15:19:34', NULL, 1); INSERT INTO `menu` VALUES (10, b'0', '组件管理', NULL, 0, 50, 'zujian', 'components', b'0', b'0', NULL, '2018-12-19 13:38:16', NULL, 0); INSERT INTO `menu` VALUES (11, b'0', '图标库', 'components/IconSelect', 10, 51, 'icon', 'icon', b'0', b'0', 'Icons', '2018-12-19 13:38:49', NULL, 1); INSERT INTO `menu` VALUES (14, b'0', '邮件工具', 'tools/email/index', 36, 24, 'email', 'email', b'0', b'0', 'Email', '2018-12-27 10:13:09', NULL, 1); @@ -291,7 +296,35 @@ INSERT INTO `menu` VALUES (75, b'0', '任务删除', '', 28, 4, '', '', b'0', b' INSERT INTO `menu` VALUES (77, b'0', '上传文件', '', 18, 2, '', '', b'0', b'0', '', '2019-10-29 13:09:09', 'storage:add', 2); INSERT INTO `menu` VALUES (78, b'0', '文件编辑', '', 18, 3, '', '', b'0', b'0', '', '2019-10-29 13:09:22', 'storage:edit', 2); INSERT INTO `menu` VALUES (79, b'0', '文件删除', '', 18, 4, '', '', b'0', b'0', '', '2019-10-29 13:09:34', 'storage:del', 2); -INSERT INTO `menu` VALUES (81, b'0', '服务器监控', 'monitor/server/index', 6, 15, 'system', 'server', b'0', b'0', 'Server', '2019-11-01 16:37:41', 'server:list', 1); +INSERT INTO `menu` VALUES (80, b'0', '服务监控', 'monitor/server/index', 6, 14, 'codeConsole', 'server', b'0', b'0', 'ServerMonitor', '2019-11-07 13:06:39', 'server:list', 1); + +-- ---------------------------- +-- Table structure for monitor_server +-- ---------------------------- +DROP TABLE IF EXISTS `monitor_server`; +CREATE TABLE `monitor_server` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `cpu_core` int(11) NULL DEFAULT NULL, + `cpu_rate` double NULL DEFAULT NULL, + `disk_total` double NULL DEFAULT NULL, + `disk_used` double NULL DEFAULT NULL, + `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `mem_total` double NULL DEFAULT NULL, + `mem_used` double NULL DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `port` int(11) NULL DEFAULT NULL, + `sort` int(11) NULL DEFAULT NULL, + `state` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `swap_total` double NULL DEFAULT NULL, + `swap_used` double NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of monitor_server +-- ---------------------------- +INSERT INTO `monitor_server` VALUES (1, NULL, NULL, NULL, NULL, 'localhost', NULL, NULL, '本地', 8777, 1, '0', NULL, NULL); + -- ---------------------------- -- Table structure for picture -- ---------------------------- @@ -308,7 +341,7 @@ CREATE TABLE `picture` ( `width` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片宽度', `md5code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for qiniu_config @@ -339,7 +372,7 @@ CREATE TABLE `qiniu_content` ( `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件url', `suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for quartz_job @@ -381,7 +414,7 @@ CREATE TABLE `quartz_log` ( `params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `time` bigint(20) NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 269 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for role @@ -396,7 +429,7 @@ CREATE TABLE `role` ( `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', `permission` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of role @@ -497,7 +530,7 @@ INSERT INTO `roles_menus` VALUES (75, 1); INSERT INTO `roles_menus` VALUES (77, 1); INSERT INTO `roles_menus` VALUES (78, 1); INSERT INTO `roles_menus` VALUES (79, 1); -INSERT INTO `roles_menus` VALUES (81, 1); +INSERT INTO `roles_menus` VALUES (80, 1); INSERT INTO `roles_menus` VALUES (1, 2); INSERT INTO `roles_menus` VALUES (2, 2); INSERT INTO `roles_menus` VALUES (3, 2); @@ -556,7 +589,7 @@ CREATE TABLE `user` ( CONSTRAINT `FK5rwmryny6jthaaxkogownknqp` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, CONSTRAINT `FKfftoc2abhot8f2wu6cl9a5iky` FOREIGN KEY (`job_id`) REFERENCES `job` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, CONSTRAINT `FKpq2dhypk2qgt68nauh2by22jb` FOREIGN KEY (`avatar_id`) REFERENCES `user_avatar` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of user @@ -624,33 +657,6 @@ CREATE TABLE `visits` ( `week_day` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `UK_11aksgq87euk9bcyeesfs4vtp`(`date`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 111 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; - --- ---------------------------- --- Records of visits --- ---------------------------- -INSERT INTO `visits` VALUES (108, '2019-10-29 21:45:49', '2019-10-29', 1, 1, 'Tue'); -INSERT INTO `visits` VALUES (109, '2019-10-30 08:58:54', '2019-10-30', 2, 11, 'Wed'); -INSERT INTO `visits` VALUES (110, '2019-10-31 09:04:18', '2019-10-31', 2, 8, 'Thu'); - - -DROP TABLE IF EXISTS `monitor_server`; -CREATE TABLE `monitor_server` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号', - `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称', - `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'IP地址', - `port` int(11) NULL DEFAULT NULL COMMENT '访问端口', - `state` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '状态', - `cpu_rate` float NULL DEFAULT NULL COMMENT 'CPU使用率', - `cpu_core` int(11) NULL DEFAULT NULL COMMENT 'CPU内核数', - `mem_total` float NULL DEFAULT NULL COMMENT '内存总数', - `mem_used` float NULL DEFAULT NULL COMMENT '内存使用量', - `disk_total` float NULL DEFAULT NULL COMMENT '磁盘总量', - `disk_used` float NULL DEFAULT NULL COMMENT '磁盘使用量', - `swap_total` float NULL DEFAULT NULL COMMENT '交换区总量', - `swap_used` float NULL DEFAULT NULL COMMENT '交换区使用量', - `sort` int(11) NULL DEFAULT NULL COMMENT '排序', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '服务器监控' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 118 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; SET FOREIGN_KEY_CHECKS = 1; From 5ab7fb5b73427700655997a144ec9ee6db334e63 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Sun, 17 Nov 2019 14:34:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=20Not=20Equal=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/annotation/Query.java | 2 + .../java/me/zhengjie/utils/QueryHelp.java | 3 ++ eladmin-generator/pom.xml | 39 +++++++++++++++++++ .../java/me/zhengjie}/domain/GenConfig.java | 7 +--- .../me/zhengjie}/domain/vo/ColumnInfo.java | 2 +- .../me/zhengjie}/domain/vo/TableInfo.java | 2 +- .../repository/GenConfigRepository.java | 4 +- .../zhengjie}/rest/GenConfigController.java | 6 +-- .../zhengjie}/rest/GeneratorController.java | 9 ++--- .../zhengjie}/service/GenConfigService.java | 4 +- .../zhengjie}/service/GeneratorService.java | 6 +-- .../service/impl/GenConfigServiceImpl.java | 8 ++-- .../service/impl/GeneratorServiceImpl.java | 12 +++--- .../main/java/me/zhengjie}/utils/ColUtil.java | 6 +-- .../main/java/me/zhengjie}/utils/GenUtil.java | 8 ++-- eladmin-system/pom.xml | 12 ++++++ .../modules/system/rest/UserController.java | 4 +- eladmin-tools/pom.xml | 14 ------- .../tools => }/domain/AlipayConfig.java | 2 +- .../tools => }/domain/EmailConfig.java | 2 +- .../tools => }/domain/LocalStorage.java | 2 +- .../{modules/tools => }/domain/Picture.java | 2 +- .../tools => }/domain/QiniuConfig.java | 2 +- .../tools => }/domain/QiniuContent.java | 2 +- .../tools => }/domain/VerificationCode.java | 2 +- .../tools => }/domain/vo/EmailVo.java | 2 +- .../tools => }/domain/vo/TradeVo.java | 2 +- .../repository/AlipayRepository.java | 4 +- .../repository/EmailRepository.java | 4 +- .../repository/LocalStorageRepository.java | 4 +- .../repository/PictureRepository.java | 4 +- .../repository/QiNiuConfigRepository.java | 4 +- .../repository/QiniuContentRepository.java | 4 +- .../VerificationCodeRepository.java | 4 +- .../tools => }/rest/AliPayController.java | 12 +++--- .../tools => }/rest/EmailController.java | 8 ++-- .../rest/LocalStorageController.java | 8 ++-- .../tools => }/rest/PictureController.java | 8 ++-- .../tools => }/rest/QiniuController.java | 10 ++--- .../rest/VerificationCodeController.java | 10 ++--- .../tools => }/service/AlipayService.java | 6 +-- .../tools => }/service/EmailService.java | 6 +-- .../service/LocalStorageService.java | 8 ++-- .../tools => }/service/PictureService.java | 6 +-- .../tools => }/service/QiNiuService.java | 8 ++-- .../service/VerificationCodeService.java | 6 +-- .../service/dto/LocalStorageDTO.java | 2 +- .../dto/LocalStorageQueryCriteria.java | 2 +- .../service/dto/PictureQueryCriteria.java | 2 +- .../service/dto/QiniuQueryCriteria.java | 2 +- .../service/impl/AlipayServiceImpl.java | 10 ++--- .../service/impl/EmailServiceImpl.java | 10 ++--- .../service/impl/LocalStorageServiceImpl.java | 14 +++---- .../service/impl/PictureServiceImpl.java | 10 ++--- .../service/impl/QiNiuServiceImpl.java | 16 ++++---- .../impl/VerificationCodeServiceImpl.java | 10 ++--- .../service/mapper/LocalStorageMapper.java | 6 +-- .../tools => }/utils/AliPayStatusEnum.java | 2 +- .../tools => }/utils/AlipayUtils.java | 4 +- .../{modules/tools => }/utils/QiNiuUtil.java | 2 +- pom.xml | 3 +- 61 files changed, 210 insertions(+), 175 deletions(-) create mode 100644 eladmin-generator/pom.xml rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/domain/GenConfig.java (77%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/domain/vo/ColumnInfo.java (93%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/domain/vo/TableInfo.java (90%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/repository/GenConfigRepository.java (64%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/rest/GenConfigController.java (86%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/rest/GeneratorController.java (90%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/service/GenConfigService.java (60%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/service/GeneratorService.java (80%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/service/impl/GenConfigServiceImpl.java (87%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/service/impl/GeneratorServiceImpl.java (89%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/utils/ColUtil.java (75%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/utils/GenUtil.java (97%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/AlipayConfig.java (97%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/EmailConfig.java (94%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/LocalStorage.java (97%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/Picture.java (95%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/QiniuConfig.java (96%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/QiniuContent.java (95%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/VerificationCode.java (96%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/vo/EmailVo.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/vo/TradeVo.java (96%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/AlipayRepository.java (65%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/EmailRepository.java (65%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/LocalStorageRepository.java (75%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/PictureRepository.java (78%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/QiNiuConfigRepository.java (80%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/QiniuContentRepository.java (81%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/VerificationCodeRepository.java (83%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/AliPayController.java (94%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/EmailController.java (87%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/LocalStorageController.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/PictureController.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/QiniuController.java (93%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/VerificationCodeController.java (87%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/AlipayService.java (85%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/EmailService.java (82%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/LocalStorageService.java (76%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/PictureService.java (81%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/QiNiuService.java (89%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/VerificationCodeService.java (69%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/dto/LocalStorageDTO.java (91%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/dto/LocalStorageQueryCriteria.java (90%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/dto/PictureQueryCriteria.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/dto/QiniuQueryCriteria.java (90%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/AlipayServiceImpl.java (94%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/EmailServiceImpl.java (91%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/LocalStorageServiceImpl.java (93%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/PictureServiceImpl.java (94%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/QiNiuServiceImpl.java (95%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/VerificationCodeServiceImpl.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/mapper/LocalStorageMapper.java (65%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/utils/AliPayStatusEnum.java (91%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/utils/AlipayUtils.java (95%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/utils/QiNiuUtil.java (97%) diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java index 0a583390..8d986b9c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java +++ b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java @@ -50,6 +50,8 @@ public @interface Query { , LESS_THAN_NQ // jie 2019/6/4 包含 , IN + // 不等于 + ,NOT_EQUAL } /** diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java index 7c82dc1e..e8c59d79 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java @@ -106,6 +106,9 @@ public class QueryHelp { list.add(getExpression(attributeName,join,root).in((Collection) val)); } break; + case NOT_EQUAL: + list.add(cb.notEqual(getExpression(attributeName,join,root), val)); + break; default: break; } } diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml new file mode 100644 index 00000000..1ac5ccb1 --- /dev/null +++ b/eladmin-generator/pom.xml @@ -0,0 +1,39 @@ + + + + eladmin + me.zhengjie + 2.3 + + 4.0.0 + + eladmin-generator + 代码生成模块 + + + 1.9 + + + + + me.zhengjie + eladmin-common + 2.3 + + + + + org.springframework.boot + spring-boot-starter-freemarker + + + + + commons-configuration + commons-configuration + ${configuration.version} + + + \ No newline at end of file diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java similarity index 77% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java rename to eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java index 516fc208..30790e46 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java @@ -1,10 +1,7 @@ -package me.zhengjie.modules.generator.domain; +package me.zhengjie.domain; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * 代码生成配置 diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java rename to eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java index ba387d78..a22470aa 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.generator.domain.vo; +package me.zhengjie.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/TableInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java similarity index 90% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/TableInfo.java rename to eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java index d753a9c0..b1b6ba4e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/TableInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.generator.domain.vo; +package me.zhengjie.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/repository/GenConfigRepository.java b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java similarity index 64% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/repository/GenConfigRepository.java rename to eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java index 0cd8a142..d72787d0 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/repository/GenConfigRepository.java +++ b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.generator.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.generator.domain.GenConfig; +import me.zhengjie.domain.GenConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java similarity index 86% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java rename to eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java index 3788be8b..0650b959 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java @@ -1,9 +1,9 @@ -package me.zhengjie.modules.generator.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.service.GenConfigService; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.service.GenConfigService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java similarity index 90% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GeneratorController.java rename to eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index 1661b878..653489e2 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GeneratorController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -1,17 +1,16 @@ -package me.zhengjie.modules.generator.rest; +package me.zhengjie.rest; import cn.hutool.core.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import me.zhengjie.domain.vo.ColumnInfo; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.generator.domain.vo.ColumnInfo; -import me.zhengjie.modules.generator.service.GenConfigService; -import me.zhengjie.modules.generator.service.GeneratorService; +import me.zhengjie.service.GenConfigService; +import me.zhengjie.service.GeneratorService; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; - import java.util.List; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java similarity index 60% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java rename to eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java index 0023e93e..67afbbf5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.generator.service; +package me.zhengjie.service; -import me.zhengjie.modules.generator.domain.GenConfig; +import me.zhengjie.domain.GenConfig; /** * @author Zheng Jie diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java similarity index 80% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java rename to eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java index ed585370..7ddb7f1e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.generator.service; +package me.zhengjie.service; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.domain.vo.ColumnInfo; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.domain.vo.ColumnInfo; import java.util.List; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GenConfigServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java similarity index 87% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GenConfigServiceImpl.java rename to eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java index 1d7cc19f..4dfa354c 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GenConfigServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.generator.service.impl; +package me.zhengjie.service.impl; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.repository.GenConfigRepository; -import me.zhengjie.modules.generator.service.GenConfigService; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.repository.GenConfigRepository; +import me.zhengjie.service.GenConfigService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java similarity index 89% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java rename to eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java index 6a7e6459..51198e56 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java @@ -1,12 +1,12 @@ -package me.zhengjie.modules.generator.service.impl; +package me.zhengjie.service.impl; import cn.hutool.core.util.ObjectUtil; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.domain.vo.ColumnInfo; +import me.zhengjie.domain.vo.TableInfo; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.domain.vo.ColumnInfo; -import me.zhengjie.modules.generator.domain.vo.TableInfo; -import me.zhengjie.modules.generator.service.GeneratorService; -import me.zhengjie.modules.generator.utils.GenUtil; +import me.zhengjie.service.GeneratorService; +import me.zhengjie.utils.GenUtil; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.StringUtils; import org.springframework.stereotype.Service; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java similarity index 75% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java rename to eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java index 0b9a37d2..9a119f2a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java @@ -1,8 +1,6 @@ -package me.zhengjie.modules.generator.utils; +package me.zhengjie.utils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration.*; /** * sql字段转java diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java rename to eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index 6f223b4d..2fb826c5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -1,12 +1,10 @@ -package me.zhengjie.modules.generator.utils; +package me.zhengjie.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.*; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.domain.vo.ColumnInfo; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.StringUtils; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.domain.vo.ColumnInfo; import org.springframework.util.ObjectUtils; import java.io.File; import java.io.FileWriter; diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index 8c350703..67d8db37 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -17,6 +17,18 @@ + + + me.zhengjie + eladmin-generator + 2.3 + + + me.zhengjie + eladmin-common + + + diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index d15613bb..4084e068 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.zhengjie.aop.log.Log; import me.zhengjie.config.DataScope; -import me.zhengjie.modules.tools.domain.VerificationCode; +import me.zhengjie.domain.VerificationCode; import me.zhengjie.modules.system.domain.User; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.vo.UserPassVo; @@ -12,7 +12,7 @@ import me.zhengjie.modules.system.service.DeptService; import me.zhengjie.modules.system.service.RoleService; import me.zhengjie.modules.system.service.dto.RoleSmallDTO; import me.zhengjie.modules.system.service.dto.UserQueryCriteria; -import me.zhengjie.modules.tools.service.VerificationCodeService; +import me.zhengjie.service.VerificationCodeService; import me.zhengjie.utils.*; import me.zhengjie.modules.system.service.UserService; import org.springframework.data.domain.Pageable; diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml index 878cbf12..62df3e9f 100644 --- a/eladmin-tools/pom.xml +++ b/eladmin-tools/pom.xml @@ -16,7 +16,6 @@ 1.4.7 [7.2.0, 7.2.99] 3.1.0 - 1.9 @@ -34,19 +33,6 @@ ${mail.version} - - - org.springframework.boot - spring-boot-starter-freemarker - - - - - commons-configuration - commons-configuration - ${configuration.version} - - com.qiniu diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java index 25b99d62..914adf75 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; import javax.persistence.*; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/EmailConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/EmailConfig.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java index 4033cdc3..c49131dc 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/EmailConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/LocalStorage.java b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/LocalStorage.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java index c7373ed7..9d6e9fcf 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/LocalStorage.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.*; import cn.hutool.core.bean.BeanUtil; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/Picture.java b/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/Picture.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java index 50dc37f1..09a2867e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/Picture.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuConfig.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java index 1bf77b98..f4f84858 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; import javax.persistence.*; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuContent.java b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuContent.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java index fad5a3af..3d1b7a06 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuContent.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; import org.hibernate.annotations.UpdateTimestamp; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/VerificationCode.java b/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/VerificationCode.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java index 3be1bc81..8fd96689 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/VerificationCode.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/EmailVo.java b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/EmailVo.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java index 6537347d..289aa30d 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/EmailVo.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain.vo; +package me.zhengjie.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/TradeVo.java b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/TradeVo.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java index 702df7cd..638ab9b5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/TradeVo.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain.vo; +package me.zhengjie.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/AlipayRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java similarity index 65% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/AlipayRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java index c2fb3a56..fe1c0080 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/AlipayRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.AlipayConfig; +import me.zhengjie.domain.AlipayConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/EmailRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java similarity index 65% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/EmailRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java index 6341bf7e..d5fb22fc 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/EmailRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.EmailConfig; +import me.zhengjie.domain.EmailConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/LocalStorageRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java similarity index 75% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/LocalStorageRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java index c6908452..15554451 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/LocalStorageRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.LocalStorage; +import me.zhengjie.domain.LocalStorage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/PictureRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java similarity index 78% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/PictureRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java index 08e64032..59c66945 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/PictureRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.Picture; +import me.zhengjie.domain.Picture; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiNiuConfigRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java similarity index 80% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiNiuConfigRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java index a08cb1d8..86ff49c7 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiNiuConfigRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.QiniuConfig; +import me.zhengjie.domain.QiniuConfig; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiniuContentRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java similarity index 81% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiniuContentRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java index 1c82fecc..f6fdb1da 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiniuContentRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.QiniuContent; +import me.zhengjie.domain.QiniuContent; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/VerificationCodeRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java similarity index 83% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/VerificationCodeRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java index d973a4ec..c602a45e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/VerificationCodeRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.VerificationCode; +import me.zhengjie.domain.VerificationCode; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/AliPayController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/AliPayController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java index d35f9799..8994dcae 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/AliPayController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java @@ -1,15 +1,15 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import me.zhengjie.annotation.AnonymousAccess; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.AlipayConfig; -import me.zhengjie.modules.tools.domain.vo.TradeVo; -import me.zhengjie.modules.tools.utils.AliPayStatusEnum; -import me.zhengjie.modules.tools.utils.AlipayUtils; -import me.zhengjie.modules.tools.service.AlipayService; +import me.zhengjie.domain.vo.TradeVo; +import me.zhengjie.domain.AlipayConfig; +import me.zhengjie.utils.AliPayStatusEnum; +import me.zhengjie.utils.AlipayUtils; +import me.zhengjie.service.AlipayService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/EmailController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java similarity index 87% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/EmailController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java index 782c9a5f..f4892e5f 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/EmailController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java @@ -1,11 +1,11 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.EmailConfig; -import me.zhengjie.modules.tools.domain.vo.EmailVo; -import me.zhengjie.modules.tools.service.EmailService; +import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.EmailConfig; +import me.zhengjie.service.EmailService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/LocalStorageController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/LocalStorageController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java index a520fd1b..0dce020f 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/LocalStorageController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java @@ -1,9 +1,9 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.LocalStorage; -import me.zhengjie.modules.tools.service.LocalStorageService; -import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria; +import me.zhengjie.domain.LocalStorage; +import me.zhengjie.service.LocalStorageService; +import me.zhengjie.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/PictureController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/PictureController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java index fb4bddfb..8a7852f4 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/PictureController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java @@ -1,11 +1,11 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.Picture; -import me.zhengjie.modules.tools.service.PictureService; -import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria; +import me.zhengjie.domain.Picture; +import me.zhengjie.service.PictureService; +import me.zhengjie.service.dto.PictureQueryCriteria; import me.zhengjie.utils.SecurityUtils; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/QiniuController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/QiniuController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java index c76f03f6..e8f5bc03 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/QiniuController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java @@ -1,13 +1,13 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.QiniuConfig; -import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria; -import me.zhengjie.modules.tools.domain.QiniuContent; -import me.zhengjie.modules.tools.service.QiNiuService; +import me.zhengjie.domain.QiniuConfig; +import me.zhengjie.domain.QiniuContent; +import me.zhengjie.service.dto.QiniuQueryCriteria; +import me.zhengjie.service.QiNiuService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/VerificationCodeController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java similarity index 87% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/VerificationCodeController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java index 02471175..bffa0948 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/VerificationCodeController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java @@ -1,11 +1,11 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import me.zhengjie.modules.tools.domain.VerificationCode; -import me.zhengjie.modules.tools.domain.vo.EmailVo; -import me.zhengjie.modules.tools.service.EmailService; -import me.zhengjie.modules.tools.service.VerificationCodeService; +import me.zhengjie.domain.VerificationCode; +import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.service.EmailService; +import me.zhengjie.service.VerificationCodeService; import me.zhengjie.utils.ElAdminConstant; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/AlipayService.java b/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java similarity index 85% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/AlipayService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java index 916541e4..1d5a82f5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/AlipayService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.AlipayConfig; -import me.zhengjie.modules.tools.domain.vo.TradeVo; +import me.zhengjie.domain.vo.TradeVo; +import me.zhengjie.domain.AlipayConfig; /** * @author Zheng Jie diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/EmailService.java b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java similarity index 82% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/EmailService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java index ab5a79f9..a8e05d3e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/EmailService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.EmailConfig; -import me.zhengjie.modules.tools.domain.vo.EmailVo; +import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.EmailConfig; import org.springframework.scheduling.annotation.Async; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/LocalStorageService.java b/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java similarity index 76% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/LocalStorageService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java index 133dde9a..f8990bad 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/LocalStorageService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.LocalStorage; -import me.zhengjie.modules.tools.service.dto.LocalStorageDTO; -import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria; +import me.zhengjie.domain.LocalStorage; +import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/PictureService.java b/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java similarity index 81% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/PictureService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java index 9f594b69..746ec580 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/PictureService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.Picture; -import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria; +import me.zhengjie.domain.Picture; +import me.zhengjie.service.dto.PictureQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/QiNiuService.java b/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java similarity index 89% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/QiNiuService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java index 45305d5d..4704f979 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/QiNiuService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.QiniuConfig; -import me.zhengjie.modules.tools.domain.QiniuContent; -import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria; +import me.zhengjie.domain.QiniuConfig; +import me.zhengjie.domain.QiniuContent; +import me.zhengjie.service.dto.QiniuQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/VerificationCodeService.java b/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java similarity index 69% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/VerificationCodeService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java index 1098cb4d..058947f5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/VerificationCodeService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.VerificationCode; -import me.zhengjie.modules.tools.domain.vo.EmailVo; +import me.zhengjie.domain.VerificationCode; +import me.zhengjie.domain.vo.EmailVo; /** * @author Zheng Jie diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageDTO.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageDTO.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java index 94b1a74f..b71c687c 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageDTO.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.dto; +package me.zhengjie.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java similarity index 90% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageQueryCriteria.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java index c3f0b3a1..089aeda7 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.dto; +package me.zhengjie.service.dto; import lombok.Data; import java.sql.Timestamp; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/PictureQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/PictureQueryCriteria.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java index 4821b9d2..2869e7ee 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/PictureQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.dto; +package me.zhengjie.service.dto; import lombok.Data; import me.zhengjie.annotation.Query; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/QiniuQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java similarity index 90% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/QiniuQueryCriteria.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java index adc50605..6f02941a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/QiniuQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.dto; +package me.zhengjie.service.dto; import lombok.Data; import me.zhengjie.annotation.Query; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/AlipayServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/AlipayServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java index afab5e1f..f0ef1bb4 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/AlipayServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java @@ -1,14 +1,14 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import com.alipay.api.AlipayClient; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradePagePayRequest; import com.alipay.api.request.AlipayTradeWapPayRequest; -import me.zhengjie.modules.tools.domain.AlipayConfig; -import me.zhengjie.modules.tools.domain.vo.TradeVo; +import me.zhengjie.domain.vo.TradeVo; +import me.zhengjie.domain.AlipayConfig; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.tools.repository.AlipayRepository; -import me.zhengjie.modules.tools.service.AlipayService; +import me.zhengjie.repository.AlipayRepository; +import me.zhengjie.service.AlipayService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/EmailServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/EmailServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java index 7206fc48..fee562de 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/EmailServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java @@ -1,12 +1,12 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; -import me.zhengjie.modules.tools.domain.EmailConfig; -import me.zhengjie.modules.tools.domain.vo.EmailVo; +import me.zhengjie.domain.EmailConfig; +import me.zhengjie.domain.vo.EmailVo; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.tools.repository.EmailRepository; -import me.zhengjie.modules.tools.service.EmailService; +import me.zhengjie.repository.EmailRepository; +import me.zhengjie.service.EmailService; import me.zhengjie.utils.EncryptUtils; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CachePut; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/LocalStorageServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/LocalStorageServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java index f8e08c95..0849ba2d 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/LocalStorageServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java @@ -1,14 +1,14 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import cn.hutool.core.util.ObjectUtil; -import me.zhengjie.modules.tools.domain.LocalStorage; -import me.zhengjie.modules.tools.service.dto.LocalStorageDTO; -import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria; -import me.zhengjie.modules.tools.service.mapper.LocalStorageMapper; +import me.zhengjie.domain.LocalStorage; +import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.service.dto.LocalStorageQueryCriteria; +import me.zhengjie.service.mapper.LocalStorageMapper; import me.zhengjie.exception.BadRequestException; import me.zhengjie.utils.*; -import me.zhengjie.modules.tools.repository.LocalStorageRepository; -import me.zhengjie.modules.tools.service.LocalStorageService; +import me.zhengjie.repository.LocalStorageRepository; +import me.zhengjie.service.LocalStorageService; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/PictureServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/PictureServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java index a91dfb56..bd57e129 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/PictureServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java @@ -1,14 +1,14 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.modules.tools.domain.Picture; -import me.zhengjie.modules.tools.repository.PictureRepository; -import me.zhengjie.modules.tools.service.PictureService; -import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria; +import me.zhengjie.domain.Picture; +import me.zhengjie.repository.PictureRepository; +import me.zhengjie.service.PictureService; +import me.zhengjie.service.dto.PictureQueryCriteria; import me.zhengjie.exception.BadRequestException; import me.zhengjie.utils.*; import org.springframework.cache.annotation.CacheConfig; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/QiNiuServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/QiNiuServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java index eb52ec2c..3300fd80 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/QiNiuServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import com.alibaba.fastjson.JSON; import com.qiniu.common.QiniuException; @@ -9,14 +9,14 @@ import com.qiniu.storage.UploadManager; import com.qiniu.storage.model.DefaultPutRet; import com.qiniu.storage.model.FileInfo; import com.qiniu.util.Auth; -import me.zhengjie.modules.tools.domain.QiniuConfig; -import me.zhengjie.modules.tools.domain.QiniuContent; -import me.zhengjie.modules.tools.repository.QiniuContentRepository; -import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria; -import me.zhengjie.modules.tools.utils.QiNiuUtil; +import me.zhengjie.domain.QiniuConfig; +import me.zhengjie.domain.QiniuContent; +import me.zhengjie.repository.QiniuContentRepository; +import me.zhengjie.service.dto.QiniuQueryCriteria; +import me.zhengjie.utils.QiNiuUtil; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.tools.repository.QiNiuConfigRepository; -import me.zhengjie.modules.tools.service.QiNiuService; +import me.zhengjie.repository.QiNiuConfigRepository; +import me.zhengjie.service.QiNiuService; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.QueryHelp; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/VerificationCodeServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/VerificationCodeServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java index 93d6ea41..bb47fe5d 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/VerificationCodeServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; @@ -6,11 +6,11 @@ import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; -import me.zhengjie.modules.tools.domain.VerificationCode; -import me.zhengjie.modules.tools.domain.vo.EmailVo; +import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.VerificationCode; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.tools.repository.VerificationCodeRepository; -import me.zhengjie.modules.tools.service.VerificationCodeService; +import me.zhengjie.repository.VerificationCodeRepository; +import me.zhengjie.service.VerificationCodeService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/mapper/LocalStorageMapper.java b/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java similarity index 65% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/mapper/LocalStorageMapper.java rename to eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java index f3d3d20b..e3fb8f0a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/mapper/LocalStorageMapper.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.tools.service.mapper; +package me.zhengjie.service.mapper; import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.tools.service.dto.LocalStorageDTO; -import me.zhengjie.modules.tools.domain.LocalStorage; +import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.domain.LocalStorage; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AliPayStatusEnum.java b/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AliPayStatusEnum.java rename to eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java index 4cb5fcc8..9bda06e8 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AliPayStatusEnum.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.utils; +package me.zhengjie.utils; /** * 支付状态 diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AlipayUtils.java b/eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AlipayUtils.java rename to eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java index 5c64327b..bf38d29b 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AlipayUtils.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.tools.utils; +package me.zhengjie.utils; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; -import me.zhengjie.modules.tools.domain.AlipayConfig; +import me.zhengjie.domain.AlipayConfig; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/QiNiuUtil.java b/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/QiNiuUtil.java rename to eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java index 5d09fc1a..73a401cf 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/QiNiuUtil.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.utils; +package me.zhengjie.utils; import com.qiniu.storage.Region; import me.zhengjie.utils.FileUtil; diff --git a/pom.xml b/pom.xml index 803708a3..824758aa 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ eladmin-system eladmin-tools eladmin-monitor - + eladmin-generator + EL-ADMIN后台管理系统 http://auauz.net From 41b562f37403e47fa7e97928b4b1536ac5d670d8 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Sun, 17 Nov 2019 22:40:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/domain/ColumnInfo.java | 74 +++++++++++++++++++ .../java/me/zhengjie/domain/GenConfig.java | 17 +++++ .../me/zhengjie/domain/vo/ColumnInfo.java | 40 ---------- .../repository/ColumnInfoRepository.java | 14 ++++ .../repository/GenConfigRepository.java | 2 + .../me/zhengjie/rest/GenConfigController.java | 8 +- .../me/zhengjie/rest/GeneratorController.java | 23 ++++-- .../me/zhengjie/service/GenConfigService.java | 4 +- .../me/zhengjie/service/GeneratorService.java | 19 ++++- .../service/impl/GenConfigServiceImpl.java | 19 ++--- .../service/impl/GeneratorServiceImpl.java | 47 ++++++++++-- .../main/java/me/zhengjie/utils/GenUtil.java | 16 ++-- .../modules/system/rest/DictController.java | 8 ++ 13 files changed, 215 insertions(+), 76 deletions(-) create mode 100644 eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java delete mode 100644 eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java create mode 100644 eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java new file mode 100644 index 00000000..52f83da2 --- /dev/null +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java @@ -0,0 +1,74 @@ +package me.zhengjie.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +/** + * 列的数据信息 + * @author Zheng Jie + * @date 2019-01-02 + */ +@Data +@Entity +@NoArgsConstructor +@Table(name = "column_config") +public class ColumnInfo { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Long id; + + private String tableName; + + // 数据库字段名称 + private String columnName; + + // 数据库字段类型 + private String columnType; + + // 数据库字段键类型 + private String keyType; + + // 字段额外的参数 + private String extra; + + // 数据库字段描述 + private String remark; + + // 必填 + private Boolean notNull; + + // 是否在列表显示 + private Boolean listShow; + + // 是否表单显示 + private Boolean formShow; + + // 表单类型 + private String formType; + + // 查询 1:模糊 2：精确 + private String queryType; + + // 字典名称 + private String dictName; + + // 关联表名 + private String joinName; + + public ColumnInfo(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) { + this.tableName = tableName; + this.columnName = columnName; + this.columnType = columnType; + this.keyType = keyType; + this.extra = extra; + this.remark = remark; + this.notNull = notNull; + this.listShow = true; + this.formShow = true; + } +} diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java index 30790e46..96a9cc36 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java @@ -1,7 +1,9 @@ package me.zhengjie.domain; import lombok.Data; +import lombok.NoArgsConstructor; import javax.persistence.*; +import javax.validation.constraints.NotBlank; /** * 代码生成配置 @@ -10,20 +12,35 @@ import javax.persistence.*; */ @Data @Entity +@NoArgsConstructor @Table(name = "gen_config") public class GenConfig { + public GenConfig(String tableName) { + this.cover = false; + this.moduleName = "eladmin-system"; + this.tableName = tableName; + } + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") private Long id; + @NotBlank + private String tableName; + // 包路径 + @NotBlank private String pack; // 模块名 @Column(name = "module_name") + @NotBlank private String moduleName; // 前端文件路径 + @NotBlank private String path; // 前端文件路径 diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java deleted file mode 100644 index a22470aa..00000000 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java +++ /dev/null @@ -1,40 +0,0 @@ -package me.zhengjie.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 列的数据信息 - * @author Zheng Jie - * @date 2019-01-02 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class ColumnInfo { - - // 数据库字段名称 - private Object columnName; - - // 允许空值 - private Object isNullable; - - // 数据库字段类型 - private Object columnType; - - // 数据库字段注释 - private Object columnComment; - - // 数据库字段键类型 - private Object columnKey; - - // 额外的参数 - private Object extra; - - // 查询 1:模糊 2：精确 - private String columnQuery; - - // 是否在列表显示 - private String columnShow; -} diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java b/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java new file mode 100644 index 00000000..57d39078 --- /dev/null +++ b/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java @@ -0,0 +1,14 @@ +package me.zhengjie.repository; + +import me.zhengjie.domain.ColumnInfo; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + +/** + * @author Zheng Jie + * @date 2019-01-14 + */ +public interface ColumnInfoRepository extends JpaRepository { + + List findByTableNameOrderByIdAsc(String tableName); +} diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java index d72787d0..645c217c 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java +++ b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java @@ -8,4 +8,6 @@ import org.springframework.data.jpa.repository.JpaRepository; * @date 2019-01-14 */ public interface GenConfigRepository extends JpaRepository { + + GenConfig findByTableName(String tableName); } diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java index 0650b959..daf6d281 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java @@ -25,14 +25,14 @@ public class GenConfigController { } @ApiOperation("查询") - @GetMapping - public ResponseEntity get(){ - return new ResponseEntity<>(genConfigService.find(), HttpStatus.OK); + @GetMapping(value = "/{tableName}") + public ResponseEntity get(@PathVariable String tableName){ + return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK); } @ApiOperation("修改") @PutMapping public ResponseEntity emailConfig(@Validated @RequestBody GenConfig genConfig){ - return new ResponseEntity<>(genConfigService.update(genConfig),HttpStatus.OK); + return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK); } } diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index 653489e2..80438813 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -1,12 +1,12 @@ package me.zhengjie.rest; -import cn.hutool.core.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import me.zhengjie.domain.vo.ColumnInfo; +import me.zhengjie.domain.ColumnInfo; import me.zhengjie.exception.BadRequestException; import me.zhengjie.service.GenConfigService; import me.zhengjie.service.GeneratorService; +import me.zhengjie.utils.PageUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -34,7 +34,7 @@ public class GeneratorController { this.genConfigService = genConfigService; } - @ApiOperation("查询数据库元数据") + @ApiOperation("查询数据库数据") @GetMapping(value = "/tables") public ResponseEntity getTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "0")Integer page, @@ -43,10 +43,21 @@ public class GeneratorController { return new ResponseEntity<>(generatorService.getTables(name,startEnd), HttpStatus.OK); } - @ApiOperation("查询表内元数据") + @ApiOperation("查询字段数据") @GetMapping(value = "/columns") public ResponseEntity getTables(@RequestParam String tableName){ - return new ResponseEntity<>(generatorService.getColumns(tableName), HttpStatus.OK); + List columnInfos = generatorService.getColumns(tableName); + // 异步同步表信息 + generatorService.sync(columnInfos); + return new ResponseEntity<>(PageUtil.toPage(columnInfos,columnInfos.size()), HttpStatus.OK); + } + + @ApiOperation("保存字段数据") + @PutMapping + public ResponseEntity save(@RequestBody List columnInfos){ + // 异步同步表信息 + generatorService.save(columnInfos); + return new ResponseEntity(HttpStatus.OK); } @ApiOperation("生成代码") @@ -55,7 +66,7 @@ public class GeneratorController { if(!generatorEnabled){ throw new BadRequestException("此环境不允许生成代码！"); } - generatorService.generator(columnInfos,genConfigService.find(),tableName); + generatorService.generator(columnInfos,genConfigService.find(tableName),tableName); return new ResponseEntity(HttpStatus.OK); } } diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java index 67afbbf5..2c61e368 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java @@ -8,7 +8,7 @@ import me.zhengjie.domain.GenConfig; */ public interface GenConfigService { - GenConfig find(); + GenConfig find(String tableName); - GenConfig update(GenConfig genConfig); + GenConfig update(String tableName, GenConfig genConfig); } diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java index 7ddb7f1e..79d0971e 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java @@ -1,7 +1,9 @@ package me.zhengjie.service; import me.zhengjie.domain.GenConfig; -import me.zhengjie.domain.vo.ColumnInfo; +import me.zhengjie.domain.ColumnInfo; +import org.springframework.scheduling.annotation.Async; + import java.util.List; /** @@ -23,7 +25,7 @@ public interface GeneratorService { * @param name 表名 * @return / */ - Object getColumns(String name); + List getColumns(String name); /** * 生成代码 @@ -32,4 +34,17 @@ public interface GeneratorService { * @param tableName 表名 */ void generator(List columnInfos, GenConfig genConfig, String tableName); + + /** + * 同步表数据 + * @param columnInfos / + */ + @Async + void sync(List columnInfos); + + /** + * 保持数据 + * @param columnInfos / + */ + void save(List columnInfos); } diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java index 4dfa354c..3f07e0c9 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java @@ -4,11 +4,10 @@ import me.zhengjie.domain.GenConfig; import me.zhengjie.repository.GenConfigRepository; import me.zhengjie.service.GenConfigService; import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.io.File; -import java.util.Optional; /** * @author Zheng Jie @@ -25,16 +24,18 @@ public class GenConfigServiceImpl implements GenConfigService { } @Override - @Cacheable(key = "'1'") - public GenConfig find() { - Optional genConfig = genConfigRepository.findById(1L); - return genConfig.orElseGet(GenConfig::new); + @Cacheable(key = "#p0") + public GenConfig find(String tableName) { + GenConfig genConfig = genConfigRepository.findByTableName(tableName); + if(genConfig == null){ + return new GenConfig(tableName); + } + return genConfig; } @Override - @CacheEvict(allEntries = true) - public GenConfig update(GenConfig genConfig) { - genConfig.setId(1L); + @CachePut(key = "#p0") + public GenConfig update(String tableName, GenConfig genConfig) { // 自动设置Api路径，注释掉前需要同步取消前端的注释 String separator = File.separator; String[] paths; diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java index 51198e56..a687d9b8 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java @@ -1,10 +1,12 @@ package me.zhengjie.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import me.zhengjie.domain.GenConfig; -import me.zhengjie.domain.vo.ColumnInfo; +import me.zhengjie.domain.ColumnInfo; import me.zhengjie.domain.vo.TableInfo; import me.zhengjie.exception.BadRequestException; +import me.zhengjie.repository.ColumnInfoRepository; import me.zhengjie.service.GeneratorService; import me.zhengjie.utils.GenUtil; import me.zhengjie.utils.PageUtil; @@ -27,6 +29,12 @@ public class GeneratorServiceImpl implements GeneratorService { @PersistenceContext private EntityManager em; + private final ColumnInfoRepository columnInfoRepository; + + public GeneratorServiceImpl(ColumnInfoRepository columnInfoRepository) { + this.columnInfoRepository = columnInfoRepository; + } + @Override @SuppressWarnings("all") public Object getTables(String name, int[] startEnd) { @@ -50,20 +58,49 @@ public class GeneratorServiceImpl implements GeneratorService { } @Override + public List getColumns(String tableName) { + List columnInfos = columnInfoRepository.findByTableNameOrderByIdAsc(tableName); + if(CollectionUtil.isNotEmpty(columnInfos)){ + return columnInfos; + } else { + columnInfos = query(tableName); + return columnInfoRepository.saveAll(columnInfos); + } + } + @SuppressWarnings("all") - public Object getColumns(String name) { + public List query(String tableName){ // 使用预编译防止sql注入 String sql = "select column_name, is_nullable, data_type, column_comment, column_key, extra from information_schema.columns " + "where table_name = ? and table_schema = (select database()) order by ordinal_position"; Query query = em.createNativeQuery(sql); - query.setParameter(1, StringUtils.isNotBlank(name) ? name : null); + query.setParameter(1,tableName); List result = query.getResultList(); List columnInfos = new ArrayList<>(); for (Object obj : result) { Object[] arr = (Object[]) obj; - columnInfos.add(new ColumnInfo(arr[0],arr[1],arr[2],arr[3],arr[4],arr[5],null,"true")); + columnInfos.add( + new ColumnInfo( + tableName, + arr[0].toString(), + arr[1].equals("NO"), + arr[2].toString(), + ObjectUtil.isNotNull(arr[3]) ? arr[3].toString() : null, + ObjectUtil.isNotNull(arr[4]) ? arr[4].toString() : null, + ObjectUtil.isNotNull(arr[5]) ? arr[5].toString() : null) + ); } - return PageUtil.toPage(columnInfos,columnInfos.size()); + return columnInfos; + } + + @Override + public void sync(List columnInfos) { + + } + + @Override + public void save(List columnInfos) { + columnInfoRepository.saveAll(columnInfos); } @Override diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index 2fb826c5..91c2d7bc 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.*; import lombok.extern.slf4j.Slf4j; import me.zhengjie.domain.GenConfig; -import me.zhengjie.domain.vo.ColumnInfo; +import me.zhengjie.domain.ColumnInfo; import org.springframework.util.ObjectUtils; import java.io.File; import java.io.FileWriter; @@ -95,13 +95,13 @@ public class GenUtil { List> queryColumns = new ArrayList<>(); for (ColumnInfo column : columnInfos) { Map listMap = new HashMap<>(); - listMap.put("columnComment",column.getColumnComment()); - listMap.put("columnKey",column.getColumnKey()); + listMap.put("columnComment",column.getRemark()); + listMap.put("columnKey",column.getKeyType()); String colType = ColUtil.cloToJava(column.getColumnType().toString()); String changeColumnName = StringUtils.toCamelCase(column.getColumnName().toString()); String capitalColumnName = StringUtils.toCapitalizeCamelCase(column.getColumnName().toString()); - if(PK.equals(column.getColumnKey())){ + if(PK.equals(column.getKeyType())){ map.put("pkColumnType",colType); map.put("pkChangeColName",changeColumnName); map.put("pkCapitalColName",capitalColumnName); @@ -117,14 +117,14 @@ public class GenUtil { } listMap.put("columnType",colType); listMap.put("columnName",column.getColumnName()); - listMap.put("isNullable",column.getIsNullable()); - listMap.put("columnShow",column.getColumnShow()); + listMap.put("isNullable",column.getNotNull()); + listMap.put("columnShow",column.getListShow()); listMap.put("changeColumnName",changeColumnName); listMap.put("capitalColumnName",capitalColumnName); // 判断是否有查询，如有则把查询的字段set进columnQuery - if(!StringUtils.isBlank(column.getColumnQuery())){ - listMap.put("columnQuery",column.getColumnQuery()); + if(!StringUtils.isBlank(column.getQueryType())){ + listMap.put("columnQuery",column.getQueryType()); map.put("hasQuery",true); if(TIMESTAMP.equals(colType)){ map.put("queryHasTimestamp",true); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java index 99f89ff6..3751296a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java @@ -42,6 +42,14 @@ public class DictController { dictService.download(dictService.queryAll(criteria), response); } + @Log("查询字典") + @ApiOperation("查询字典") + @GetMapping(value = "/all") + @PreAuthorize("@el.check('dict:list')") + public ResponseEntity all(){ + return new ResponseEntity<>(dictService.queryAll(new DictQueryCriteria()),HttpStatus.OK); + } + @Log("查询字典") @ApiOperation("查询字典") @GetMapping From 3f80af66414d3148a7ae560bd67c392b3d9292da Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Tue, 19 Nov 2019 12:49:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E5=9F=BA=E7=A1=80=E5=8D=87=E7=BA=A7=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E5=89=A9=E4=BD=99=EF=BC=9A=E9=A2=84=E8=A7=88=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=EF=BC=8C=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/domain/ColumnInfo.java | 11 +- .../me/zhengjie/rest/GeneratorController.java | 18 +- .../me/zhengjie/service/GeneratorService.java | 22 ++- .../service/impl/GeneratorServiceImpl.java | 18 +- .../main/java/me/zhengjie/utils/GenUtil.java | 186 ++++++++++++------ .../java/me/zhengjie/gen/domain/GenTest.java | 51 +++++ .../gen/repository/GenTestRepository.java | 12 ++ .../zhengjie/gen/rest/GenTestController.java | 73 +++++++ .../zhengjie/gen/service/GenTestService.java | 47 +++++ .../zhengjie/gen/service/dto/GenTestDTO.java | 33 ++++ .../gen/service/dto/GenTestQueryCriteria.java | 35 ++++ .../gen/service/impl/GenTestServiceImpl.java | 109 ++++++++++ .../gen/service/mapper/GenTestMapper.java | 16 ++ .../template/generator/admin/Dto.ftl | 4 +- .../template/generator/admin/Entity.ftl | 28 ++- .../generator/admin/QueryCriteria.ftl | 39 +++- .../template/generator/admin/ServiceImpl.ftl | 4 +- .../template/generator/front/eForm.ftl | 64 ++++-- .../template/generator/front/index.ftl | 49 ++++- 19 files changed, 714 insertions(+), 105 deletions(-) create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/domain/GenTest.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/repository/GenTestRepository.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/rest/GenTestController.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/GenTestService.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestDTO.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestQueryCriteria.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/impl/GenTestServiceImpl.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/mapper/GenTestMapper.java diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java index 52f83da2..727be0aa 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java @@ -1,9 +1,8 @@ package me.zhengjie.domain; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; - +import me.zhengjie.utils.GenUtil; import javax.persistence.*; /** @@ -60,14 +59,20 @@ public class ColumnInfo { // 关联表名 private String joinName; + // 日期注解 + private String dateAnnotation; + public ColumnInfo(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) { this.tableName = tableName; this.columnName = columnName; this.columnType = columnType; this.keyType = keyType; this.extra = extra; - this.remark = remark; this.notNull = notNull; + if(GenUtil.PK.equalsIgnoreCase(keyType) && GenUtil.EXTRA.equalsIgnoreCase(extra)){ + this.notNull = false; + } + this.remark = remark; this.listShow = true; this.formShow = true; } diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index 80438813..497766ae 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -34,6 +34,12 @@ public class GeneratorController { this.genConfigService = genConfigService; } + @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables/all") + public ResponseEntity getTables(){ + return new ResponseEntity<>(generatorService.getTables(), HttpStatus.OK); + } + @ApiOperation("查询数据库数据") @GetMapping(value = "/tables") public ResponseEntity getTables(@RequestParam(defaultValue = "") String name, @@ -55,18 +61,22 @@ public class GeneratorController { @ApiOperation("保存字段数据") @PutMapping public ResponseEntity save(@RequestBody List columnInfos){ - // 异步同步表信息 generatorService.save(columnInfos); return new ResponseEntity(HttpStatus.OK); } @ApiOperation("生成代码") - @PostMapping - public ResponseEntity generator(@RequestBody List columnInfos, @RequestParam String tableName){ + @PostMapping(value = "/{tableName}/{type}") + public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type){ if(!generatorEnabled){ throw new BadRequestException("此环境不允许生成代码！"); } - generatorService.generator(columnInfos,genConfigService.find(tableName),tableName); + switch (type){ + // 生成代码 + case 0: generatorService.generator(genConfigService.find(tableName), generatorService.getColumns(tableName)); + break; + default: break; + } return new ResponseEntity(HttpStatus.OK); } } diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java index 79d0971e..027d2bdd 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java @@ -27,14 +27,6 @@ public interface GeneratorService { */ List getColumns(String name); - /** - * 生成代码 - * @param columnInfos 表字段数据 - * @param genConfig 代码生成配置 - * @param tableName 表名 - */ - void generator(List columnInfos, GenConfig genConfig, String tableName); - /** * 同步表数据 * @param columnInfos / @@ -47,4 +39,18 @@ public interface GeneratorService { * @param columnInfos / */ void save(List columnInfos); + + /** + * 获取所有table + * @return / + */ + Object getTables(); + + /** + * 代码生成 + * @param genConfig 配置信息 + * @param columns 字段信息 + * @return / + */ + Object generator(GenConfig genConfig, List columns); } diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java index a687d9b8..678a1aeb 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java @@ -24,6 +24,7 @@ import java.util.List; * @date 2019-01-02 */ @Service +@SuppressWarnings("all") public class GeneratorServiceImpl implements GeneratorService { @PersistenceContext @@ -36,7 +37,16 @@ public class GeneratorServiceImpl implements GeneratorService { } @Override - @SuppressWarnings("all") + public Object getTables() { + // 使用预编译防止sql注入 + String sql = "select table_name ,create_time , engine, table_collation, table_comment from information_schema.tables " + + "where table_schema = (select database()) " + + "order by create_time desc"; + Query query = em.createNativeQuery(sql); + return query.getResultList(); + } + + @Override public Object getTables(String name, int[] startEnd) { // 使用预编译防止sql注入 String sql = "select table_name ,create_time , engine, table_collation, table_comment from information_schema.tables " + @@ -68,7 +78,6 @@ public class GeneratorServiceImpl implements GeneratorService { } } - @SuppressWarnings("all") public List query(String tableName){ // 使用预编译防止sql注入 String sql = "select column_name, is_nullable, data_type, column_comment, column_key, extra from information_schema.columns " + @@ -104,14 +113,15 @@ public class GeneratorServiceImpl implements GeneratorService { } @Override - public void generator(List columnInfos, GenConfig genConfig, String tableName) { + public Object generator(GenConfig genConfig, List columns) { if(genConfig.getId() == null){ throw new BadRequestException("请先配置生成器"); } try { - GenUtil.generatorCode(columnInfos,genConfig,tableName); + GenUtil.generatorCode(columns,genConfig); } catch (IOException e) { throw new RuntimeException(e); } + return null; } } diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index 91c2d7bc..a8868105 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -28,9 +28,9 @@ public class GenUtil { private static final String BIGDECIMAL = "BigDecimal"; - private static final String PK = "PRI"; + public static final String PK = "PRI"; - private static final String EXTRA = "auto_increment"; + public static final String EXTRA = "auto_increment"; /** * 获取后端代码模板名称 @@ -61,85 +61,161 @@ public class GenUtil { return templateNames; } - /** - * 生成代码 - * @param columnInfos 表元数据 - * @param genConfig 生成代码的参数配置，如包路径，作者 - */ - public static void generatorCode(List columnInfos, GenConfig genConfig, String tableName) throws IOException { - Map map = new HashMap<>(); - map.put("package",genConfig.getPack()); - map.put("moduleName",genConfig.getModuleName()); - map.put("author",genConfig.getAuthor()); - map.put("date", LocalDate.now().toString()); - map.put("tableName",tableName); - String className = StringUtils.toCapitalizeCamelCase(tableName); - String changeClassName = StringUtils.toCamelCase(tableName); - + public static void generatorCode(List columnInfos, GenConfig genConfig) throws IOException { + // 存储模版字段数据 + Map genMap = new HashMap<>(); + // 包名称 + genMap.put("package",genConfig.getPack()); + // 模块名称 + genMap.put("moduleName",genConfig.getModuleName()); + // 作者 + genMap.put("author",genConfig.getAuthor()); + // 创建日期 + genMap.put("date", LocalDate.now().toString()); + // 表名 + genMap.put("tableName",genConfig.getTableName()); + // 大写开头的类名 + String className = StringUtils.toCapitalizeCamelCase(genConfig.getTableName()); + // 小写开头的类名 + String changeClassName = StringUtils.toCamelCase(genConfig.getTableName()); // 判断是否去除表前缀 if (StringUtils.isNotEmpty(genConfig.getPrefix())) { - className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(tableName,genConfig.getPrefix())); - changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(tableName,genConfig.getPrefix())); + className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(genConfig.getTableName(),genConfig.getPrefix())); + changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(genConfig.getTableName(),genConfig.getPrefix())); } - map.put("className", className); - map.put("upperCaseClassName", className.toUpperCase()); - map.put("changeClassName", changeClassName); - map.put("hasTimestamp",false); - map.put("queryHasTimestamp",false); - map.put("queryHasBigDecimal",false); - map.put("hasBigDecimal",false); - map.put("hasQuery",false); - map.put("auto",false); - + // 保存类名 + genMap.put("className", className); + // 保存小写开头的类名 + genMap.put("changeClassName", changeClassName); + // 存在 Timestamp 字段 + genMap.put("hasTimestamp",false); + // 查询类中存在 Timestamp 字段 + genMap.put("queryHasTimestamp",false); + // 存在 BigDecimal 字段 + genMap.put("hasBigDecimal",false); + // 查询类中存在 BigDecimal 字段 + genMap.put("queryHasBigDecimal",false); + // 是否需要创建查询 + genMap.put("hasQuery",false); + // 自增主键 + genMap.put("auto",false); + // 存在字典 + genMap.put("hasDict",false); + // 存在日期注解 + genMap.put("hasDateAnnotation",false); + // 保存字段信息 List> columns = new ArrayList<>(); + // 保存查询字段的信息 List> queryColumns = new ArrayList<>(); + // 存储字典信息 + List dicts = new ArrayList<>(); + // 存储 DateRange 信息 + List> dateRanges = new ArrayList<>(); + // 存储不为空的字段信息 + List> isNotNullColumns = new ArrayList<>(); + for (ColumnInfo column : columnInfos) { Map listMap = new HashMap<>(); - listMap.put("columnComment",column.getRemark()); + // 字段描述 + listMap.put("remark",column.getRemark()); + // 字段类型 listMap.put("columnKey",column.getKeyType()); - - String colType = ColUtil.cloToJava(column.getColumnType().toString()); + // 主键类型 + String colType = ColUtil.cloToJava(column.getColumnType()); + // 小写开头的字段名 String changeColumnName = StringUtils.toCamelCase(column.getColumnName().toString()); + // 大写开头的字段名 String capitalColumnName = StringUtils.toCapitalizeCamelCase(column.getColumnName().toString()); if(PK.equals(column.getKeyType())){ - map.put("pkColumnType",colType); - map.put("pkChangeColName",changeColumnName); - map.put("pkCapitalColName",capitalColumnName); + // 存储主键类型 + genMap.put("pkColumnType",colType); + // 存储小写开头的字段名 + genMap.put("pkChangeColName",changeColumnName); + // 存储大写开头的字段名 + genMap.put("pkCapitalColName",capitalColumnName); } + // 是否存在 Timestamp 类型的字段 if(TIMESTAMP.equals(colType)){ - map.put("hasTimestamp",true); + genMap.put("hasTimestamp",true); } + // 是否存在 BigDecimal 类型的字段 if(BIGDECIMAL.equals(colType)){ - map.put("hasBigDecimal",true); + genMap.put("hasBigDecimal",true); } + // 主键是否自增 if(EXTRA.equals(column.getExtra())){ - map.put("auto",true); + genMap.put("auto",true); + } + // 主键存在字典 + if(StringUtils.isNotBlank(column.getDictName())){ + genMap.put("hasDict",true); + dicts.add(column.getDictName()); } - listMap.put("columnType",colType); - listMap.put("columnName",column.getColumnName()); - listMap.put("isNullable",column.getNotNull()); - listMap.put("columnShow",column.getListShow()); - listMap.put("changeColumnName",changeColumnName); - listMap.put("capitalColumnName",capitalColumnName); + // 存储字段类型 + listMap.put("columnType",colType); + // 存储字原始段名称 + listMap.put("columnName",column.getColumnName()); + // 不为空 + listMap.put("istNotNull",column.getNotNull()); + // 字段列表显示 + listMap.put("columnShow",column.getListShow()); + // 表单显示 + listMap.put("formShow",column.getFormShow()); + // 表单组件类型 + listMap.put("formType",column.getFormType()); + // 小写开头的字段名称 + listMap.put("changeColumnName",changeColumnName); + //大写开头的字段名称 + listMap.put("capitalColumnName",capitalColumnName); + // 字典名称 + listMap.put("dictName",column.getDictName()); + // 关联字段 + listMap.put("joinName",column.getJoinName()); + // 日期注解 + listMap.put("dateAnnotation",column.getDateAnnotation()); + if(StringUtils.isNotBlank(column.getDateAnnotation())){ + genMap.put("hasDateAnnotation",true); + } + // 添加非空字段信息 + if(column.getNotNull()){ + isNotNullColumns.add(listMap); + } // 判断是否有查询，如有则把查询的字段set进columnQuery if(!StringUtils.isBlank(column.getQueryType())){ - listMap.put("columnQuery",column.getQueryType()); - map.put("hasQuery",true); + // 查询类型 + listMap.put("queryType",column.getQueryType()); + // 是否存在查询 + genMap.put("hasQuery",true); if(TIMESTAMP.equals(colType)){ - map.put("queryHasTimestamp",true); + // 查询中存储 Timestamp 类型 + genMap.put("queryHasTimestamp",true); } if(BIGDECIMAL.equals(colType)){ - map.put("queryHasBigDecimal",true); + // 查询中存储 BigDecimal 类型 + genMap.put("queryHasBigDecimal",true); + } + if("DateRange".equalsIgnoreCase(column.getQueryType())){ + dateRanges.add(listMap); + } else { + // 添加到查询列表中 + queryColumns.add(listMap); } - queryColumns.add(listMap); } + // 添加到字段列表中 columns.add(listMap); } - map.put("columns",columns); - map.put("queryColumns",queryColumns); + // 保存字段列表 + genMap.put("columns",columns); + // 保存查询列表 + genMap.put("queryColumns",queryColumns); + // 保存字段列表 + genMap.put("dicts",dicts); + // 保存查询列表 + genMap.put("dateRanges",dateRanges); + // 保存非空字段信息 + genMap.put("isNotNullColumns",isNotNullColumns); TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH)); - // 生成后端代码 List templates = getAdminTemplateNames(); for (String templateName : templates) { @@ -154,14 +230,14 @@ public class GenUtil { continue; } // 生成代码 - genFile(file, template, map); + genFile(file, template, genMap); } // 生成前端代码 templates = getFrontTemplateNames(); for (String templateName : templates) { Template template = engine.getTemplate("generator/front/"+templateName+".ftl"); - String filePath = getFrontFilePath(templateName,genConfig,map.get("changeClassName").toString()); + String filePath = getFrontFilePath(templateName,genConfig,genMap.get("changeClassName").toString()); assert filePath != null; File file = new File(filePath); @@ -171,7 +247,7 @@ public class GenUtil { continue; } // 生成代码 - genFile(file, template, map); + genFile(file, template, genMap); } } diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/domain/GenTest.java b/eladmin-system/src/main/java/me/zhengjie/gen/domain/GenTest.java new file mode 100644 index 00000000..f16ebea0 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/domain/GenTest.java @@ -0,0 +1,51 @@ +package me.zhengjie.gen.domain; + +import lombok.Data; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import javax.persistence.*; +import javax.validation.constraints.*; +import javax.persistence.Entity; +import javax.persistence.Table; +import org.hibernate.annotations.*; +import java.sql.Timestamp; +import java.io.Serializable; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Entity +@Data +@Table(name="gen_test") +public class GenTest implements Serializable { + + // ID + @Id + @Column(name = "id") + private Long id; + + // 名称 + @Column(name = "name",nullable = false) + @NotBlank + private String name; + + // 状态 + @Column(name = "status",nullable = false) + @NotNull + private Boolean status; + + // 日期 + @Column(name = "date",nullable = false) + @NotNull + private Timestamp date; + + // 创建日期 + @Column(name = "create_time") + @CreationTimestamp + private Timestamp createTime; + + public void copy(GenTest source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/repository/GenTestRepository.java b/eladmin-system/src/main/java/me/zhengjie/gen/repository/GenTestRepository.java new file mode 100644 index 00000000..e52586d0 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/repository/GenTestRepository.java @@ -0,0 +1,12 @@ +package me.zhengjie.gen.repository; + +import me.zhengjie.gen.domain.GenTest; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +public interface GenTestRepository extends JpaRepository, JpaSpecificationExecutor { +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/rest/GenTestController.java b/eladmin-system/src/main/java/me/zhengjie/gen/rest/GenTestController.java new file mode 100644 index 00000000..d5a37a85 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/rest/GenTestController.java @@ -0,0 +1,73 @@ +package me.zhengjie.gen.rest; + +import me.zhengjie.aop.log.Log; +import me.zhengjie.gen.domain.GenTest; +import me.zhengjie.gen.service.GenTestService; +import me.zhengjie.gen.service.dto.GenTestQueryCriteria; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Api(tags = "GenTest管理") +@RestController +@RequestMapping("/api/genTest") +public class GenTestController { + + private final GenTestService genTestService; + + public GenTestController(GenTestService genTestService) { + this.genTestService = genTestService; + } + + @Log("导出数据") + @ApiOperation("导出数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('genTest:list')") + public void download(HttpServletResponse response, GenTestQueryCriteria criteria) throws IOException { + genTestService.download(genTestService.queryAll(criteria), response); + } + + @GetMapping + @Log("查询GenTest") + @ApiOperation("查询GenTest") + @PreAuthorize("@el.check('genTest:list')") + public ResponseEntity getGenTests(GenTestQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity<>(genTestService.queryAll(criteria,pageable),HttpStatus.OK); + } + + @PostMapping + @Log("新增GenTest") + @ApiOperation("新增GenTest") + @PreAuthorize("@el.check('genTest:add')") + public ResponseEntity create(@Validated @RequestBody GenTest resources){ + return new ResponseEntity<>(genTestService.create(resources),HttpStatus.CREATED); + } + + @PutMapping + @Log("修改GenTest") + @ApiOperation("修改GenTest") + @PreAuthorize("@el.check('genTest:edit')") + public ResponseEntity update(@Validated @RequestBody GenTest resources){ + genTestService.update(resources); + return new ResponseEntity(HttpStatus.NO_CONTENT); + } + + @DeleteMapping(value = "/{id}") + @Log("删除GenTest") + @ApiOperation("删除GenTest") + @PreAuthorize("@el.check('genTest:del')") + public ResponseEntity delete(@PathVariable Long id){ + genTestService.delete(id); + return new ResponseEntity(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/GenTestService.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/GenTestService.java new file mode 100644 index 00000000..4c6c6123 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/GenTestService.java @@ -0,0 +1,47 @@ +package me.zhengjie.gen.service; + +import me.zhengjie.gen.domain.GenTest; +import me.zhengjie.gen.service.dto.GenTestDTO; +import me.zhengjie.gen.service.dto.GenTestQueryCriteria; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +public interface GenTestService { + + /** + * 查询数据分页 + * @param criteria 条件参数 + * @param pageable 分页参数 + * @return Map + */ + Map queryAll(GenTestQueryCriteria criteria, Pageable pageable); + + /** + * 查询所有数据不分页 + * @param criteria 条件参数 + * @return List + */ + List queryAll(GenTestQueryCriteria criteria); + + /** + * 根据ID查询 + * @param id ID + * @return GenTestDTO + */ + GenTestDTO findById(Long id); + + GenTestDTO create(GenTest resources); + + void update(GenTest resources); + + void delete(Long id); + + void download(List all, HttpServletResponse response) throws IOException; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestDTO.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestDTO.java new file mode 100644 index 00000000..d1239b58 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestDTO.java @@ -0,0 +1,33 @@ +package me.zhengjie.gen.service.dto; + +import lombok.Data; +import java.sql.Timestamp; +import java.io.Serializable; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Data +public class GenTestDTO implements Serializable { + + // ID + // 处理精度丢失问题 + @JsonSerialize(using= ToStringSerializer.class) + private Long id; + + // 名称 + private String name; + + // 状态 + private Boolean status; + + // 日期 + private Timestamp date; + + // 创建日期 + private Timestamp createTime; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestQueryCriteria.java new file mode 100644 index 00000000..55b00ecc --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestQueryCriteria.java @@ -0,0 +1,35 @@ +package me.zhengjie.gen.service.dto; + +import lombok.Data; +import java.sql.Timestamp; +import me.zhengjie.annotation.Query; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Data +public class GenTestQueryCriteria{ + + // 模糊 + @Query(type = Query.Type.INNER_LIKE) + private String name; + + // 精确 + @Query + private Boolean status; + + // 时间段查询 + @Query(type = Query.Type.GREATER_THAN, propName = "date") + private Timestamp dateStart; + + @Query(type = Query.Type.LESS_THAN, propName = "date") + private Timestamp dateEnd; + + // 时间段查询 + @Query(type = Query.Type.GREATER_THAN, propName = "createTime") + private Timestamp createTimeStart; + + @Query(type = Query.Type.LESS_THAN, propName = "createTime") + private Timestamp createTimeEnd; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/impl/GenTestServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/impl/GenTestServiceImpl.java new file mode 100644 index 00000000..6f65d306 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/impl/GenTestServiceImpl.java @@ -0,0 +1,109 @@ +package me.zhengjie.gen.service.impl; + +import me.zhengjie.gen.domain.GenTest; +import me.zhengjie.utils.ValidationUtil; +import me.zhengjie.utils.FileUtil; +import me.zhengjie.gen.repository.GenTestRepository; +import me.zhengjie.gen.service.GenTestService; +import me.zhengjie.gen.service.dto.GenTestDTO; +import me.zhengjie.gen.service.dto.GenTestQueryCriteria; +import me.zhengjie.gen.service.mapper.GenTestMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import me.zhengjie.utils.PageUtil; +import me.zhengjie.utils.QueryHelp; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Service +@CacheConfig(cacheNames = "genTest") +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class GenTestServiceImpl implements GenTestService { + + private final GenTestRepository genTestRepository; + + private final GenTestMapper genTestMapper; + + public GenTestServiceImpl(GenTestRepository genTestRepository, GenTestMapper genTestMapper) { + this.genTestRepository = genTestRepository; + this.genTestMapper = genTestMapper; + } + + @Override + @Cacheable + public Map queryAll(GenTestQueryCriteria criteria, Pageable pageable){ + Page page = genTestRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + return PageUtil.toPage(page.map(genTestMapper::toDto)); + } + + @Override + @Cacheable + public List queryAll(GenTestQueryCriteria criteria){ + return genTestMapper.toDto(genTestRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + } + + @Override + @Cacheable(key = "#p0") + public GenTestDTO findById(Long id) { + GenTest genTest = genTestRepository.findById(id).orElseGet(GenTest::new); + ValidationUtil.isNull(genTest.getId(),"GenTest","id",id); + return genTestMapper.toDto(genTest); + } + + @Override + @CacheEvict(allEntries = true) + @Transactional(rollbackFor = Exception.class) + public GenTestDTO create(GenTest resources) { + Snowflake snowflake = IdUtil.createSnowflake(1, 1); + resources.setId(snowflake.nextId()); + return genTestMapper.toDto(genTestRepository.save(resources)); + } + + @Override + @CacheEvict(allEntries = true) + @Transactional(rollbackFor = Exception.class) + public void update(GenTest resources) { + GenTest genTest = genTestRepository.findById(resources.getId()).orElseGet(GenTest::new); + ValidationUtil.isNull( genTest.getId(),"GenTest","id",resources.getId()); + genTest.copy(resources); + genTestRepository.save(genTest); + } + + @Override + @CacheEvict(allEntries = true) + @Transactional(rollbackFor = Exception.class) + public void delete(Long id) { + genTestRepository.deleteById(id); + } + + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (GenTestDTO genTest : all) { + Map map = new LinkedHashMap<>(); + map.put("名称", genTest.getName()); + map.put("状态", genTest.getStatus()); + map.put("日期", genTest.getDate()); + map.put("创建日期", genTest.getCreateTime()); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/mapper/GenTestMapper.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/mapper/GenTestMapper.java new file mode 100644 index 00000000..4ffcebe4 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/mapper/GenTestMapper.java @@ -0,0 +1,16 @@ +package me.zhengjie.gen.service.mapper; + +import me.zhengjie.base.BaseMapper; +import me.zhengjie.gen.domain.GenTest; +import me.zhengjie.gen.service.dto.GenTestDTO; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface GenTestMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl index d57910b4..c97b19fb 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl @@ -23,8 +23,8 @@ public class ${className}DTO implements Serializable { <#if columns??> <#list columns as column> - <#if column.columnComment != ''> - // ${column.columnComment} + <#if column.remark != ''> + // ${column.remark} <#if column.columnKey = 'PRI'> <#if !auto && pkColumnType = 'Long'> diff --git a/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl b/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl index 5bf7eab4..d2a1494d 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl @@ -4,6 +4,14 @@ import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; +<#if isNotNullColumns??> +import javax.validation.constraints.*; + +<#if hasDateAnnotation> +import javax.persistence.Entity; +import javax.persistence.Table; +import org.hibernate.annotations.*; + <#if hasTimestamp> import java.sql.Timestamp; @@ -23,8 +31,8 @@ public class ${className} implements Serializable { <#if columns??> <#list columns as column> - <#if column.columnComment != ''> - // ${column.columnComment} + <#if column.remark != ''> + // ${column.remark} <#if column.columnKey = 'PRI'> @Id @@ -32,7 +40,21 @@ public class ${className} implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "${column.columnName}"<#if column.columnKey = 'UNI'>,unique = true<#if column.isNullable = 'NO' && column.columnKey != 'PRI'>,nullable = false) + @Column(name = "${column.columnName}"<#if column.columnKey = 'UNI'>,unique = true<#if column.istNotNull && column.columnKey != 'PRI'>,nullable = false) + <#if column.istNotNull && column.columnKey != 'PRI'> + <#if column.columnType = 'String'> + @NotBlank + <#else> + @NotNull + + + <#if column.dateAnnotation??> + <#if column.dateAnnotation = 'CreationTimestamp'> + @CreationTimestamp + <#else> + @UpdateTimestamp + + private ${column.columnType} ${column.changeColumnName}; diff --git a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl index 2f5e20a7..d46682e5 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl @@ -20,15 +20,42 @@ public class ${className}QueryCriteria{ <#if queryColumns??> <#list queryColumns as column> - <#if column.columnQuery = '1'> - // 模糊 - @Query(type = Query.Type.INNER_LIKE) - - <#if column.columnQuery = '2'> +<#if column.queryType = '='> // 精确 @Query - private ${column.columnType} ${column.changeColumnName}; + +<#if column.queryType = 'Like'> + // 模糊 + @Query(type = Query.Type.INNER_LIKE) + private ${column.columnType} ${column.changeColumnName}; + +<#if column.queryType = '!='> + // 不等于 + @Query(type = Query.Type.NOT_EQUAL) + private ${column.columnType} ${column.changeColumnName}; + +<#if column.queryType = '>='> + // 大于等于 + @Query(type = Query.Type.GREATER_THAN) + private ${column.columnType} ${column.changeColumnName}; + +<#if column.queryType = '<='> + // 小于等于 + @Query(type = Query.Type.LESS_THAN) + private ${column.columnType} ${column.changeColumnName}; + + + +<#if dateRanges??> + <#list dateRanges as column> + + // 时间段查询 + @Query(type = Query.Type.GREATER_THAN, propName = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName}Start; + + @Query(type = Query.Type.LESS_THAN, propName = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName}End; } \ No newline at end of file diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl index b81db3b5..29cd908b 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -141,8 +141,8 @@ public class ${className}ServiceImpl implements ${className}Service { Map map = new LinkedHashMap<>(); <#list columns as column> <#if column.columnKey != 'PRI'> - <#if column.columnComment != ''> - map.put("${column.columnComment}", ${changeClassName}.get${column.capitalColumnName}()); + <#if column.remark != ''> + map.put("${column.remark}", ${changeClassName}.get${column.capitalColumnName}()); <#else> map.put(" ${column.changeColumnName}", ${changeClassName}.get${column.capitalColumnName}()); diff --git a/eladmin-system/src/main/resources/template/generator/front/eForm.ftl b/eladmin-system/src/main/resources/template/generator/front/eForm.ftl index de44a6ae..4a1d9339 100644 --- a/eladmin-system/src/main/resources/template/generator/front/eForm.ftl +++ b/eladmin-system/src/main/resources/template/generator/front/eForm.ftl @@ -1,13 +1,33 @@