From 68bab565343849637bc437132c2a51b3208b3f04 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Tue, 27 Jul 2021 23:08:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=BAthymeleaf=E3=80=81vue=E3=80=81layui=E5=85=B1?= =?UTF-8?q?=E5=90=8C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../login/base/consts/IUserCenterConst.java | 9 +- .../route/OAuthRouteController.java | 107 +---- .../src/main/resources/templates/login.html | 435 +++++++----------- 3 files changed, 187 insertions(+), 364 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 14601df6..da6f6768 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 @@ -37,6 +37,10 @@ public interface IUserCenterConst { * 系统子标题大小 */ String SYSTEM_SUB_TITLE_SIZE = "systemSubTitleSize"; + /** + * 系统简称,菜单上方名称 + */ + String SYSTEM_SIMPLE_TITLE = "systemSimpleTitle"; /** * 版权年份 */ @@ -81,8 +85,5 @@ public interface IUserCenterConst { * 菜单模式 */ String MENU_MODE = "menuMode"; - /** - * 登录页面 - */ - String LOGIN_PAGE = "loginPage"; + } diff --git a/login-base/src/main/java/ink/wgink/login/base/controller/route/OAuthRouteController.java b/login-base/src/main/java/ink/wgink/login/base/controller/route/OAuthRouteController.java index bcfe1bc6..88cdc254 100644 --- a/login-base/src/main/java/ink/wgink/login/base/controller/route/OAuthRouteController.java +++ b/login-base/src/main/java/ink/wgink/login/base/controller/route/OAuthRouteController.java @@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; +import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -48,100 +49,38 @@ public class OAuthRouteController { @GetMapping("login") public ModelAndView login(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); - mv.addObject(IUserCenterConst.SERVER_URL, serverProperties.getUrl()); - if (request.getParameter(IUserCenterConst.ERROR) != null) { - mv.addObject(IUserCenterConst.ERROR_MESSAGE, request.getSession().getAttribute(IUserCenterConst.ERROR_MESSAGE)); - } Map config = ConfigManager.getInstance().getConfig(); + + Map pageParams = new HashMap<>(16); + pageParams.put(IUserCenterConst.SERVER_URL, serverProperties.getUrl()); + pageParams.put(IUserCenterConst.ERROR_MESSAGE, request.getSession().getAttribute(IUserCenterConst.ERROR_MESSAGE)); + // 服务地址 + pageParams.put(IUserCenterConst.SERVER_URL, serverProperties.getUrl()); // 系统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, ""); - } + pageParams.put(IUserCenterConst.SYSTEM_LOGO, config.get(IUserCenterConst.SYSTEM_LOGO).toString()); // 背景图片 - if (!Objects.isNull(config.get(IUserCenterConst.LOGIN_BACKGROUND_IMAGES)) && !StringUtils.isBlank(config.get(IUserCenterConst.LOGIN_BACKGROUND_IMAGES).toString())) { - mv.addObject(IUserCenterConst.LOGIN_BACKGROUND_IMAGES, config.get(IUserCenterConst.LOGIN_BACKGROUND_IMAGES).toString()); - } else { - mv.addObject(IUserCenterConst.LOGIN_BACKGROUND_IMAGES, ""); - } + pageParams.put(IUserCenterConst.LOGIN_BACKGROUND_IMAGES, config.get(IUserCenterConst.LOGIN_BACKGROUND_IMAGES).toString()); // 系统标题 - 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()); - } else { - mv.addObject(IUserCenterConst.SYSTEM_TITLE, serverProperties.getSystemTitle()); - } - // 系统标题大小 - if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE)) && Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString()) > 12) { - mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString())); - } else { - mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, 26); - } + pageParams.put(IUserCenterConst.SYSTEM_TITLE, config.get(IUserCenterConst.SYSTEM_TITLE).toString()); + // 系统标题大小,默认26 + pageParams.put(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString())); // 系统子标题 - 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()); - } else { - mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE, serverProperties.getSystemSubTitle()); - } - // 系统子标题大小 - if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE)) && Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString()) > 12) { - mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString())); - } else { - mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, 16); - } + pageParams.put(IUserCenterConst.SYSTEM_SUB_TITLE, config.get(IUserCenterConst.SYSTEM_SUB_TITLE).toString()); + // 系统子标题大小,默认16 + pageParams.put(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString())); // 版权年份 - if (!Objects.isNull(config.get(IUserCenterConst.COPY_RIGHT_YEAR))) { - mv.addObject(IUserCenterConst.COPY_RIGHT_YEAR, config.get(IUserCenterConst.COPY_RIGHT_YEAR).toString()); - } else { - mv.addObject(IUserCenterConst.COPY_RIGHT_YEAR, ""); - } + pageParams.put(IUserCenterConst.COPY_RIGHT_YEAR, config.get(IUserCenterConst.COPY_RIGHT_YEAR).toString()); // 版权所属 - if (!Objects.isNull(config.get(IUserCenterConst.COPY_LEFT))) { - mv.addObject(IUserCenterConst.COPY_LEFT, config.get(IUserCenterConst.COPY_LEFT).toString()); - } else { - mv.addObject(IUserCenterConst.COPY_LEFT, ""); - } + pageParams.put(IUserCenterConst.COPY_LEFT, config.get(IUserCenterConst.COPY_LEFT).toString()); // 官方链接 - if (!Objects.isNull(config.get(IUserCenterConst.OFFICIAL_URL))) { - mv.addObject(IUserCenterConst.OFFICIAL_URL, config.get(IUserCenterConst.OFFICIAL_URL).toString()); - } else { - mv.addObject(IUserCenterConst.OFFICIAL_URL, ""); - } + pageParams.put(IUserCenterConst.OFFICIAL_URL, config.get(IUserCenterConst.OFFICIAL_URL).toString()); // 开启验证码 - if (!Objects.isNull(config.get(ISystemConstant.VERIFICATION_CODE))) { - mv.addObject(ISystemConstant.VERIFICATION_CODE, config.get(ISystemConstant.VERIFICATION_CODE).toString()); - } else { - mv.addObject(ISystemConstant.VERIFICATION_CODE, ISystemConstant.IS_FALSE); - } - // 开启uKey登录 - if (!Objects.isNull(config.get(IUserCenterConst.UKEY_LOGIN))) { - mv.addObject(IUserCenterConst.UKEY_LOGIN, config.get(IUserCenterConst.UKEY_LOGIN).toString()); - } else { - mv.addObject(IUserCenterConst.UKEY_LOGIN, ISystemConstant.IS_FALSE); - } - // 开启扫码登录 - if (!Objects.isNull(config.get(IUserCenterConst.SCAN_CODE_LOGIN))) { - mv.addObject(IUserCenterConst.SCAN_CODE_LOGIN, config.get(IUserCenterConst.SCAN_CODE_LOGIN).toString()); - // 钉钉扫码登陆APPID -// if (!StringUtils.isBlank(dingDingScanCodeLoginProperties.getAppId())) { -// mv.addObject(IUserCenterConst.DING_DING_SCAN_CODE_APP_ID, dingDingScanCodeLoginProperties.getAppId()); -// } else { -// mv.addObject(IUserCenterConst.DING_DING_SCAN_CODE_APP_ID, ""); -// } - } else { - mv.addObject(IUserCenterConst.SCAN_CODE_LOGIN, ISystemConstant.IS_FALSE); - } + pageParams.put(ISystemConstant.VERIFICATION_CODE, config.get(ISystemConstant.VERIFICATION_CODE).toString()); // 登录框位置 - if (!Objects.isNull(config.get(IUserCenterConst.LOGIN_BOX_POSITION))) { - mv.addObject(IUserCenterConst.LOGIN_BOX_POSITION, config.get(IUserCenterConst.LOGIN_BOX_POSITION).toString()); - } else { - mv.addObject(IUserCenterConst.LOGIN_BOX_POSITION, "default"); - } - if (!Objects.isNull(config.get(IUserCenterConst.LOGIN_PAGE))) { - mv.setViewName(config.get(IUserCenterConst.LOGIN_PAGE).toString()); - } else { - mv.setViewName("login"); - } + pageParams.put(IUserCenterConst.LOGIN_BOX_POSITION, config.get(IUserCenterConst.LOGIN_BOX_POSITION).toString()); + mv.addObject("pageParams", pageParams); + mv.addObject("customLoginForm", "
"); + mv.setViewName("login"); return mv; } diff --git a/login-base/src/main/resources/templates/login.html b/login-base/src/main/resources/templates/login.html index 2d122686..a032a725 100644 --- a/login-base/src/main/resources/templates/login.html +++ b/login-base/src/main/resources/templates/login.html @@ -12,13 +12,13 @@ - - -