Browse Source

B2B对接接口地址调整

chenw 7 years ago
parent
commit
b86ef88364

+ 5 - 4
applications/purchase/purchase-server/src/main/resources/application.yml

@@ -90,7 +90,8 @@ hystrix:
                     thread:
                         timeoutInMilliseconds: 4000
 b2b:
-  inquiry:
-    base-url: https://test-inquiry.uuzcc.cn
-  Component:
-    base-url: https://test-mall.uuzcc.cn
+  baseUrl:
+    inquiry: https://test-inquiry.uuzcc.cn
+    Component: https://test-mall.uuzcc.cn
+    product: http://test-product.uuzcc.cn
+    uu: https://test-b2b.uuzcc.cn

+ 5 - 2
applications/sale/sale-server/src/main/resources/application.yml

@@ -90,5 +90,8 @@ hystrix:
                     thread:
                         timeoutInMilliseconds: 4000
 b2b:
-  inquiry:
-    base-url: https://test-inquiry.uuzcc.cn
+  baseUrl:
+    inquiry: https://test-inquiry.uuzcc.cn
+    Component: https://test-mall.uuzcc.cn
+    product: http://test-product.uuzcc.cn
+    uu: https://test-b2b.uuzcc.cn

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/InquiryApi.java

@@ -5,7 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(url = "${b2b.inquiry.base-url}", name = "inquiry-server")
+@FeignClient(url = "${b2b.baseUrl.inquiry}", name = "inquiry-server")
 @RequestMapping("/inquiry")
 public interface InquiryApi {
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/ProductApi.java

@@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(url = "${b2b.product.base-url}", name = "product-server")
+@FeignClient(url = "${b2b.baseUrl.product}", name = "product-server")
 @RequestMapping("/product")
 public interface ProductApi {
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/SearchApi.java

@@ -4,7 +4,7 @@ import com.usoftchina.inquiry.po.search.SearchComponentResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(url = "${b2b.Component.base-url}", name = "search-server")
+@FeignClient(url = "${b2b.baseUrl.Component}", name = "search-server")
 @RequestMapping("/search")
 public interface SearchApi {
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/SearchUUApi.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-@FeignClient(url = "${b2b.uu.base-url}", name = "b2b-server")
+@FeignClient(url = "${b2b.baseUrl.uu}", name = "b2b-server")
 @RequestMapping("/public")
 public interface SearchUUApi {
     /**

+ 5 - 8
applications/transfers/mall-api/src/test/resources/application.yml

@@ -1,9 +1,6 @@
 b2b:
-  inquiry:
-    base-url: https://test-inquiry.uuzcc.cn
-  Component:
-    base-url: https://test-mall.uuzcc.cn
-  product:
-    base-url: http://test-product.uuzcc.cn
-  uu:
-    base-url: https://test-b2b.uuzcc.cn
+  baseUrl:
+    inquiry: https://test-inquiry.uuzcc.cn
+    Component: https://test-mall.uuzcc.cn
+    product: http://test-product.uuzcc.cn
+    uu: https://test-b2b.uuzcc.cn