Skip to content

Commit c105df6

Browse files
elunezelunez
committed
2.2版本发布，详情查阅版本说明
1 parent 0f0392d commit c105df6

File tree

9 files changed

+27
-33
lines changed

9 files changed

+27
-33
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前
7878
</table>
7979

8080
#### 项目捐赠
81-
如果你用爽了，可以请作者喝杯咖啡表示支持 ☕️！ [Donate](https://docs.auauz.net/#/jz)
81+
项目的发展离不开你的支持，请作者喝杯咖啡吧 ☕！ [Donate](https://docs.auauz.net/#/jz)
8282
#### 反馈交流
8383
- QQ交流群：891137268

‎eladmin-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>eladmin</artifactId>
77
<groupId>me.zhengjie</groupId>
8-
<version>2.1</version>
8+
<version>2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎eladmin-generator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>eladmin</artifactId>
77
<groupId>me.zhengjie</groupId>
8-
<version>2.1</version>
8+
<version>2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>me.zhengjie</groupId>
2222
<artifactId>eladmin-common</artifactId>
23-
<version>2.1</version>
23+
<version>2.2</version>
2424
</dependency>
2525

2626
<!--模板引擎-->

‎eladmin-logging/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>eladmin</artifactId>
77
<groupId>me.zhengjie</groupId>
8-
<version>2.1</version>
8+
<version>2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -16,7 +16,7 @@
1616
<dependency>
1717
<groupId>me.zhengjie</groupId>
1818
<artifactId>eladmin-common</artifactId>
19-
<version>2.1</version>
19+
<version>2.2</version>
2020
</dependency>
2121
</dependencies>
2222
</project>

‎eladmin-system/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>eladmin</artifactId>
77
<groupId>me.zhengjie</groupId>
8-
<version>2.1</version>
8+
<version>2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>me.zhengjie</groupId>
2222
<artifactId>eladmin-generator</artifactId>
23-
<version>2.1</version>
23+
<version>2.2</version>
2424
<exclusions>
2525
<exclusion>
2626
<groupId>me.zhengjie</groupId>
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>me.zhengjie</groupId>
3434
<artifactId>eladmin-tools</artifactId>
35-
<version>2.1</version>
35+
<version>2.2</version>
3636
</dependency>
3737

3838
<!--jwt-->

‎eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
package me.zhengjie.config;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import com.fasterxml.jackson.databind.module.SimpleModule;
5-
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
63
import org.springframework.beans.factory.annotation.Value;
74
import org.springframework.context.annotation.Configuration;
8-
import org.springframework.http.converter.HttpMessageConverter;
9-
import org.springframework.http.converter.StringHttpMessageConverter;
10-
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
115
import org.springframework.web.servlet.config.annotation.CorsRegistry;
126
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
137
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
148
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
15-
import java.math.BigInteger;
16-
import java.nio.charset.Charset;
17-
import java.util.List;
189

1910
/**
2011
* WebMvcConfigurer

‎eladmin-tools/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>eladmin</artifactId>
77
<groupId>me.zhengjie</groupId>
8-
<version>2.1</version>
8+
<version>2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>me.zhengjie</groupId>
2525
<artifactId>eladmin-logging</artifactId>
26-
<version>2.1</version>
26+
<version>2.2</version>
2727
</dependency>
2828

2929
<!--邮件依赖-->

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>me.zhengjie</groupId>
88
<artifactId>eladmin</artifactId>
99
<packaging>pom</packaging>
10-
<version>2.1</version>
10+
<version>2.2</version>
1111

1212
<modules>
1313
<module>eladmin-common</module>

‎sql/eladmin.sql

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Target Server Version : 50562
1212
File Encoding : 65001
1313
14-
Date: 07/09/2019 21:59:47
14+
Date: 26/09/2019 17:41:39
1515
*/
1616

1717
SET NAMES utf8mb4;
@@ -85,7 +85,6 @@ CREATE TABLE `dict` (
8585
INSERT INTO `dict` VALUES (1, 'user_status', '用户状态');
8686
INSERT INTO `dict` VALUES (4, 'dept_status', '部门状态');
8787
INSERT INTO `dict` VALUES (5, 'job_status', '岗位状态');
88-
INSERT INTO `dict` VALUES (6, 'tt', 'tt');
8988

9089
-- ----------------------------
9190
-- Table structure for dict_detail
@@ -111,7 +110,6 @@ INSERT INTO `dict_detail` VALUES (11, '正常', 'true', '1', 4);
111110
INSERT INTO `dict_detail` VALUES (12, '停用', 'false', '2', 4);
112111
INSERT INTO `dict_detail` VALUES (13, '正常', 'true', '1', 5);
113112
INSERT INTO `dict_detail` VALUES (14, '停用', 'false', '2', 5);
114-
INSERT INTO `dict_detail` VALUES (15, 'f', 'fdaf', '1', 6);
115113

116114
-- ----------------------------
117115
-- Table structure for email_config
@@ -146,7 +144,7 @@ CREATE TABLE `gen_config` (
146144
-- ----------------------------
147145
-- Records of gen_config
148146
-- ----------------------------
149-
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);
147+
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);
150148

151149
-- ----------------------------
152150
-- Table structure for job
@@ -209,7 +207,7 @@ CREATE TABLE `log` (
209207
`username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
210208
`address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
211209
PRIMARY KEY (`id`) USING BTREE
212-
) ENGINE = InnoDB AUTO_INCREMENT = 13914 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
210+
) ENGINE = InnoDB AUTO_INCREMENT = 14269 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
213211

214212
-- ----------------------------
215213
-- Table structure for menu
@@ -279,7 +277,7 @@ CREATE TABLE `permission` (
279277
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
280278
`pid` int(11) NOT NULL COMMENT '上级权限',
281279
PRIMARY KEY (`id`) USING BTREE
282-
) ENGINE = InnoDB AUTO_INCREMENT = 55 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
280+
) ENGINE = InnoDB AUTO_INCREMENT = 60 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
283281

