myhgo
diff --git a/‎redis-manager-dashboard/src/main/java/com/newegg/ec/redis/service/impl/RdbAnalyzeResultService.java
+3 b/‎redis-manager-dashboard/src/main/java/com/newegg/ec/redis/service/impl/RdbAnalyzeResultService.java
+3
diff --git a/‎redis-manager-dashboard/src/main/resources/static/css/app.f61d2722f1dd870e46b6e2210fbfd3c7.css renamed to ‎redis-manager-dashboard/src/main/resources/static/css/app.0a7fdf918bd5f0613edf8f97cb196404.css
+2-2 b/‎redis-manager-dashboard/src/main/resources/static/css/app.f61d2722f1dd870e46b6e2210fbfd3c7.css renamed to ‎redis-manager-dashboard/src/main/resources/static/css/app.0a7fdf918bd5f0613edf8f97cb196404.css
+2-2
diff --git a/‎redis-manager-dashboard/src/main/resources/static/css/app.0a7fdf918bd5f0613edf8f97cb196404.css.gz
52.7 KB b/‎redis-manager-dashboard/src/main/resources/static/css/app.0a7fdf918bd5f0613edf8f97cb196404.css.gz
52.7 KB
diff --git a/‎redis-manager-dashboard/src/main/resources/static/css/app.f61d2722f1dd870e46b6e2210fbfd3c7.css.map renamed to ‎redis-manager-dashboard/src/main/resources/static/css/app.0a7fdf918bd5f0613edf8f97cb196404.css.map
+1-1 b/‎redis-manager-dashboard/src/main/resources/static/css/app.f61d2722f1dd870e46b6e2210fbfd3c7.css.map renamed to ‎redis-manager-dashboard/src/main/resources/static/css/app.0a7fdf918bd5f0613edf8f97cb196404.css.map
+1-1
diff --git a/‎redis-manager-dashboard/src/main/resources/static/css/app.f61d2722f1dd870e46b6e2210fbfd3c7.css.gz
-52.7 KB b/‎redis-manager-dashboard/src/main/resources/static/css/app.f61d2722f1dd870e46b6e2210fbfd3c7.css.gz
-52.7 KB
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.28b845b4830b8c99b81f.js
+2 b/‎redis-manager-dashboard/src/main/resources/static/js/app.28b845b4830b8c99b81f.js
+2
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.28b845b4830b8c99b81f.js.gz
42.4 KB b/‎redis-manager-dashboard/src/main/resources/static/js/app.28b845b4830b8c99b81f.js.gz
42.4 KB
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.28b845b4830b8c99b81f.js.map
+1 b/‎redis-manager-dashboard/src/main/resources/static/js/app.28b845b4830b8c99b81f.js.map
+1
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.900c48b767135cc67bd9.js
-2 b/‎redis-manager-dashboard/src/main/resources/static/js/app.900c48b767135cc67bd9.js
-2
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.900c48b767135cc67bd9.js.gz
-42.3 KB b/‎redis-manager-dashboard/src/main/resources/static/js/app.900c48b767135cc67bd9.js.gz
-42.3 KB
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.900c48b767135cc67bd9.js.map
-1 b/‎redis-manager-dashboard/src/main/resources/static/js/app.900c48b767135cc67bd9.js.map
-1
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.afd53ba53203bd7edda7.js
-2 b/‎redis-manager-dashboard/src/main/resources/static/js/app.afd53ba53203bd7edda7.js
-2
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.afd53ba53203bd7edda7.js.gz
-42.3 KB b/‎redis-manager-dashboard/src/main/resources/static/js/app.afd53ba53203bd7edda7.js.gz
-42.3 KB
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/app.afd53ba53203bd7edda7.js.map
-1 b/‎redis-manager-dashboard/src/main/resources/static/js/app.afd53ba53203bd7edda7.js.map
-1
diff --git a/‎redis-manager-dashboard/src/main/resources/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
+1-1 b/‎redis-manager-dashboard/src/main/resources/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
+1-1
diff --git a/‎redis-manager-dashboard/src/main/resources/templates/index.html
+1-1 b/‎redis-manager-dashboard/src/main/resources/templates/index.html
+1-1
diff --git a/‎redis-manager-ui/redis-manager-vue/src/components/rct/JobResultDetail.vue
+1-1 b/‎redis-manager-ui/redis-manager-vue/src/components/rct/JobResultDetail.vue
+1-1
diff --git a/‎redis-manager-ui/redis-manager-vue/src/components/rct/chart/Table.vue
+9-1 b/‎redis-manager-ui/redis-manager-vue/src/components/rct/chart/Table.vue
+9-1
diff --git a/‎redis-manager-ui/redis-manager-vue/src/components/rct/chart/Top1000KeysByTypeTable.vue
+1 b/‎redis-manager-ui/redis-manager-vue/src/components/rct/chart/Top1000KeysByTypeTable.vue
+1
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.util.TypeUtils;
 import com.newegg.ec.redis.dao.IRdbAnalyzeResult;
 import com.newegg.ec.redis.entity.Cluster;
 import com.newegg.ec.redis.entity.RDBAnalyze;
