From 9e257236d18cd1f3f20addf253360d42374a8caa Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 28 Dec 2020 10:36:25 +0800
Subject: [PATCH] =?UTF-8?q?gateway=E6=96=B0=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                          | 11 +++++++++++
 epmet-gateway/src/main/resources/bootstrap.yml | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index a6b276158b..41ad7a65f7 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -205,6 +205,9 @@
                 <!-- 34、 开放接口服务 -->
                 <gateway.routes.epmet-ext-server.url>lb://epmet-ext-server</gateway.routes.epmet-ext-server.url>
 <!--                <gateway.routes.epmet-ext-server.url>http://127.0.0.1:8113</gateway.routes.epmet-ext-server.url>-->
+                <!-- 35、多数据源服务 -->
+                <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
+<!--                <gateway.routes.data-aggregator-server.url>http://127.0.0.1:8114</gateway.routes.data-aggregator-server.url>-->
             </properties>
         </profile>
         <profile>
@@ -324,6 +327,10 @@
                 <!-- 34、 开放接口服务 -->
                 <gateway.routes.epmet-ext-server.url>lb://epmet-ext-server</gateway.routes.epmet-ext-server.url>
                 <!--                <gateway.routes.epmet-ext-server.url>http://127.0.0.1:8113</gateway.routes.epmet-ext-server.url>-->
+
+                <!-- 35、多数据源服务 -->
+                <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
+<!--                <gateway.routes.data-aggregator-server.url>http://127.0.0.1:8114</gateway.routes.data-aggregator-server.url>-->
             </properties>
         </profile>
         <profile>
@@ -416,6 +423,8 @@
                  <gateway.routes.epmet-point-server.url>lb://epmet-point-server</gateway.routes.epmet-point-server.url>
                 <!--  34、开放接口服务  -->
                 <gateway.routes.epmet-ext-server.url>lb://epmet-ext-server</gateway.routes.epmet-ext-server.url>
+                <!-- 35、多数据源服务 -->
+                <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
             </properties>
         </profile>
         <profile>
@@ -505,6 +514,8 @@
                 <gateway.routes.epmet-point-server.url>lb://epmet-point-server</gateway.routes.epmet-point-server.url>
                 <!-- 34、开放接口服务  -->
                 <gateway.routes.epmet-ext-server.url>lb://epmet-ext-server</gateway.routes.epmet-ext-server.url>
+                <!-- 35、多数据源服务 -->
+                <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 53ec286911..fa7b45c2f2 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -323,6 +323,15 @@ spring:
           filters:
             - StripPrefix=1
             - CpAuth=true
+        # 多数据源服务
+        - id: data-aggregator-server
+          uri: @gateway.routes.data-aggregator-server.url@
+          order: 35
+          predicates:
+            - Path=${server.servlet.context-path}/data/aggregator/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
@@ -438,6 +447,7 @@ epmet:
     - /gov/project/**
     - /resi/home/**
     - /data/report/**
+    - /data/aggregator/**
 
   # 内部认证url白名单(在白名单中的，就不会再校验登录了)
   internalAuthUrlsWhiteList: