From ea173b876bcfbbf32f9d4214fe0251d6dbf4aa00 Mon Sep 17 00:00:00 2001 From: suihua Date: Sun, 1 Sep 2019 20:09:56 +0800 Subject: [PATCH 1/4] update mysql Driver --- eladmin-system/src/main/resources/log4jdbc.log4j2.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eladmin-system/src/main/resources/log4jdbc.log4j2.properties b/eladmin-system/src/main/resources/log4jdbc.log4j2.properties index 5cb6f991..302525ff 100644 --- a/eladmin-system/src/main/resources/log4jdbc.log4j2.properties +++ b/eladmin-system/src/main/resources/log4jdbc.log4j2.properties @@ -1,2 +1,4 @@ # If you use SLF4J. First, you need to tell log4jdbc-log4j2 that you want to use the SLF4J logger -log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator \ No newline at end of file +log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator +log4jdbc.auto.load.popular.drivers=false +log4jdbc.drivers=com.mysql.cj.jdbc.Driver \ No newline at end of file From 3a6a7d9dd9267860f629b3051f3e3506a29677c3 Mon Sep 17 00:00:00 2001 From: "wei.zhang" Date: Mon, 16 Sep 2019 17:45:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20url=E4=BC=A0=E5=80=BC?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=AF=94=E5=A6=82=EF=BC=9A/api/creditInfo=3F?= =?UTF-8?q?enterpriseName=3D&startTime=3D&endTime=3D&page=3D0&size=3D10=20?= =?UTF-8?q?=E5=90=8E=E5=8F=B0sql=E8=AF=AD=E5=8F=A5=20=E6=9C=89enterpriseNa?= =?UTF-8?q?me=3D''=20and=20startTime=3D''=20and=20endTime=3D''=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=9F=A5=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c0c945ea..a9c645a6 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java @@ -40,7 +40,7 @@ public class QueryHelp { String attributeName = isBlank(propName) ? field.getName() : propName; Class fieldType = field.getType(); Object val = field.get(query); - if (ObjectUtil.isNull(val)) { + if (ObjectUtil.isNull(val) || "".equals(val)) { continue; } Join join = null; From c105df600ad58f01f1d09b89576eaf85ce7de1be Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Fri, 27 Sep 2019 09:24:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?2.2=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E6=9F=A5=E9=98=85=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- eladmin-common/pom.xml | 2 +- eladmin-generator/pom.xml | 4 +-- eladmin-logging/pom.xml | 4 +-- eladmin-system/pom.xml | 6 ++--- .../me/zhengjie/config/ConfigurerAdapter.java | 9 ------- eladmin-tools/pom.xml | 4 +-- pom.xml | 2 +- sql/eladmin.sql | 27 ++++++++++--------- 9 files changed, 27 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index bcb758ea..f8dd8b6a 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,6 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前 #### 项目捐赠 -如果你用爽了，可以请作者喝杯咖啡表示支持 ☕️！ [Donate](https://docs.auauz.net/#/jz) +项目的发展离不开你的支持，请作者喝杯咖啡吧 ☕！ [Donate](https://docs.auauz.net/#/jz) #### 反馈交流 - QQ交流群：891137268 diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml index c7467180..af94c4df 100644 --- a/eladmin-common/pom.xml +++ b/eladmin-common/pom.xml @@ -5,7 +5,7 @@ eladmin me.zhengjie - 2.1 + 2.2 4.0.0 diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml index 7ced1116..df8ea391 100644 --- a/eladmin-generator/pom.xml +++ b/eladmin-generator/pom.xml @@ -5,7 +5,7 @@ eladmin me.zhengjie - 2.1 + 2.2 4.0.0 @@ -20,7 +20,7 @@ me.zhengjie eladmin-common - 2.1 + 2.2 diff --git a/eladmin-logging/pom.xml b/eladmin-logging/pom.xml index e58fe26a..84d79abc 100644 --- a/eladmin-logging/pom.xml +++ b/eladmin-logging/pom.xml @@ -5,7 +5,7 @@ eladmin me.zhengjie - 2.1 + 2.2 4.0.0 @@ -16,7 +16,7 @@ me.zhengjie eladmin-common - 2.1 + 2.2 \ No newline at end of file diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index d2d4f5f9..fbc1e007 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -5,7 +5,7 @@ eladmin me.zhengjie - 2.1 + 2.2 4.0.0 @@ -20,7 +20,7 @@ me.zhengjie eladmin-generator - 2.1 + 2.2 me.zhengjie @@ -32,7 +32,7 @@ me.zhengjie eladmin-tools - 2.1 + 2.2 diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java index 87d2d15d..03351a75 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java @@ -1,20 +1,11 @@ package me.zhengjie.config; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.StringHttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import java.math.BigInteger; -import java.nio.charset.Charset; -import java.util.List; /** * WebMvcConfigurer diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml index 3247ae41..3d0554db 100644 --- a/eladmin-tools/pom.xml +++ b/eladmin-tools/pom.xml @@ -5,7 +5,7 @@ eladmin me.zhengjie - 2.1 + 2.2 4.0.0 @@ -23,7 +23,7 @@ me.zhengjie eladmin-logging - 2.1 + 2.2 diff --git a/pom.xml b/pom.xml index 4c6eb547..541cb331 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ me.zhengjie eladmin pom - 2.1 + 2.2 eladmin-common diff --git a/sql/eladmin.sql b/sql/eladmin.sql index dca6d848..90a49841 100644 --- a/sql/eladmin.sql +++ b/sql/eladmin.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 07/09/2019 21:59:47 + Date: 26/09/2019 17:41:39 */ SET NAMES utf8mb4; @@ -85,7 +85,6 @@ CREATE TABLE `dict` ( INSERT INTO `dict` VALUES (1, 'user_status', '用户状态'); INSERT INTO `dict` VALUES (4, 'dept_status', '部门状态'); INSERT INTO `dict` VALUES (5, 'job_status', '岗位状态'); -INSERT INTO `dict` VALUES (6, 'tt', 'tt'); -- ---------------------------- -- Table structure for dict_detail @@ -111,7 +110,6 @@ INSERT INTO `dict_detail` VALUES (11, '正常', 'true', '1', 4); INSERT INTO `dict_detail` VALUES (12, '停用', 'false', '2', 4); INSERT INTO `dict_detail` VALUES (13, '正常', 'true', '1', 5); INSERT INTO `dict_detail` VALUES (14, '停用', 'false', '2', 5); -INSERT INTO `dict_detail` VALUES (15, 'f', 'fdaf', '1', 6); -- ---------------------------- -- Table structure for email_config @@ -146,7 +144,7 @@ CREATE TABLE `gen_config` ( -- ---------------------------- -- Records of gen_config -- ---------------------------- -INSERT INTO `gen_config` VALUES (1, 'Zheng Jie', b'0', 'eladmin-tools', 'me.zhengjie', 'E:\\workspace\\me\\front\\eladmin-qt\\src\\views\\tools\\storage\\local', '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-qt\\src\\views\\test1111', 'E:\\workspace\\me\\front\\eladmin-qt\\src\\api', NULL); -- ---------------------------- -- Table structure for job @@ -209,7 +207,7 @@ CREATE TABLE `log` ( `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 13914 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 14269 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for menu @@ -279,7 +277,7 @@ CREATE TABLE `permission` ( `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称', `pid` int(11) NOT NULL COMMENT '上级权限', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 55 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 60 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of permission @@ -332,6 +330,11 @@ INSERT INTO `permission` VALUES (51, '字典查询', '2019-04-10 16:25:16', 'DIC INSERT INTO `permission` VALUES (52, '字典创建', '2019-04-10 16:25:29', 'DICT_CREATE', 50); INSERT INTO `permission` VALUES (53, '字典编辑', '2019-04-10 16:27:19', 'DICT_EDIT', 50); INSERT INTO `permission` VALUES (54, '字典删除', '2019-04-10 16:27:30', 'DICT_DELETE', 50); +INSERT INTO `permission` VALUES (55, '文件管理', '2019-09-08 12:31:54', 'LOCALSTORAGE_ALL', 0); +INSERT INTO `permission` VALUES (56, '文件搜索', '2019-09-08 12:40:53', 'LOCALSTORAGE_SELECT', 55); +INSERT INTO `permission` VALUES (57, '文件上传', '2019-09-08 12:41:05', 'LOCALSTORAGE_CREATE', 55); +INSERT INTO `permission` VALUES (58, '文件编辑', '2019-09-08 12:41:19', 'LOCALSTORAGE_EDIT', 55); +INSERT INTO `permission` VALUES (59, '文件删除', '2019-09-08 12:41:29', 'LOCALSTORAGE_DELETE', 55); -- ---------------------------- -- Table structure for picture @@ -348,7 +351,7 @@ CREATE TABLE `picture` ( `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名称', `width` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci 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 = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for qiniu_config @@ -373,13 +376,13 @@ CREATE TABLE `qiniu_content` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `bucket` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Bucket 识别符', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名称', - `suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件后缀', `size` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件大小', `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件类型：私有或公开', `update_time` datetime NULL DEFAULT NULL COMMENT '上传或同步的时间', `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 = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for quartz_job @@ -403,7 +406,7 @@ CREATE TABLE `quartz_job` ( -- ---------------------------- INSERT INTO `quartz_job` VALUES (1, 'visitsTask', '0 0 0 * * ?', b'0', '更新访客记录', 'run', NULL, '每日0点创建新的访客记录', '2019-01-08 14:53:31'); INSERT INTO `quartz_job` VALUES (2, 'testTask', '0/5 * * * * ?', b'1', '测试1', 'run1', 'test', '带参测试，多参使用json', '2019-08-22 14:08:29'); -INSERT INTO `quartz_job` VALUES (3, 'testTask', '0/5 * * * * ?', b'1', '测试', 'run', '', '不带参测试', '2019-08-22 14:08:28'); +INSERT INTO `quartz_job` VALUES (3, 'testTask', '0/5 * * * * ?', b'1', '测试', 'run', '', '不带参测试', '2019-09-26 16:44:39'); -- ---------------------------- -- Table structure for quartz_log @@ -421,7 +424,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 = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 51 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for role @@ -675,6 +678,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 = 89 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 96 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; SET FOREIGN_KEY_CHECKS = 1; From ad4537b4e856be63ebf7e6c96aa658861f7f3209 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Fri, 27 Sep 2019 17:06:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=B6=20freemarker=E5=8F=91=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/zhengjie/modules/system/domain/Menu.java | 2 +- eladmin-system/src/main/resources/config/application.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java index 16846e57..5ac2e6cb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java @@ -40,7 +40,7 @@ public class Menu implements Serializable { private String component; - @Column(unique = true) + @Column(unique = true,name = "component_name") private String componentName; private String icon; diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index 2127c638..c45c9529 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -2,6 +2,8 @@ server: port: 8000 spring: + freemarker: + check-template-location: false profiles: active: dev jackson: