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 97e92c35..14601df6 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
@@ -81,4 +81,8 @@ 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 e626e94a..bcfe1bc6 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
@@ -47,7 +47,7 @@ public class OAuthRouteController {
*/
@GetMapping("login")
public ModelAndView login(HttpServletRequest request) {
- ModelAndView mv = new ModelAndView("login");
+ 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));
@@ -137,6 +137,11 @@ public class OAuthRouteController {
} 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");
+ }
return mv;
}
diff --git a/login-base/src/main/java/ink/wgink/login/base/pojo/vos/ConfigVO.java b/login-base/src/main/java/ink/wgink/login/base/pojo/vos/ConfigVO.java
index dd41a33b..61f6b310 100644
--- a/login-base/src/main/java/ink/wgink/login/base/pojo/vos/ConfigVO.java
+++ b/login-base/src/main/java/ink/wgink/login/base/pojo/vos/ConfigVO.java
@@ -69,6 +69,9 @@ public class ConfigVO {
@ApiModelProperty(name = "menuMode", value = "菜单模式")
@CheckEmptyAnnotation(name = "菜单模式", types = {"fixedLeft", "floatLeft"})
private String menuMode;
+ @ApiModelProperty(name = "loginPage", value = "登录页面")
+ @CheckEmptyAnnotation(name = "登录页面", types = {"login", "login2"})
+ private String loginPage;
public String getPasswordValidity() {
return passwordValidity == null ? "" : passwordValidity.trim();
@@ -229,4 +232,12 @@ public class ConfigVO {
public void setMenuMode(String menuMode) {
this.menuMode = menuMode;
}
+
+ public String getLoginPage() {
+ return loginPage == null ? "" : loginPage.trim();
+ }
+
+ public void setLoginPage(String loginPage) {
+ this.loginPage = loginPage;
+ }
}
diff --git a/login-base/src/main/resources/templates/config/update.html b/login-base/src/main/resources/templates/config/update.html
index e29b26dd..34afdd17 100644
--- a/login-base/src/main/resources/templates/config/update.html
+++ b/login-base/src/main/resources/templates/config/update.html
@@ -225,6 +225,13 @@
+