Merge branch 'feature/20210723_促销满减活动购物车提示语改造新_wanghanghang' into qa

order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java

@@ -29,7 +29,7 @@ import com.freemud.application.sdk.api.promotioncenter.response.PromotionRespons
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(name = "promotion-service", url = "http://localhost:8003")
+@FeignClient(name = "promotion-service", url = "${saas.activityclient.feign.url}")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface PromotionDiscountClient {
 

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 //券活动测试 地址：http://115.159.65.101:8003 线上 http://10.51.0.7:8003
-@FeignClient(name = "promotion-service", url = "http://localhost:8003")
+@FeignClient(name = "promotion-service", url = "${saas.activityclient.feign.url}")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface ActivityClient {