fix: resource output json error (#5160)

Co-authored-by: west <[email protected]>
apache · Aug 23, 2024 · 0d1c3f8 · 0d1c3f8
1 parent 074ae7e
commit 0d1c3f8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...er-common/src/main/java/org/apache/linkis/manager/common/entity/resource/CPUResource.java b/...er-common/src/main/java/org/apache/linkis/manager/common/entity/resource/CPUResource.java
@@ -128,7 +128,7 @@ public int compare(Resource r) {
 
   @Override
   public String toJson() {
-    return String.format(" \"cpu\":%s ", cores);
+    return String.format(" {\"cpu\":%s} ", cores);
   }
 
   @Override

diff --git a/.../src/main/java/org/apache/linkis/manager/common/entity/resource/LoadInstanceResource.java b/.../src/main/java/org/apache/linkis/manager/common/entity/resource/LoadInstanceResource.java
@@ -170,7 +170,7 @@ public String toJson() {
   public String toString() {
     return String.format(
         "Number of instances(实例数)：%d，(RAM)内存：%s ,cpu: %s",
-        this.getInstances(), this.getMemory(), this.getCores());
+        this.getInstances(), ByteTimeUtils.bytesToString(this.getMemory()), this.getCores());
   }
 
   public long getMemory() {

diff --git a/...r-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadResource.java b/...r-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadResource.java
@@ -125,7 +125,7 @@ public int compare(Resource r) {
   @Override
   public String toJson() {
     return String.format(
-        "{\"memory\":%s,\"cpu\":%d}", ByteTimeUtils.bytesToString(this.memory), this.cores);
+        "{\"memory\":\"%s\",\"cpu\":%d}", ByteTimeUtils.bytesToString(this.memory), this.cores);
   }
 
   @Override

diff --git a/...common/src/main/java/org/apache/linkis/manager/common/entity/resource/MemoryResource.java b/...common/src/main/java/org/apache/linkis/manager/common/entity/resource/MemoryResource.java
@@ -112,7 +112,7 @@ public boolean equalsTo(Resource resource) {
 
   @Override
   public String toJson() {
-    return " \"memory\":\"" + ByteTimeUtils.bytesToString(memory) + " ";
+    return " {\"memory\":\"" + ByteTimeUtils.bytesToString(memory) + "\"} ";
   }
 
   @Override