feat: 全部模块改名

luoyb

2024-05-18 ac693f5ddb22583fda2c1f46af2dfe36ef35ef0e

feat: 全部模块改名

 .flattened-pom.xml

@@ -11,7 +11,7 @@
  <url>https://gitee.com/dromara/RuoYi-Vue-Plus</url>
  <modules>
    <module>hs-service</module>
    <module>ruoyi-common</module>
    <module>hs-common</module>
    <module>hs-extend</module>
    <module>hs-modules</module>
  </modules>
@@ -76,7 +76,7 @@
      </dependency>
      <dependency>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common-bom</artifactId>
        <artifactId>hs-common-bom</artifactId>
        <version>5.1.2</version>
        <type>pom</type>
        <scope>import</scope>

 hs-common/.flattened-pom.xml

New file
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-vue-plus</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>hs-common</artifactId>
  <version>5.1.2</version>
  <packaging>pom</packaging>
  <description>common 通用模块</description>
  <modules>
    <module>hs-common-bom</module>
    <module>hs-common-social</module>
    <module>hs-common-core</module>
    <module>hs-common-doc</module>
    <module>hs-common-excel</module>
    <module>hs-common-idempotent</module>
    <module>hs-common-job</module>
    <module>hs-common-log</module>
    <module>hs-common-mail</module>
    <module>hs-common-mybatis</module>
    <module>hs-common-oss</module>
    <module>hs-common-ratelimiter</module>
    <module>hs-common-redis</module>
    <module>hs-common-satoken</module>
    <module>hs-common-security</module>
    <module>hs-common-sms</module>
    <module>hs-common-web</module>
    <module>hs-common-translation</module>
    <module>hs-common-sensitive</module>
    <module>hs-common-json</module>
    <module>hs-common-encrypt</module>
    <module>hs-common-tenant</module>
    <module>hs-common-websocket</module>
  </modules>
</project>

 hs-common/hs-common-bom/pom.xml

File was renamed from ruoyi-common/ruoyi-common-bom/pom.xml
@@ -5,12 +5,12 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common-bom</artifactId>
    <artifactId>hs-common-bom</artifactId>
    <version>${revision}</version>
    <packaging>pom</packaging>

    <description>
        ruoyi-common-bom common依赖项
        hs-common-bom common依赖项
    </description>

    <properties>
@@ -22,153 +22,153 @@
            <!-- 核心模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-core</artifactId>
                <artifactId>hs-common-core</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 接口模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-doc</artifactId>
                <artifactId>hs-common-doc</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- excel -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-excel</artifactId>
                <artifactId>hs-common-excel</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 幂等 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-idempotent</artifactId>
                <artifactId>hs-common-idempotent</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 调度模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-job</artifactId>
                <artifactId>hs-common-job</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 日志记录 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-log</artifactId>
                <artifactId>hs-common-log</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 邮件服务 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-mail</artifactId>
                <artifactId>hs-common-mail</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 数据库服务 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-mybatis</artifactId>
                <artifactId>hs-common-mybatis</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- OSS -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-oss</artifactId>
                <artifactId>hs-common-oss</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 限流 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-ratelimiter</artifactId>
                <artifactId>hs-common-ratelimiter</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 缓存服务 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-redis</artifactId>
                <artifactId>hs-common-redis</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- satoken -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-satoken</artifactId>
                <artifactId>hs-common-satoken</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 安全模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-security</artifactId>
                <artifactId>hs-common-security</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 短信模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-sms</artifactId>
                <artifactId>hs-common-sms</artifactId>
                <version>${revision}</version>
            </dependency>

            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-social</artifactId>
                <artifactId>hs-common-social</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- web服务 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-web</artifactId>
                <artifactId>hs-common-web</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 翻译模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-translation</artifactId>
                <artifactId>hs-common-translation</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 脱敏模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-sensitive</artifactId>
                <artifactId>hs-common-sensitive</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 序列化模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-json</artifactId>
                <artifactId>hs-common-json</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 数据库加解密模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-encrypt</artifactId>
                <artifactId>Hs-common-encrypt</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 租户模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-tenant</artifactId>
                <artifactId>hs-common-tenant</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- WebSocket模块 -->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-websocket</artifactId>
                <artifactId>hs-common-websocket</artifactId>
                <version>${revision}</version>
            </dependency>


 hs-common/hs-common-core/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-core/.flattened-pom.xml
@@ -4,13 +4,13 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-core</artifactId>
  <artifactId>hs-common-core</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-core 核心模块</description>
  <description>hs-common-core 核心模块</description>
  <dependencies>
    <dependency>
      <groupId>org.springframework</groupId>

 hs-common/hs-common-core/pom.xml

File was renamed from ruoyi-common/ruoyi-common-core/pom.xml
@@ -4,15 +4,15 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-core</artifactId>
    <artifactId>hs-common-core</artifactId>

    <description>
        ruoyi-common-core 核心模块
        hs-common-core 核心模块
    </description>

    <dependencies>

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/config/ApplicationConfig.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/config/AsyncConfig.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/config/RuoYiConfig.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/config/ThreadPoolConfig.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/config/ValidatorConfig.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/config/properties/ThreadPoolProperties.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/constant/CacheConstants.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/constant/CacheNames.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/constant/Constants.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/constant/GlobalConstants.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/constant/HttpStatus.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/constant/TenantConstants.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/constant/UserConstants.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/R.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/dto/RoleDTO.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/dto/UserOnlineDTO.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/EmailLoginBody.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/LoginBody.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/LoginUser.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/PasswordLoginBody.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/RegisterBody.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/SmsLoginBody.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/SocialLoginBody.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/XcxLoginBody.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/domain/model/XcxLoginUser.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/enums/DeviceType.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/enums/LoginType.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/enums/TenantStatus.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/enums/UserStatus.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/enums/UserType.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/exception/ServiceException.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/exception/base/BaseException.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/exception/file/FileException.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/exception/file/FileNameLengthLimitExceededException.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/exception/file/FileSizeLimitExceededException.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/exception/user/CaptchaException.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/exception/user/CaptchaExpireException.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/exception/user/UserException.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/factory/YmlPropertySourceFactory.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/service/ConfigService.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/service/DeptService.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/service/DictService.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/service/OssService.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/service/UserService.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/DateUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/MapstructUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/MessageUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/ServletUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/SpringUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/StreamUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/StringUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/Threads.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/TreeBuildUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/ValidatorUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/file/FileUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/file/MimeTypeUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/ip/AddressUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/ip/RegionUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/reflect/ReflectUtils.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/utils/sql/SqlUtil.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/validate/AddGroup.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/validate/EditGroup.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/validate/QueryGroup.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/xss/Xss.java

 hs-common/hs-common-core/src/main/java/com/sunsail/common/core/xss/XssValidator.java

 hs-common/hs-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-doc/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-doc/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-doc</artifactId>
  <artifactId>hs-common-doc</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-doc 系统接口</description>
  <description>hs-common-doc 系统接口</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>org.springdoc</groupId>

 hs-common/hs-common-doc/pom.xml

File was renamed from ruoyi-common/ruoyi-common-doc/pom.xml
@@ -4,21 +4,21 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-doc</artifactId>
    <artifactId>hs-common-doc</artifactId>

    <description>
        ruoyi-common-doc 系统接口
        hs-common-doc 系统接口
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <dependency>

 hs-common/hs-common-doc/src/main/java/com/sunsail/common/doc/config/SpringDocConfig.java

 hs-common/hs-common-doc/src/main/java/com/sunsail/common/doc/config/properties/SpringDocProperties.java

 hs-common/hs-common-doc/src/main/java/com/sunsail/common/doc/handler/OpenApiHandler.java

 hs-common/hs-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-encrypt/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-encrypt/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-encrypt</artifactId>
  <artifactId>hs-common-encrypt</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-encrypt 数据加解密模块</description>
  <description>hs-common-encrypt 数据加解密模块</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>org.mybatis.spring.boot</groupId>

 hs-common/hs-common-encrypt/pom.xml

File was renamed from ruoyi-common/ruoyi-common-encrypt/pom.xml
@@ -4,22 +4,22 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-encrypt</artifactId>
    <artifactId>hs-common-encrypt</artifactId>

    <description>
        ruoyi-common-encrypt 数据加解密模块
        hs-common-encrypt 数据加解密模块
    </description>

    <dependencies>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <dependency>

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/annotation/ApiEncrypt.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/annotation/EncryptField.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/config/ApiDecryptAutoConfiguration.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/config/EncryptorAutoConfiguration.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/EncryptContext.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/EncryptorManager.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/IEncryptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/encryptor/AbstractEncryptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/encryptor/AesEncryptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/encryptor/Base64Encryptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/encryptor/RsaEncryptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/encryptor/Sm2Encryptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/core/encryptor/Sm4Encryptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/enumd/AlgorithmType.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/enumd/EncodeType.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/filter/CryptoFilter.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/filter/DecryptRequestBodyWrapper.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/filter/EncryptResponseBodyWrapper.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/interceptor/MybatisDecryptInterceptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/interceptor/MybatisEncryptInterceptor.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/properties/ApiDecryptProperties.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/properties/EncryptorProperties.java

 hs-common/hs-common-encrypt/src/main/java/com/sunsail/common/encrypt/utils/EncryptUtils.java

 hs-common/hs-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-excel/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-excel/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-excel</artifactId>
  <artifactId>hs-common-excel</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-excel</description>
  <description>hs-common-excel</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-json</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
    <dependency>
      <groupId>com.alibaba</groupId>

 hs-common/hs-common-excel/pom.xml

File was renamed from ruoyi-common/ruoyi-common-excel/pom.xml
@@ -4,21 +4,21 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-excel</artifactId>
    <artifactId>hs-common-excel</artifactId>

    <description>
        ruoyi-common-excel
        hs-common-excel
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-json</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

        <dependency>

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/annotation/CellMerge.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/annotation/ExcelDictFormat.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/annotation/ExcelEnumFormat.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/convert/ExcelBigNumberConvert.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/convert/ExcelDictConvert.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/convert/ExcelEnumConvert.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/core/CellMergeStrategy.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/core/DefaultExcelListener.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/core/DefaultExcelResult.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/core/DropDownOptions.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/core/ExcelDownHandler.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/core/ExcelListener.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/core/ExcelResult.java

 hs-common/hs-common-excel/src/main/java/com/sunsail/common/excel/utils/ExcelUtil.java

 hs-common/hs-common-idempotent/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-idempotent/.flattened-pom.xml
@@ -4,21 +4,21 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-idempotent</artifactId>
  <artifactId>hs-common-idempotent</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-idempotent 幂等功能</description>
  <description>hs-common-idempotent 幂等功能</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-json</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
    <dependency>
      <groupId>cn.hutool</groupId>

 hs-common/hs-common-idempotent/pom.xml

File was renamed from ruoyi-common/ruoyi-common-idempotent/pom.xml
@@ -4,26 +4,26 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-idempotent</artifactId>
    <artifactId>hs-common-idempotent</artifactId>

    <description>
        ruoyi-common-idempotent 幂等功能
        hs-common-idempotent 幂等功能
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-json</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>

        <dependency>

 hs-common/hs-common-idempotent/src/main/java/com/sunsail/common/idempotent/annotation/RepeatSubmit.java

 hs-common/hs-common-idempotent/src/main/java/com/sunsail/common/idempotent/aspectj/RepeatSubmitAspect.java

 hs-common/hs-common-idempotent/src/main/java/com/sunsail/common/idempotent/config/IdempotentConfig.java

 hs-common/hs-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-job/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-job/.flattened-pom.xml
@@ -4,13 +4,13 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-job</artifactId>
  <artifactId>hs-common-job</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-job 定时任务</description>
  <description>hs-common-job 定时任务</description>
  <dependencies>
    <dependency>
      <groupId>org.springframework.boot</groupId>
@@ -36,7 +36,7 @@
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
  </dependencies>
</project>

 hs-common/hs-common-job/pom.xml

File was renamed from ruoyi-common/ruoyi-common-job/pom.xml
@@ -4,15 +4,15 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-job</artifactId>
    <artifactId>hs-common-job</artifactId>

    <description>
        ruoyi-common-job 定时任务
        hs-common-job 定时任务
    </description>

    <dependencies>
@@ -45,7 +45,7 @@

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

    </dependencies>

 hs-common/hs-common-job/src/main/java/com/sunsail/common/job/config/PowerJobConfig.java

 hs-common/hs-common-json/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-json/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-json</artifactId>
  <artifactId>hs-common-json</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-json 序列化模块</description>
  <description>hs-common-json 序列化模块</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>com.fasterxml.jackson.core</groupId>

 hs-common/hs-common-json/pom.xml

