Merge branch 'fork_master' into master

2022-08-11 20:19:03 +08:00 · 2022-08-11 20:19:03 +08:00 · 3d3e77dd98
parent 7f5640cb1f 1c141bfc5d
commit 3d3e77dd98
22 changed files with 53 additions and 55 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-<h1 style="text-align: center">EL-ADMIN 后台管理系统</h1>
+<h1 style="text-align: center">ELADMIN 后台管理系统</h1>
 <div style="text-align: center">

 [![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交流群：一群：<strike>891137268</strike> 、二群：<strike>947578238</strike>、三群：659622532
--- 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")
 * </p>
 * @author Zheng Jie
- * @website https://el-admin.vip
+ * @website https://eladmin.vip
 * @date 2020-05-07
 **/
@Target(ElementType.TYPE)
--- 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<String,Object> container = new HashMap<>(4);
+            Map<String,Object> container = new HashMap<>(8);
            Class<?> targetClassClass = target.getClass();
            // 类地址
            container.put("class",targetClassClass.toGenericString());
--- 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
 **/
--- 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();
    }
--- 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
 **/
--- 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
 **/
--- 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<String, Object> map = new HashMap<>(4);
+                Map<String, Object> map = new HashMap<>(2);
                String key = parameters[i].getName();
                if (!StringUtils.isEmpty(requestParam.value())) {
                    key = requestParam.value();
--- 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()));
--- 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
 **/
--- 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;
    }
--- 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 &copy;${.now?string("yyyy")} <a hover="color: #DA251D;" style="color: #999;" href="https://github.com/elunez/eladmin" target="_blank">EL-ADMIN</a> 后台管理系统 All Rights Reserved.
+            Copyright &copy;${.now?string("yyyy")} <a hover="color: #DA251D;" style="color: #999;" href="https://github.com/elunez/eladmin" target="_blank">ELADMIN</a> 后台管理系统 All Rights Reserved.
        </div>

    </div>
--- 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 &copy;${.now?string("yyyy")} <a hover="color: #DA251D;" style="color: #999;" href="https://github.com/elunez/eladmin" target="_blank">EL-ADMIN</a> 后台管理系统 All Rights Reserved.
+            Copyright &copy;${.now?string("yyyy")} <a hover="color: #DA251D;" style="color: #999;" href="https://github.com/elunez/eladmin" target="_blank">ELADMIN</a> 后台管理系统 All Rights Reserved.
        </div>

    </div>
--- 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}
 **/
--- 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;
 </#if>

 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @description /
 * @author ${author}
 * @date ${date}
--- 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}
--- 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}
 **/
--- 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;
 </#if>

 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @author ${author}
 * @date ${date}
 **/
--- 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}
 **/
--- 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}
--- 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}
--- a/pom.xml
+++ b/pom.xml
@ -17,8 +17,8 @@
        <module>eladmin-generator</module>
    </modules>

-    <name>EL-ADMIN 后台管理</name>
-    <url>https://el-admin.vip</url>
+    <name>ELADMIN 后台管理</name>
+    <url>https://eladmin.vip</url>

    <parent>
        <groupId>org.springframework.boot</groupId>