From a51172f7ee2551e0605a5c2b549ce5eeca5888ea Mon Sep 17 00:00:00 2001
From: "haoxianrui@" <1490493387@qq.com>
Date: Sat, 27 Jun 2020 01:34:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml               | 121 ++++--------------------------------------
 youlai-auth/pom.xml   |  25 +++++----
 youlai-common/pom.xml |   2 +-
 3 files changed, 25 insertions(+), 123 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffdd998a..eb5a0289 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,13 +7,8 @@
     <artifactId>youlai-mall</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <modules>
-        <module>youlai-common</module>
-        <module>youlai-mall-auth</module>
-        <module>yshop-gateway</module>
-        <module>yshop-eureka</module>
-        <module>yshop-config</module>
-        <module>yshop-service</module>
-        <module>yshop-service-api</module>
+        <module>youlai-mall-service</module>
+        <module>youlai-mall-service-api</module>
     </modules>
     <packaging>pom</packaging>
     <parent>
@@ -22,7 +17,7 @@
         <version>2.2.6.RELEASE</version>
     </parent>
     <properties>
-        <docker.image.prefix>fly4j</docker.image.prefix>
+        <docker.image.prefix>youlai</docker.image.prefix>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -50,6 +45,13 @@
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
         </dependency>
+
+        <!-- HuTool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -69,109 +71,6 @@
                 <artifactId>feign-httpclient</artifactId>
                 <version>${feign-httpclient.version}</version>
             </dependency>
-
-            <!-- spring boot admin -->
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-server</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-client</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-
-            <!-- HuTool -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-all</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
-            <!-- fastJson -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-
-            <!-- mysql -->
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql.version}</version>
-            </dependency>
-
-            <!-- druid -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
-                <version>${druid.version}</version>
-            </dependency>
-
-            <!-- mybatis-plus -->
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-generator</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-extension</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
-
-            <!-- swagger -->
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger-ui</artifactId>
-                <version>${swagger.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-                <version>${swagger.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger-annotations.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>${swagger-models.version}</version>
-            </dependency>
-
-            <!-- fastDFS -->
-            <dependency>
-                <groupId>com.github.tobato</groupId>
-                <artifactId>fastdfs-client</artifactId>
-                <version>${fastdfs-client.version}</version>
-            </dependency>
-
-            <!-- dozer -->
-            <dependency>
-                <groupId>net.sf.dozer</groupId>
-                <artifactId>dozer</artifactId>
-                <version>${dozer.version}</version>
-            </dependency>
-
-            <!-- redisson -->
-            <dependency>
-                <groupId>org.redisson</groupId>
-                <artifactId>redisson</artifactId>
-                <version>${redisson.version}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/youlai-auth/pom.xml b/youlai-auth/pom.xml
index b975e32d..0a32c611 100644
--- a/youlai-auth/pom.xml
+++ b/youlai-auth/pom.xml
@@ -3,24 +3,28 @@
          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>
-        <artifactId>youlai-mall</artifactId>
-        <groupId>com.youlai</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>youlai-mall-auth</artifactId>
+    <artifactId>youlai-auth</artifactId>
+
+    <properties>
+       <youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
+    </properties>
 
     <dependencies>
         <dependency>
-            <groupId>com.fly4j</groupId>
-            <artifactId>yshop-common-db</artifactId>
-            <version>${yshop.version}</version>
+            <groupId>com.youlai</groupId>
+            <artifactId>youlai-common-db</artifactId>
+            <version>${youlai-common.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.fly4j</groupId>
-            <artifactId>yshop-common-core</artifactId>
-            <version>${yshop.version}</version>
+            <groupId>com.youlai</groupId>
+            <artifactId>youlai-common-core</artifactId>
+            <version>${youlai-common.version}</version>
         </dependency>
 
         <!-- Spring Cloud Eureka -->
@@ -46,7 +50,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>
diff --git a/youlai-common/pom.xml b/youlai-common/pom.xml
index 7d919582..5e9cf96b 100644
--- a/youlai-common/pom.xml
+++ b/youlai-common/pom.xml
@@ -115,7 +115,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-pool2</artifactId>
-                <version>${commons-pool2.version}</version>
+                <version>${common-pools.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-- 
GitLab