Merge remote-tracking branch 'origin/develop' into develop

DESKTOP-AO0VKC8\mahua
2 parents 72a2c94f ffa07096
Showing 2 changed files with 13 additions and 10 deletions
src/main/java/com/huaheng/pc/monitor/apilog/controller/ApiLogController.java
src/main/resources/templates/monitor/apilog/apilog.html
@@ -49,7 +49,7 @@ public class ApiLogController extends BaseController {
     @RequiresPermissions("monitor:apiLog:view")
     @GetMapping()
     public String apiLog() {
-        return prefix + "/apiLog";
+        return prefix + "/apilog";
     }
@@ -53,8 +53,8 @@
                             </select>
                         </li>
                         <li>
-                            <label>响应时间</label>
-                            <input type="number" name="paramDuration" placeholder="1000毫秒"/>
+                            <label>响应时间 &gt; </label>
+                            <input type="text" name="paramDuration" placeholder="1000毫秒"/>
                         </li>
                         <li class="time">
                             <label>请求时间：</label>
@@ -199,21 +199,22 @@
                         return actions.join(" ")
                     }
                 },
-
+                /**
                 {
                     field: 'requestHeader',
-                    title: '请求头',
-                    visible: false
+                    title: '请求头'
                 },
+                 **/
                 {
                     field: 'requestBody',
                     title: '请求内容',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        if(value == undefined)
+                        if(value == undefined || value == '')
                             value = " "
-                        actions.push('<pre style="white-space: pre-wrap; width:350px" ondblclick="copy(this)" title="双击复制">'+value+ '</pre>')
+                        else
+                            actions.push('<pre style="max-height:100px; white-space: pre-wrap; width:350px" ondblclick="copy(this)" title="双击复制">'+value+ '</pre>')
                         return actions.join(" ")
                     }
                 },
@@ -230,7 +231,8 @@
                         var actions = [];
                         if(value == undefined)
                             value = " "
-                        actions.push('<pre style="white-space: pre-wrap; width:350px" ondblclick="copy(this)" title="双击复制">'+value+ '</pre>')
+                        else
+                            actions.push('<pre style="vertical-align: top; max-height:100px; white-space: pre-wrap; width:350px" ondblclick="copy(this)" title="双击复制">'+value+ '</pre>')
                         return actions.join(" ")
                     }
                 },
@@ -242,7 +244,8 @@
                         var actions = [];
                         if(value == undefined)
                             value = " "
-                        actions.push('<span style="color:red">'+value+ '</span>')
+                        else
+                            actions.push('<span style="color:red">'+value+ '</span>')
                         return actions.join(" ")
                     }
                 }