Browse Source

'实现分离'

yq 2 years ago
parent
commit
67e5e534d6

+ 58 - 2
base-modules/service-system/service-system-biz/pom.xml

@@ -17,11 +17,67 @@
     </description>
 
     <dependencies>
-        <!--  Common Cloud Starter -->
+        <!-- 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>
+
+        <!-- RuoYi Common DataSource -->
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-datasource</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataScope -->
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>common-cloud-starter</artifactId>
+            <artifactId>ruoyi-common-datascope</artifactId>
         </dependency>
+
+        <!-- RuoYi Common Log -->
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Swagger -->
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-swagger</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 0 - 2
base-modules/service-system/service-system-biz/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java

@@ -2,7 +2,6 @@ package com.ruoyi.system;
 
 import com.ruoyi.common.security.annotation.EnableCustomConfig;
 import com.ruoyi.common.security.annotation.EnableRyFeignClients;
-import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -20,7 +19,6 @@ import java.net.UnknownHostException;
  */
 
 @EnableCustomConfig
-@EnableCustomSwagger2
 @EnableRyFeignClients
 @SpringBootApplication
 public class RuoYiSystemApplication

+ 7 - 0
pom.xml

@@ -336,6 +336,13 @@
                 <version>${druid.version}</version>
             </dependency>
 
+
+            <dependency>
+                <groupId>com.usky</groupId>
+                <artifactId>service-system-api</artifactId>
+                <version>${usky.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

+ 15 - 39
usky-common/common-cloud-starter/pom.xml

@@ -24,10 +24,10 @@
         </dependency>
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>-->
+<!--        </dependency>-->
 
         <!-- SpringBoot Actuator -->
         <dependency>
@@ -35,13 +35,6 @@
             <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>
@@ -53,6 +46,11 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
@@ -63,50 +61,28 @@
             <artifactId>velocity-engine-core</artifactId>
         </dependency>
 
-        <!-- RuoYi Common DataSource -->
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>ruoyi-common-datasource</artifactId>
-        </dependency>
 
-        <!-- RuoYi Common DataScope -->
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>ruoyi-common-datascope</artifactId>
+            <artifactId>service-system-api</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Log -->
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>ruoyi-common-log</artifactId>
+            <artifactId>usky-common-core</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Swagger -->
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>ruoyi-common-swagger</artifactId>
+            <artifactId>usky-common-mvc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>service-system-api</artifactId>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.18.Final</version>
         </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>