File was renamed from ruoyi-common/ruoyi-common-json/pom.xml
@@ -4,21 +4,21 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-json</artifactId>
    <artifactId>hs-common-json</artifactId>

    <description>
        ruoyi-common-json 序列化模块
        hs-common-json 序列化模块
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <!-- JSON工具类 -->

 hs-common/hs-common-json/src/main/java/com/sunsail/common/json/config/JacksonConfig.java

 hs-common/hs-common-json/src/main/java/com/sunsail/common/json/handler/BigNumberSerializer.java

 hs-common/hs-common-json/src/main/java/com/sunsail/common/json/utils/JsonUtils.java

 hs-common/hs-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-log/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-log/.flattened-pom.xml
@@ -4,21 +4,21 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-log</artifactId>
  <artifactId>hs-common-log</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-log 日志记录</description>
  <description>hs-common-log 日志记录</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-satoken</artifactId>
      <artifactId>hs-common-satoken</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-json</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
    <dependency>
      <groupId>com.alibaba</groupId>

 hs-common/hs-common-log/pom.xml

File was renamed from ruoyi-common/ruoyi-common-log/pom.xml
@@ -4,27 +4,27 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-log</artifactId>
    <artifactId>hs-common-log</artifactId>

    <description>
        ruoyi-common-log 日志记录
        hs-common-log 日志记录
    </description>

    <dependencies>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-satoken</artifactId>
            <artifactId>hs-common-satoken</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-json</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

        <dependency>

 hs-common/hs-common-log/src/main/java/com/sunsail/common/log/annotation/Log.java

 hs-common/hs-common-log/src/main/java/com/sunsail/common/log/aspect/LogAspect.java

 hs-common/hs-common-log/src/main/java/com/sunsail/common/log/enums/BusinessStatus.java

 hs-common/hs-common-log/src/main/java/com/sunsail/common/log/enums/BusinessType.java

 hs-common/hs-common-log/src/main/java/com/sunsail/common/log/enums/OperatorType.java

 hs-common/hs-common-log/src/main/java/com/sunsail/common/log/event/LogininforEvent.java

 hs-common/hs-common-log/src/main/java/com/sunsail/common/log/event/OperLogEvent.java

 hs-common/hs-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-mail/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-mail/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-mail</artifactId>
  <artifactId>hs-common-mail</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-mail 邮件模块</description>
  <description>hs-common-mail 邮件模块</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>jakarta.mail</groupId>

 hs-common/hs-common-mail/pom.xml

File was renamed from ruoyi-common/ruoyi-common-mail/pom.xml
@@ -4,21 +4,21 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-mail</artifactId>
    <artifactId>hs-common-mail</artifactId>

    <description>
        ruoyi-common-mail 邮件模块
        hs-common-mail 邮件模块
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <dependency>

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/config/MailConfig.java

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/config/properties/MailProperties.java

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/utils/GlobalMailAccount.java

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/utils/InternalMailUtil.java

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/utils/Mail.java

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/utils/MailAccount.java

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/utils/MailException.java

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/utils/MailUtils.java

 hs-common/hs-common-mail/src/main/java/com/sunsail/common/mail/utils/UserPassAuthenticator.java

 hs-common/hs-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-mybatis/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml
@@ -4,21 +4,21 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-mybatis</artifactId>
  <artifactId>hs-common-mybatis</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-mybatis 数据库服务</description>
  <description>hs-common-mybatis 数据库服务</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-satoken</artifactId>
      <artifactId>hs-common-satoken</artifactId>
    </dependency>
    <dependency>
      <groupId>com.baomidou</groupId>

 hs-common/hs-common-mybatis/pom.xml

File was renamed from ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -4,26 +4,26 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-mybatis</artifactId>
    <artifactId>hs-common-mybatis</artifactId>

    <description>
        ruoyi-common-mybatis 数据库服务
        hs-common-mybatis 数据库服务
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-satoken</artifactId>
            <artifactId>hs-common-satoken</artifactId>
        </dependency>

        <!-- dynamic-datasource 多数据源-->

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/annotation/DataColumn.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/annotation/DataPermission.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/config/MybatisPlusConfig.java

File was renamed from ruoyi-common/ruoyi-common-mybatis/src/main/java/com/sunsail/common/mybatis/config/MybatisPlusConfig.java
@@ -30,7 +30,7 @@
@EnableTransactionManagement(proxyTargetClass = true)
@AutoConfiguration(before = MybatisPlusAutoConfiguration.class)
@MapperScan("${mybatis-plus.mapperPackage}")
@PropertySource(value = "classpath:common-mybatis.yml", factory = YmlPropertySourceFactory.class)
@PropertySource(value = "common-mybatis.yml", factory = YmlPropertySourceFactory.class)
public class MybatisPlusConfig {

    @Bean

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/core/domain/BaseEntity.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/core/mapper/BaseMapperPlus.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/core/page/PageQuery.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/core/page/TableDataInfo.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/enums/DataBaseType.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/enums/DataScopeType.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/handler/InjectionMetaObjectHandler.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/handler/MybatisExceptionHandler.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/handler/PlusDataPermissionHandler.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/helper/DataBaseHelper.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/helper/DataPermissionHelper.java

 hs-common/hs-common-mybatis/src/main/java/com/sunsail/common/mybatis/interceptor/PlusDataPermissionInterceptor.java

 hs-common/hs-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-mybatis/src/main/resources/common-mybatis.yml

 hs-common/hs-common-oss/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-oss/.flattened-pom.xml
@@ -4,21 +4,21 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-oss</artifactId>
  <artifactId>hs-common-oss</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-oss oss服务</description>
  <description>hs-common-oss oss服务</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-json</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
    <dependency>
      <groupId>com.amazonaws</groupId>

 hs-common/hs-common-oss/pom.xml

File was renamed from ruoyi-common/ruoyi-common-oss/pom.xml
@@ -4,26 +4,26 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-oss</artifactId>
    <artifactId>hs-common-oss</artifactId>

    <description>
        ruoyi-common-oss oss服务
        hs-common-oss oss服务
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-json</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>

        <dependency>

 hs-common/hs-common-oss/src/main/java/com/sunsail/common/oss/constant/OssConstant.java

 hs-common/hs-common-oss/src/main/java/com/sunsail/common/oss/core/OssClient.java

 hs-common/hs-common-oss/src/main/java/com/sunsail/common/oss/entity/UploadResult.java

