diff --git a/docker-compose.yml b/docker-compose.yml index f4e251da..3d4558a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: sonic-server-eureka: - image: "sonicorg/sonic-server-eureka:v1.3.1-beta" + image: "sonicorg/sonic-server-eureka:v1.3.1-release" hostname: sonic-server-eureka environment: - EUREKA_HOST=sonic-server-eureka @@ -12,7 +12,7 @@ services: ports: - "9090:9090" sonic-server-bus: - image: "sonicorg/sonic-server-bus:v1.3.1-beta" + image: "sonicorg/sonic-server-bus:v1.3.1-release" environment: - PROFILE=prod - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/ @@ -24,7 +24,7 @@ services: depends_on: - sonic-server-eureka sonic-server-gateway: - image: "sonicorg/sonic-server-gateway:v1.3.1-beta" + image: "sonicorg/sonic-server-gateway:v1.3.1-release" environment: - PROFILE=prod - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/ @@ -38,7 +38,7 @@ services: ports: - "8094:8094" sonic-server-controller: - image: "sonicorg/sonic-server-controller:v1.3.1-beta" + image: "sonicorg/sonic-server-controller:v1.3.1-release" environment: - PROFILE=prod - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/ @@ -51,7 +51,7 @@ services: - sonic-server-eureka - sonic-server-gateway sonic-server-folder: - image: "sonicorg/sonic-server-folder:v1.3.1-beta" + image: "sonicorg/sonic-server-folder:v1.3.1-release" environment: - PROFILE=prod - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/ @@ -68,7 +68,7 @@ services: - sonic-server-eureka - sonic-server-gateway sonic-server-task: - image: "sonicorg/sonic-server-task:v1.3.1-beta" + image: "sonicorg/sonic-server-task:v1.3.1-release" environment: - PROFILE=prod - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/ @@ -81,7 +81,7 @@ services: - sonic-server-eureka - sonic-server-gateway sonic-server-transport: - image: "sonicorg/sonic-server-transport:v1.3.1-beta" + image: "sonicorg/sonic-server-transport:v1.3.1-release" environment: - PROFILE=prod - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/ diff --git a/sonic-server-bus/pom.xml b/sonic-server-bus/pom.xml index 6c570c69..b0b3c755 100644 --- a/sonic-server-bus/pom.xml +++ b/sonic-server-bus/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-bus - 1.3.1-beta + 1.3.1-release jar diff --git a/sonic-server-controller/pom.xml b/sonic-server-controller/pom.xml index 284a9e4a..e8a62509 100644 --- a/sonic-server-controller/pom.xml +++ b/sonic-server-controller/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-controller - 1.3.1-beta + 1.3.1-release jar diff --git a/sonic-server-eureka/pom.xml b/sonic-server-eureka/pom.xml index 523a9a66..fe256a4a 100644 --- a/sonic-server-eureka/pom.xml +++ b/sonic-server-eureka/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-eureka - 1.3.1-beta + 1.3.1-release jar diff --git a/sonic-server-folder/pom.xml b/sonic-server-folder/pom.xml index bd26c352..81e3ba10 100644 --- a/sonic-server-folder/pom.xml +++ b/sonic-server-folder/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-folder - 1.3.1-beta + 1.3.1-release jar diff --git a/sonic-server-gateway/pom.xml b/sonic-server-gateway/pom.xml index 2992a8af..f54b5983 100644 --- a/sonic-server-gateway/pom.xml +++ b/sonic-server-gateway/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-gateway - 1.3.1-beta + 1.3.1-release jar diff --git a/sonic-server-task/pom.xml b/sonic-server-task/pom.xml index fa81f8c6..d5e3c3ec 100644 --- a/sonic-server-task/pom.xml +++ b/sonic-server-task/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-task - 1.3.1-beta + 1.3.1-release jar diff --git a/sonic-server-transport/pom.xml b/sonic-server-transport/pom.xml index aaf6304d..2566aff5 100644 --- a/sonic-server-transport/pom.xml +++ b/sonic-server-transport/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-transport - 1.3.1-beta + 1.3.1-release jar diff --git a/sonic-server-transport/src/main/java/org/cloud/sonic/transport/controller/ExchangeController.java b/sonic-server-transport/src/main/java/org/cloud/sonic/transport/controller/ExchangeController.java index 0273b965..6cd3f2aa 100644 --- a/sonic-server-transport/src/main/java/org/cloud/sonic/transport/controller/ExchangeController.java +++ b/sonic-server-transport/src/main/java/org/cloud/sonic/transport/controller/ExchangeController.java @@ -22,7 +22,7 @@ public RespModel reboot(@RequestParam(name = "id") int id) { RespModel device = controllerFeignClient.findDeviceById(id); if (device.getCode() == 2000) { LinkedHashMap d = (LinkedHashMap) device.getData(); - RespModel agent = controllerFeignClient.findKeyById((Integer) d.get("agentId")); + RespModel agent = controllerFeignClient.findAgentById((Integer) d.get("agentId")); if (agent.getCode() == 2000) { JSONObject jsonObject = new JSONObject(); jsonObject.put("msg", "reboot");