diff --git a/pom.xml b/pom.xml index de694be..3f08dab 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ cn.hutool hutool-all - 4.1.8 + [4.1.12,) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9475760..4b79210 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -86,7 +86,7 @@ spring: jpa: properties: hibernate: -# show_sql: true + show_sql: true # format_sql: true dialect: org.hibernate.dialect.MySQL5InnoDBDialect hibernate: diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 90ee656..8ba341f 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -7,7 +7,7 @@ %black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n) - UTF-8 + utf-8 diff --git a/src/main/resources/templates/job/log.html b/src/main/resources/templates/job/log.html index 1b35aa8..38bb73b 100644 --- a/src/main/resources/templates/job/log.html +++ b/src/main/resources/templates/job/log.html @@ -99,7 +99,13 @@ }); $("td[data-field$='times']").children().each(function () { - $(this).html(""+$(this).text()+""); + if($(this).text()<100){ + $(this).html(""+$(this).text()+""); + } else if($(this).text()<1000){ + $(this).html(""+$(this).text()+""); + } else{ + $(this).html(""+$(this).text()+""); + } }); } }); diff --git a/src/main/resources/templates/system/log/index.html b/src/main/resources/templates/system/log/index.html index 5576ddc..71cc55e 100644 --- a/src/main/resources/templates/system/log/index.html +++ b/src/main/resources/templates/system/log/index.html @@ -74,13 +74,19 @@ ,{field:'operation', title: '描述',width:135} ,{field:'method', title: '请求方法'} ,{field:'params', title: '请求参数'} - ,{field:'time', align:'center', title: '耗时(毫秒)', width:90} + ,{field:'time', align:'center', title: '耗时(毫秒)', width:96} ,{field:'createTime',width:160, title: '创建时间'} ] ] ,done:function(res, curr, count) { //res 接口返回的信息 $("td[data-field$='time']").children().each(function () { - $(this).html(""+$(this).text()+""); + if($(this).text()<100){ + $(this).html(""+$(this).text()+""); + } else if($(this).text()<1000){ + $(this).html(""+$(this).text()+""); + } else{ + $(this).html(""+$(this).text()+""); + } }); } }); diff --git a/src/main/resources/templates/system/menu/index.html b/src/main/resources/templates/system/menu/index.html index 37f1a8e..5c099b9 100644 --- a/src/main/resources/templates/system/menu/index.html +++ b/src/main/resources/templates/system/menu/index.html @@ -107,7 +107,7 @@ $(this).html(""); }); $("td[data-field$='soft']").children().each(function () { - $(this).html(""+$(this).text()+""); + $(this).html(""+$(this).text()+""); }); } }); diff --git a/src/main/resources/templates/system/online/index.html b/src/main/resources/templates/system/online/index.html index b6e2bf3..af4fa58 100644 --- a/src/main/resources/templates/system/online/index.html +++ b/src/main/resources/templates/system/online/index.html @@ -33,7 +33,7 @@ {field: 'id', align: 'center', width: 130, title: 'sessionID'} , {field: 'username', title: '用户昵称'} , {field: 'host', title: '主机地址'} - , {field: 'location', title: '所在地'} + , {field: 'location', title: '所在地',width:190} , {field: 'status',width: 80, align: 'center',title: '状态'} , {field: 'startTimestamp',width: 170, title: '登录时间'} , {field: 'lastAccessTime',width: 170, title: '最近登录'}