init

2024-05-14 18:54:08 +08:00
parent 517d91a0a8
commit 874b33557d
71 changed files with 1637 additions and 112 deletions
--- a/ruoyi-component/pom.xml
+++ b/ruoyi-component/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>dk-sass-server</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>
    <artifactId>ruoyi-component</artifactId>
    <packaging>pom</packaging>
--- a/ruoyi-component/ruoyi-component-bom/pom.xml
+++ b/ruoyi-component/ruoyi-component-bom/pom.xml
@@ -7,7 +7,7 @@
    <packaging>pom</packaging>

    <properties>
-        <revision>4.8.2</revision>
+        <revision>4.8.3</revision>
    </properties>

    <dependencyManagement>
--- a/ruoyi-component/ruoyi-component-core/pom.xml
+++ b/ruoyi-component/ruoyi-component-core/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-core</artifactId>
--- a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/CacheNames.java
+++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/CacheNames.java
@@ -35,6 +35,8 @@ public interface CacheNames {
     */
    String SYS_USER_NAME = "sys_user_name#30d";

+    String SYS_TENANT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_tenant#30d";
+
    /**
     * 部门
     */
@@ -48,7 +50,7 @@ public interface CacheNames {
    /**
     * OSS配置
     */
-    String SYS_OSS_CONFIG = "sys_oss_config";
+    String SYS_OSS_CONFIG = GlobalConstants.GLOBAL_REDIS_KEY + "sys_oss_config";

    /**
     * 在线用户
--- a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/Constants.java
+++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/Constants.java
@@ -72,5 +72,11 @@ public interface Constants {
     */
    String TOKEN = "token";

+
+    /**
+     * 顶级部门id
+     */
+    Long TOP_PARENT_ID = 0L;
+
 }

--- a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/TenantConstants.java
+++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/TenantConstants.java
@@ -0,0 +1,45 @@
+package com.ruoyi.component.core.constant;
+
+/**
+ * 租户常量信息
+ *
+ * @author Lion Li
+ */
+public interface TenantConstants {
+
+    /**
+     * 租户正常状态
+     */
+    String NORMAL = "0";
+
+    /**
+     * 租户封禁状态
+     */
+    String DISABLE = "1";
+
+    /**
+     * 超级管理员ID
+     */
+    Long SUPER_ADMIN_ID = 1L;
+
+    /**
+     * 超级管理员角色 roleKey
+     */
+    String SUPER_ADMIN_ROLE_KEY = "superadmin";
+
+    /**
+     * 租户管理员角色 roleKey
+     */
+    String TENANT_ADMIN_ROLE_KEY = "admin";
+
+    /**
+     * 租户管理员角色名称
+     */
+    String TENANT_ADMIN_ROLE_NAME = "管理员";
+
+    /**
+     * 默认租户ID
+     */
+    String DEFAULT_TENANT_ID = "000000";
+
+}
--- a/ruoyi-component/ruoyi-component-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-component/ruoyi-component-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -3,4 +3,4 @@ com.ruoyi.component.core.config.AsyncConfig
 com.ruoyi.component.core.config.RuoYiConfig
 com.ruoyi.component.core.config.ThreadPoolConfig
 com.ruoyi.component.core.config.ValidatorConfig
-com.ruoyi.component.core.utils.SpringUtils
+com.ruoyi.component.core.util.spring.SpringUtils
--- a/ruoyi-component/ruoyi-component-encrypt/pom.xml
+++ b/ruoyi-component/ruoyi-component-encrypt/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-encrypt</artifactId>
--- a/ruoyi-component/ruoyi-component-excel/pom.xml
+++ b/ruoyi-component/ruoyi-component-excel/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-excel</artifactId>
--- a/ruoyi-component/ruoyi-component-generator/pom.xml
+++ b/ruoyi-component/ruoyi-component-generator/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-generator</artifactId>
--- a/ruoyi-component/ruoyi-component-idempotent/pom.xml
+++ b/ruoyi-component/ruoyi-component-idempotent/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-idempotent</artifactId>
--- a/ruoyi-component/ruoyi-component-job/pom.xml
+++ b/ruoyi-component/ruoyi-component-job/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-job</artifactId>
--- a/ruoyi-component/ruoyi-component-json/pom.xml
+++ b/ruoyi-component/ruoyi-component-json/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-json</artifactId>
--- a/ruoyi-component/ruoyi-component-log/pom.xml
+++ b/ruoyi-component/ruoyi-component-log/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-log</artifactId>
--- a/ruoyi-component/ruoyi-component-mail/pom.xml
+++ b/ruoyi-component/ruoyi-component-mail/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-mail</artifactId>
--- a/ruoyi-component/ruoyi-component-mybatis/pom.xml
+++ b/ruoyi-component/ruoyi-component-mybatis/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-component</artifactId>
-    <version>4.8.2</version>
+    <version>${revision}</version>
  </parent>
  <artifactId>ruoyi-component-mybatis</artifactId>
  <packaging>jar</packaging>
--- a/ruoyi-component/ruoyi-component-oss/pom.xml
+++ b/ruoyi-component/ruoyi-component-oss/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-oss</artifactId>
--- a/ruoyi-component/ruoyi-component-ratelimiter/pom.xml
+++ b/ruoyi-component/ruoyi-component-ratelimiter/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-ratelimiter</artifactId>
--- a/ruoyi-component/ruoyi-component-redis/pom.xml
+++ b/ruoyi-component/ruoyi-component-redis/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-redis</artifactId>
--- a/ruoyi-component/ruoyi-component-satoken/pom.xml
+++ b/ruoyi-component/ruoyi-component-satoken/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>
    <artifactId>ruoyi-component-satoken</artifactId>

--- a/ruoyi-component/ruoyi-component-security/pom.xml
+++ b/ruoyi-component/ruoyi-component-security/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>
    <artifactId>ruoyi-component-security</artifactId>
    <dependencies>
--- a/ruoyi-component/ruoyi-component-sensitive/pom.xml
+++ b/ruoyi-component/ruoyi-component-sensitive/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-sensitive</artifactId>
--- a/ruoyi-component/ruoyi-component-sms/pom.xml
+++ b/ruoyi-component/ruoyi-component-sms/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-sms</artifactId>
--- a/ruoyi-component/ruoyi-component-tenant/pom.xml
+++ b/ruoyi-component/ruoyi-component-tenant/pom.xml
@@ -4,13 +4,19 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>
    <artifactId>ruoyi-component-tenant</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
+            <artifactId>ruoyi-component-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
@@ -20,13 +26,13 @@
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-component-satoken</artifactId>
        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>transmittable-thread-local</artifactId>
-        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-component-mybatis</artifactId>
        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+        </dependency>
    </dependencies>
 </project>
--- a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/core/TenantEntity.java
+++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/core/TenantEntity.java
@@ -1,6 +1,6 @@
 package com.ruoyi.component.tenant.core;

-import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.component.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

--- a/ruoyi-component/ruoyi-component-translation/pom.xml
+++ b/ruoyi-component/ruoyi-component-translation/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-translation</artifactId>
--- a/ruoyi-component/ruoyi-component-web/pom.xml
+++ b/ruoyi-component/ruoyi-component-web/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-component</artifactId>
-        <version>4.8.2</version>
+        <version>${revision}</version>
    </parent>

    <artifactId>ruoyi-component-web</artifactId>