 hs-common/hs-common-oss/src/main/java/com/sunsail/common/oss/enumd/AccessPolicyType.java

 hs-common/hs-common-oss/src/main/java/com/sunsail/common/oss/enumd/PolicyType.java

 hs-common/hs-common-oss/src/main/java/com/sunsail/common/oss/exception/OssException.java

 hs-common/hs-common-oss/src/main/java/com/sunsail/common/oss/factory/OssFactory.java

 hs-common/hs-common-oss/src/main/java/com/sunsail/common/oss/properties/OssProperties.java

 hs-common/hs-common-ratelimiter/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-ratelimiter/.flattened-pom.xml
@@ -4,21 +4,21 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-ratelimiter</artifactId>
  <artifactId>hs-common-ratelimiter</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-ratelimiter 限流功能</description>
  <description>hs-common-ratelimiter 限流功能</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
  </dependencies>
</project>

 hs-common/hs-common-ratelimiter/pom.xml

File was renamed from ruoyi-common/ruoyi-common-ratelimiter/pom.xml
@@ -4,26 +4,26 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-ratelimiter</artifactId>
    <artifactId>hs-common-ratelimiter</artifactId>

    <description>
        ruoyi-common-ratelimiter 限流功能
        hs-common-ratelimiter 限流功能
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>
    </dependencies>


 hs-common/hs-common-ratelimiter/src/main/java/com/sunsail/common/ratelimiter/annotation/RateLimiter.java

 hs-common/hs-common-ratelimiter/src/main/java/com/sunsail/common/ratelimiter/aspectj/RateLimiterAspect.java

 hs-common/hs-common-ratelimiter/src/main/java/com/sunsail/common/ratelimiter/config/RateLimiterConfig.java

 hs-common/hs-common-ratelimiter/src/main/java/com/sunsail/common/ratelimiter/enums/LimitType.java

 hs-common/hs-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-redis/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-redis/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-redis</artifactId>
  <artifactId>hs-common-redis</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-redis 缓存服务</description>
  <description>hs-common-redis 缓存服务</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>org.redisson</groupId>

 hs-common/hs-common-redis/pom.xml

File was renamed from ruoyi-common/ruoyi-common-redis/pom.xml
@@ -4,22 +4,22 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-redis</artifactId>
    <artifactId>hs-common-redis</artifactId>

    <description>
        ruoyi-common-redis 缓存服务
        hs-common-redis 缓存服务
    </description>

    <dependencies>
        <!-- RuoYi Common Core-->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <!--redisson-->

 hs-common/hs-common-redis/src/main/java/com/sunsail/common/redis/config/RedisConfig.java

 hs-common/hs-common-redis/src/main/java/com/sunsail/common/redis/config/properties/RedissonProperties.java

 hs-common/hs-common-redis/src/main/java/com/sunsail/common/redis/handler/KeyPrefixHandler.java

 hs-common/hs-common-redis/src/main/java/com/sunsail/common/redis/manager/PlusSpringCacheManager.java

 hs-common/hs-common-redis/src/main/java/com/sunsail/common/redis/utils/CacheUtils.java

 hs-common/hs-common-redis/src/main/java/com/sunsail/common/redis/utils/QueueUtils.java

 hs-common/hs-common-redis/src/main/java/com/sunsail/common/redis/utils/RedisUtils.java

 hs-common/hs-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-satoken/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-satoken/.flattened-pom.xml
@@ -4,20 +4,20 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-satoken</artifactId>
  <artifactId>hs-common-satoken</artifactId>
  <version>5.1.2</version>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
    <dependency>
      <groupId>cn.dev33</groupId>

 hs-common/hs-common-satoken/pom.xml

File was renamed from ruoyi-common/ruoyi-common-satoken/pom.xml
@@ -4,24 +4,24 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-satoken</artifactId>
    <artifactId>hs-common-satoken</artifactId>

    <dependencies>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <!-- RuoYi Common Redis-->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>

        <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->

 hs-common/hs-common-satoken/src/main/java/com/sunsail/common/satoken/config/SaTokenConfig.java

 hs-common/hs-common-satoken/src/main/java/com/sunsail/common/satoken/core/dao/PlusSaTokenDao.java

 hs-common/hs-common-satoken/src/main/java/com/sunsail/common/satoken/core/service/SaPermissionImpl.java

 hs-common/hs-common-satoken/src/main/java/com/sunsail/common/satoken/utils/LoginHelper.java

 hs-common/hs-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-satoken/src/main/resources/common-satoken.yml

 hs-common/hs-common-security/.flattened-pom.xml

copy from ruoyi-common/ruoyi-common-security/.flattened-pom.xml
copy to hs-common/hs-common-security/.flattened-pom.xml
File was copied from ruoyi-common/ruoyi-common-security/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-security</artifactId>
  <artifactId>hs-common-security</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-security 安全模块</description>
  <description>hs-common-security 安全模块</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-satoken</artifactId>
      <artifactId>hs-common-satoken</artifactId>
    </dependency>
  </dependencies>
</project>

 hs-common/hs-common-security/pom.xml

copy from ruoyi-common/ruoyi-common-security/pom.xml
copy to hs-common/hs-common-security/pom.xml
File was copied from ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,21 +4,21 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-security</artifactId>
    <artifactId>hs-common-security</artifactId>

    <description>
        ruoyi-common-security 安全模块
        hs-common-security 安全模块
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-satoken</artifactId>
            <artifactId>hs-common-satoken</artifactId>
        </dependency>

    </dependencies>

 hs-common/hs-common-security/src/main/java/com/sunsail/common/security/config/SecurityConfig.java

 hs-common/hs-common-security/src/main/java/com/sunsail/common/security/config/properties/SecurityProperties.java

 hs-common/hs-common-security/src/main/java/com/sunsail/common/security/handler/AllUrlHandler.java

 hs-common/hs-common-security/src/main/java/com/sunsail/common/security/handler/GlobalExceptionHandler.java

 hs-common/hs-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-sensitive/.flattened-pom.xml

copy from ruoyi-common/ruoyi-common-security/.flattened-pom.xml
copy to hs-common/hs-common-sensitive/.flattened-pom.xml
File was copied from ruoyi-common/ruoyi-common-security/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-security</artifactId>
  <artifactId>hs-common-sensitive</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-security 安全模块</description>
  <description>hs-common-sensitive 脱敏模块</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-satoken</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
  </dependencies>
</project>

