From ecf0ad625cdb833b81b6b29bb206d1036d8f3052 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 30 Jul 2021 19:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=9F=AD=E6=A0=87=E9=A2=98=E4=B8=8E=E7=9F=ADLOGO=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../login/base/consts/IUserCenterConst.java | 6 +- .../route/IndexRouteController.java | 22 ++-- .../login/base/pojo/vos/config/ConfigVO.java | 21 +++- .../resources/templates/config/update.html | 114 ++++++++++++++++-- .../resources/templates/default-main.html | 4 +- 5 files changed, 140 insertions(+), 27 deletions(-) diff --git a/login-base/src/main/java/ink/wgink/login/base/consts/IUserCenterConst.java b/login-base/src/main/java/ink/wgink/login/base/consts/IUserCenterConst.java index add55b75..f95797f8 100644 --- a/login-base/src/main/java/ink/wgink/login/base/consts/IUserCenterConst.java +++ b/login-base/src/main/java/ink/wgink/login/base/consts/IUserCenterConst.java @@ -40,7 +40,7 @@ public interface IUserCenterConst { /** * 系统简称，菜单上方名称 */ - String SYSTEM_SIMPLE_TITLE = "systemSimpleTitle"; + String SYSTEM_SHORT_TITLE = "systemShortTitle"; /** * 版权年份 */ @@ -65,6 +65,10 @@ public interface IUserCenterConst { * 系统LOGO */ String SYSTEM_LOGO = "systemLogo"; + /** + * 系统短LOGO，菜单上方LOGO + */ + String SYSTEM_SHORT_LOGO = "systemShortLogo"; /** * 扫码登录类型 */ 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 7f8aed1a..380ab757 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 @@ -63,21 +63,19 @@ public class IndexRouteController { UserInfoBO userInfoBO = securityComponent.getCurrentUser(); mv.addObject("userUsername", userInfoBO.getUserUsername()); Map config = ConfigManager.getInstance().getConfig(); - if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_TITLE)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_TITLE).toString())) { - mv.addObject(IUserCenterConst.SYSTEM_TITLE, config.get(IUserCenterConst.SYSTEM_TITLE).toString()); + // 先加载系统短标题，没有加载主标题，没有加载配置文件系统标题 + if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SHORT_TITLE)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_SHORT_TITLE).toString())) { + mv.addObject(IUserCenterConst.SYSTEM_SHORT_TITLE, config.get(IUserCenterConst.SYSTEM_SHORT_TITLE).toString()); + } else if(!Objects.isNull(config.get(IUserCenterConst.SYSTEM_TITLE)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_TITLE).toString())) { + mv.addObject(IUserCenterConst.SYSTEM_SHORT_TITLE, config.get(IUserCenterConst.SYSTEM_TITLE).toString()); } else { - mv.addObject(IUserCenterConst.SYSTEM_TITLE, serverProperties.getSystemTitle()); + mv.addObject(IUserCenterConst.SYSTEM_SHORT_TITLE, serverProperties.getSystemTitle()); } - if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SUB_TITLE)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_SUB_TITLE).toString())) { - mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE, config.get(IUserCenterConst.SYSTEM_SUB_TITLE).toString()); + // 系统短LOGO + if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SHORT_LOGO)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_SHORT_LOGO).toString())) { + mv.addObject(IUserCenterConst.SYSTEM_SHORT_LOGO, config.get(IUserCenterConst.SYSTEM_SHORT_LOGO).toString()); } else { - mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE, serverProperties.getSystemSubTitle()); - } - // 系统LOGO - if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_LOGO)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_LOGO).toString())) { - mv.addObject(IUserCenterConst.SYSTEM_LOGO, config.get(IUserCenterConst.SYSTEM_LOGO).toString()); - } else { - mv.addObject(IUserCenterConst.SYSTEM_LOGO, ""); + mv.addObject(IUserCenterConst.SYSTEM_SHORT_LOGO, ""); } mv.addObject("ws", serverProperties.getWs()); // 菜单模式 diff --git a/login-base/src/main/java/ink/wgink/login/base/pojo/vos/config/ConfigVO.java b/login-base/src/main/java/ink/wgink/login/base/pojo/vos/config/ConfigVO.java index 2b7e9e48..c1bc4821 100644 --- a/login-base/src/main/java/ink/wgink/login/base/pojo/vos/config/ConfigVO.java +++ b/login-base/src/main/java/ink/wgink/login/base/pojo/vos/config/ConfigVO.java @@ -4,7 +4,6 @@ package ink.wgink.login.base.pojo.vos.config; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.login.base.consts.IUserCenterConst; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -40,6 +39,8 @@ public class ConfigVO { private String loginBackgroundImages; @ApiModelProperty(name = "systemLogo", value = "系统LOGO") private String systemLogo; + @ApiModelProperty(name = "systemShortLogo", value = "系统短LOGO") + private String systemShortLogo; @ApiModelProperty(name = "systemTitle", value = "系统主名称") private String systemTitle; @ApiModelProperty(name = "systemTitleSize", value = "系统主名称字体大小") @@ -48,6 +49,8 @@ public class ConfigVO { private String systemSubTitle; @ApiModelProperty(name = "systemSubTitleSize", value = "系统副标题字体大小") private Integer systemSubTitleSize; + @ApiModelProperty(name = "systemShortTitle", value = "系统短标题") + private String systemShortTitle; @ApiModelProperty(name = "copyRightYear", value = "版权年份") private String copyRightYear; @ApiModelProperty(name = "copyleft", value = "版权所有") @@ -229,4 +232,20 @@ public class ConfigVO { public void setMenuMode(String menuMode) { this.menuMode = menuMode; } + + public String getSystemShortLogo() { + return systemShortLogo == null ? "" : systemShortLogo.trim(); + } + + public void setSystemShortLogo(String systemShortLogo) { + this.systemShortLogo = systemShortLogo; + } + + public String getSystemShortTitle() { + return systemShortTitle == null ? "" : systemShortTitle.trim(); + } + + public void setSystemShortTitle(String systemShortTitle) { + this.systemShortTitle = systemShortTitle; + } } diff --git a/login-base/src/main/resources/templates/config/update.html b/login-base/src/main/resources/templates/config/update.html index 01088f72..98047d40 100644 --- a/login-base/src/main/resources/templates/config/update.html +++ b/login-base/src/main/resources/templates/config/update.html @@ -31,8 +31,9 @@
系统主标题
-
- +
+ +
登录页面中登录表单上的主标题，如果为空，以配置文件为主
@@ -40,29 +41,40 @@
系统副标题
-
- +
+ +
登录表单上的副标题，在没有设置时，为空时，以配置文件为主，设置过之后，为空时，表单中不显示
+
+
系统短标题
+
+ +
登录后菜单上方显示，如果为空时显示主标题或配置文件中系统标题，当没有设置短LOGO时，最多显示11个汉字或19个大写字母或23个小写字母；当设置短LOGO时，最多显示9个汉字或13个大写字母或17个小写字母
+
+
版权年份
-
+
+
如果需要，可进行设置，如：2019-2021
版权所有
-
- +
+ +
如果需要，可进行设置，如：XXXX公司...
官方地址
-
- +
+ +
如果需要，可进行设置，如：http://....
@@ -70,7 +82,7 @@
- 系统 LOGO + 系统 LOGO（登录界面）
@@ -79,6 +91,18 @@
+
+
+ + 系统短 LOGO（登录系统后菜单上方） + +
+
+
+
+
+
+
@@ -250,6 +274,21 @@ {{# } }} +