feat: 优化配置和代码结构

1、优化项目结构、优化部分配置
2、新增AnonTagUtils，用于获取匿名接口
3、优化Swagger，排除不需要认证的接口
4、新增BigDecimalUtils，用于BigDecimal类型，+-*/计算，元与分的转换

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://eladmin.vip
+ * @website <a href="https://eladmin.vip">...</a>
  * @date 2020-05-07
  **/
 @Target(ElementType.TYPE)

eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousAccess.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.annotation;
+package me.zhengjie.annotation.rest;
 
 import java.lang.annotation.*;
 

eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java

@@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import me.zhengjie.annotation.AnonymousAccess;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java

@@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import me.zhengjie.annotation.AnonymousAccess;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java

@@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import me.zhengjie.annotation.AnonymousAccess;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java

@@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import me.zhengjie.annotation.AnonymousAccess;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java

@@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import me.zhengjie.annotation.AnonymousAccess;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

eladmin-common/src/main/java/me/zhengjie/config/AsyncExecutor.java

@@ -0,0 +1,96 @@
+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package me.zhengjie.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 创建自定义的线程池
+ * @author Zheng Jie
+ * @description
+ * @date 2023-06-08
+ **/
+@EnableAsync
+@Configuration
+public class AsyncExecutor implements AsyncConfigurer {
+
+    public static int corePoolSize;
+
+    public static int maxPoolSize;
+
+    public static int keepAliveSeconds;
+
+    public static int queueCapacity;
+
+    @Value("${task.pool.core-pool-size}")
+    public void setCorePoolSize(int corePoolSize) {
+        AsyncExecutor.corePoolSize = corePoolSize;
+    }
+
+    @Value("${task.pool.max-pool-size}")
+    public void setMaxPoolSize(int maxPoolSize) {
+        AsyncExecutor.maxPoolSize = maxPoolSize;
+    }
+
+    @Value("${task.pool.keep-alive-seconds}")
+    public void setKeepAliveSeconds(int keepAliveSeconds) {
+        AsyncExecutor.keepAliveSeconds = keepAliveSeconds;
+    }
+
+    @Value("${task.pool.queue-capacity}")
+    public void setQueueCapacity(int queueCapacity) {
+        AsyncExecutor.queueCapacity = queueCapacity;
+    }
+
+    /**
+     * 自定义线程池，用法 @Async
+     * @return Executor
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        // 自定义工厂
+        ThreadFactory factory = r -> new Thread(r, "el-async-" + new AtomicInteger(1).getAndIncrement());
+        // 自定义线程池
+        return new ThreadPoolExecutor(corePoolSize, maxPoolSize, keepAliveSeconds,
+                TimeUnit.SECONDS, new ArrayBlockingQueue<>(queueCapacity), factory,
+                new ThreadPoolExecutor.CallerRunsPolicy());
+    }
+
+    /**
+     * 自定义线程池，用法，注入到类中使用
+     * private ThreadPoolTaskExecutor taskExecutor;
+     * @return ThreadPoolTaskExecutor
+     */
+    @Bean("taskAsync")
+    public ThreadPoolTaskExecutor taskAsync() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(2);
+        executor.setMaxPoolSize(4);
+        executor.setQueueCapacity(20);
+        executor.setKeepAliveSeconds(60);
+        executor.setThreadNamePrefix("el-task-");
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        return executor;
+    }
+}

eladmin-common/src/main/java/me/zhengjie/config/properties/FileProperties.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.config;
+package me.zhengjie.config.properties;
 
 import lombok.Data;
 import me.zhengjie.utils.ElConstant;

eladmin-common/src/main/java/me/zhengjie/config/properties/RsaProperties.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.config;
+package me.zhengjie.config.properties;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

eladmin-common/src/main/java/me/zhengjie/config/webConfig/ConfigurerAdapter.java

@@ -13,11 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.config;
+package me.zhengjie.config.webConfig;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import me.zhengjie.config.properties.FileProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;

eladmin-common/src/main/java/me/zhengjie/config/webConfig/QueryCustomizer.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.config;
+package me.zhengjie.config.webConfig;
 
 import org.apache.catalina.connector.Connector;
 import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
  * @author bearBoy80
  */
 @Configuration(proxyBeanMethods = false)
