From b03c2fd4157c57b33f3791926ba4a2bec7ed446e Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Fri, 7 Jul 2023 18:04:49 +0800 Subject: [PATCH 01/10] update README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 798ee741..1eedb660 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,13 @@ | github | https://github.com/elunez/eladmin | https://github.com/elunez/eladmin-web | | 码云 | https://gitee.com/elunez/eladmin | https://gitee.com/elunez/eladmin-web | +#### VPS推荐 +🎉 使用优惠码: `BWHNCXNVXV`，可获得 6.81% 的折扣， [查看更多介绍](https://eladmin.vip/pages/050101/) + + +明道云零代码构建平台 + + #### 主要特性 - 使用最新技术栈，社区资源丰富。 - 高效率开发，代码生成器可一键生成前后端代码 From 86e8af65367c3985b4e6c36c2a51bd71402f047c Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Fri, 7 Jul 2023 18:07:14 +0800 Subject: [PATCH 02/10] update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1eedb660..ce80bc37 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,12 @@ | 码云 | https://gitee.com/elunez/eladmin | https://gitee.com/elunez/eladmin-web | #### VPS推荐 -🎉 使用优惠码: `BWHNCXNVXV`，可获得 6.81% 的折扣， [查看更多介绍](https://eladmin.vip/pages/050101/) - -明道云零代码构建平台 +明道云零代码构建平台 +使用优惠码: `BWHNCXNVXV`，可获得 6.81% 的折扣， [查看介绍](https://eladmin.vip/pages/050101/) + #### 主要特性 - 使用最新技术栈，社区资源丰富。 - 高效率开发，代码生成器可一键生成前后端代码 From 6d4a00406f3227ce52166506a8a2ebfba13aa1d1 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Tue, 11 Jul 2023 16:36:48 +0800 Subject: [PATCH 03/10] update eladmin.sql close https://github.com/elunez/eladmin/issues/806 --- sql/eladmin.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/eladmin.sql b/sql/eladmin.sql index 30ce1118..14483d24 100644 --- a/sql/eladmin.sql +++ b/sql/eladmin.sql @@ -35,6 +35,7 @@ CREATE TABLE `code_column_config` ( `not_null` bit(1) DEFAULT NULL, `query_type` varchar(255) DEFAULT NULL, `remark` varchar(255) DEFAULT NULL, + `date_annotation` varchar(255) DEFAULT NULL, PRIMARY KEY (`column_id`) USING BTREE, KEY `idx_table_name` (`table_name`) ) ENGINE=InnoDB AUTO_INCREMENT=191 ROW_FORMAT=COMPACT COMMENT='代码生成字段信息存储'; @@ -54,7 +55,6 @@ CREATE TABLE `code_gen_config` ( `api_path` varchar(255) DEFAULT NULL COMMENT '前端Api文件路径', `prefix` varchar(255) DEFAULT NULL COMMENT '表前缀', `api_alias` varchar(255) DEFAULT NULL COMMENT '接口名称', - `date_annotation` varchar(255) DEFAULT NULL, PRIMARY KEY (`config_id`) USING BTREE, KEY `idx_table_name` (`table_name`(100)) ) ENGINE=InnoDB AUTO_INCREMENT=7 ROW_FORMAT=COMPACT COMMENT='代码生成器配置'; From 61c71313436482eda6b365ed124bf90e962a3a90 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Wed, 12 Jul 2023 16:21:10 +0800 Subject: [PATCH 04/10] update SwaggerConfig.java close https://github.com/elunez/eladmin/issues/807 --- .../src/main/java/me/zhengjie/config/SwaggerConfig.java | 7 +++---- .../modules/security/rest/AuthorizationController.java | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java index 989be98d..1edbcc49 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java @@ -78,7 +78,7 @@ public class SwaggerConfig { return new ApiInfoBuilder() .description("一个简单且易上手的 Spring boot 后台管理框架") .title("ELADMIN 接口文档") - .version("2.6") + .version("2.7") .build(); } @@ -93,8 +93,6 @@ public class SwaggerConfig { private List securityContexts() { //设置需要登录认证的路径 List securityContexts = new ArrayList<>(); - // ^(?!auth).*$ 表示所有包含auth的接口不需要使用securitySchemes即不需要带token - // ^标识开始 ()里是一子表达式 ?!/auth表示匹配不是/auth的位置，匹配上则添加请求头，注意路径已/开头 .表示任意字符 *表示前面的字符匹配多次 $标识结束 securityContexts.add(getContextByPath()); return securityContexts; } @@ -102,7 +100,8 @@ public class SwaggerConfig { private SecurityContext getContextByPath() { return SecurityContext.builder() .securityReferences(defaultAuth()) - .operationSelector(o->o.requestMappingPattern().matches("^(?!/auth).*$")) + // 表示 /auth/code、/auth/login 接口不需要使用securitySchemes即不需要带token + .operationSelector(o->o.requestMappingPattern().matches("^(?!/auth/code|/auth/login).*$")) .build(); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java index effb15f5..535c017d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhengjie.annotation.Log; -import me.zhengjie.annotation.rest.AnonymousDeleteMapping; import me.zhengjie.annotation.rest.AnonymousGetMapping; import me.zhengjie.annotation.rest.AnonymousPostMapping; import me.zhengjie.config.RsaProperties; @@ -141,7 +140,7 @@ public class AuthorizationController { } @ApiOperation("退出登录") - @AnonymousDeleteMapping(value = "/logout") + @DeleteMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { onlineUserService.logout(tokenProvider.getToken(request)); return new ResponseEntity<>(HttpStatus.OK); From d6cb573671d2ad8910ca5dbfa322e82d7c66e4a0 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Wed, 26 Jul 2023 15:24:22 +0800 Subject: [PATCH 05/10] update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ce80bc37..4040fb7a 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,10 @@ #### VPS推荐 -明道云零代码构建平台 + -使用优惠码: `BWHNCXNVXV`，可获得 6.81% 的折扣， [查看介绍](https://eladmin.vip/pages/050101/) +使用优惠码: `BWHNCXNVXV`，可获得 6.81% 的折扣， [查看介绍](https://eladmin.vip/pages/040101/) #### 主要特性 - 使用最新技术栈，社区资源丰富。 From 7b52d617e50a68b4262d19c4e50ad0fdf5131828 Mon Sep 17 00:00:00 2001 From: l2063610646 <64514383+l2063610646@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:00:03 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix(EmailServiceImpl):=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E7=94=B1=E4=BA=8Ejdk8=E4=B9=8B=E5=90=8E=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=A6=81=E7=94=A8=E4=BA=86=E9=83=A8=E5=88=86tls?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=EF=BC=8C=E4=BB=8E=E8=80=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#809)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、测试jdk版本：jdk1.8.0_351 --- .../main/java/me/zhengjie/service/impl/EmailServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java index c98c76ec..aa567327 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java @@ -86,6 +86,8 @@ public class EmailServiceImpl implements EmailService { account.setSslEnable(true); // 使用STARTTLS安全连接 account.setStarttlsEnable(true); + // 解决jdk8之后默认禁用部分tls协议，导致邮件发送失败的问题 + account.setSslProtocols("TLSv1 TLSv1.1 TLSv1.2"); String content = emailVo.getContent(); // 发送 try { From f3fb86a69986213f4c9054297f0ecb1ddfe761c5 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Fri, 28 Jul 2023 15:55:13 +0800 Subject: [PATCH 07/10] update eladmin.sql --- sql/eladmin.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/eladmin.sql b/sql/eladmin.sql index 14483d24..20ee0949 100644 --- a/sql/eladmin.sql +++ b/sql/eladmin.sql @@ -658,7 +658,7 @@ CREATE TABLE `sys_user` ( `avatar_path` varchar(255) DEFAULT NULL COMMENT '头像真实路径', `password` varchar(255) DEFAULT NULL COMMENT '密码', `is_admin` bit(1) DEFAULT b'0' COMMENT '是否为admin账号', - `enabled` bigint(20) DEFAULT NULL COMMENT '状态：1启用、0禁用', + `enabled` bit(1) DEFAULT NULL COMMENT '状态：1启用、0禁用', `create_by` varchar(255) DEFAULT NULL COMMENT '创建者', `update_by` varchar(255) DEFAULT NULL COMMENT '更新者', `pwd_reset_time` datetime DEFAULT NULL COMMENT '修改密码的时间', From b17873ff9d1bb8d4d934764c802f8dce7abe0716 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Sat, 12 Aug 2023 18:48:52 +0800 Subject: [PATCH 08/10] update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4040fb7a..35700880 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,10 @@ | github | https://github.com/elunez/eladmin | https://github.com/elunez/eladmin-web | | 码云 | https://gitee.com/elunez/eladmin | https://gitee.com/elunez/eladmin-web | -#### VPS推荐 - - +#### 赞助商 | Sponsor + + +明道云零代码构建平台 使用优惠码: `BWHNCXNVXV`，可获得 6.81% 的折扣， [查看介绍](https://eladmin.vip/pages/040101/) From 490a8f24c00efdd3ab0d41ba6018a4e034e10252 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Sat, 12 Aug 2023 18:49:02 +0800 Subject: [PATCH 09/10] update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 35700880..ea0770a2 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,6 @@ 明道云零代码构建平台 -使用优惠码: `BWHNCXNVXV`，可获得 6.81% 的折扣， [查看介绍](https://eladmin.vip/pages/040101/) - #### 主要特性 - 使用最新技术栈，社区资源丰富。 - 高效率开发，代码生成器可一键生成前后端代码 From 2a879115bc5fa364f0ae8042c76edc4be84fa7e7 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Sun, 8 Oct 2023 14:54:34 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E5=87=BA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E6=8F=90=E5=87=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=AB=AF401=E6=AD=BB=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20close=20https://github.com/elunez/eladmin/?= =?UTF-8?q?issues/817?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/security/rest/AuthorizationController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java index 535c017d..effb15f5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhengjie.annotation.Log; +import me.zhengjie.annotation.rest.AnonymousDeleteMapping; import me.zhengjie.annotation.rest.AnonymousGetMapping; import me.zhengjie.annotation.rest.AnonymousPostMapping; import me.zhengjie.config.RsaProperties; @@ -140,7 +141,7 @@ public class AuthorizationController { } @ApiOperation("退出登录") - @DeleteMapping(value = "/logout") + @AnonymousDeleteMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { onlineUserService.logout(tokenProvider.getToken(request)); return new ResponseEntity<>(HttpStatus.OK);