diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..682ae57
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "epdc-cloud-client-yushan"]
+	path = epdc-cloud-client-yushan
+	url = http://121.42.41.42:7070/r/epdc-cloud-client-yushan.git
+[submodule "epdc-cloud-commons-yushan"]
+	path = epdc-cloud-commons-yushan
+	url = http://121.42.41.42:7070/r/epdc-cloud-commons-yushan.git
+[submodule "epdc-cloud-parent-yushan"]
+	path = epdc-cloud-parent-yushan
+	url = http://121.42.41.42:7070/r/epdc-cloud-parent-yushan.git
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
new file mode 160000
index 0000000..8c3f710
--- /dev/null
+++ b/epdc-cloud-client-yushan
@@ -0,0 +1 @@
+Subproject commit 8c3f710e726265ff1b3b47ac6ab005d025218974
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
new file mode 160000
index 0000000..8e13368
--- /dev/null
+++ b/epdc-cloud-commons-yushan
@@ -0,0 +1 @@
+Subproject commit 8e13368aad9310e107299b137fedd118c76bb57d
diff --git a/Dockerfile b/epdc-cloud-gateway/Dockerfile
old mode 100755
new mode 100644
similarity index 100%
rename from Dockerfile
rename to epdc-cloud-gateway/Dockerfile
diff --git a/epdc-cloud-gateway/pom.xml b/epdc-cloud-gateway/pom.xml
new file mode 100644
index 0000000..0062baf
--- /dev/null
+++ b/epdc-cloud-gateway/pom.xml
@@ -0,0 +1,267 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.esua.epdc.yushan</groupId>
+        <artifactId>epdc-cloud-parent-yushan</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../epdc-cloud-parent-yushan</relativePath>
+    </parent>
+
+    <artifactId>epdc-cloud-gateway</artifactId>
+    <packaging>jar</packaging>
+    <description>榆山党建e家网关模块</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+        </dependency>
+
+        <!-- zipkin client -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
+
+        <!-- commons start -->
+        <dependency>
+            <groupId>com.esua.epdc.yushan</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>${epdc-cloud-commons.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.esua.epdc.yushan</groupId>
+            <artifactId>epdc-common-clienttoken</artifactId>
+            <version>${epdc-cloud-commons.version}</version>
+        </dependency>
+        <!-- commons end -->
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <server.port>9094</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+                <docker.tag>dev</docker.tag>
+
+                <!-- redis配置 -->
+                <spring.redis.index>9</spring.redis.index>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+
+                <!-- gateway routes -->
+                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
+                <!--                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
+                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
+                </gateway.routes.epdc-activiti-server.uri>
+                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
+                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
+                <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
+                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
+                <!--                <gateway.routes.epdc-heart-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-heart-server.uri>-->
+                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+                <!--                <gateway.routes.epdc-job-server.uri>http://127.0.0.1:9061</gateway.routes.epdc-job-server.uri>-->
+                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
+                </gateway.routes.epdc-message-server.uri>
+                <!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>-->
+                <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>
+                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
+                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
+                <!--                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->
+                <gateway.routes.epdc-cloud-analysis-server.uri>http://127.0.0.1:9060
+                </gateway.routes.epdc-cloud-analysis-server.uri>
+                <!--                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>-->
+                <gateway.routes.epdc-work-record-server.uri>http://127.0.0.1:9085
+                </gateway.routes.epdc-work-record-server.uri>
+                <!--                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server</gateway.routes.epdc-work-record-server.uri>-->
+                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
+                </gateway.routes.epdc-services-server.uri>
+                <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
+                <!--<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>-->
+                <gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>
+                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
+                <gateway.routes.epdc-group-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-group-server.uri>
+                <!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>-->
+                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
+                </gateway.routes.epdc-websocket-server.uri>
+                <!--                <gateway.routes.epdc-custom-server.uri>http://127.0.0.1:9076</gateway.routes.epdc-kpi-server.uri>-->
+                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
+                <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
+                <!--                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>-->
+                <gateway.routes.epdc-kpi-server.uri>http://127.0.0.1:9069</gateway.routes.epdc-kpi-server.uri>
+                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
+                </gateway.routes.epdc-analysis-server.uri>
+                <gateway.routes.epdc-property-server.uri>http://127.0.0.1:10009
+                </gateway.routes.epdc-property-server.uri>
+                <!-- nacos -->
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <server.port>17020</server.port>
+                <spring.profiles.active>test</spring.profiles.active>
+                <docker.tag>test</docker.tag>
+
+                <!-- redis配置 -->
+                <spring.redis.index>9</spring.redis.index>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+
+                <!-- gateway routes -->
+                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
+                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
+                </gateway.routes.epdc-activiti-server.uri>
+                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
+                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
+                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
+                </gateway.routes.epdc-message-server.uri>
+                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
+                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
+                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
+                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server
+                </gateway.routes.epdc-cloud-analysis-server.uri>
+                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server
+                </gateway.routes.epdc-work-record-server.uri>
+                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
+                </gateway.routes.epdc-services-server.uri>
+                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
+                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
+                <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
+                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
+                </gateway.routes.epdc-websocket-server.uri>
+                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
+                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
+                <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
+                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
+                </gateway.routes.epdc-analysis-server.uri>
+                <gateway.routes.epdc-property-server.uri>lb://epdc-property-server
+                </gateway.routes.epdc-property-server.uri>
+
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>192.168.0.15</nacos.ip>
+                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <server.port>9094</server.port>
+                <spring.profiles.active>prod</spring.profiles.active>
+                <docker.tag>prod</docker.tag>
+
+                <!-- gateway routes -->
+                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
+                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
+                </gateway.routes.epdc-activiti-server.uri>
+                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
+                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
+                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
+                </gateway.routes.epdc-message-server.uri>
+                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
+                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
+                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server
+                </gateway.routes.epdc-cloud-analysis-server.uri>
+                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server
+                </gateway.routes.epdc-work-record-server.uri>
+                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
+                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
+                </gateway.routes.epdc-services-server.uri>
+                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
+                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
+                <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
+                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
+                </gateway.routes.epdc-websocket-server.uri>
+                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
+                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
+                <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
+                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
+                </gateway.routes.epdc-analysis-server.uri>
+                <gateway.routes.epdc-property-server.uri>lb://epdc-property-server
+                </gateway.routes.epdc-property-server.uri>
+
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>172.16.1.243</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>Elink833066</spring.redis.password>
+
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>172.16.1.243:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace></nacos.namespace>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/src/main/java/com/elink/esua/epdc/GatewayApplication.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/GatewayApplication.java
similarity index 100%
rename from src/main/java/com/elink/esua/epdc/GatewayApplication.java
rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/GatewayApplication.java
diff --git a/src/main/java/com/elink/esua/epdc/config/CorsConfig.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/config/CorsConfig.java
similarity index 100%
rename from src/main/java/com/elink/esua/epdc/config/CorsConfig.java
rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/config/CorsConfig.java
diff --git a/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
similarity index 100%
rename from src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
diff --git a/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
similarity index 100%
rename from src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
diff --git a/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
similarity index 100%
rename from src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
diff --git a/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
similarity index 100%
rename from src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
diff --git a/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
similarity index 100%
rename from src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
diff --git a/src/main/java/com/elink/esua/epdc/filter/CpProperty.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java
similarity index 100%
rename from src/main/java/com/elink/esua/epdc/filter/CpProperty.java
rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java
diff --git a/src/main/resources/application.yml b/epdc-cloud-gateway/src/main/resources/application.yml
similarity index 100%
rename from src/main/resources/application.yml
rename to epdc-cloud-gateway/src/main/resources/application.yml
diff --git a/src/main/resources/logback-spring.xml b/epdc-cloud-gateway/src/main/resources/logback-spring.xml
similarity index 100%
rename from src/main/resources/logback-spring.xml
rename to epdc-cloud-gateway/src/main/resources/logback-spring.xml
diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan
new file mode 160000
index 0000000..db92131
--- /dev/null
+++ b/epdc-cloud-parent-yushan
@@ -0,0 +1 @@
+Subproject commit db9213163f8005cba05ad21334bebb72484174b7
diff --git a/pom.xml b/pom.xml
index b4e2b5e..595bc18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,265 +3,16 @@
          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>
 
-    <parent>
-        <groupId>com.esua.epdc.yushan</groupId>
-        <artifactId>epdc-cloud-parent-yushan</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../epdc-cloud-parent-yushan</relativePath>
-    </parent>
-
+    <groupId>com.esua.epdc.yushan</groupId>
     <artifactId>epdc-cloud-gateway-yushan</artifactId>
-    <packaging>jar</packaging>
-    <description>榆山党建e家网关模块</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-        </dependency>
-
-        <!-- zipkin client -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-        </dependency>
-
-        <!-- commons start -->
-        <dependency>
-            <groupId>com.esua.epdc.yushan</groupId>
-            <artifactId>epdc-commons-tools</artifactId>
-            <version>${epdc-cloud-commons.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.esua.epdc.yushan</groupId>
-            <artifactId>epdc-common-clienttoken</artifactId>
-            <version>${epdc-cloud-commons.version}</version>
-        </dependency>
-        <!-- commons end -->
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <server.port>9094</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
-                <docker.tag>dev</docker.tag>
-
-                <!-- redis配置 -->
-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <!--                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
-                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
-                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
-                <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
-                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
-                <!--                <gateway.routes.epdc-heart-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-heart-server.uri>-->
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
-                <!--                <gateway.routes.epdc-job-server.uri>http://127.0.0.1:9061</gateway.routes.epdc-job-server.uri>-->
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>-->
-                <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
-                <!--                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->
-                <gateway.routes.epdc-cloud-analysis-server.uri>http://127.0.0.1:9060
-                </gateway.routes.epdc-cloud-analysis-server.uri>
-                <!--                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>-->
-                <gateway.routes.epdc-work-record-server.uri>http://127.0.0.1:9085
-                </gateway.routes.epdc-work-record-server.uri>
-                <!--                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server</gateway.routes.epdc-work-record-server.uri>-->
-                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
-                </gateway.routes.epdc-services-server.uri>
-                <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
-                <!--<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>-->
-                <gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>
-                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
-                <gateway.routes.epdc-group-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-group-server.uri>
-                <!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>-->
-                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
-                </gateway.routes.epdc-websocket-server.uri>
-                <!--                <gateway.routes.epdc-custom-server.uri>http://127.0.0.1:9076</gateway.routes.epdc-kpi-server.uri>-->
-                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
-                <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
-                <!--                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>-->
-                <gateway.routes.epdc-kpi-server.uri>http://127.0.0.1:9069</gateway.routes.epdc-kpi-server.uri>
-                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
-                </gateway.routes.epdc-analysis-server.uri>
-                <gateway.routes.epdc-property-server.uri>http://127.0.0.1:10009
-                </gateway.routes.epdc-property-server.uri>
-                <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip></nacos.ip>
-                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
-
-                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-            </properties>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <server.port>17020</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
-                <docker.tag>test</docker.tag>
-
-                <!-- redis配置 -->
-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
-                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
-                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server
-                </gateway.routes.epdc-cloud-analysis-server.uri>
-                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server
-                </gateway.routes.epdc-work-record-server.uri>
-                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
-                </gateway.routes.epdc-services-server.uri>
-                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
-                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
-                <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
-                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
-                </gateway.routes.epdc-websocket-server.uri>
-                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
-                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
-                <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
-                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
-                </gateway.routes.epdc-analysis-server.uri>
-                <gateway.routes.epdc-property-server.uri>lb://epdc-property-server
-                </gateway.routes.epdc-property-server.uri>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip>192.168.0.15</nacos.ip>
-                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
-
-                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>prod</id>
-            <properties>
-                <server.port>9094</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
-                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server
-                </gateway.routes.epdc-cloud-analysis-server.uri>
-                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server
-                </gateway.routes.epdc-work-record-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
-                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
-                </gateway.routes.epdc-services-server.uri>
-                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
-                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
-                <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
-                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
-                </gateway.routes.epdc-websocket-server.uri>
-                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
-                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
-                <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
-                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
-                </gateway.routes.epdc-analysis-server.uri>
-                <gateway.routes.epdc-property-server.uri>lb://epdc-property-server
-                </gateway.routes.epdc-property-server.uri>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.16.1.243</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.1.243:8848</nacos.server-addr>
-                <nacos.ip></nacos.ip>
-                <nacos.namespace></nacos.namespace>
-
-                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-            </properties>
-        </profile>
-    </profiles>
-
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <description>榆山党群e家网关微服务模块</description>
+
+    <modules>
+        <module>epdc-cloud-gateway</module>
+        <module>epdc-cloud-client-yushan</module>
+        <module>epdc-cloud-commons-yushan</module>
+        <module>epdc-cloud-parent-yushan</module>
+    </modules>
 </project>