Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_0814

esua-epdc/epdc-gateway/pom.xml

@@ -83,6 +83,7 @@
             </activation>
             <properties>
                 <server.port>9094</server.port>
+                <server.servlet.context-path>/epdc</server.servlet.context-path>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
@@ -130,6 +131,7 @@
             <id>test</id>
             <properties>
                 <server.port>9094</server.port>
+                <server.servlet.context-path>/epdc</server.servlet.context-path>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
@@ -169,6 +171,7 @@
             <id>prod</id>
             <properties>
                 <server.port>9002</server.port>
+                <server.servlet.context-path>/epdc</server.servlet.context-path>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -1,5 +1,7 @@
 server:
   port: @server.port@
+  servlet:
+    context-path: @server.servlet.context-path@
 
 spring:
   application:
@@ -20,7 +22,7 @@ spring:
           uri: @gateway.routes.epdc-auth-server.uri@
           order: 1
           predicates:
-            - Path=/auth/**
+            - Path=@server.servlet.context-path@/auth/**
           filters:
             - StripPrefix=0
         #Admin服务
@@ -28,7 +30,7 @@ spring:
           uri: @gateway.routes.epdc-admin-server.uri@
           order: 2
           predicates:
-            - Path=/sys/**
+            - Path=@server.servlet.context-path@/sys/**
           filters:
             - StripPrefix=0
         #OSS服务
@@ -36,7 +38,7 @@ spring:
           uri: @gateway.routes.epdc-oss-server.uri@
           order: 3
           predicates:
-            - Path=/oss/**
+            - Path=@server.servlet.context-path@/oss/**
           filters:
             - StripPrefix=0
         #消息服务
@@ -44,7 +46,7 @@ spring:
           uri: @gateway.routes.epdc-message-server.uri@
           order: 4
           predicates:
-            - Path=/message/**
+            - Path=@server.servlet.context-path@/message/**
           filters:
             - StripPrefix=0
         #工作流服务
@@ -52,7 +54,7 @@ spring:
           uri: @gateway.routes.epdc-activiti-server.uri@
           order: 5
           predicates:
-            - Path=/activiti/**
+            - Path=@server.servlet.context-path@/activiti/**
           filters:
             - StripPrefix=0
         #定时任务服务
@@ -60,7 +62,7 @@ spring:
           uri: @gateway.routes.epdc-job-server.uri@
           order: 6
           predicates:
-            - Path=/job/**
+            - Path=@server.servlet.context-path@/job/**
           filters:
             - StripPrefix=0
         #APP流服务
@@ -68,7 +70,7 @@ spring:
           uri: @gateway.routes.epdc-api-server.uri@
           order: 7
           predicates:
-            - Path=/api/**
+            - Path=@server.servlet.context-path@/api/**
           filters:
             - StripPrefix=0
             - CpAuth=true
@@ -77,7 +79,7 @@ spring:
           uri: @gateway.routes.epdc-heart-server.uri@
           order: 8
           predicates:
-            - Path=/heart/**
+            - Path=@server.servlet.context-path@/heart/**
           filters:
             - StripPrefix=0
         #友邻社群模块
@@ -85,7 +87,7 @@ spring:
           uri: @gateway.routes.epdc-neighbor-server.uri@
           order: 9
           predicates:
-            - Path=/neighbor/**
+            - Path=@server.servlet.context-path@/neighbor/**
           filters:
             - StripPrefix=0
         #新闻公告模块
@@ -93,7 +95,7 @@ spring:
           uri: @gateway.routes.epdc-news-server.uri@
           order: 10
           predicates:
-            - Path=/news/**
+            - Path=@server.servlet.context-path@/news/**
           filters:
             - StripPrefix=0
         #党群议事模块
@@ -101,7 +103,7 @@ spring:
           uri: @gateway.routes.epdc-events-server.uri@
           order: 11
           predicates:
-            - Path=/events/**
+            - Path=@server.servlet.context-path@/events/**
           filters:
             - StripPrefix=0
         #生活服务模块
@@ -109,7 +111,7 @@ spring:
           uri: @gateway.routes.epdc-services-server.uri@
           order: 12
           predicates:
-            - Path=/services/**
+            - Path=@server.servlet.context-path@/services/**
           filters:
             - StripPrefix=0
         #APP用户模块
@@ -117,7 +119,7 @@ spring:
           uri: @gateway.routes.epdc-user-server.uri@
           order: 14
           predicates:
-            - Path=/app-user/**
+            - Path=@server.servlet.context-path@/app-user/**
           filters:
             - StripPrefix=0
         #DEMO服务
@@ -125,7 +127,7 @@ spring:
           uri: @gateway.routes.epdc-demo-server.uri@
           order: 15
           predicates:
-            - Path=/demo/**
+            - Path=@server.servlet.context-path@/demo/**
           filters:
             - StripPrefix=0
     nacos: