refactor/去除冗余多模块

Author: freestylefly

pmhub-base/pmhub-base-core/pom.xml

@@ -115,6 +115,34 @@
             <artifactId>fastjson2</artifactId>
         </dependency>
 
+        <!-- 阿里数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Web容器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- 验证码 -->
+        <dependency>
+            <groupId>pro.fessional</groupId>
+            <artifactId>kaptcha</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- io常用工具类 -->
         <dependency>
             <groupId>commons-io</groupId>
@@ -236,6 +264,13 @@
             <artifactId>bcprov-jdk15to18</artifactId>
         </dependency>
 
+        <!-- 获取系统信息 -->
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
+        </dependency>
+
+
     </dependencies>
 
 </project>

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/aspectj/DataSourceAspect.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/aspectj/DataSourceAspect.java

@@ -1,8 +1,8 @@
-package com.laigeoffer.pmhub.base.framework.aspectj;
+package com.laigeoffer.pmhub.base.core.aspectj;
 
 import com.laigeoffer.pmhub.base.core.annotation.DataSource;
+import com.laigeoffer.pmhub.base.core.datasource.DynamicDataSourceContextHolder;
 import com.laigeoffer.pmhub.base.core.utils.StringUtils;
-import com.laigeoffer.pmhub.base.framework.datasource.DynamicDataSourceContextHolder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/aspectj/RateLimiterAspect.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/aspectj/RateLimiterAspect.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.aspectj;
+package com.laigeoffer.pmhub.base.core.aspectj;
 
 import com.laigeoffer.pmhub.base.core.annotation.RateLimiter;
 import com.laigeoffer.pmhub.base.core.enums.LimitType;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/CaptchaConfig.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/CaptchaConfig.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.config;
+package com.laigeoffer.pmhub.base.core.config;
 
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/DruidConfig.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/DruidConfig.java

@@ -1,13 +1,13 @@
-package com.laigeoffer.pmhub.base.framework.config;
+package com.laigeoffer.pmhub.base.core.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.util.Utils;
+import com.laigeoffer.pmhub.base.core.datasource.DynamicDataSource;
 import com.laigeoffer.pmhub.base.core.enums.DataSourceType;
+import com.laigeoffer.pmhub.base.core.properties.DruidProperties;
 import com.laigeoffer.pmhub.base.core.utils.spring.SpringUtils;
-import com.laigeoffer.pmhub.base.framework.config.properties.DruidProperties;
-import com.laigeoffer.pmhub.base.framework.datasource.DynamicDataSource;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -28,11 +28,6 @@
  */
 @Configuration
 public class DruidConfig {
-    @Bean
-    public DruidStatProperties druidStatProperties() {
-        return new DruidStatProperties();
-    }
-
     @Bean
     @ConfigurationProperties("spring.datasource.druid.master")
     public DataSource masterDataSource(DruidProperties druidProperties) {
@@ -114,4 +109,4 @@ public void destroy() {
         registrationBean.addUrlPatterns(commonJsPattern);
         return registrationBean;
     }
-}
+}

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/FilterConfig.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/FilterConfig.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.config;
+package com.laigeoffer.pmhub.base.core.config;
 
 import com.laigeoffer.pmhub.base.core.filter.RepeatableFilter;
 import com.laigeoffer.pmhub.base.core.filter.XssFilter;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/JacksonConfig.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/JacksonConfig.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.config;
+package com.laigeoffer.pmhub.base.core.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.MapperFeature;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/MybatisPlusConfig.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.config;
+package com.laigeoffer.pmhub.base.core.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/ServerConfig.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/ServerConfig.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.config;
+package com.laigeoffer.pmhub.base.core.config;
 
 import com.laigeoffer.pmhub.base.core.utils.ServletUtils;
 import org.springframework.stereotype.Component;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/ThreadPoolConfig.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/ThreadPoolConfig.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.config;
+package com.laigeoffer.pmhub.base.core.config;
 
 import com.laigeoffer.pmhub.base.core.utils.Threads;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/TomcatServletWebServerFactorySelf.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/TomcatServletWebServerFactorySelf.java

@@ -1,18 +1,19 @@
-package com.laigeoffer.pmhub.base.framework.config;
+package com.laigeoffer.pmhub.base.core.config;
 
 
 import org.apache.catalina.*;
 import org.apache.catalina.session.ManagerBase;
 import org.apache.commons.logging.Log;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 
 /**
  * 由于启用了JWT，自定义TomcatServletWebServerFactory以禁用session，获取session时将返回null，避免开发时误用，同时略微提升性能
  */
-//@Component
+@Component
 public class TomcatServletWebServerFactorySelf extends TomcatServletWebServerFactory {
 
     @Override
@@ -92,4 +93,4 @@ public Session[] findSessions() {
         public void processExpires() {
         }
     }
-}
+}

pmhub-base/pmhub-base-redis/src/main/java/com/laigeoffer/pmhub/base/redis/config/FastJson2JsonRedisSerializer.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/redis/FastJson2JsonRedisSerializer.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.redis.config;
+package com.laigeoffer.pmhub.base.core.config.redis;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONReader;

pmhub-base/pmhub-base-redis/src/main/java/com/laigeoffer/pmhub/base/redis/config/RedisConfig.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/redis/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.redis.config;
+package com.laigeoffer.pmhub.base.core.config.redis;
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;

pmhub-base/pmhub-base-redis/src/main/java/com/laigeoffer/pmhub/base/redis/service/RedisService.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/redis/RedisService.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.redis.service;
+package com.laigeoffer.pmhub.base.core.config.redis;
 
 import cn.hutool.core.util.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/web/domain/Server.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/core/domain/Server.java

@@ -1,8 +1,8 @@
-package com.laigeoffer.pmhub.base.framework.web.domain;
+package com.laigeoffer.pmhub.base.core.core.domain;
 
+import com.laigeoffer.pmhub.base.core.core.domain.server.*;
 import com.laigeoffer.pmhub.base.core.utils.Arith;
 import com.laigeoffer.pmhub.base.core.utils.ip.IpUtils;
-import com.laigeoffer.pmhub.base.framework.web.domain.server.*;
 import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
 import oshi.hardware.CentralProcessor.TickType;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/web/domain/server/Cpu.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/core/domain/server/Cpu.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.web.domain.server;
+package com.laigeoffer.pmhub.base.core.core.domain.server;
 
 
 import com.laigeoffer.pmhub.base.core.utils.Arith;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/web/domain/server/Jvm.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/core/domain/server/Jvm.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.web.domain.server;
+package com.laigeoffer.pmhub.base.core.core.domain.server;
 
 
 import com.laigeoffer.pmhub.base.core.utils.Arith;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/web/domain/server/Mem.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/core/domain/server/Mem.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.web.domain.server;
+package com.laigeoffer.pmhub.base.core.core.domain.server;
 
 
 import com.laigeoffer.pmhub.base.core.utils.Arith;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/web/domain/server/Sys.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/core/domain/server/Sys.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.web.domain.server;
+package com.laigeoffer.pmhub.base.core.core.domain.server;
 
 /**
  * 系统相关信息

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/web/domain/server/SysFile.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/core/domain/server/SysFile.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.web.domain.server;
+package com.laigeoffer.pmhub.base.core.core.domain.server;
 
 /**
  * 系统文件相关信息

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/datasource/DynamicDataSource.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/datasource/DynamicDataSource.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.datasource;
+package com.laigeoffer.pmhub.base.core.datasource;
 
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/datasource/DynamicDataSourceContextHolder.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/datasource/DynamicDataSourceContextHolder.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.datasource;
+package com.laigeoffer.pmhub.base.core.datasource;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/interceptor/RepeatSubmitInterceptor.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/interceptor/RepeatSubmitInterceptor.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.interceptor;
+package com.laigeoffer.pmhub.base.core.interceptor;
 
 import com.alibaba.fastjson2.JSON;
 import com.laigeoffer.pmhub.base.core.annotation.RepeatSubmit;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/interceptor/SameUrlDataInterceptor.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/interceptor/SameUrlDataInterceptor.java

@@ -1,12 +1,12 @@
-package com.laigeoffer.pmhub.base.framework.interceptor;
+package com.laigeoffer.pmhub.base.core.interceptor;
 
 import com.alibaba.fastjson2.JSON;
 import com.laigeoffer.pmhub.base.core.annotation.RepeatSubmit;
+import com.laigeoffer.pmhub.base.core.config.redis.RedisService;
 import com.laigeoffer.pmhub.base.core.constant.CacheConstants;
 import com.laigeoffer.pmhub.base.core.filter.RepeatedlyRequestWrapper;
 import com.laigeoffer.pmhub.base.core.utils.StringUtils;
 import com.laigeoffer.pmhub.base.core.utils.http.HttpHelper;
-import com.laigeoffer.pmhub.base.redis.service.RedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/manage/AsyncManager.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/manage/AsyncManager.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.system.manage;
+package com.laigeoffer.pmhub.base.core.manage;
 
 
 import com.laigeoffer.pmhub.base.core.utils.Threads;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/manager/ShutdownManager.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/manage/ShutdownManager.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.manager;
+package com.laigeoffer.pmhub.base.core.manage;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

pmhub-base/pmhub-base-framework/src/main/java/com/laigeoffer/pmhub/base/framework/config/properties/DruidProperties.java pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/properties/DruidProperties.java

@@ -1,4 +1,4 @@
-package com.laigeoffer.pmhub.base.framework.config.properties;
+package com.laigeoffer.pmhub.base.core.properties;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.springframework.beans.factory.annotation.Value;

pmhub-base/pmhub-base-core/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,18 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.laigeoffer.pmhub.base.core.utils.spring.SpringUtils,\
 com.laigeoffer.pmhub.base.core.config.PmhubConfig,\
-com.laigeoffer.pmhub.base.core.config.MetaObjectHandlerConfig
+com.laigeoffer.pmhub.base.core.config.MetaObjectHandlerConfig,\
+com.laigeoffer.pmhub.base.core.aspectj.DataSourceAspect,\
+com.laigeoffer.pmhub.base.core.aspectj.RateLimiterAspect,\
+com.laigeoffer.pmhub.base.core.config.DruidConfig,\
+com.laigeoffer.pmhub.base.core.properties.DruidProperties,\
+com.laigeoffer.pmhub.base.core.config.CaptchaConfig,\
+com.laigeoffer.pmhub.base.core.config.FilterConfig,\
+com.laigeoffer.pmhub.base.core.config.JacksonConfig,\
+com.laigeoffer.pmhub.base.core.config.MybatisPlusConfig,\
+com.laigeoffer.pmhub.base.core.config.ServerConfig,\
+com.laigeoffer.pmhub.base.core.config.ThreadPoolConfig,\
+com.laigeoffer.pmhub.base.core.config.TomcatServletWebServerFactorySelf,\
+com.laigeoffer.pmhub.base.core.manage.ShutdownManager,\
+com.laigeoffer.pmhub.base.core.config.redis.RedisConfig,\
+com.laigeoffer.pmhub.base.core.config.redis.RedisService