 hs-common/hs-common-sensitive/pom.xml

copy from ruoyi-common/ruoyi-common-security/pom.xml
copy to hs-common/hs-common-sensitive/pom.xml
File was copied from ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,23 +4,22 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-security</artifactId>
    <artifactId>hs-common-sensitive</artifactId>

    <description>
        ruoyi-common-security 安全模块
        hs-common-sensitive 脱敏模块
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-satoken</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

    </dependencies>

</project>

 hs-common/hs-common-sensitive/src/main/java/com/sunsail/common/sensitive/annotation/Sensitive.java

 hs-common/hs-common-sensitive/src/main/java/com/sunsail/common/sensitive/core/SensitiveService.java

 hs-common/hs-common-sensitive/src/main/java/com/sunsail/common/sensitive/core/SensitiveStrategy.java

 hs-common/hs-common-sensitive/src/main/java/com/sunsail/common/sensitive/handler/SensitiveHandler.java

 hs-common/hs-common-sms/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-sms/.flattened-pom.xml
@@ -4,13 +4,13 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-sms</artifactId>
  <artifactId>hs-common-sms</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-sms 短信模块</description>
  <description>hs-common-sms 短信模块</description>
  <dependencies>
    <dependency>
      <groupId>org.dromara.sms4j</groupId>

 hs-common/hs-common-sms/pom.xml

File was renamed from ruoyi-common/ruoyi-common-sms/pom.xml
@@ -4,15 +4,15 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-sms</artifactId>
    <artifactId>hs-common-sms</artifactId>

    <description>
        ruoyi-common-sms 短信模块
        hs-common-sms 短信模块
    </description>

    <dependencies>

 hs-common/hs-common-sms/src/main/java/com/sunsail/common/sms/config/SmsAutoConfiguration.java

 hs-common/hs-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-social/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-social/.flattened-pom.xml
@@ -4,13 +4,13 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-social</artifactId>
  <artifactId>hs-common-social</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-social 授权认证</description>
  <description>hs-common-social 授权认证</description>
  <dependencies>
    <dependency>
      <groupId>me.zhyd.oauth</groupId>
@@ -18,11 +18,11 @@
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-json</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
  </dependencies>
</project>

 hs-common/hs-common-social/pom.xml

File was renamed from ruoyi-common/ruoyi-common-social/pom.xml
@@ -4,15 +4,15 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-social</artifactId>
    <artifactId>hs-common-social</artifactId>

    <description>
        ruoyi-common-social 授权认证
        hs-common-social 授权认证
    </description>

    <dependencies>
@@ -23,12 +23,12 @@

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-json</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>
    </dependencies>
</project>

 hs-common/hs-common-social/src/main/java/com/sunsail/common/social/config/SocialAutoConfiguration.java

 hs-common/hs-common-social/src/main/java/com/sunsail/common/social/config/properties/SocialLoginConfigProperties.java

 hs-common/hs-common-social/src/main/java/com/sunsail/common/social/config/properties/SocialProperties.java

 hs-common/hs-common-social/src/main/java/com/sunsail/common/social/maxkey/AuthMaxKeyRequest.java

 hs-common/hs-common-social/src/main/java/com/sunsail/common/social/maxkey/AuthMaxKeySource.java

 hs-common/hs-common-social/src/main/java/com/sunsail/common/social/utils/AuthRedisStateCache.java

 hs-common/hs-common-social/src/main/java/com/sunsail/common/social/utils/SocialUtils.java

 hs-common/hs-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-tenant/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-tenant/.flattened-pom.xml
@@ -4,25 +4,31 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-tenant</artifactId>
  <artifactId>hs-common-tenant</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-tenant 租户模块</description>
  <description>hs-common-tenant 租户模块</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-mybatis</artifactId>
      <artifactId>hs-common-mybatis</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
    <dependency>
      <groupId>com.alibaba</groupId>
      <artifactId>transmittable-thread-local</artifactId>
    </dependency>
    <dependency>
      <groupId>com.baomidou</groupId>
      <artifactId>mybatis-plus-extension</artifactId>
      <version>3.5.5</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
</project>

 hs-common/hs-common-tenant/pom.xml

File was renamed from ruoyi-common/ruoyi-common-tenant/pom.xml
@@ -4,32 +4,38 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-tenant</artifactId>
    <artifactId>hs-common-tenant</artifactId>

    <description>
        ruoyi-common-tenant 租户模块
        hs-common-tenant 租户模块
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-mybatis</artifactId>
            <artifactId>hs-common-mybatis</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>

        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>transmittable-thread-local</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-extension</artifactId>
            <version>3.5.5</version>
            <scope>compile</scope>
        </dependency>

    </dependencies>


 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/config/TenantConfig.java

 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/core/TenantEntity.java

 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/core/TenantSaTokenDao.java

 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/exception/TenantException.java

 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/handle/PlusTenantLineHandler.java

 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/handle/TenantKeyPrefixHandler.java

 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/helper/TenantHelper.java

 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/manager/TenantSpringCacheManager.java

 hs-common/hs-common-tenant/src/main/java/com/sunsail/common/tenant/properties/TenantProperties.java

 hs-common/hs-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-translation/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-security/.flattened-pom.xml
@@ -4,17 +4,17 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-security</artifactId>
  <artifactId>hs-common-translation</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-security 安全模块</description>
  <description>hs-common-translation 通用翻译功能</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-satoken</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
  </dependencies>
</project>

 hs-common/hs-common-translation/pom.xml

File was renamed from ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,21 +4,22 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-security</artifactId>
    <artifactId>hs-common-translation</artifactId>

    <description>
        ruoyi-common-security 安全模块
        hs-common-translation 通用翻译功能
    </description>

    <dependencies>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-satoken</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

    </dependencies>

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/annotation/Translation.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/annotation/TranslationType.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/config/TranslationConfig.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/constant/TransConstant.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/core/TranslationInterface.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/core/handler/TranslationBeanSerializerModifier.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/core/handler/TranslationHandler.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/core/impl/DeptNameTranslationImpl.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/core/impl/DictTypeTranslationImpl.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/core/impl/NicknameTranslationImpl.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/core/impl/OssUrlTranslationImpl.java

 hs-common/hs-common-translation/src/main/java/com/sunsail/common/translation/core/impl/UserNameTranslationImpl.java