-public class RelaxedQueryCharsConnectorCustomizer implements TomcatConnectorCustomizer {
+public class QueryCustomizer implements TomcatConnectorCustomizer {
     @Override
     public void customize(Connector connector) {
         connector.setProperty("relaxedQueryChars", "[]{}");

eladmin-common/src/main/java/me/zhengjie/config/webConfig/SwaggerConfig.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.config;
+package me.zhengjie.config.webConfig;
 
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.classmate.TypeResolver;

eladmin-common/src/main/java/me/zhengjie/config/webConfig/WebSocketConfig.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.config;
+package me.zhengjie.config.webConfig;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -15,7 +15,7 @@
  */
 package me.zhengjie.utils;
 
-import me.zhengjie.annotation.AnonymousAccess;
+import me.zhengjie.annotation.rest.AnonymousAccess;
 import me.zhengjie.utils.enums.RequestMethodEnum;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -0,0 +1,143 @@
+/*
+ * Copyright 2019-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.zhengjie.utils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * @author Zheng Jie
+ * @description 计算类
+ * @date 2024-12-27
+ **/
+public class BigDecimalUtils {
+
+    /**
+     * 将对象转换为 BigDecimal
+     * @param obj 输入对象
+     * @return 转换后的 BigDecimal
+     */
+    private static BigDecimal toBigDecimal(Object obj) {
+        if (obj instanceof BigDecimal) {
+            return (BigDecimal) obj;
+        } else if (obj instanceof Long) {
+            return BigDecimal.valueOf((Long) obj);
+        } else if (obj instanceof Integer) {
+            return BigDecimal.valueOf((Integer) obj);
+        } else if (obj instanceof Double) {
+            return new BigDecimal(String.valueOf(obj));
+        } else {
+            throw new IllegalArgumentException("Unsupported type");
+        }
+    }
+
+    /**
+     * 加法
+     * @param a 加数
+     * @param b 加数
+     * @return 两个加数的和，保留两位小数
+     */
+    public static BigDecimal add(Object a, Object b) {
+        BigDecimal bdA = toBigDecimal(a);
+        BigDecimal bdB = toBigDecimal(b);
+        return bdA.add(bdB).setScale(2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 减法
+     * @param a 被减数
+     * @param b 减数
+     * @return 两数的差，保留两位小数
+     */
+    public static BigDecimal subtract(Object a, Object b) {
+        BigDecimal bdA = toBigDecimal(a);
+        BigDecimal bdB = toBigDecimal(b);
+        return bdA.subtract(bdB).setScale(2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 乘法
+     * @param a 乘数
+     * @param b 乘数
+     * @return 两个乘数的积，保留两位小数
+     */
+    public static BigDecimal multiply(Object a, Object b) {
+        BigDecimal bdA = toBigDecimal(a);
+        BigDecimal bdB = toBigDecimal(b);
+        return bdA.multiply(bdB).setScale(2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 除法
+     * @param a 被除数
+     * @param b 除数
+     * @return 两数的商，保留两位小数
+     */
+    public static BigDecimal divide(Object a, Object b) {
+        BigDecimal bdA = toBigDecimal(a);
+        BigDecimal bdB = toBigDecimal(b);
+        return bdA.divide(bdB, 2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 除法
+     * @param a 被除数
+     * @param b 除数
+     * @param scale 保留小数位数
+     * @return 两数的商，保留两位小数
+     */
+    public static BigDecimal divide(Object a, Object b, int scale) {
+        BigDecimal bdA = toBigDecimal(a);
+        BigDecimal bdB = toBigDecimal(b);
+        return bdA.divide(bdB, scale, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 分转元
+     * @param obj 分的金额
+     * @return 转换后的元，保留两位小数
+     */
+    public static BigDecimal centsToYuan(Object obj) {
+        BigDecimal cents = toBigDecimal(obj);
+        return cents.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 元转分
+     * @param obj 元的金额
+     * @return 转换后的分
+     */
+    public static Long yuanToCents(Object obj) {
+        BigDecimal yuan = toBigDecimal(obj);
+        return yuan.multiply(BigDecimal.valueOf(100)).setScale(0, RoundingMode.HALF_UP).longValue();
+    }
+    
+    public static void main(String[] args) {
+        BigDecimal num1 = new BigDecimal("10.123");
+        BigDecimal num2 = new BigDecimal("2.456");
+
+        System.out.println("加法结果: " + add(num1, num2));
+        System.out.println("减法结果: " + subtract(num1, num2));
+        System.out.println("乘法结果: " + multiply(num1, num2));
+        System.out.println("除法结果: " + divide(num1, num2));
+
+        Long cents = 12345L;
+        System.out.println("分转元结果: " + centsToYuan(cents));
+
+        BigDecimal yuan = new BigDecimal("123.45");
+        System.out.println("元转分结果: " + yuanToCents(yuan));
+    }
+}

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

@@ -1,43 +0,0 @@
-/*
- * Copyright 2019-2020  the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package me.zhengjie.utils;
-
-/**
- * @author: liaojinlong
- * @date: 2020/6/9 17:02
- * @since: 1.0
- * @see {@link SpringContextHolder}
- * 针对某些初始化方法，在SpringContextHolder 初始化前时，<br>
- * 可提交一个 提交回调任务。<br>
- * 在SpringContextHolder 初始化后，进行回调使用
- */
-
-public interface CallBack {
-    /**
-     * 回调执行方法
-     */
-    void executor();
-
-    /**
-     * 本回调任务名称
-     * @return /
-     */
-    default String getCallBackName() {
-        return Thread.currentThread().getId() + ":" + this.getClass().getName();
-    }
-}
-

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

@@ -19,16 +19,17 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
+import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.exception.BadRequestException;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.nio.file.Files;
 import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
@@ -44,10 +45,9 @@ import java.util.stream.Collectors;
  * @author Zheng Jie
  * @date 2018-12-27
  */
+@Slf4j
 public class FileUtil extends cn.hutool.core.io.FileUtil {
 
-    private static final Logger log = LoggerFactory.getLogger(FileUtil.class);
-
     /**
      * 系统临时目录
      * <br>
@@ -110,7 +110,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
      * 获取文件扩展名，不带 .
      */
     public static String getExtensionName(String filename) {
-        if ((filename != null) && (filename.length() > 0)) {
+        if ((filename != null) && (!filename.isEmpty())) {
             int dot = filename.lastIndexOf('.');
             if ((dot > -1) && (dot < (filename.length() - 1))) {
                 return filename.substring(dot + 1);
@@ -123,9 +123,9 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
      * Java文件操作 获取不带扩展名的文件名
      */
     public static String getFileNameNoEx(String filename) {
-        if ((filename != null) && (filename.length() > 0)) {
+        if ((filename != null) && (!filename.isEmpty())) {
             int dot = filename.lastIndexOf('.');
-            if ((dot > -1) && (dot < (filename.length()))) {
+            if (dot > -1) {
                 return filename.substring(0, dot);
             }
         }
@@ -162,7 +162,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         }
         OutputStream os = null;
         try {
-            os = new FileOutputStream(file);
+            os = Files.newOutputStream(file.toPath());
             int bytesRead;
             int len = 8192;
             byte[] buffer = new byte[len];
@@ -170,7 +170,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
                 os.write(buffer, 0, bytesRead);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } finally {
             CloseUtil.close(os);
             CloseUtil.close(ins);
@@ -301,7 +301,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         byte[] b = new byte[(int) file.length()];
         InputStream in = null;
         try {
-            in = new FileInputStream(file);
+            in = Files.newInputStream(file.toPath());
             try {
                 System.out.println(in.read(b));
             } catch (IOException e) {
@@ -407,7 +407,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         return fileName;
     }
 
-
     public static String getMd5(File file) {
         return getMd5(getByte(file));
     }

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

@@ -1,16 +1,24 @@
 package me.zhengjie.utils;
 
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.List;
 
-@Getter
-@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
-public class PageResult<T> {
+/**
+ * 分页结果封装类
+ * @author Zheng Jie
+ * @date 2018-11-23
+ * @param <T>
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageResult<T> implements Serializable {
 
-    private final List<T> content;
+    private List<T> content;
 
-    private final long totalElements;
+    private long totalElements;
 }

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

@@ -41,7 +41,7 @@ public class SecurityUtils {
      * @return UserDetails
      */
     public static UserDetails getCurrentUser() {
-        UserDetailsService userDetailsService = SpringContextHolder.getBean(UserDetailsService.class);
+        UserDetailsService userDetailsService = SpringBeanHolder.getBean(UserDetailsService.class);
         return userDetailsService.loadUserByUsername(getCurrentUsername());
     }
 

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

@@ -31,10 +31,11 @@ import java.util.List;
  * @date 2019-01-07
  */
 @Slf4j
-public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
+@SuppressWarnings("all")
+public class SpringBeanHolder implements ApplicationContextAware, DisposableBean {
 
     private static ApplicationContext applicationContext = null;
-    private static final List<CallBack> CALL_BACKS = new ArrayList<>();
+    private static final List<SpringBeanHolder.CallBack> CALL_BACKS = new ArrayList<>();
     private static boolean addCallback = true;
 
     /**
@@ -43,9 +44,9 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
      *
      * @param callBack 回调函数
      */
-    public synchronized static void addCallBacks(CallBack callBack) {
+    public synchronized static void addCallBacks(SpringBeanHolder.CallBack callBack) {
         if (addCallback) {
-            SpringContextHolder.CALL_BACKS.add(callBack);
+            SpringBeanHolder.CALL_BACKS.add(callBack);
         } else {
             log.warn("CallBack：{} 已无法添加！立即执行", callBack.getCallBackName());
             callBack.executor();
@@ -55,7 +56,6 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
     /**
      * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型.
      */
-    @SuppressWarnings("unchecked")
     public static <T> T getBean(String name) {
         assertContextInjected();
         return (T) applicationContext.getBean(name);
@@ -127,22 +127,22 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
 
     @Override
     public void destroy() {
-        SpringContextHolder.clearHolder();
+        SpringBeanHolder.clearHolder();
     }
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if (SpringContextHolder.applicationContext != null) {
-            log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
+        if (SpringBeanHolder.applicationContext != null) {
+            log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringBeanHolder.applicationContext);
         }
-        SpringContextHolder.applicationContext = applicationContext;
+        SpringBeanHolder.applicationContext = applicationContext;
         if (addCallback) {
-            for (CallBack callBack : SpringContextHolder.CALL_BACKS) {
+            for (SpringBeanHolder.CallBack callBack : SpringBeanHolder.CALL_BACKS) {
                 callBack.executor();
             }
             CALL_BACKS.clear();
         }
-        SpringContextHolder.addCallback = false;
+        SpringBeanHolder.addCallback = false;
     }
 
     /**
@@ -153,4 +153,20 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
         return new ArrayList<>(Arrays.asList(applicationContext
                 .getBeanNamesForAnnotation(Service.class)));
     }
+
+    interface CallBack {
+
+        /**
+         * 回调执行方法
+         */
+        void executor();
+
+        /**
+         * 本回调任务名称
+         * @return /
+         */
+        default String getCallBackName() {
+            return Thread.currentThread().getId() + ":" + this.getClass().getName();
+        }
+    }
 }

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

@@ -41,7 +41,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     /**
      * 注入bean
      */
-    private final static Ip2regionSearcher IP_SEARCHER = SpringContextHolder.getBean(Ip2regionSearcher.class);
+    private final static Ip2regionSearcher IP_SEARCHER = SpringBeanHolder.getBean(Ip2regionSearcher.class);
 
     /**
      * 驼峰命名法工具

eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java

@@ -45,7 +45,7 @@ public class ColUtil {
      */
     public static PropertiesConfiguration getConfig() {
         try {
-            return new PropertiesConfiguration("generator.properties");
+            return new PropertiesConfiguration("gen.properties");
         } catch (ConfigurationException e) {
             log.error(e.getMessage(), e);
         }

eladmin-system/pom.xml

@@ -39,12 +39,6 @@
             <version>2.7</version>
         </dependency>
 
-        <!-- Spring boot websocket -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-websocket</artifactId>
-		</dependency>
-
         <!-- quartz -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -18,7 +18,7 @@ package me.zhengjie;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;
-import me.zhengjie.utils.SpringContextHolder;
+import me.zhengjie.utils.SpringBeanHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.ApplicationPidFileWriter;
@@ -56,8 +56,8 @@ public class AppRun {
     }
 
     @Bean
-    public SpringContextHolder springContextHolder() {
-        return new SpringContextHolder();
+    public SpringBeanHolder springContextHolder() {
+        return new SpringBeanHolder();
     }
 
     /**

eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java

@@ -1,59 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package me.zhengjie.config.thread;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 线程池配置属性类
- * @author https://juejin.im/entry/5abb8f6951882555677e9da2
- * @date 2019年10月31日14:58:18
- */
-@Data
-@Component
-public class AsyncTaskProperties {
-
-    public static int corePoolSize;
-
-    public static int maxPoolSize;
-
-    public static int keepAliveSeconds;
-
-    public static int queueCapacity;
-
-    @Value("${task.pool.core-pool-size}")
-    public void setCorePoolSize(int corePoolSize) {
-        AsyncTaskProperties.corePoolSize = corePoolSize;
-    }
-
-    @Value("${task.pool.max-pool-size}")
-    public void setMaxPoolSize(int maxPoolSize) {
-        AsyncTaskProperties.maxPoolSize = maxPoolSize;
-    }
-
-    @Value("${task.pool.keep-alive-seconds}")
-    public void setKeepAliveSeconds(int keepAliveSeconds) {
-        AsyncTaskProperties.keepAliveSeconds = keepAliveSeconds;
-    }
-
-    @Value("${task.pool.queue-capacity}")
-    public void setQueueCapacity(int queueCapacity) {
-        AsyncTaskProperties.queueCapacity = queueCapacity;
-    }
-}

eladmin-system/src/main/java/me/zhengjie/config/thread/CustomExecutorConfig.java

@@ -1,52 +0,0 @@
-package me.zhengjie.config.thread;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ThreadPoolExecutor;
-
-/**
- * 创建自定义的线程池
- * @author Zheng Jie
- * @description
- * @date 2023-06-08
- **/
-@Configuration
-public class CustomExecutorConfig {
-
-    /**
-     * 自定义线程池，用法 @Async
-     * @return Executor
-     */
-    @Bean
-    @Primary
-    public Executor elAsync() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(AsyncTaskProperties.corePoolSize);
-        executor.setMaxPoolSize(AsyncTaskProperties.maxPoolSize);
-        executor.setQueueCapacity(AsyncTaskProperties.queueCapacity);
-        executor.setThreadNamePrefix("el-async-");
-        executor.setKeepAliveSeconds(AsyncTaskProperties.keepAliveSeconds);
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        executor.initialize();
-        return executor;
-    }
-
-    /**
-     * 自定义线程池，用法 @Async("otherAsync")
-     * @return Executor
-     */
-    @Bean
-    public Executor otherAsync() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(15);
-        executor.setQueueCapacity(50);
-        executor.setKeepAliveSeconds(AsyncTaskProperties.keepAliveSeconds);
-        executor.setThreadNamePrefix("el-task-");
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        executor.initialize();
-        return executor;
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/maint/domain/App.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.modules.maint.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;

eladmin-system/src/main/java/me/zhengjie/modules/maint/domain/Database.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.modules.maint.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;

eladmin-system/src/main/java/me/zhengjie/modules/maint/domain/Deploy.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.modules.maint.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;

eladmin-system/src/main/java/me/zhengjie/modules/maint/domain/DeployHistory.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.modules.maint.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;

eladmin-system/src/main/java/me/zhengjie/modules/maint/domain/ServerDeploy.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.modules.maint.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;

eladmin-system/src/main/java/me/zhengjie/modules/maint/repository/AppRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.modules.maint.repository;
 
-import me.zhengjie.modules.mnt.domain.App;
+import me.zhengjie.modules.maint.domain.App;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/repository/DatabaseRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.modules.maint.repository;
 
-import me.zhengjie.modules.mnt.domain.Database;
+import me.zhengjie.modules.maint.domain.Database;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/repository/DeployHistoryRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.modules.maint.repository;
 
-import me.zhengjie.modules.mnt.domain.DeployHistory;
+import me.zhengjie.modules.maint.domain.DeployHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/repository/DeployRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.modules.maint.repository;
 
-import me.zhengjie.modules.mnt.domain.Deploy;
+import me.zhengjie.modules.maint.domain.Deploy;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/repository/ServerDeployRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.modules.maint.repository;
 
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
+import me.zhengjie.modules.maint.domain.ServerDeploy;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/rest/AppController.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.modules.maint.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.AppService;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
+import me.zhengjie.modules.maint.domain.App;
+import me.zhengjie.modules.maint.service.AppService;
+import me.zhengjie.modules.maint.service.dto.AppDto;
+import me.zhengjie.modules.maint.service.dto.AppQueryCriteria;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

eladmin-system/src/main/java/me/zhengjie/modules/maint/rest/DatabaseController.java

@@ -13,18 +13,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.modules.maint.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.DatabaseService;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
-import me.zhengjie.modules.mnt.util.SqlUtils;
+import me.zhengjie.modules.maint.domain.Database;
+import me.zhengjie.modules.maint.service.DatabaseService;
+import me.zhengjie.modules.maint.service.dto.DatabaseDto;
+import me.zhengjie.modules.maint.service.dto.DatabaseQueryCriteria;
+import me.zhengjie.modules.maint.util.SqlUtils;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/maint/rest/DeployController.java

@@ -13,18 +13,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.modules.maint.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.DeployService;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
+import me.zhengjie.modules.maint.domain.Deploy;
+import me.zhengjie.modules.maint.domain.DeployHistory;
+import me.zhengjie.modules.maint.service.DeployService;
+import me.zhengjie.modules.maint.service.dto.DeployDto;
+import me.zhengjie.modules.maint.service.dto.DeployQueryCriteria;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/maint/rest/DeployHistoryController.java

@@ -13,15 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.modules.maint.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
+import me.zhengjie.modules.maint.service.DeployHistoryService;
+import me.zhengjie.modules.maint.service.dto.DeployHistoryDto;
+import me.zhengjie.modules.maint.service.dto.DeployHistoryQueryCriteria;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

eladmin-system/src/main/java/me/zhengjie/modules/maint/rest/ServerDeployController.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.modules.maint.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
+import me.zhengjie.modules.maint.domain.ServerDeploy;
+import me.zhengjie.modules.maint.service.ServerDeployService;
+import me.zhengjie.modules.maint.service.dto.ServerDeployDto;
+import me.zhengjie.modules.maint.service.dto.ServerDeployQueryCriteria;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/AppService.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.modules.maint.service;
 
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
+import me.zhengjie.modules.maint.domain.App;
+import me.zhengjie.modules.maint.service.dto.AppDto;
+import me.zhengjie.modules.maint.service.dto.AppQueryCriteria;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/DatabaseService.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.modules.maint.service;
 
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
+import me.zhengjie.modules.maint.domain.Database;
+import me.zhengjie.modules.maint.service.dto.DatabaseDto;
+import me.zhengjie.modules.maint.service.dto.DatabaseQueryCriteria;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/DeployHistoryService.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.modules.maint.service;
 
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
+import me.zhengjie.modules.maint.domain.DeployHistory;
+import me.zhengjie.modules.maint.service.dto.DeployHistoryDto;
+import me.zhengjie.modules.maint.service.dto.DeployHistoryQueryCriteria;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/DeployService.java

@@ -13,12 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.modules.maint.service;
 
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
+import me.zhengjie.modules.maint.domain.Deploy;
+import me.zhengjie.modules.maint.domain.DeployHistory;
+import me.zhengjie.modules.maint.service.dto.DeployDto;
+import me.zhengjie.modules.maint.service.dto.DeployQueryCriteria;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/ServerDeployService.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.modules.maint.service;
 
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
+import me.zhengjie.modules.maint.domain.ServerDeploy;
+import me.zhengjie.modules.maint.service.dto.ServerDeployDto;
+import me.zhengjie.modules.maint.service.dto.ServerDeployQueryCriteria;
 import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/AppDto.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/AppQueryCriteria.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/DatabaseDto.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/DatabaseQueryCriteria.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/DeployDto.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.Getter;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/DeployHistoryDto.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Data;
 import java.io.Serializable;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/DeployHistoryQueryCriteria.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/DeployQueryCriteria.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/ServerDeployDto.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/dto/ServerDeployQueryCriteria.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.modules.maint.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/impl/AppServiceImpl.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.modules.maint.service.impl;
 
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.repository.AppRepository;
-import me.zhengjie.modules.mnt.service.AppService;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.AppMapper;
+import me.zhengjie.modules.maint.domain.App;
+import me.zhengjie.modules.maint.repository.AppRepository;
+import me.zhengjie.modules.maint.service.AppService;
+import me.zhengjie.modules.maint.service.dto.AppDto;
+import me.zhengjie.modules.maint.service.dto.AppQueryCriteria;
+import me.zhengjie.modules.maint.service.mapstruct.AppMapper;
 import me.zhengjie.utils.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/impl/DatabaseServiceImpl.java

@@ -13,18 +13,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.modules.maint.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.repository.DatabaseRepository;
-import me.zhengjie.modules.mnt.service.DatabaseService;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.DatabaseMapper;
-import me.zhengjie.modules.mnt.util.SqlUtils;
+import me.zhengjie.modules.maint.domain.Database;
+import me.zhengjie.modules.maint.repository.DatabaseRepository;
+import me.zhengjie.modules.maint.service.DatabaseService;
+import me.zhengjie.modules.maint.service.dto.DatabaseDto;
+import me.zhengjie.modules.maint.service.dto.DatabaseQueryCriteria;
+import me.zhengjie.modules.maint.service.mapstruct.DatabaseMapper;
+import me.zhengjie.modules.maint.util.SqlUtils;
 import me.zhengjie.utils.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/impl/DeployHistoryServiceImpl.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.modules.maint.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.repository.DeployHistoryRepository;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.DeployHistoryMapper;
+import me.zhengjie.modules.maint.domain.DeployHistory;
+import me.zhengjie.modules.maint.repository.DeployHistoryRepository;
+import me.zhengjie.modules.maint.service.DeployHistoryService;
+import me.zhengjie.modules.maint.service.dto.DeployHistoryDto;
+import me.zhengjie.modules.maint.service.dto.DeployHistoryQueryCriteria;
+import me.zhengjie.modules.maint.service.mapstruct.DeployHistoryMapper;
 import me.zhengjie.utils.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/impl/DeployServiceImpl.java

@@ -13,31 +13,31 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.modules.maint.service.impl;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.repository.DeployRepository;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.DeployService;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.mapstruct.DeployMapper;
-import me.zhengjie.modules.mnt.util.ExecuteShellUtil;
-import me.zhengjie.modules.mnt.util.ScpClientUtil;
-import me.zhengjie.modules.mnt.websocket.MsgType;
-import me.zhengjie.modules.mnt.websocket.SocketMsg;
-import me.zhengjie.modules.mnt.websocket.WebSocketServer;
+import me.zhengjie.modules.maint.domain.App;
+import me.zhengjie.modules.maint.domain.Deploy;
+import me.zhengjie.modules.maint.domain.DeployHistory;
+import me.zhengjie.modules.maint.domain.ServerDeploy;
+import me.zhengjie.modules.maint.repository.DeployRepository;
+import me.zhengjie.modules.maint.service.DeployHistoryService;
+import me.zhengjie.modules.maint.service.DeployService;
+import me.zhengjie.modules.maint.service.ServerDeployService;
+import me.zhengjie.modules.maint.service.dto.AppDto;
+import me.zhengjie.modules.maint.service.dto.DeployDto;
+import me.zhengjie.modules.maint.service.dto.DeployQueryCriteria;
+import me.zhengjie.modules.maint.service.dto.ServerDeployDto;
+import me.zhengjie.modules.maint.service.mapstruct.DeployMapper;
+import me.zhengjie.modules.maint.util.ExecuteShellUtil;
+import me.zhengjie.modules.maint.util.ScpClientUtil;
+import me.zhengjie.modules.maint.websocket.MsgType;
+import me.zhengjie.modules.maint.websocket.SocketMsg;
+import me.zhengjie.modules.maint.websocket.WebSocketServer;
 import me.zhengjie.utils.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/impl/ServerDeployServiceImpl.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.modules.maint.service.impl;
 
 import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.repository.ServerDeployRepository;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.ServerDeployMapper;
-import me.zhengjie.modules.mnt.util.ExecuteShellUtil;
+import me.zhengjie.modules.maint.domain.ServerDeploy;
+import me.zhengjie.modules.maint.repository.ServerDeployRepository;
+import me.zhengjie.modules.maint.service.ServerDeployService;
+import me.zhengjie.modules.maint.service.dto.ServerDeployDto;
+import me.zhengjie.modules.maint.service.dto.ServerDeployQueryCriteria;
+import me.zhengjie.modules.maint.service.mapstruct.ServerDeployMapper;
+import me.zhengjie.modules.maint.util.ExecuteShellUtil;
 import me.zhengjie.utils.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/mapstruct/AppMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.modules.maint.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
+import me.zhengjie.modules.maint.domain.App;
+import me.zhengjie.modules.maint.service.dto.AppDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/mapstruct/DatabaseMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.modules.maint.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
+import me.zhengjie.modules.maint.domain.Database;
+import me.zhengjie.modules.maint.service.dto.DatabaseDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/mapstruct/DeployHistoryMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.modules.maint.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
+import me.zhengjie.modules.maint.domain.DeployHistory;
+import me.zhengjie.modules.maint.service.dto.DeployHistoryDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/mapstruct/DeployMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.modules.maint.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
+import me.zhengjie.modules.maint.domain.Deploy;
+import me.zhengjie.modules.maint.service.dto.DeployDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/service/mapstruct/ServerDeployMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.modules.maint.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
+import me.zhengjie.modules.maint.domain.ServerDeploy;
+import me.zhengjie.modules.maint.service.dto.ServerDeployDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/util/DataTypeEnum.java

@@ -17,7 +17,7 @@
  *
  */
 
-package me.zhengjie.modules.mnt.util;
+package me.zhengjie.modules.maint.util;
 import lombok.extern.slf4j.Slf4j;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/maint/util/ExecuteShellUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.util;
+package me.zhengjie.modules.maint.util;
 
 import cn.hutool.core.io.IoUtil;
 import com.jcraft.jsch.ChannelShell;

eladmin-system/src/main/java/me/zhengjie/modules/maint/util/ScpClientUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.util;
+package me.zhengjie.modules.maint.util;
 
 import ch.ethz.ssh2.Connection;
 import ch.ethz.ssh2.SCPClient;

eladmin-system/src/main/java/me/zhengjie/modules/maint/util/SqlUtils.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.util;
+package me.zhengjie.modules.maint.util;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.util.StringUtils;

eladmin-system/src/main/java/me/zhengjie/modules/maint/websocket/MsgType.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.websocket;
+package me.zhengjie.modules.maint.websocket;
 
 /**
  * @author ZhangHouYing

eladmin-system/src/main/java/me/zhengjie/modules/maint/websocket/SocketMsg.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.websocket;
+package me.zhengjie.modules.maint.websocket;
 
 import lombok.Data;
 

eladmin-system/src/main/java/me/zhengjie/modules/maint/websocket/WebSocketServer.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.websocket;
+package me.zhengjie.modules.maint.websocket;
 
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;

eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java

@@ -26,7 +26,7 @@ import me.zhengjie.modules.quartz.domain.QuartzLog;
 import me.zhengjie.modules.quartz.service.QuartzJobService;
 import me.zhengjie.modules.quartz.service.dto.JobQueryCriteria;
 import me.zhengjie.utils.PageResult;
-import me.zhengjie.utils.SpringContextHolder;
+import me.zhengjie.utils.SpringBeanHolder;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -134,7 +134,7 @@ public class QuartzJobController {
     private void checkBean(String beanName){
         // 避免调用攻击者可以从SpringContextHolder获得控制jdbcTemplate类
         // 并使用getDeclaredMethod调用jdbcTemplate的queryForMap函数，执行任意sql命令。
-        if(!SpringContextHolder.getAllServiceBeanName().contains(beanName)){
+        if(!SpringBeanHolder.getAllServiceBeanName().contains(beanName)){
             throw new BadRequestException("非法的 Bean，请重新输入！");
         }
     }

eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java

@@ -26,7 +26,7 @@ import me.zhengjie.modules.quartz.repository.QuartzLogRepository;
 import me.zhengjie.modules.quartz.service.QuartzJobService;
 import me.zhengjie.service.EmailService;
 import me.zhengjie.utils.RedisUtils;
-import me.zhengjie.utils.SpringContextHolder;
+import me.zhengjie.utils.SpringBeanHolder;
 import me.zhengjie.utils.StringUtils;
 import me.zhengjie.utils.ThrowableUtil;
 import org.quartz.JobExecutionContext;
@@ -49,16 +49,16 @@ public class ExecutionJob extends QuartzJobBean {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     // 此处仅供参考，可根据任务执行情况自定义线程池参数
-    private final ThreadPoolTaskExecutor executor = SpringContextHolder.getBean("elAsync");
+    private final ThreadPoolTaskExecutor executor = SpringBeanHolder.getBean("elAsync");
 
     @Override
     public void executeInternal(JobExecutionContext context) {
         // 获取任务
         QuartzJob quartzJob = (QuartzJob) context.getMergedJobDataMap().get(QuartzJob.JOB_KEY);
         // 获取spring bean
-        QuartzLogRepository quartzLogRepository = SpringContextHolder.getBean(QuartzLogRepository.class);
-        QuartzJobService quartzJobService = SpringContextHolder.getBean(QuartzJobService.class);
-        RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
+        QuartzLogRepository quartzLogRepository = SpringBeanHolder.getBean(QuartzLogRepository.class);
+        QuartzJobService quartzJobService = SpringBeanHolder.getBean(QuartzJobService.class);
+        RedisUtils redisUtils = SpringBeanHolder.getBean(RedisUtils.class);
 
         String uuid = quartzJob.getUuid();
 
@@ -105,7 +105,7 @@ public class ExecutionJob extends QuartzJobBean {
                 quartzJobService.updateIsPause(quartzJob);
             }
             if(quartzJob.getEmail() != null){
-                EmailService emailService = SpringContextHolder.getBean(EmailService.class);
+                EmailService emailService = SpringBeanHolder.getBean(EmailService.class);
                 // 邮箱报警
                 if(StringUtils.isNoneBlank(quartzJob.getEmail())){
                     EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e));

eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java

@@ -16,7 +16,7 @@
 package me.zhengjie.modules.quartz.utils;
 
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.utils.SpringContextHolder;
+import me.zhengjie.utils.SpringBeanHolder;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.ReflectionUtils;
 import java.lang.reflect.Method;
@@ -35,7 +35,7 @@ public class QuartzRunnable implements Callable<Object> {
 
 	QuartzRunnable(String beanName, String methodName, String params)
 			throws NoSuchMethodException, SecurityException {
-		this.target = SpringContextHolder.getBean(beanName);
+		this.target = SpringBeanHolder.getBean(beanName);
 		this.params = params;
 		if (StringUtils.isNotBlank(params)) {
 			this.method = target.getClass().getDeclaredMethod(methodName, String.class);

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

@@ -25,7 +25,7 @@ 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;
+import me.zhengjie.config.properties.RsaProperties;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.security.config.bean.LoginCodeEnum;
 import me.zhengjie.modules.security.config.bean.LoginProperties;

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

@@ -21,7 +21,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.utils.PageResult;
-import me.zhengjie.config.RsaProperties;
+import me.zhengjie.config.properties.RsaProperties;
 import me.zhengjie.modules.system.domain.Dept;
 import me.zhengjie.modules.system.service.DataService;
 import me.zhengjie.modules.system.domain.User;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -17,7 +17,7 @@ package me.zhengjie.modules.system.service.impl;
 
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.utils.PageResult;
-import me.zhengjie.config.FileProperties;
+import me.zhengjie.config.properties.FileProperties;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.security.service.OnlineUserService;
 import me.zhengjie.modules.security.service.UserCacheManager;

eladmin-system/src/main/java/me/zhengjie/sysrunner/SystemRunner.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.zhengjie.sysrunner;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Zheng Jie
+ * @description 程序启动后处理数据
+ * @date 2025-01-13
+ **/
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class SystemRunner implements ApplicationRunner {
+
+    @Override
+    public void run(ApplicationArguments args) {
+    }
+}

eladmin-tools/src/main/java/me/zhengjie/domain/enums/AliPayStatusEnum.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.utils;
+package me.zhengjie.domain.enums;
 
 /**
  * 支付状态

eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java

@@ -19,12 +19,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.annotation.AnonymousAccess;
+import me.zhengjie.annotation.rest.AnonymousAccess;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.domain.vo.TradeVo;
 import me.zhengjie.domain.AlipayConfig;
-import me.zhengjie.utils.AliPayStatusEnum;
+import me.zhengjie.domain.enums.AliPayStatusEnum;
 import me.zhengjie.utils.AlipayUtils;
 import me.zhengjie.service.AliPayService;
 import org.springframework.http.HttpStatus;

eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java

@@ -17,7 +17,7 @@ package me.zhengjie.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
-import me.zhengjie.config.FileProperties;
+import me.zhengjie.config.properties.FileProperties;
 import me.zhengjie.domain.LocalStorage;
 import me.zhengjie.service.dto.LocalStorageDto;
 import me.zhengjie.service.dto.LocalStorageQueryCriteria;

pom.xml

@@ -47,6 +47,12 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
+        <!-- Spring boot websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
         <!--Spring boot Web容器-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

sql/eladmin.sql

@@ -412,11 +412,11 @@ INSERT INTO `sys_menu` VALUES (80, 6, 0, 1, '服务监控', 'ServerMonitor', 'mo
 INSERT INTO `sys_menu` VALUES (82, 36, 0, 1, '生成配置', 'GeneratorConfig', 'generator/config', 33, 'dev', 'generator/config/:tableName', b'0', b'1', b'1', '', NULL, NULL, '2019-11-17 20:08:56', NULL);
 INSERT INTO `sys_menu` VALUES (83, 10, 0, 1, '图表库', 'Echarts', 'components/Echarts', 50, 'chart', 'echarts', b'0', b'1', b'0', '', NULL, NULL, '2019-11-21 09:04:32', NULL);
 INSERT INTO `sys_menu` VALUES (90, NULL, 5, 1, '运维管理', 'Mnt', '', 20, 'mnt', 'mnt', b'0', b'0', b'0', NULL, NULL, NULL, '2019-11-09 10:31:08', NULL);
-INSERT INTO `sys_menu` VALUES (92, 90, 3, 1, '服务器', 'ServerDeploy', 'mnt/server/index', 22, 'server', 'mnt/serverDeploy', b'0', b'0', b'0', 'serverDeploy:list', NULL, NULL, '2019-11-10 10:29:25', NULL);
-INSERT INTO `sys_menu` VALUES (93, 90, 3, 1, '应用管理', 'App', 'mnt/app/index', 23, 'app', 'mnt/app', b'0', b'0', b'0', 'app:list', NULL, NULL, '2019-11-10 11:05:16', NULL);
-INSERT INTO `sys_menu` VALUES (94, 90, 3, 1, '部署管理', 'Deploy', 'mnt/deploy/index', 24, 'deploy', 'mnt/deploy', b'0', b'0', b'0', 'deploy:list', NULL, NULL, '2019-11-10 15:56:55', NULL);
-INSERT INTO `sys_menu` VALUES (97, 90, 1, 1, '部署备份', 'DeployHistory', 'mnt/deployHistory/index', 25, 'backup', 'mnt/deployHistory', b'0', b'0', b'0', 'deployHistory:list', NULL, NULL, '2019-11-10 16:49:44', NULL);
-INSERT INTO `sys_menu` VALUES (98, 90, 3, 1, '数据库管理', 'Database', 'mnt/database/index', 26, 'database', 'mnt/database', b'0', b'0', b'0', 'database:list', NULL, NULL, '2019-11-10 20:40:04', NULL);
+INSERT INTO `sys_menu` VALUES (92, 90, 3, 1, '服务器', 'ServerDeploy', 'maint/server/index', 22, 'server', 'maint/serverDeploy', b'0', b'0', b'0', 'serverDeploy:list', NULL, NULL, '2019-11-10 10:29:25', NULL);
+INSERT INTO `sys_menu` VALUES (93, 90, 3, 1, '应用管理', 'App', 'maint/app/index', 23, 'app', 'maint/app', b'0', b'0', b'0', 'app:list', NULL, NULL, '2019-11-10 11:05:16', NULL);
+INSERT INTO `sys_menu` VALUES (94, 90, 3, 1, '部署管理', 'Deploy', 'maint/deploy/index', 24, 'deploy', 'maint/deploy', b'0', b'0', b'0', 'deploy:list', NULL, NULL, '2019-11-10 15:56:55', NULL);
+INSERT INTO `sys_menu` VALUES (97, 90, 1, 1, '部署备份', 'DeployHistory', 'maint/deployHistory/index', 25, 'backup', 'maint/deployHistory', b'0', b'0', b'0', 'deployHistory:list', NULL, NULL, '2019-11-10 16:49:44', NULL);
+INSERT INTO `sys_menu` VALUES (98, 90, 3, 1, '数据库管理', 'Database', 'maint/database/index', 26, 'database', 'maint/database', b'0', b'0', b'0', 'database:list', NULL, NULL, '2019-11-10 20:40:04', NULL);
 INSERT INTO `sys_menu` VALUES (102, 97, 0, 2, '删除', NULL, '', 999, '', '', b'0', b'0', b'0', 'deployHistory:del', NULL, NULL, '2019-11-17 09:32:48', NULL);
 INSERT INTO `sys_menu` VALUES (103, 92, 0, 2, '服务器新增', NULL, '', 999, '', '', b'0', b'0', b'0', 'serverDeploy:add', NULL, NULL, '2019-11-17 11:08:33', NULL);
 INSERT INTO `sys_menu` VALUES (104, 92, 0, 2, '服务器编辑', NULL, '', 999, '', '', b'0', b'0', b'0', 'serverDeploy:edit', NULL, NULL, '2019-11-17 11:08:57', NULL);

sql/tool_picture.sql

@@ -1,2 +0,0 @@
--- 删除免费图床表
-DROP TABLE tool_picture;

sql/脚本如何选择.md

@@ -1,11 +0,0 @@
-## 脚本指南
-项目根目录的 sql 文件夹内提供了本次数据库变更的脚本，脚本如何选择，以及执行的顺序如下
-
-::: tip 注意
-操作数据库属于危险行为，请勿用于生产库，请事先做好备份！！！
-:::
-
-### 初次使用
-eladmin.sql 为 eladmin 项目完整的 sql 脚本，适合于初次使用的用户
-
-### 更新迭代