diff --git a/pom.xml b/pom.xml index 2c8b1bd..41d92d8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.langpy ko-time - 2.4.5 + 2.4.6 KoTime A springboot tool for tracking the paths of the methods,which can help you find method's performances easily. diff --git a/src/main/java/cn/langpy/kotime/config/DefaultConfig.java b/src/main/java/cn/langpy/kotime/config/DefaultConfig.java index 631dad7..9de19b7 100644 --- a/src/main/java/cn/langpy/kotime/config/DefaultConfig.java +++ b/src/main/java/cn/langpy/kotime/config/DefaultConfig.java @@ -46,6 +46,7 @@ public class DefaultConfig { private Integer mailThreshold; private String mailScope; private String propertyFile; + private Boolean abbreviationEnable; public String getPropertyFile() { return propertyFile; @@ -312,4 +313,11 @@ public class DefaultConfig { this.paramAnalyse = paramAnalyse; } + public Boolean getAbbreviationEnable() { + return abbreviationEnable; + } + + public void setAbbreviationEnable(Boolean abbreviationEnable) { + this.abbreviationEnable = abbreviationEnable; + } } diff --git a/src/main/java/cn/langpy/kotime/config/LoadConfig.java b/src/main/java/cn/langpy/kotime/config/LoadConfig.java index 6f41513..9b6d083 100644 --- a/src/main/java/cn/langpy/kotime/config/LoadConfig.java +++ b/src/main/java/cn/langpy/kotime/config/LoadConfig.java @@ -117,6 +117,7 @@ public class LoadConfig { config.setParamAnalyse(defaultConfig.getParamAnalyse() == null ? true : defaultConfig.getParamAnalyse()); config.setDataReset(defaultConfig.getDataReset() == null ? false : defaultConfig.getDataReset()); config.setVersionNotice(defaultConfig.getVersionNotice() == null ? true : defaultConfig.getVersionNotice()); + config.setAbbreviationEnable(defaultConfig.getAbbreviationEnable() == null ? true : defaultConfig.getAbbreviationEnable()); config.setStaticToken(defaultConfig.getStaticToken()); config.setMailEnable(defaultConfig.getMailEnable()); diff --git a/src/main/java/cn/langpy/kotime/controller/KoInitController.java b/src/main/java/cn/langpy/kotime/controller/KoInitController.java index 224b513..3b2176e 100644 --- a/src/main/java/cn/langpy/kotime/controller/KoInitController.java +++ b/src/main/java/cn/langpy/kotime/controller/KoInitController.java @@ -144,6 +144,8 @@ public class KoInitController { line = line.replace("KoTimeUtil", KoTimeUtil); } else if (line.indexOf("koTimeVersionValue") > -1) { line = line.replace("koTimeVersionValue", "'" + KoUtil.getVerssion()+ "'"); + }else if (line.indexOf("abbreviationEnableValue") > -1) { + line = line.replace("abbreviationEnableValue", Context.getConfig().getAbbreviationEnable()+""); } return line; } diff --git a/src/main/java/cn/langpy/kotime/controller/KoTimeController.java b/src/main/java/cn/langpy/kotime/controller/KoTimeController.java index 66772d7..964451e 100644 --- a/src/main/java/cn/langpy/kotime/controller/KoTimeController.java +++ b/src/main/java/cn/langpy/kotime/controller/KoTimeController.java @@ -124,6 +124,9 @@ public class KoTimeController { if (config.getMailEnable() != null) { koTimeConfig.setMailEnable(config.getMailEnable()); } + if (config.getAbbreviationEnable() != null) { + koTimeConfig.setAbbreviationEnable(config.getAbbreviationEnable()); + } if (config.getThreshold() != null) { koTimeConfig.setThreshold(config.getThreshold()); } diff --git a/src/main/resources/META-INF/spring-configuration-metadata.json b/src/main/resources/META-INF/spring-configuration-metadata.json index 35a662b..a4ceb2f 100644 --- a/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/src/main/resources/META-INF/spring-configuration-metadata.json @@ -35,6 +35,13 @@ "description": "to print log in console", "sourceType": "cn.langpy.kotime.config.DefaultConfig" }, + { + "name": "ko-time.abbreviation-enable", + "type": "java.lang.Boolean", + "defaultValue": true, + "description": "to abbreviate the interface name", + "sourceType": "cn.langpy.kotime.config.DefaultConfig" + }, { "name": "ko-time.language", "defaultValue": "chinese", diff --git a/src/main/resources/kostatic/dict/chinese.properties b/src/main/resources/kostatic/dict/chinese.properties index 13d129b..5898f16 100644 --- a/src/main/resources/kostatic/dict/chinese.properties +++ b/src/main/resources/kostatic/dict/chinese.properties @@ -82,6 +82,7 @@ tab.configuration.kotime-config.enable-kotime-tip=开启KoTime tab.configuration.kotime-config.enable-exception-tip=开启异常检测 tab.configuration.kotime-config.enable-console-tip=开启控制台日志 tab.configuration.kotime-config.enable-email-tip=开启邮件通知 +tab.configuration.kotime-config.enable-abbreviation-tip=开启接口缩写 tab.configuration.kotime-config.select-language-tip=语言选择 tab.configuration.kotime-config.select-language-chinese=中文 tab.configuration.kotime-config.select-language-english=英文 diff --git a/src/main/resources/kostatic/dict/english.properties b/src/main/resources/kostatic/dict/english.properties index b25b1c3..74f4834 100644 --- a/src/main/resources/kostatic/dict/english.properties +++ b/src/main/resources/kostatic/dict/english.properties @@ -82,6 +82,7 @@ tab.configuration.kotime-config.enable-kotime-tip=KoTime switch tab.configuration.kotime-config.enable-exception-tip=exception switch tab.configuration.kotime-config.enable-console-tip=console log switch tab.configuration.kotime-config.enable-email-tip=email switch +tab.configuration.kotime-config.enable-abbreviation-tip=abbreviation switch tab.configuration.kotime-config.select-language-tip=language switch tab.configuration.kotime-config.select-language-chinese=Chinese tab.configuration.kotime-config.select-language-english=English diff --git a/src/main/resources/kotime.html b/src/main/resources/kotime.html index 5f91969..9c52ed8 100644 --- a/src/main/resources/kotime.html +++ b/src/main/resources/kotime.html @@ -19,6 +19,7 @@ var globalToken = staticTokenVisit ? staticToken : sessionStorage.getItem("kotimeToken"); let globalIsLogin = false; let koTimeVersion = koTimeVersionValue; + let abbreviationEnable = abbreviationEnableValue; function concatToken(url) { if (globalNeedLogin) { @@ -73,6 +74,7 @@ let element = getDom('apiList'); html = ''; for (let i = 0; i < data.length; i++) { + let simName = data[i]['name'].replace('.','#'); let className = data[i]['className']; let methodName = data[i]['methodName']; let avgRunTime = data[i]['avgRunTime']; @@ -82,9 +84,17 @@ let apiId = className + "." + methodName; let color = avgRunTime > globalThreshold ? 'danger' : 'success'; if (methodType == 'Controller' && routeName != null && routeName != '') { - html += "
  • " + className + "#" + methodName + " (" + routeName + ")   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + if (abbreviationEnable) { + html += "
  • " + simName + " (" + routeName + ")   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + }else { + html += "
  • " + className + "#" + methodName + " (" + routeName + ")   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + } } else { - html += "
  • " + className + "#" + methodName + "   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + if (abbreviationEnable) { + html += "
  • " + simName + "   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + }else { + html += "
  • " + className + "#" + methodName + "   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + } } } ; @@ -173,6 +183,14 @@ }) }; + getDom('abbreviationEnable').onclick = function () { + post(concatToken('contextPath/koTime/updateConfig'),{abbreviationEnable: getDom('abbreviationEnable').checked},function (res) { + noticeSuccess('{{tab.configuration.kotime-config.change-ok-tip}}') + },function () { + noticeError('{{tab.configuration.kotime-config.change-fail-tip}}') + }) + }; + getDom('languageSwitch').onclick = function () { let selectedObj = getDom('languageSwitch'); post(concatToken('contextPath/koTime/updateConfig'),{language: selectedObj.options[selectedObj.selectedIndex].value},function (res) { @@ -217,7 +235,8 @@ kotimeEnableDom.checked = kotimeEnable; let apiTip = getDom('apiTip'); - apiTip.innerHTML = kotimeEnable == true ? "{{tab.summary.bottom-normal-tip}}" : "{{tab.summary.bottom-close-tip}}"; + apiTip.innerHTML = kotimeEnable == true ? "{{tab.summary.bottom-normal-tip}}" : + "{{tab.summary.bottom-close-tip}}"; let threshold = data['threshold']; @@ -232,6 +251,10 @@ let mailEnableDom = getDom('mailEnable'); mailEnableDom.checked = mailEnable; + let abbreviationEnable = data['abbreviationEnable']; + let abbreviationEnableDom = getDom('abbreviationEnable'); + abbreviationEnableDom.checked = abbreviationEnable; + let language = data['language']; $("#languageSwitch").val(language) }); @@ -302,7 +325,8 @@ {'name': '{{tab.interface.interface-list.show-metric.min}}:' + data['minRunTime'] + ' ms'} ]; if (data['exceptionNum'] != null && data['exceptionNum'] > 0) { - data['data'].push({'name': '{{tab.interface.interface-list.show-metric.exception-num}}:' + data['exceptionNum'] + ' {{tab.interface.interface-list.show-metric.exception-unit}}'}); + data['data'].push({'name': '{{tab.interface.interface-list.show-metric.exception-num}}:' + data['exceptionNum'] + + ' {{tab.interface.interface-list.show-metric.exception-unit}}'}); } data["dblclick"] = "paramGraph"; return data; @@ -398,6 +422,7 @@ let element = getDom('apiList'); html = ''; for (let i = 0; i < data.length; i++) { + let simName = data[i]['name'].replace('.','#'); let className = data[i]['className']; let methodName = data[i]['methodName']; let avgRunTime = data[i]['avgRunTime']; @@ -407,9 +432,17 @@ let color = avgRunTime > globalThreshold ? 'danger' : 'success'; if (methodType == 'Controller' && routeName != null && routeName != '') { - html += "
  • " + className + "#" + methodName + " (" + routeName + ")   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + if (abbreviationEnable) { + html += "
  • " + simName + " (" + routeName + ")   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + }else { + html += "
  • " + className + "#" + methodName + " (" + routeName + ")   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + } } else { - html += "
  • " + className + "#" + methodName + "   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + if (abbreviationEnable) { + html += "
  • " + simName + "   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + }else { + html += "
  • " + className + "#" + methodName + "   {{tab.interface.interface-list.avg-tip}} " + avgRunTime + " ms
  • "; + } } } ; @@ -901,6 +934,8 @@

    + +