调整 pom 配置依赖

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

@@ -8,8 +8,7 @@
         <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>common-cloud-starter</artifactId>
+<artifactId>common-cloud-starter</artifactId>
 
     <dependencies>
         <!-- SpringCloud Alibaba Nacos -->
@@ -49,6 +48,21 @@
             <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>
@@ -83,5 +97,7 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
+
+
     </dependencies>
 </project>

base-common/pom.xml

@@ -2,11 +2,17 @@
 <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.ruoyi</groupId>
-        <artifactId>ruoyi</artifactId>
-        <version>3.5.0</version>
+        <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>
 
     <modules>
         <module>ruoyi-common-log</module>
@@ -19,11 +25,8 @@
         <module>common-cloud-starter</module>
     </modules>
 
-    <artifactId>base-common</artifactId>
-    <packaging>pom</packaging>
 
-    <description>
-	    base-common通用模块
-    </description>
+
+
 
 </project>

base-components/gateway/pom.xml

@@ -2,9 +2,9 @@
          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.ruoyi</groupId>
+        <groupId>com.usky</groupId>
         <artifactId>base-components</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

base-components/monitor/pom.xml

@@ -2,9 +2,9 @@
          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.ruoyi</groupId>
+        <groupId>com.usky</groupId>
         <artifactId>base-components</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

base-components/pom.xml

@@ -2,9 +2,9 @@
 <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.ruoyi</groupId>
-        <artifactId>ruoyi</artifactId>
-        <version>3.5.0</version>
+        <groupId>com.usky</groupId>
+        <artifactId>uskycloud</artifactId>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

base-modules/pom.xml

@@ -2,9 +2,9 @@
 <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.ruoyi</groupId>
-        <artifactId>ruoyi</artifactId>
-        <version>3.5.0</version>
+        <groupId>com.usky</groupId>
+        <artifactId>uskycloud</artifactId>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

base-modules/service-auth/pom.xml

@@ -2,9 +2,9 @@
          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.ruoyi</groupId>
+        <groupId>com.usky</groupId>
         <artifactId>base-modules</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

base-modules/service-file/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>
+        <groupId>com.usky</groupId>
         <artifactId>base-modules</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

base-modules/service-gen/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>
+        <groupId>com.usky</groupId>
         <artifactId>base-modules</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

base-modules/service-job/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>
+        <groupId>com.usky</groupId>
         <artifactId>base-modules</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

base-modules/service-system/pom.xml

@@ -2,9 +2,9 @@
 <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.ruoyi</groupId>
+        <groupId>com.usky</groupId>
         <artifactId>base-modules</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

base-modules/service-system/service-system-api/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>
+        <groupId>com.usky</groupId>
         <artifactId>service-system</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

base-modules/service-system/service-system-biz/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>
+        <groupId>com.usky</groupId>
         <artifactId>service-system</artifactId>
-        <version>3.5.0</version>
+        <version>0.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

doc/修改日志.md

@@ -0,0 +1,52 @@
+
+
+- 调整 common-security 逻辑
+- 新增 SecurityUtils.getTenantId() 获取
+- 增加 日志输出及sql日志和文件打印
+
+TODO：
+1.ruoyi 整体命名调整
+
+
+# 怎么获取当前会话的租户ID
+- 代码获取：
+Integer tenantId = SecurityUtils.getTenantId(); 
+例:
+```
+  /**
+     *  通过租户ID获取配置
+     */
+    @GetMapping("/getTenantConfig")
+    public ApiResult<SysConfigTenantVo> getTenantConfig() {
+        Integer tenantId = SecurityUtils.getTenantId(); 
+        SysConfigTenantVo config = sysTenantService.getSysConfig(tenantId);
+        return ApiResult.success(config);
+    }
+```
+- 登录获取Token
+```
+curl --location --request POST 'http://usky-cloud-web:9150/auth/login' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+    "username": "admin",
+    "password": "admin123",
+    "code": "7",
+    "uuid": "de8b904e5d81474e83f33f61c6cb0854"
+}'
+``` 
+
+```
+{
+    "code": 200,
+    "msg": null,
+    "data": {
+        "access_token": "eyJhbGciOiJIUzUxMiJ9.eyJ0ZW5hbnRfaWQiOjEwMDEsInVzZXJfaWQiOjEsInVzZXJfa2V5IjoiNjFkOGQzYjgtOTk2Mi00YzA5LWEwMWYtYzNlMDc2MTIwYjY2IiwidXNlcm5hbWUiOiJhZG1pbiJ9.-2uBvkfY7FYxejPcPvZ-jUw4FiLoNiHDVbm9NDX66jSMZpH8MZJEK17JgNhErVH_mfP5QSmp91cNksBEW26Jaw",
+        "tenantId": 1001,
+        "expires_in": 7200
+    }
+}
+```
+
+
+
+

pom.xml

@@ -3,9 +3,9 @@
          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">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.ruoyi</groupId>
-    <artifactId>ruoyi</artifactId>
-    <version>3.5.0</version>
+    <groupId>com.usky</groupId>
+    <artifactId>uskycloud</artifactId>
+    <version>0.0.1</version>
 
 <!--    <parent>-->
 <!--        <groupId>org.springframework.boot</groupId>-->
@@ -55,6 +55,7 @@
         <poi.version>4.1.2</poi.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+        <mybatis-plus-boot-starter.version>3.3.0</mybatis-plus-boot-starter.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -116,6 +117,25 @@
                 <version>${spring-boot.mybatis}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus-boot-starter.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-generator</artifactId>
+                <version>${mybatis-plus-boot-starter.version}</version>
+            </dependency>
+
+            <!-- 代码生成使用模板 -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity-engine-core</artifactId>
+                <version>${velocity.version}</version>
+            </dependency>
+
             <!-- Swagger 依赖配置 -->
             <dependency>
                 <groupId>io.swagger</groupId>
@@ -163,12 +183,6 @@
                 <version>${commons.fileupload.version}</version>
             </dependency>
 
-            <!-- 代码生成使用模板 -->
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity-engine-core</artifactId>
-                <version>${velocity.version}</version>
-            </dependency>
 
             <!-- Collection 增强Java集合框架 -->
             <dependency>

ruoyi-ui/.env.development

@@ -1,11 +1,11 @@
-# 页面标题
-VUE_APP_TITLE = 若依管理系统
-
-# 开发环境配置
-ENV = 'development'
-
-# 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
-
-# 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
+# 页面标题
+VUE_APP_TITLE = SaaS管理系统
+
+# 开发环境配置
+ENV = 'development'
+
+# 若依管理系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true