diff --git a/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java b/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java index e5191540..95462057 100644 --- a/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java +++ b/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java @@ -68,7 +68,7 @@ public class IndexRouteController { public ModelAndView defaultMain(@PathVariable("menuIdAndDefaultHome") String menuIdAndDefaultHome) { ModelAndView mv = new ModelAndView("default-main"); UserInfoBO userInfoBO = securityComponent.getCurrentUser(); - mv.addObject("userUsername", userInfoBO.getUserUsername()); + mv.addObject("userName", userInfoBO.getUserName()); Map config = ConfigManager.getInstance().getConfig(); // 先加载系统短标题，没有加载主标题，没有加载配置文件系统标题 if (!StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_SHORT_TITLE))) { diff --git a/login-base/src/main/resources/templates/default-main.html b/login-base/src/main/resources/templates/default-main.html index 551f02f4..1dc40a9d 100644 --- a/login-base/src/main/resources/templates/default-main.html +++ b/login-base/src/main/resources/templates/default-main.html @@ -14,8 +14,8 @@ @@ -375,6 +376,8 @@ theme: 'dracula', matchBrackets: true, indentUnit : 4, + indentWithTabs: 4, + flattenSpans: false, tabSize : 4, extraKeys: { 'Shift-Tab': function (cm) { diff --git a/login-base/src/main/resources/templates/login/form/update.html b/login-base/src/main/resources/templates/login/form/update.html index dffe93d0..29a49772 100644 --- a/login-base/src/main/resources/templates/login/form/update.html +++ b/login-base/src/main/resources/templates/login/form/update.html @@ -16,6 +16,7 @@ .resource-img, .resource-img-path {text-align: center} .layui-btn-container .layui-btn {margin-bottom: 0px} .layui-table {width: auto;} + .CodeMirror {font-size : 13px;line-height: 150%;} @@ -377,6 +378,8 @@ theme: 'dracula', matchBrackets: true, indentUnit : 4, + indentWithTabs: 4, + flattenSpans: false, tabSize : 4, extraKeys: { 'Shift-Tab': function (cm) {