Merge branch 'release' of uskycloud/RuoYi-Cloud into master

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html

base-common/common-cloud-starter/README.md

@@ -0,0 +1,20 @@
+Cloud Quick Starter 项目
+===============
+```
+  - Auth       Shiro集成
+  - AOP        切面编程(自定义注解)
+  - Token       Jwt集成
+  - Cloud       SpringCloud依赖
+  - Common      共同依赖
+```
+
+新建微服务模块，引用此依赖即可。
+引用如下:  
+ 
+```
+    <dependency>
+       <groupId>org.jeecgframework.cloud</groupId>
+       <artifactId>jeecg-common-cloud-starter</artifactId>
+       <version>${jeecgboot.version}</version>
+    </dependency>
+```

base-common/common-cloud-starter/pom.xml

@@ -0,0 +1,112 @@
+<?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>
+        <groupId>com.usky</groupId>
+        <artifactId>base-common</artifactId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>common-cloud-starter</artifactId>
+
+    <dependencies>
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataSource -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-datasource</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataScope -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-datascope</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Log -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Swagger -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>service-system-api</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Security-->
+<!--        <dependency>-->
+<!--            <groupId>com.ruoyi</groupId>-->
+<!--            <artifactId>ruoyi-common-security</artifactId>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.usky</groupId>-->
+<!--            <artifactId>usky-common-core</artifactId>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.usky</groupId>-->
+<!--            <artifactId>usky-common-mvc</artifactId>-->
+<!--        </dependency>-->
+
+    </dependencies>
+</project>

base-common/pom.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.usky</groupId>
+        <artifactId>uskycloud</artifactId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>base-common</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        base-common通用模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <modules>
+        <module>ruoyi-common-log</module>
+        <module>ruoyi-common-core</module>
+        <module>ruoyi-common-redis</module>
+        <module>ruoyi-common-swagger</module>
+        <module>ruoyi-common-security</module>
+        <module>ruoyi-common-datascope</module>
+		<module>ruoyi-common-datasource</module>
+        <module>common-cloud-starter</module>
+        <module>usky-common-core</module>
+        <module>usky-common-mvc</module>
+        <module>usky-common-spring</module>
+    </modules>
+
+
+
+
+
+</project>

ruoyi-common/ruoyi-common-core/pom.xml → base-common/ruoyi-common-core/pom.xml

@@ -3,9 +3,9 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-common</artifactId>
-        <version>3.5.0</version>
+        <groupId>com.usky</groupId>
+        <artifactId>base-common</artifactId>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java → base-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java

@@ -10,7 +10,7 @@ public class CacheConstants
     /**
      * 缓存有效期，默认720（分钟）
      */
-    public final static long EXPIRATION = 720;
+    public final static long EXPIRATION = 7200;
 
     /**
      * 缓存刷新时间，默认120（分钟）

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java → base-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java

@@ -12,6 +12,11 @@ public class SecurityConstants
      */
     public static final String DETAILS_USER_ID = "user_id";
 
+    /**
+     * 租户ID字段
+     */
+    public static final String DETAILS_TENANT_ID = "tenant_id";
+
     /**
      * 用户名字段
      */

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java → base-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java

@@ -56,6 +56,15 @@ public class SecurityContextHolder
         return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
     }
 
+    public static Integer getTenantId()
+    {
+        return Convert.toInt(get(SecurityConstants.DETAILS_TENANT_ID), 0);
+    }
+
+    public static void setTenantId(String tenantId) {
+       set(SecurityConstants.DETAILS_TENANT_ID,tenantId);
+    }
+
     public static void setUserId(String account)
     {
         set(SecurityConstants.DETAILS_USER_ID, account);

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java → base-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java

@@ -52,6 +52,11 @@ public class JwtUtils
         return getValue(claims, SecurityConstants.USER_KEY);
     }
 
+    public static String getTenantId(Claims claims)
+    {
+        return getValue(claims, SecurityConstants.DETAILS_TENANT_ID);
+    }
+
     /**
      * 根据令牌获取用户标识
      * 

ruoyi-common/ruoyi-common-datascope/pom.xml → base-common/ruoyi-common-datascope/pom.xml

@@ -3,9 +3,9 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-common</artifactId>
-        <version>3.5.0</version>
+        <groupId>com.usky</groupId>
+        <artifactId>base-common</artifactId>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-datasource/pom.xml → base-common/ruoyi-common-datasource/pom.xml

@@ -3,9 +3,9 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-common</artifactId>
-        <version>3.5.0</version>
+        <groupId>com.usky</groupId>
+        <artifactId>base-common</artifactId>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -32,10 +32,10 @@
         </dependency>
         
         <!-- SpringBoot Seata -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>-->
+<!--        </dependency>-->
 
     </dependencies>
 </project>

ruoyi-common/ruoyi-common-log/pom.xml → base-common/ruoyi-common-log/pom.xml

@@ -3,20 +3,19 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-common</artifactId>
-        <version>3.5.0</version>
+        <groupId>com.usky</groupId>
+        <artifactId>base-common</artifactId>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
     <artifactId>ruoyi-common-log</artifactId>
 	
     <description>
-        ruoyi-common-log日志记录
+        base-common-log日志记录
     </description>
 
     <dependencies>
-		
         <!-- RuoYi Common Security -->
         <dependency>
             <groupId>com.ruoyi</groupId>

ruoyi-common/ruoyi-common-redis/pom.xml → base-common/ruoyi-common-redis/pom.xml

@@ -3,9 +3,9 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-common</artifactId>
-        <version>3.5.0</version>
+        <groupId>com.usky</groupId>
+        <artifactId>base-common</artifactId>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>