Merge branch 'master' of http://139.159.239.83:9093/ocr-cloud-platform/ocrCloudPlatformAdmin

src/main/resources/application-prod.yml

@@ -28,23 +28,17 @@ spring:
       max-request-size: 10240MB
 
   redis:
-    cluster:
-      nodes:
-        - 147.2.4.15:6379
-        - 147.2.4.15:6380
-        - 147.2.4.16:6379
-        - 147.2.4.16:6380
-        - 147.2.4.17:6379
-        - 147.2.4.17:6380
+    host: 147.2.4.16
+    port: 6379
     database: 0
     password: Docimax@123
     jedis:
       pool:
-        max-active: 128
+        max-active: 1024
         max-wait: 60s
         max-idle: 64
-        min-idle: 0
-      timeout: 5000
+        min-idle: 8
+    timeout: 5000
 
 eureka:
   client:
@@ -110,4 +104,4 @@ ocr:
       appKey: 9a7245235a8b4640a8714577f05ba9b2
 
 temp:
-  dir: /data/app/ocrAdmin/template
\ No newline at end of file
+  dir: /data/app/ocrAdmin/template

src/main/resources/templates/callSupervision/index.html

@@ -292,6 +292,7 @@
             url: gatewayUrl + '/server/getServerStatus',
             cellMinWidth: 80,
             height: '#tableContent-0',
+            loading: false,
             parseData: function (res) { // res 即为原始返回的数据
                 return {
                     "code": res.code, // 解析接口状态