 hs-common/hs-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-web/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-web/.flattened-pom.xml
@@ -4,21 +4,21 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-web</artifactId>
  <artifactId>hs-common-web</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-web web服务</description>
  <description>hs-common-web web服务</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-json</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>

 hs-common/hs-common-web/pom.xml

File was renamed from ruoyi-common/ruoyi-common-web/pom.xml
@@ -4,26 +4,26 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-web</artifactId>
    <artifactId>hs-common-web</artifactId>

    <description>
        ruoyi-common-web web服务
        hs-common-web web服务
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-json</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>

        <!-- SpringBoot Web容器 -->

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/config/CaptchaConfig.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/config/FilterConfig.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/config/I18nConfig.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/config/ResourcesConfig.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/config/UndertowConfig.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/config/properties/CaptchaProperties.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/config/properties/XssProperties.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/core/BaseController.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/core/I18nLocaleResolver.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/enums/CaptchaCategory.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/enums/CaptchaType.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/filter/RepeatableFilter.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/filter/RepeatedlyRequestWrapper.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/filter/XssFilter.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/filter/XssHttpServletRequestWrapper.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/interceptor/PlusWebInvokeTimeInterceptor.java

 hs-common/hs-common-web/src/main/java/com/sunsail/common/web/utils/UnsignedMathGenerator.java

 hs-common/hs-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/hs-common-websocket/.flattened-pom.xml

File was renamed from ruoyi-common/ruoyi-common-websocket/.flattened-pom.xml
@@ -4,29 +4,29 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>com.sunsail</groupId>
    <artifactId>ruoyi-common</artifactId>
    <artifactId>hs-common</artifactId>
    <version>5.1.2</version>
  </parent>
  <groupId>com.sunsail</groupId>
  <artifactId>ruoyi-common-websocket</artifactId>
  <artifactId>hs-common-websocket</artifactId>
  <version>5.1.2</version>
  <description>ruoyi-common-websocket 模块</description>
  <description>hs-common-websocket 模块</description>
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-satoken</artifactId>
      <artifactId>hs-common-satoken</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-json</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>

 hs-common/hs-common-websocket/pom.xml

File was renamed from ruoyi-common/ruoyi-common-websocket/pom.xml
@@ -4,33 +4,33 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sunsail</groupId>
        <artifactId>ruoyi-common</artifactId>
        <artifactId>hs-common</artifactId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ruoyi-common-websocket</artifactId>
    <artifactId>hs-common-websocket</artifactId>

    <description>
        ruoyi-common-websocket 模块
        hs-common-websocket 模块
    </description>

    <dependencies>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-satoken</artifactId>
            <artifactId>hs-common-satoken</artifactId>
        </dependency>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-json</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/config/WebSocketConfig.java

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/config/properties/WebSocketProperties.java

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/constant/WebSocketConstants.java

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/dto/WebSocketMessageDto.java

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/handler/PlusWebSocketHandler.java

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/holder/WebSocketSessionHolder.java

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/interceptor/PlusWebSocketInterceptor.java

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/listener/WebSocketTopicListener.java

 hs-common/hs-common-websocket/src/main/java/com/sunsail/common/websocket/utils/WebSocketUtils.java

 hs-common/hs-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 hs-common/pom.xml

New file
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.sunsail</groupId>
        <version>${revision}</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <modules>
        <module>hs-common-bom</module>
        <module>hs-common-social</module>
        <module>hs-common-core</module>
        <module>hs-common-doc</module>
        <module>hs-common-excel</module>
        <module>hs-common-idempotent</module>
        <module>hs-common-job</module>
        <module>hs-common-log</module>
        <module>hs-common-mail</module>
        <module>hs-common-mybatis</module>
        <module>hs-common-oss</module>
        <module>hs-common-ratelimiter</module>
        <module>hs-common-redis</module>
        <module>hs-common-satoken</module>
        <module>hs-common-security</module>
        <module>hs-common-sms</module>
        <module>hs-common-web</module>
        <module>hs-common-translation</module>
        <module>hs-common-sensitive</module>
        <module>hs-common-json</module>
        <module>hs-common-encrypt</module>
        <module>hs-common-tenant</module>
        <module>hs-common-websocket</module>
    </modules>

    <artifactId>hs-common</artifactId>
    <packaging>pom</packaging>

    <description>
        common 通用模块
    </description>

</project>

 hs-modules/hs-demo/.flattened-pom.xml

@@ -14,71 +14,72 @@
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-doc</artifactId>
      <artifactId>hs-common-doc</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-sms</artifactId>
      <artifactId>hs-common-sms</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-mail</artifactId>
      <artifactId>hs-common-mail</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-redis</artifactId>
      <artifactId>hs-common-redis</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-idempotent</artifactId>
      <artifactId>hs-common-idempotent</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-mybatis</artifactId>
      <artifactId>hs-common-mybatis</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-log</artifactId>
      <artifactId>hs-common-log</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-excel</artifactId>
      <artifactId>hs-common-excel</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-security</artifactId>
      <artifactId>hs-common-security</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-web</artifactId>
      <artifactId>hs-common-web</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-ratelimiter</artifactId>
      <artifactId>hs-common-ratelimiter</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-translation</artifactId>
      <artifactId>hs-common-translation</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-sensitive</artifactId>
      <artifactId>hs-common-sensitive</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-encrypt</artifactId>
      <artifactId>hs-common-tenant</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-tenant</artifactId>
      <artifactId>hs-common-websocket</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-websocket</artifactId>
      <artifactId>hs-common-encrypt</artifactId>
      <version>5.1.2</version>
    </dependency>
  </dependencies>
</project>

 hs-modules/hs-demo/pom.xml

@@ -20,89 +20,88 @@
        <!-- 通用工具-->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-doc</artifactId>
            <artifactId>hs-common-doc</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-sms</artifactId>
            <artifactId>hs-common-sms</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-mail</artifactId>
            <artifactId>hs-common-mail</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-redis</artifactId>
            <artifactId>hs-common-redis</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-idempotent</artifactId>
            <artifactId>hs-common-idempotent</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-mybatis</artifactId>
            <artifactId>hs-common-mybatis</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-log</artifactId>
            <artifactId>hs-common-log</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-excel</artifactId>
            <artifactId>hs-common-excel</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-security</artifactId>
            <artifactId>hs-common-security</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-web</artifactId>
            <artifactId>hs-common-web</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-ratelimiter</artifactId>
            <artifactId>hs-common-ratelimiter</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-translation</artifactId>
            <artifactId>hs-common-translation</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-sensitive</artifactId>
            <artifactId>hs-common-sensitive</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-encrypt</artifactId>
            <artifactId>hs-common-tenant</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-tenant</artifactId>
            <artifactId>hs-common-websocket</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-websocket</artifactId>
            <artifactId>hs-common-encrypt</artifactId>
            <version>5.1.2</version>
        </dependency>