284282
-- ----------------------------
285283
-- Records of permission
@@ -332,6 +330,11 @@ INSERT INTO `permission` VALUES (51, '字典查询', '2019-04-10 16:25:16', 'DIC
332330
INSERT INTO `permission` VALUES (52, '字典创建', '2019-04-10 16:25:29', 'DICT_CREATE', 50);
333331
INSERT INTO `permission` VALUES (53, '字典编辑', '2019-04-10 16:27:19', 'DICT_EDIT', 50);
334332
INSERT INTO `permission` VALUES (54, '字典删除', '2019-04-10 16:27:30', 'DICT_DELETE', 50);
333+
INSERT INTO `permission` VALUES (55, '文件管理', '2019-09-08 12:31:54', 'LOCALSTORAGE_ALL', 0);
334+
INSERT INTO `permission` VALUES (56, '文件搜索', '2019-09-08 12:40:53', 'LOCALSTORAGE_SELECT', 55);
335+
INSERT INTO `permission` VALUES (57, '文件上传', '2019-09-08 12:41:05', 'LOCALSTORAGE_CREATE', 55);
336+
INSERT INTO `permission` VALUES (58, '文件编辑', '2019-09-08 12:41:19', 'LOCALSTORAGE_EDIT', 55);
337+
INSERT INTO `permission` VALUES (59, '文件删除', '2019-09-08 12:41:29', 'LOCALSTORAGE_DELETE', 55);
335338

336339
-- ----------------------------
337340
-- Table structure for picture
@@ -348,7 +351,7 @@ CREATE TABLE `picture` (
348351
`username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名称',
349352
`width` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片宽度',
350353
PRIMARY KEY (`id`) USING BTREE
351-
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
354+
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
352355

353356
-- ----------------------------
354357
-- Table structure for qiniu_config
@@ -373,13 +376,13 @@ CREATE TABLE `qiniu_content` (
373376
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
374377
`bucket` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Bucket 识别符',
375378
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名称',
376-
`suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件后缀',
377379
`size` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件大小',
378380
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件类型：私有或公开',
379381
`update_time` datetime NULL DEFAULT NULL COMMENT '上传或同步的时间',
380382
`url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件url',
383+
`suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
381384
PRIMARY KEY (`id`) USING BTREE
382-
) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
385+
) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
383386

384387
-- ----------------------------
385388
-- Table structure for quartz_job
@@ -403,7 +406,7 @@ CREATE TABLE `quartz_job` (
403406
-- ----------------------------
404407
INSERT INTO `quartz_job` VALUES (1, 'visitsTask', '0 0 0 * * ?', b'0', '更新访客记录', 'run', NULL, '每日0点创建新的访客记录', '2019-01-08 14:53:31');
405408
INSERT INTO `quartz_job` VALUES (2, 'testTask', '0/5 * * * * ?', b'1', '测试1', 'run1', 'test', '带参测试，多参使用json', '2019-08-22 14:08:29');
406-
INSERT INTO `quartz_job` VALUES (3, 'testTask', '0/5 * * * * ?', b'1', '测试', 'run', '', '不带参测试', '2019-08-22 14:08:28');
409+
INSERT INTO `quartz_job` VALUES (3, 'testTask', '0/5 * * * * ?', b'1', '测试', 'run', '', '不带参测试', '2019-09-26 16:44:39');
407410

408411
-- ----------------------------
409412
-- Table structure for quartz_log
@@ -421,7 +424,7 @@ CREATE TABLE `quartz_log` (
421424
`params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
422425
`time` bigint(20) NULL DEFAULT NULL,
423426
PRIMARY KEY (`id`) USING BTREE
424-
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
427+
) ENGINE = InnoDB AUTO_INCREMENT = 51 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
425428

426429
-- ----------------------------
427430
-- Table structure for role
@@ -675,6 +678,6 @@ CREATE TABLE `visits` (
675678
`week_day` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
676679
PRIMARY KEY (`id`) USING BTREE,
677680
UNIQUE INDEX `UK_11aksgq87euk9bcyeesfs4vtp`(`date`) USING BTREE
678-
) ENGINE = InnoDB AUTO_INCREMENT = 89 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
681+
) ENGINE = InnoDB AUTO_INCREMENT = 96 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
679682

680683
SET FOREIGN_KEY_CHECKS = 1;

0 commit comments

Comments
 (0)