Merge branch 'feature/zijie' of http://gitea.tashowz.com/tashow/tashow-platform into feature/zijie

# Conflicts:
#	tashow-dependencies/pom.xml
#	tashow-module/pom.xml
#	tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml

tashow-module/tashow-module-system/pom.xml

@@ -8,12 +8,8 @@
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <modules>
-        <module>tashow-module-system-api</module>
-        <module>tashow-module-system-biz</module>
-    </modules>
     <artifactId>tashow-module-system</artifactId>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
     <description>
@@ -21,4 +17,165 @@
         例如说：用户、部门、权限、数据字典等等
     </description>
 
+    <dependencies>
+        <!-- Spring Cloud 基础 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-framework-env</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-framework-mq</artifactId>
+        </dependency>
+        <!-- 依赖服务 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-system-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-infra-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-data-permission</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-framework-tenant</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-framework-security</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-data-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-data-redis</artifactId>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-framework-rpc</artifactId>
+        </dependency>
+
+        <!-- Registry 注册中心相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- Config 配置中心相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- Job 定时任务相关 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-framework-job</artifactId>
+        </dependency>
+
+        <!-- 消息队列相关 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-framework-mq</artifactId>
+        </dependency>
+
+        <!-- 服务保障相关 TODO 芋艿：暂时去掉 -->
+<!--        <dependency>-->
+<!--            <groupId>com.tashow.cloud</groupId>-->
+<!--            <artifactId>yudao-spring-boot-starter-protection</artifactId>-->
+<!--        </dependency>-->
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-data-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
+        <!-- 监控相关 -->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-framework-monitor</artifactId>
+        </dependency>
+
+        <!-- 三方云服务相关 -->
+        <dependency>
+            <groupId>com.xingyuv</groupId>
+            <artifactId>spring-boot-starter-justauth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） -->
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>wx-java-mp-spring-boot-starter</artifactId> <!-- 微信登录（公众号） -->
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>  <!-- 微信登录（小程序） -->
+        </dependency>
+
+        <dependency>
+            <groupId>com.xingyuv</groupId>
+            <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 -->
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara.hutool</groupId>
+            <artifactId>hutool-extra</artifactId> <!-- 邮件 -->
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <!-- 设置构建的 jar 包名 -->
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <!-- 打包 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java

@@ -2,12 +2,14 @@ package com.tashow.cloud.system;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * 项目的启动类
  * @author 芋道源码
  */
 @SpringBootApplication
+@EnableAsync // 开启异步
 public class SystemServerApplication {
 
     public static void main(String[] args) {