From f45f8edd8516741ccc445d8cc4ad0262fa8ca882 Mon Sep 17 00:00:00 2001
From: Xbcmz <1570435771@qq.com>
Date: Sat, 28 Mar 2020 17:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=B6=88=E8=B4=B9=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml            | 30 ++++++++++++++++++------------
 shop-admin/pom.xml | 15 +++++++++++++++
 2 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 shop-admin/pom.xml

diff --git a/pom.xml b/pom.xml
index 10bcc473c..c690577e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,15 +3,15 @@
          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.fly.cloud</groupId>
+    <groupId>com.fly4j.cloud</groupId>
     <artifactId>shop-cloud</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <modules>
-        <module>fly-common</module>
-        <module>fly-gateway</module>
-        <module>fly-auth</module>
-        <module>fly-consumer</module>
-        <module>fly-provider</module>
+        <module>fly4j-common</module>
+        <module>fly4j-gateway</module>
+        <module>fly4j-auth</module>
+        <module>shop-api</module>
+        <module>shop-admin</module>
     </modules>
     <packaging>pom</packaging>
     <name>shop-cloud</name>
@@ -22,7 +22,7 @@
     </parent>
     <properties>
         <docker.image.prefix>fly4j</docker.image.prefix>
-        <fly.version>1.0.0-SNAPSHOT</fly.version>
+        <fly4j.version>1.0.0-SNAPSHOT</fly4j.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -33,8 +33,8 @@
         <druid.version>1.1.14</druid.version>
         <fastjson.version>1.2.67</fastjson.version>
         <mysql.version>8.0.18</mysql.version>
-        <fly-common.version>1.0.0</fly-common.version>
-        <fly-framework.version>1.0.0</fly-framework.version>
+        <fly4j-common.version>1.0.0</fly4j-common.version>
+        <fly4j-framework.version>1.0.0</fly4j-framework.version>
         <zipkin.version>2.12.3</zipkin.version>
         <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
         <!--Swagger Resources-->
@@ -117,9 +117,15 @@
             </dependency>
 
             <dependency>
-                <groupId>com.fly.cloud</groupId>
-                <artifactId>fly-common-core</artifactId>
-                <version>${fly.version}</version>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>${hutool.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fly4j.cloud</groupId>
+                <artifactId>fly4j-common</artifactId>
+                <version>${fly4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.github.tobato</groupId>
diff --git a/shop-admin/pom.xml b/shop-admin/pom.xml
new file mode 100644
index 000000000..41f7c23fb
--- /dev/null
+++ b/shop-admin/pom.xml
@@ -0,0 +1,15 @@
+<?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>
+        <artifactId>shop-cloud</artifactId>
+        <groupId>com.fly4j.cloud</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>shop-admin</artifactId>
+
+
+</project>
\ No newline at end of file