Selaa lähdekoodia

更新 ByteConverter 对应的变化

reghao 5 kuukautta sitten
vanhempi
commit
d9d3bf2ebf

+ 4 - 4
common/src/main/java/cn/reghao/devops/common/machine/MemoryStat.java

@@ -19,9 +19,9 @@ public class MemoryStat {
 
     public MemoryStat(MemoryUsage memoryUsage) {
         ByteConverter convert = new ByteConverter();
-        this.init = convert.convertStr(ByteType.Bytes, ByteType.MiB, memoryUsage.getInit());
-        this.max = convert.convertStr(ByteType.Bytes, ByteType.MiB, memoryUsage.getMax());
-        this.used = convert.convertStr(ByteType.Bytes, ByteType.MiB, memoryUsage.getUsed());
-        this.committed = convert.convertStr(ByteType.Bytes, ByteType.MiB, memoryUsage.getCommitted());
+        this.init = convert.convert(memoryUsage.getInit());
+        this.max = convert.convert(memoryUsage.getMax());
+        this.used = convert.convert(memoryUsage.getUsed());
+        this.committed = convert.convert(memoryUsage.getCommitted());
     }
 }

+ 3 - 3
mgr/src/main/java/cn/reghao/devops/mgr/build/service/impl/BuildDirServiceImpl.java

@@ -47,11 +47,11 @@ public class BuildDirServiceImpl implements BuildDirService {
         String machineIpv4 = Machine.IPV4;
         String mountedOn = diskDetail.getMountedOn();
         long total = diskDetail.getTotal();
-        String totalStr = converter.convert(ByteType.Bytes, total);
+        String totalStr = converter.convert(total);
         long used = diskDetail.getUsed();
-        String usedStr = converter.convertStr(ByteType.Bytes, ByteType.MiB, used);
+        String usedStr = converter.convert(used);
         long avail = diskDetail.getAvail();
-        String availStr = converter.convertStr(ByteType.Bytes, ByteType.MiB, avail);
+        String availStr = converter.convert(avail);
 
         BuildDir buildDir = new BuildDir(machineId, machineIpv4, localBuildDir, mountedOn,
                 total, totalStr, used, usedStr, avail, availStr);