    </dependencies>

</project>

 hs-modules/hs-demo/src/main/java/com/sunsail/demo/domain/TestDemoEncrypt.java

@@ -15,6 +15,7 @@
     * key键
     */
    // @EncryptField(algorithm=AlgorithmType.SM2, privateKey = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgZSlOvw8FBiH+aFJWLYZP/VRjg9wjfRarTkGBZd/T3N+gCgYIKoEcz1UBgi2hRANCAAR5DGuQwJqkxnbCsP+iPSDoHWIF4RwcR5EsSvT8QPxO1wRkR2IhCkzvRb32x2CUgJFdvoqVqfApFDPZzShqzBwX", publicKey = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEeQxrkMCapMZ2wrD/oj0g6B1iBeEcHEeRLEr0/ED8TtcEZEdiIQpM70W99sdglICRXb6KlanwKRQz2c0oaswcFw==")

    @EncryptField(algorithm = AlgorithmType.RSA, privateKey = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBANBBEeueWlXlkkj2+WY5l+IWe42d8b5K28g+G/CFKC/yYAEHtqGlCsBOrb+YBkG9mPzmuYA/n9k0NFIc8E8yY5vZQaroyFBrTTWEzG9RY2f7Y3svVyybs6jpXSUs4xff8abo7wL1Y/wUaeatTViamxYnyTvdTmLm3d+JjRij68rxAgMBAAECgYAB0TnhXraSopwIVRfmboea1b0upl+BUdTJcmci412UjrKr5aE695ZLPkXbFXijVu7HJlyyv94NVUdaMACV7Ku/S2RuNB70M7YJm8rAjHFC3/i2ZeIM60h1Ziy4QKv0XM3pRATlDCDNhC1WUrtQCQSgU8kcp6eUUppruOqDzcY04QJBAPm9+sBP9CwDRgy3e5+V8aZtJkwDstb0lVVV/KY890cydVxiCwvX3fqVnxKMlb+x0YtH0sb9v+71xvK2lGobaRECQQDVePU6r/cCEfpc+nkWF6osAH1f8Mux3rYv2DoBGvaPzV2BGfsLed4neRfCwWNCKvGPCdW+L0xMJg8+RwaoBUPhAkAT5kViqXxFPYWJYd1h2+rDXhMdH3ZSlm6HvDBDdrwlWinr0Iwcx3iSjPV93uHXwm118aUj4fg3LDJMCKxOwBxhAkByrQXfvwOMYygBprRBf/j0plazoWFrbd6lGR0f1uI5IfNnFRPdeFw1DEINZ2Hw+6zEUF44SqRMC+4IYJNc02dBAkBCgy7RvfyV/A7N6kKXxTHauY0v6XwSSvpeKtRJkbIcRWOdIYvaHO9L7cklj3vIEdwjSUp9K4VTBYYlmAz1xh03", publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDQQRHrnlpV5ZJI9vlmOZfiFnuNnfG+StvIPhvwhSgv8mABB7ahpQrATq2/mAZBvZj85rmAP5/ZNDRSHPBPMmOb2UGq6MhQa001hMxvUWNn+2N7L1csm7Oo6V0lLOMX3/Gm6O8C9WP8FGnmrU1YmpsWJ8k73U5i5t3fiY0Yo+vK8QIDAQAB")
    private String testKey;

@@ -23,6 +24,7 @@
     */
    // @EncryptField // 什么也不写走默认yml配置
    // @EncryptField(algorithm = AlgorithmType.SM4, password = "10rfylhtccpuyke5")

    @EncryptField(algorithm = AlgorithmType.AES, password = "10rfylhtccpuyke5")
    private String value;


 hs-modules/hs-generator/.flattened-pom.xml

@@ -14,23 +14,23 @@
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-doc</artifactId>
      <artifactId>hs-common-doc</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-mybatis</artifactId>
      <artifactId>hs-common-mybatis</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-web</artifactId>
      <artifactId>hs-common-web</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-log</artifactId>
      <artifactId>hs-common-log</artifactId>
    </dependency>
    <dependency>
      <groupId>org.apache.velocity</groupId>

 hs-modules/hs-generator/pom.xml

@@ -19,27 +19,27 @@
        <!-- 通用工具-->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-doc</artifactId>
            <artifactId>hs-common-doc</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-mybatis</artifactId>
            <artifactId>hs-common-mybatis</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-web</artifactId>
            <artifactId>hs-common-web</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-log</artifactId>
            <artifactId>hs-common-log</artifactId>
        </dependency>

        <!--velocity代码生成使用模板 -->

 hs-modules/hs-job/.flattened-pom.xml

@@ -14,11 +14,11 @@
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-json</artifactId>
      <artifactId>hs-common-json</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-job</artifactId>
      <artifactId>hs-common-job</artifactId>
    </dependency>
  </dependencies>
</project>

 hs-modules/hs-job/pom.xml

@@ -20,12 +20,12 @@
        <!-- 通用工具-->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-json</artifactId>
            <artifactId>hs-common-json</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-job</artifactId>
            <artifactId>hs-common-job</artifactId>
        </dependency>

    </dependencies>

 hs-modules/hs-system/.flattened-pom.xml

@@ -14,63 +14,59 @@
  <dependencies>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-core</artifactId>
      <artifactId>hs-common-core</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-doc</artifactId>
      <artifactId>hs-common-doc</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-mybatis</artifactId>
      <artifactId>hs-common-mybatis</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-translation</artifactId>
      <artifactId>hs-common-translation</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-oss</artifactId>
      <artifactId>hs-common-oss</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-log</artifactId>
      <artifactId>hs-common-log</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-excel</artifactId>
      <artifactId>hs-common-excel</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-sms</artifactId>
      <artifactId>hs-common-sms</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-tenant</artifactId>
      <artifactId>hs-common-tenant</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-security</artifactId>
      <artifactId>hs-common-security</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-web</artifactId>
      <artifactId>hs-common-web</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-idempotent</artifactId>
      <artifactId>hs-common-idempotent</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-sensitive</artifactId>
      <artifactId>hs-common-sensitive</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-encrypt</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-websocket</artifactId>
      <artifactId>hs-common-websocket</artifactId>
    </dependency>
  </dependencies>
</project>

