diff --git a/Jenkinsfile b/Jenkinsfile index 0b57438..32242c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,6 +66,7 @@ pipeline { --name \${CONTAINER_NAME} \ --network sczx-net \ -p 8088:8088 \ + -e SPRING_PROFILES_ACTIVE=test \ -e JAVA_OPTS="-Xms256m -Xmx512m -Duser.timezone=Asia/Shanghai" \ --restart always \ \${DOCKER_IMAGE} diff --git a/src/main/java/com/sczx/order/thirdpart/facade/CarFacade.java b/src/main/java/com/sczx/order/thirdpart/facade/CarFacade.java index 43a97f6..793784e 100644 --- a/src/main/java/com/sczx/order/thirdpart/facade/CarFacade.java +++ b/src/main/java/com/sczx/order/thirdpart/facade/CarFacade.java @@ -6,7 +6,7 @@ import com.sczx.order.thirdpart.dto.req.CarQueryConditionReq; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(name = "sczx-car") +@FeignClient(name = "sczx-car", url = "${sczx-car.ribbon.listOfServers:}") public interface CarFacade { @RequestMapping("/carModel/getCarModelByModelId") diff --git a/src/main/java/com/sczx/order/thirdpart/facade/StoreFacade.java b/src/main/java/com/sczx/order/thirdpart/facade/StoreFacade.java index 109e595..18f08b4 100644 --- a/src/main/java/com/sczx/order/thirdpart/facade/StoreFacade.java +++ b/src/main/java/com/sczx/order/thirdpart/facade/StoreFacade.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -@FeignClient(name = "sczx-store") +@FeignClient(name = "sczx-store", url = "${sczx-store.ribbon.listOfServers:}") public interface StoreFacade { @RequestMapping("/pub/getStoreById") diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 0000000..f415879 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,7 @@ +sczx-store: + ribbon: + listOfServers: http://115.190.8.52:8082 + +sczx-car: + ribbon: + listOfServers: http://115.190.8.52:8083 \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..e69de29