@@ -188,6 +189,7 @@ private String combinePrefixKeyByType(String result,String type){
         List<PrefixResult> prefixKeyList =  JSONObject.parseArray(result,PrefixResult.class);
         List<PrefixResult> prefixResultList = combinePrefixByType(prefixKeyList,type);
         List<PrefixResult> finalPrefixResultList = prefixResultList.stream().map(prefixResult -> setPrefixKey(prefixResult,true)).collect(Collectors.toList());
+        TypeUtils.compatibleWithJavaBean = true;
         return JSONObject.toJSONString(finalPrefixResultList, SerializerFeature.NotWriteDefaultValue);
     }
 
@@ -627,6 +629,7 @@ public List<RDBAnalyzeResult> getAllAnalyzeResult(List<RDBAnalyzeResult> results
     static class PrefixResult{
         private String prefixKey;
         private int noTTL = 0;
+
         private int TTL = 0 ;
         private long memorySize;
         private long keyCount;
 
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>redis-manager</title><link rel="shortcut icon" type=image/x-icon href=/static/logo.ico><link rel="shortcut icon" href=/logo.ico><link href=/static/css/app.f61d2722f1dd870e46b6e2210fbfd3c7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.4c9e46c331d20b46d8af.js></script><script type=text/javascript src=/static/js/app.900c48b767135cc67bd9.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>redis-manager</title><link rel="shortcut icon" type=image/x-icon href=/static/logo.ico><link rel="shortcut icon" href=/logo.ico><link href=/static/css/app.0a7fdf918bd5f0613edf8f97cb196404.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.4c9e46c331d20b46d8af.js></script><script type=text/javascript src=/static/js/app.28b845b4830b8c99b81f.js></script></body></html>
@@ -99,7 +99,7 @@ export default {
         }, {
           label: 'TTL',
           sort: true,
-          prop: 'tTL',
+          prop: 'TTL',
           type: Number,
           formatter: this.formatterCount
         }, {
 
@@ -71,7 +71,9 @@ export default {
       if(this.tableObj.columns.filter(c=>c=='noTTL')){
          this.tableData = this.tableData.sort(this.compareValue('noTTL','descending'));
       }
-     
+      if(this.tableObj.columns.filter(c=>c=='keyCount')){
+         this.tableData = this.tableData.sort(this.compareValue('keyCount','descending'));
+      }
       this.length = this.tableData.length
       this.pageData = this.tableData.slice((this.currentPage - 1) * this.pagesize, this.currentPage * this.pagesize)
     },
@@ -82,6 +84,12 @@ export default {
     },
     compareValue (property, order) {
       return function (obj1, obj2) {
+        if(!obj2[property]){
+          obj2[property]= 0;
+        }
+          if(!obj1[property]){
+          obj1[property]= 0;
+        }
         if (order === 'ascending') {
           return parseInt(obj1[property]) - parseInt(obj2[property])
         }
 
@@ -49,6 +49,7 @@ export default {
           key: value.key
         }
       })
+      this.tableData = this.tableData.sort(this.compareValue('itemCount', 'descending'))
       this.pageData = this.tableData.slice((this.currentPage - 1) * this.pagesize, this.currentPage * this.pagesize)
     },
     compareValue (property, order) {
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>redis-manager</title><link rel="shortcut icon" type=image/x-icon href=/static/logo.ico><link rel="shortcut icon" href=/logo.ico><link href=/static/css/app.f61d2722f1dd870e46b6e2210fbfd3c7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.4c9e46c331d20b46d8af.js></script><script type=text/javascript src=/static/js/app.900c48b767135cc67bd9.js></script></body></html>
	`1`	+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>redis-manager</title><link rel="shortcut icon" type=image/x-icon href=/static/logo.ico><link rel="shortcut icon" href=/logo.ico><link href=/static/css/app.0a7fdf918bd5f0613edf8f97cb196404.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.4c9e46c331d20b46d8af.js></script><script type=text/javascript src=/static/js/app.28b845b4830b8c99b81f.js></script></body></html>
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ export default {`
`49`	`49`	`key: value.key`
`50`	`50`	`}`
`51`	`51`	`})`
	`52`	`+ this.tableData = this.tableData.sort(this.compareValue('itemCount', 'descending'))`
`52`	`53`	`this.pageData = this.tableData.slice((this.currentPage - 1) * this.pagesize, this.currentPage * this.pagesize)`
`53`	`54`	`},`
`54`	`55`	`compareValue (property, order) {`