 hs-modules/hs-system/pom.xml

@@ -19,80 +19,75 @@
        <!-- 通用工具-->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <artifactId>hs-common-core</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-doc</artifactId>
            <artifactId>hs-common-doc</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-mybatis</artifactId>
            <artifactId>hs-common-mybatis</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-translation</artifactId>
            <artifactId>hs-common-translation</artifactId>
        </dependency>

        <!-- OSS功能模块 -->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-oss</artifactId>
            <artifactId>hs-common-oss</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-log</artifactId>
            <artifactId>hs-common-log</artifactId>
        </dependency>

        <!-- excel-->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-excel</artifactId>
            <artifactId>hs-common-excel</artifactId>
        </dependency>

        <!-- SMS功能模块 -->
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-sms</artifactId>
            <artifactId>hs-common-sms</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-tenant</artifactId>
            <artifactId>hs-common-tenant</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-security</artifactId>
            <artifactId>hs-common-security</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-web</artifactId>
            <artifactId>hs-common-web</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-idempotent</artifactId>
            <artifactId>hs-common-idempotent</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-sensitive</artifactId>
            <artifactId>hs-common-sensitive</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-encrypt</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-websocket</artifactId>
            <artifactId>hs-common-websocket</artifactId>
        </dependency>

    </dependencies>

 hs-modules/hs-system/src/main/java/com/sunsail/system/controller/system/SysProfileController.java

@@ -6,7 +6,6 @@
import com.sunsail.common.core.domain.R;
import com.sunsail.common.core.utils.StringUtils;
import com.sunsail.common.core.utils.file.MimeTypeUtils;
import com.sunsail.common.encrypt.annotation.ApiEncrypt;
import com.sunsail.common.log.annotation.Log;
import com.sunsail.common.log.enums.BusinessType;
import com.sunsail.common.satoken.utils.LoginHelper;
@@ -81,7 +80,7 @@
     *
     * @param bo 新旧密码
     */
    @ApiEncrypt

    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping("/updatePwd")
    public R<Void> updatePwd(@Validated @RequestBody SysUserPasswordBo bo) {

 hs-modules/hs-system/src/main/java/com/sunsail/system/controller/system/SysTenantController.java

@@ -12,7 +12,6 @@
import com.sunsail.common.core.domain.R;
import com.sunsail.common.core.validate.AddGroup;
import com.sunsail.common.core.validate.EditGroup;
import com.sunsail.common.encrypt.annotation.ApiEncrypt;
import com.sunsail.common.excel.utils.ExcelUtil;
import com.sunsail.common.idempotent.annotation.RepeatSubmit;
import com.sunsail.common.log.annotation.Log;
@@ -80,7 +79,7 @@
    /**
     * 新增租户
     */
    @ApiEncrypt

    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
    @SaCheckPermission("system:tenant:add")
    @Log(title = "租户", businessType = BusinessType.INSERT)

 hs-modules/hs-system/src/main/java/com/sunsail/system/controller/system/SysUserController.java

@@ -14,7 +14,6 @@
import com.sunsail.common.core.utils.MapstructUtils;
import com.sunsail.common.core.utils.StreamUtils;
import com.sunsail.common.core.utils.StringUtils;
import com.sunsail.common.encrypt.annotation.ApiEncrypt;
import com.sunsail.common.excel.core.ExcelResult;
import com.sunsail.common.excel.utils.ExcelUtil;
import com.sunsail.common.log.annotation.Log;
@@ -210,7 +209,7 @@
    /**
     * 重置密码
     */
    @ApiEncrypt

    @SaCheckPermission("system:user:resetPwd")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping("/resetPwd")

 hs-service/.flattened-pom.xml

@@ -30,15 +30,15 @@
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-doc</artifactId>
      <artifactId>hs-common-doc</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-social</artifactId>
      <artifactId>hs-common-social</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>ruoyi-common-ratelimiter</artifactId>
      <artifactId>hs-common-ratelimiter</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
@@ -69,6 +69,15 @@
      <groupId>me.zhyd.oauth</groupId>
      <artifactId>JustAuth</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>hs-common-mail</artifactId>
    </dependency>
    <dependency>
      <groupId>com.sunsail</groupId>
      <artifactId>hs-common-encrypt</artifactId>
      <version>5.1.2</version>
    </dependency>
  </dependencies>
  <build>
    <finalName>${project.artifactId}</finalName>

 hs-service/pom.xml

@@ -41,17 +41,17 @@

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-doc</artifactId>
            <artifactId>hs-common-doc</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-social</artifactId>
            <artifactId>hs-common-social</artifactId>
        </dependency>

        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>ruoyi-common-ratelimiter</artifactId>
            <artifactId>hs-common-ratelimiter</artifactId>
        </dependency>

        <dependency>
@@ -91,6 +91,15 @@
            <groupId>me.zhyd.oauth</groupId>
            <artifactId>JustAuth</artifactId>
        </dependency>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>hs-common-mail</artifactId>
        </dependency>
        <dependency>
            <groupId>com.sunsail</groupId>
            <artifactId>hs-common-encrypt</artifactId>
            <version>5.1.2</version>
        </dependency>

        <!-- skywalking 整合 logback -->
<!--        <dependency>-->

 pom.xml

@@ -120,7 +120,7 @@
            <!-- common 的依赖配置-->
            <dependency>
                <groupId>com.sunsail</groupId>
                <artifactId>ruoyi-common-bom</artifactId>
                <artifactId>hs-common-bom</artifactId>
                <version>${revision}</version>
                <type>pom</type>
                <scope>import</scope>
@@ -344,7 +344,7 @@

    <modules>
        <module>hs-service</module>
        <module>ruoyi-common</module>
        <module>hs-common</module>
        <module>hs-extend</module>
        <module>hs-modules</module>
    </modules>

 ruoyi-common/.flattened-pom.xml

File was deleted

 ruoyi-common/pom.xml

File was deleted

 ruoyi-common/ruoyi-common-sensitive/.flattened-pom.xml

File was deleted

 ruoyi-common/ruoyi-common-sensitive/pom.xml

File was deleted

 ruoyi-common/ruoyi-common-translation/.flattened-pom.xml

File was deleted

 ruoyi-common/ruoyi-common-translation/pom.xml

File was deleted