Merge branch 'dev_grid_platform' into develop

epmet-gateway/pom.xml

@@ -365,8 +365,8 @@
 <!--                <gateway.routes.data-aggregator-server.url>http://127.0.0.1:8114</gateway.routes.data-aggregator-server.url>-->
 
                 <!-- 36、中间库服务 -->
-               <!-- <gateway.routes.open-data-worker-server.url>lb://open-data-worker-server</gateway.routes.open-data-worker-server.url>-->
-                <gateway.routes.open-data-worker-server.url>http://127.0.0.1:8117</gateway.routes.open-data-worker-server.url>
+                <gateway.routes.open-data-worker-server.url>lb://open-data-worker-server</gateway.routes.open-data-worker-server.url>
+<!--                <gateway.routes.open-data-worker-server.url>http://127.0.0.1:8117</gateway.routes.open-data-worker-server.url>-->
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>

epmet-gateway/src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
-server:
+basedisputeprocessserver:
   tomcat:
     max-swallow-size: 100MB
   port: @server.port@
@@ -352,7 +352,7 @@ spring:
             - CpAuth=true
         #政府工作端议题管理
         - id: open-data-worker-server
-          uri: @gateway.routes.gov-issue-server.uri@
+          uri: @gateway.routes.open-data-worker-server.url@
           order: 38
           predicates:
             - Path=${server.servlet.context-path}/opendata/**