Merge pull request #130 from SonicCloudOrg/v1.3.1-release

V1.3.1 release
SonicCloudOrg · Feb 24, 2022 · 02d287c · 02d287c
2 parents f16fe9f + 2ce3abc
commit 02d287c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-bus</artifactId>
-    <version>1.3.1-beta</version>
+    <version>1.3.1-release</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/sonic-server-controller/pom.xml b/sonic-server-controller/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-controller</artifactId>
-    <version>1.3.1-beta</version>
+    <version>1.3.1-release</version>
     <packaging>jar</packaging>
 
     <!-- 依赖列表   -->

diff --git a/sonic-server-eureka/pom.xml b/sonic-server-eureka/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-eureka</artifactId>
-    <version>1.3.1-beta</version>
+    <version>1.3.1-release</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/sonic-server-folder/pom.xml b/sonic-server-folder/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-folder</artifactId>
-    <version>1.3.1-beta</version>
+    <version>1.3.1-release</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/sonic-server-gateway/pom.xml b/sonic-server-gateway/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-gateway</artifactId>
-    <version>1.3.1-beta</version>
+    <version>1.3.1-release</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/sonic-server-task/pom.xml b/sonic-server-task/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-task</artifactId>
-    <version>1.3.1-beta</version>
+    <version>1.3.1-release</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/sonic-server-transport/pom.xml b/sonic-server-transport/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-transport</artifactId>
-    <version>1.3.1-beta</version>
+    <version>1.3.1-release</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...rver-transport/src/main/java/org/cloud/sonic/transport/controller/ExchangeController.java b/...rver-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");