From 61ecc0cf9e1e97845a88c8bed0e72ac06e2efa57 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= <hongqing.liu@supwisdom.com>
Date: Wed, 4 Sep 2019 22:22:12 +0800
Subject: [PATCH] =?utf8?q?fix:=20=E4=BF=AE=E5=A4=8D=20maven=20=E6=9E=84?=
 =?utf8?q?=E5=BB=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 aggr/admin/pom.xml                                 |  7 +++++++
 .../FeignBasicAuthRequestInterceptor.java          |  2 +-
 bff/admin/pom.xml                                  | 14 --------------
 3 files changed, 8 insertions(+), 15 deletions(-)
 rename {bff/admin/src/main/java/com/supwisdom/institute/backend/admin/bff => aggr/admin/src/main/java/com/supwisdom/institute/backend/admin/aggr}/configuration/FeignBasicAuthRequestInterceptor.java (97%)

diff --git a/aggr/admin/pom.xml b/aggr/admin/pom.xml
index 38a14f1..f7fb563 100644
--- a/aggr/admin/pom.xml
+++ b/aggr/admin/pom.xml
@@ -84,6 +84,13 @@
       <groupId>com.supwisdom.institute</groupId>
       <artifactId>sw-backend-common-framework</artifactId>
     </dependency>
+    
+    
+    <!-- openfeign's dependency -->
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
 
 
     <dependency>
diff --git a/bff/admin/src/main/java/com/supwisdom/institute/backend/admin/bff/configuration/FeignBasicAuthRequestInterceptor.java b/aggr/admin/src/main/java/com/supwisdom/institute/backend/admin/aggr/configuration/FeignBasicAuthRequestInterceptor.java
similarity index 97%
rename from bff/admin/src/main/java/com/supwisdom/institute/backend/admin/bff/configuration/FeignBasicAuthRequestInterceptor.java
rename to aggr/admin/src/main/java/com/supwisdom/institute/backend/admin/aggr/configuration/FeignBasicAuthRequestInterceptor.java
index 2a22b46..a0f7c62 100644
--- a/bff/admin/src/main/java/com/supwisdom/institute/backend/admin/bff/configuration/FeignBasicAuthRequestInterceptor.java
+++ b/aggr/admin/src/main/java/com/supwisdom/institute/backend/admin/aggr/configuration/FeignBasicAuthRequestInterceptor.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.admin.bff.configuration;
+package com.supwisdom.institute.backend.admin.aggr.configuration;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/bff/admin/pom.xml b/bff/admin/pom.xml
index fc19506..0f600d2 100644
--- a/bff/admin/pom.xml
+++ b/bff/admin/pom.xml
@@ -58,11 +58,6 @@
       <artifactId>spring-cloud-starter-gateway</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-openfeign</artifactId>
-    </dependency>
-
 
     <!-- <dependency>
       <groupId>com.supwisdom.infras</groupId>
@@ -130,15 +125,6 @@
       <artifactId>fastjson</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <!-- <dependency>
-      <groupId>com.netflix.feign</groupId>
-      <artifactId>feign-httpclient</artifactId>
-    </dependency> -->
-
 
     <dependency>
       <groupId>io.springfox</groupId>
-- 
2.17.1