Merge remote-tracking branch 'upstream/master' into master

.gitignore

@@ -4,3 +4,4 @@
 */target/*
 */*.iml
 /.gradle/
+/application.pid

README.md

@@ -13,7 +13,7 @@
 
 **开发文档：**  [https://el-admin.vip](https://el-admin.vip)
 
-**体验地址：**  [https://el-admin.xin](https://el-admin.xin)
+**体验地址：**  [https://el-admin.vip/demo](https://el-admin.vip/demo)
 
 **账号密码：** `admin / 123456`
 

eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java

@@ -253,7 +253,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         // 1M
         int len = 1024 * 1024;
         if (size > (maxSize * len)) {
-            throw new BadRequestException("文件超出规定大小");
+            throw new BadRequestException("文件超出规定大小:" + maxSize + "MB");
         }
     }
 

eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java

@@ -40,7 +40,7 @@ public enum CodeBiEnum {
 
     public static CodeBiEnum find(Integer code) {
         for (CodeBiEnum value : CodeBiEnum.values()) {
-            if (code.equals(value.getCode())) {
+            if (value.getCode().equals(code)) {
                 return value;
             }
         }

eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java

@@ -43,7 +43,7 @@ public enum DataScopeEnum {
 
     public static DataScopeEnum find(String val) {
         for (DataScopeEnum dataScopeEnum : DataScopeEnum.values()) {
-            if (val.equals(dataScopeEnum.getValue())) {
+            if (dataScopeEnum.getValue().equals(val)) {
                 return dataScopeEnum;
             }
         }

eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java

@@ -65,7 +65,7 @@ public enum RequestMethodEnum {
 
     public static RequestMethodEnum find(String type) {
         for (RequestMethodEnum value : RequestMethodEnum.values()) {
-            if (type.equals(value.getType())) {
+            if (value.getType().equals(type)) {
                 return value;
             }
         }

eladmin-system/src/main/java/me/zhengjie/AppRun.java

@@ -20,6 +20,7 @@ import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.utils.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.ApplicationPidFileWriter;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
@@ -43,7 +44,11 @@ import org.springframework.web.bind.annotation.RestController;
 public class AppRun {
 
     public static void main(String[] args) {
-        SpringApplication.run(AppRun.class, args);
+        SpringApplication springApplication = new SpringApplication(AppRun.class);
+        // 监控应用的PID，启动时可指定PID路径：--spring.pid.file=/home/eladmin/app.pid
+        // 或者在 application.yml 添加文件路径，方便 kill，kill `cat /home/eladmin/app.pid`
+        springApplication.addListeners(new ApplicationPidFileWriter());
+        springApplication.run(args);
     }
 
     @Bean

eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java

@@ -26,18 +26,18 @@ public enum LoginCodeEnum {
     /**
      * 算数
      */
-    arithmetic,
+    ARITHMETIC,
     /**
      * 中文
      */
-    chinese,
+    CHINESE,
     /**
      * 中文闪图
      */
-    chinese_gif,
+    CHINESE_GIF,
     /**
      * 闪图
      */
-    gif,
-    spec
+    GIF,
+    SPEC
 }

eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java

@@ -62,7 +62,7 @@ public class LoginProperties {
         if (Objects.isNull(loginCode)) {
             loginCode = new LoginCode();
             if (Objects.isNull(loginCode.getCodeType())) {
-                loginCode.setCodeType(LoginCodeEnum.arithmetic);
+                loginCode.setCodeType(LoginCodeEnum.ARITHMETIC);
             }
         }
         return switchCaptcha(loginCode);
@@ -78,25 +78,25 @@ public class LoginProperties {
         Captcha captcha;
         synchronized (this) {
             switch (loginCode.getCodeType()) {
-                case arithmetic:
+                case ARITHMETIC:
                     // 算术类型 https://gitee.com/whvse/EasyCaptcha
                     captcha = new FixedArithmeticCaptcha(loginCode.getWidth(), loginCode.getHeight());
                     // 几位数运算，默认是两位
                     captcha.setLen(loginCode.getLength());
                     break;
-                case chinese:
+                case CHINESE:
                     captcha = new ChineseCaptcha(loginCode.getWidth(), loginCode.getHeight());
                     captcha.setLen(loginCode.getLength());
                     break;
-                case chinese_gif:
+                case CHINESE_GIF:
                     captcha = new ChineseGifCaptcha(loginCode.getWidth(), loginCode.getHeight());
                     captcha.setLen(loginCode.getLength());
                     break;
-                case gif:
+                case GIF:
                     captcha = new GifCaptcha(loginCode.getWidth(), loginCode.getHeight());
                     captcha.setLen(loginCode.getLength());
                     break;
-                case spec:
+                case SPEC:
                     captcha = new SpecCaptcha(loginCode.getWidth(), loginCode.getHeight());
                     captcha.setLen(loginCode.getLength());
                     break;

eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java

@@ -123,7 +123,7 @@ public class AuthorizationController {
         String uuid = properties.getCodeKey() + IdUtil.simpleUUID();
         //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型
         String captchaValue = captcha.text();
-        if (captcha.getCharType() - 1 == LoginCodeEnum.arithmetic.ordinal() && captchaValue.contains(".")) {
+        if (captcha.getCharType() - 1 == LoginCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(".")) {
             captchaValue = captchaValue.split("\\.")[0];
         }
         // 保存

eladmin-system/src/main/resources/config/application.yml

@@ -12,6 +12,8 @@ spring:
     redis:
       repositories:
         enabled: false
+#  pid:
+#    file: /自行指定位置/eladmin.pid
 
   #配置 Jpa
   jpa: