From 40177c6c8dc8e542f046e3f6c95c356280035871 Mon Sep 17 00:00:00 2001 From: kdjj2006 Date: Tue, 12 Jul 2022 21:15:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=EF=BC=8C=E6=97=A0=E9=9C=80=E5=8A=A0?= =?UTF-8?q?=E9=94=81=EF=BC=8C=E4=B8=8D=E6=B6=89=E5=8F=8A=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=97=AE=E9=A2=98=EF=BC=8C=E6=8F=90=E9=AB=98?= =?UTF-8?q?=E6=95=88=E7=8E=87=20(#755)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/config/bean/LoginProperties.java | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java index 1e00f2fe..164c0073 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java @@ -68,33 +68,31 @@ public class LoginProperties { */ private Captcha switchCaptcha(LoginCode loginCode) { Captcha captcha; - synchronized (this) { - switch (loginCode.getCodeType()) { - case ARITHMETIC: - // 算术类型 https://gitee.com/whvse/EasyCaptcha - captcha = new FixedArithmeticCaptcha(loginCode.getWidth(), loginCode.getHeight()); - // 几位数运算，默认是两位 - captcha.setLen(loginCode.getLength()); - break; - case CHINESE: - captcha = new ChineseCaptcha(loginCode.getWidth(), loginCode.getHeight()); - captcha.setLen(loginCode.getLength()); - break; - case CHINESE_GIF: - captcha = new ChineseGifCaptcha(loginCode.getWidth(), loginCode.getHeight()); - captcha.setLen(loginCode.getLength()); - break; - case GIF: - captcha = new GifCaptcha(loginCode.getWidth(), loginCode.getHeight()); - captcha.setLen(loginCode.getLength()); - break; - case SPEC: - captcha = new SpecCaptcha(loginCode.getWidth(), loginCode.getHeight()); - captcha.setLen(loginCode.getLength()); - break; - default: - throw new BadConfigurationException("验证码配置信息错误！正确配置查看 LoginCodeEnum "); - } + switch (loginCode.getCodeType()) { + case ARITHMETIC: + // 算术类型 https://gitee.com/whvse/EasyCaptcha + captcha = new FixedArithmeticCaptcha(loginCode.getWidth(), loginCode.getHeight()); + // 几位数运算，默认是两位 + captcha.setLen(loginCode.getLength()); + break; + case CHINESE: + captcha = new ChineseCaptcha(loginCode.getWidth(), loginCode.getHeight()); + captcha.setLen(loginCode.getLength()); + break; + case CHINESE_GIF: + captcha = new ChineseGifCaptcha(loginCode.getWidth(), loginCode.getHeight()); + captcha.setLen(loginCode.getLength()); + break; + case GIF: + captcha = new GifCaptcha(loginCode.getWidth(), loginCode.getHeight()); + captcha.setLen(loginCode.getLength()); + break; + case SPEC: + captcha = new SpecCaptcha(loginCode.getWidth(), loginCode.getHeight()); + captcha.setLen(loginCode.getLength()); + break; + default: + throw new BadConfigurationException("验证码配置信息错误！正确配置查看 LoginCodeEnum "); } if(StringUtils.isNotBlank(loginCode.getFontName())){ captcha.setFont(new Font(loginCode.getFontName(), Font.PLAIN, loginCode.getFontSize())); From 62cb72eab9dfbf54ffa24ce2098506ab300854ef Mon Sep 17 00:00:00 2001 From: kdjj2006 Date: Mon, 25 Jul 2022 15:41:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9HashMap=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=AE=B9=E9=87=8F=EF=BC=8C=E5=87=8F=E5=B0=91=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E6=89=A9=E5=AE=B9=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E6=80=A7=E8=83=BD=20(#760)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 获取验证码逻辑，无需加锁，不涉及线程安全问题，提高效率 * 自定义生成策略时，Map容量设置不准确，会导致无必要的扩容 --- .../src/main/java/me/zhengjie/config/RedisConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java index bad7f79f..95217a26 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java @@ -106,7 +106,7 @@ public class RedisConfig extends CachingConfigurerSupport { @Override public KeyGenerator keyGenerator() { return (target, method, params) -> { - Map container = new HashMap<>(4); + Map container = new HashMap<>(8); Class targetClassClass = target.getClass(); // 类地址 container.put("class",targetClassClass.toGenericString()); From 5cfa96e127f16dd2e31e3b08042f366950e5d63f Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Tue, 2 Aug 2022 13:48:48 +0800 Subject: [PATCH 3/4] update domain --- README.md | 8 ++++---- .../main/java/me/zhengjie/annotation/DataPermission.java | 2 +- .../src/main/java/me/zhengjie/config/RsaProperties.java | 2 +- .../src/main/java/me/zhengjie/config/SwaggerConfig.java | 2 +- .../src/main/java/me/zhengjie/utils/CloseUtil.java | 2 +- .../java/me/zhengjie/utils/enums/RequestMethodEnum.java | 2 +- .../modules/system/service/impl/DataServiceImpl.java | 2 +- .../modules/system/service/impl/VerifyServiceImpl.java | 4 ++-- .../src/main/resources/template/email/email.ftl | 2 +- .../src/main/resources/template/email/taskAlarm.ftl | 2 +- .../resources/template/generator/admin/Controller.ftl | 2 +- .../src/main/resources/template/generator/admin/Dto.ftl | 2 +- .../main/resources/template/generator/admin/Entity.ftl | 2 +- .../main/resources/template/generator/admin/Mapper.ftl | 2 +- .../resources/template/generator/admin/QueryCriteria.ftl | 2 +- .../resources/template/generator/admin/Repository.ftl | 2 +- .../main/resources/template/generator/admin/Service.ftl | 2 +- .../resources/template/generator/admin/ServiceImpl.ftl | 2 +- pom.xml | 4 ++-- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 7462baca..0b7c3f34 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

EL-ADMIN 后台管理系统

+

ELADMIN 后台管理系统

[![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/elunez/eladmin/blob/master/LICENSE) @@ -11,9 +11,9 @@ #### 项目简介 一个基于 Spring Boot 2.1.0 、 Spring Boot Jpa、 JWT、Spring Security、Redis、Vue的前后端分离的后台管理系统 -**开发文档：** [https://el-admin.vip](https://el-admin.vip) +**开发文档：** [https://eladmin.vip](https://eladmin.vip) -**体验地址：** [https://el-admin.vip/demo](https://el-admin.vip/demo) +**体验地址：** [https://eladmin.vip/demo](https://eladmin.vip/demo) **账号密码：** `admin / 123456` @@ -102,7 +102,7 @@ - 感谢 [d15801543974](https://github.com/d15801543974) 大佬提供的基于注解的通用查询方式 #### 项目捐赠 -项目的发展离不开你的支持，请作者喝杯咖啡吧☕ [Donate](https://el-admin.vip/donation/) +项目的发展离不开你的支持，请作者喝杯咖啡吧☕ [Donate](https://eladmin.vip/donation/) #### 反馈交流 - QQ交流群：一群：891137268 、二群：947578238、三群：659622532 \ No newline at end of file diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java b/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java index b73c1a24..044d551e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java +++ b/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java @@ -28,7 +28,7 @@ import java.lang.annotation.Target; * 应该是 @DataPermission(joinName = "dept", fieldName = "id") *

* @author Zheng Jie - * @website https://el-admin.vip + * @website https://eladmin.vip * @date 2020-05-07 **/ @Target(ElementType.TYPE) diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java b/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java index a3594cdb..0a4a5375 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; /** * @author Zheng Jie - * @website https://el-admin.vip + * @website https://eladmin.vip * @description * @date 2020-05-18 **/ 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 6d267746..989be98d 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java @@ -77,7 +77,7 @@ public class SwaggerConfig { private ApiInfo apiInfo() { return new ApiInfoBuilder() .description("一个简单且易上手的 Spring boot 后台管理框架") - .title("EL-ADMIN 接口文档") + .title("ELADMIN 接口文档") .version("2.6") .build(); } diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java index 98d375be..f39919f2 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java @@ -19,7 +19,7 @@ import java.io.Closeable; /** * @author Zheng Jie - * @website https://el-admin.vip + * @website https://eladmin.vip * @description 用于关闭各种连接，缺啥补啥 * @date 2021-03-05 **/ diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java b/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java index 35e42b80..7de5146c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; /** * @author Zheng Jie - * @website https://el-admin.vip + * @website https://eladmin.vip * @description * @date 2020-06-10 **/ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java index 2933db9c..cd9cfd43 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java @@ -30,7 +30,7 @@ import java.util.*; /** * @author Zheng Jie - * @website https://el-admin.vip + * @website https://eladmin.vip * @description 数据权限服务实现 * @date 2020-05-07 **/ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java index ec3230c7..79d307f9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java @@ -60,11 +60,11 @@ public class VerifyServiceImpl implements VerifyService { throw new BadRequestException("服务异常，请联系网站负责人"); } content = template.render(Dict.create().set("code",code)); - emailVo = new EmailVo(Collections.singletonList(email),"EL-ADMIN后台管理系统",content); + emailVo = new EmailVo(Collections.singletonList(email),"ELADMIN后台管理系统",content); // 存在就再次发送原来的验证码 } else { content = template.render(Dict.create().set("code",oldCode)); - emailVo = new EmailVo(Collections.singletonList(email),"EL-ADMIN后台管理系统",content); + emailVo = new EmailVo(Collections.singletonList(email),"ELADMIN后台管理系统",content); } return emailVo; } diff --git a/eladmin-system/src/main/resources/template/email/email.ftl b/eladmin-system/src/main/resources/template/email/email.ftl index 2f82fcb5..606d490e 100644 --- a/eladmin-system/src/main/resources/template/email/email.ftl +++ b/eladmin-system/src/main/resources/template/email/email.ftl @@ -39,7 +39,7 @@ font-size: 12px; padding: 20px 0px; font-family: Microsoft YaHei;"> - Copyright ©${.now?string("yyyy")} EL-ADMIN 后台管理系统 All Rights Reserved. + Copyright ©${.now?string("yyyy")} ELADMIN 后台管理系统 All Rights Reserved.
diff --git a/eladmin-system/src/main/resources/template/email/taskAlarm.ftl b/eladmin-system/src/main/resources/template/email/taskAlarm.ftl index b116decb..a29b0780 100644 --- a/eladmin-system/src/main/resources/template/email/taskAlarm.ftl +++ b/eladmin-system/src/main/resources/template/email/taskAlarm.ftl @@ -60,7 +60,7 @@ font-size: 12px; padding: 20px 0px; font-family: Microsoft YaHei;"> - Copyright ©${.now?string("yyyy")} EL-ADMIN 后台管理系统 All Rights Reserved. + Copyright ©${.now?string("yyyy")} ELADMIN 后台管理系统 All Rights Reserved. diff --git a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl index f81e280f..5af73ddb 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl @@ -31,7 +31,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; /** -* @website https://el-admin.vip +* @website https://eladmin.vip * @author ${author} * @date ${date} **/ 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 e388a0b4..ac81d988 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl @@ -29,7 +29,7 @@ import com.alibaba.fastjson.serializer.ToStringSerializer; /** -* @website https://el-admin.vip +* @website https://eladmin.vip * @description / * @author ${author} * @date ${date} 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 c5cf9c26..2e85cea8 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl @@ -37,7 +37,7 @@ import java.math.BigDecimal; import java.io.Serializable; /** -* @website https://el-admin.vip +* @website https://eladmin.vip * @description / * @author ${author} * @date ${date} diff --git a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl index 3387f060..7bd67c0a 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl @@ -22,7 +22,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** -* @website https://el-admin.vip +* @website https://eladmin.vip * @author ${author} * @date ${date} **/ 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 2a4d1ff4..b94f0f45 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl @@ -30,7 +30,7 @@ import me.zhengjie.annotation.Query; /** -* @website https://el-admin.vip +* @website https://eladmin.vip * @author ${author} * @date ${date} **/ diff --git a/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl b/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl index 2420d4b0..dac1e924 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl @@ -20,7 +20,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** -* @website https://el-admin.vip +* @website https://eladmin.vip * @author ${author} * @date ${date} **/ diff --git a/eladmin-system/src/main/resources/template/generator/admin/Service.ftl b/eladmin-system/src/main/resources/template/generator/admin/Service.ftl index 9ecbe249..ef337149 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Service.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Service.ftl @@ -25,7 +25,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; /** -* @website https://el-admin.vip +* @website https://eladmin.vip * @description 服务接口 * @author ${author} * @date ${date} 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 17f04547..4f1f07da 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -54,7 +54,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; /** -* @website https://el-admin.vip +* @website https://eladmin.vip * @description 服务实现 * @author ${author} * @date ${date} diff --git a/pom.xml b/pom.xml index 14bf38dc..7dc9a3c6 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ eladmin-generator - EL-ADMIN 后台管理 - https://el-admin.vip + ELADMIN 后台管理 + https://eladmin.vip org.springframework.boot From 62fab6e76ef7efb970219ccd12362aab11670f82 Mon Sep 17 00:00:00 2001 From: yujr1990 <109193514+yujr1990@users.noreply.github.com> Date: Wed, 10 Aug 2022 11:12:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=A4=E6=96=AD=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @0001 @修改登录日志判断方式 Co-authored-by: yujr --- .../main/java/me/zhengjie/service/impl/LogServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java b/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java index 729a7930..6d2d6611 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java @@ -96,9 +96,9 @@ public class LogServiceImpl implements LogService { log.setUsername(username); log.setParams(getParameter(method, joinPoint.getArgs())); // 记录登录用户，隐藏密码信息 - if(log.getDescription().equals("用户登录")){ + if(signature.getName().equals("login") && StringUtils.isNotEmpty(log.getParams())){ JSONObject obj = JSONUtil.parseObj(log.getParams()); - log.setUsername(obj.get("username").toString()); + log.setUsername(obj.getStr("username", "")); log.setParams(JSONUtil.toJsonStr(Dict.create().set("username", log.getUsername()))); } log.setBrowser(browser); @@ -120,7 +120,7 @@ public class LogServiceImpl implements LogService { //将RequestParam注解修饰的参数作为请求参数 RequestParam requestParam = parameters[i].getAnnotation(RequestParam.class); if (requestParam != null) { - Map map = new HashMap<>(4); + Map map = new HashMap<>(2); String key = parameters[i].getName(); if (!StringUtils.isEmpty(requestParam.value())) { key = requestParam.value();