menus;
if (StringUtils.equalsIgnoreCase(ISystemConstant.ADMIN, userInfoBO.getUserUsername())) {
@@ -117,8 +121,8 @@ public class IndexRouteController {
@GetMapping("default-home")
public ModelAndView defaultHome() {
ModelAndView mv;
- if (!StringUtils.isBlank(systemProperties.getDefaultHomePage())) {
- mv = new ModelAndView(new RedirectView(systemProperties.getDefaultHomePage()));
+ if (!StringUtils.isBlank(serverProperties.getDefaultHomePage())) {
+ mv = new ModelAndView(new RedirectView(serverProperties.getDefaultHomePage()));
} else {
mv = new ModelAndView("default-home");
}
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 90fe556f..e626e94a 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
@@ -1,9 +1,9 @@
package ink.wgink.login.base.controller.route;
import ink.wgink.interfaces.consts.ISystemConstant;
-import ink.wgink.login.base.config.properties.SystemProperties;
import ink.wgink.login.base.consts.IUserCenterConst;
import ink.wgink.login.base.manager.ConfigManager;
+import ink.wgink.properties.ServerProperties;
import ink.wgink.util.verification.code.Captcha;
import ink.wgink.util.verification.code.GifCaptcha;
import ink.wgink.util.verification.code.SpecCaptcha;
@@ -38,7 +38,7 @@ import java.util.Objects;
public class OAuthRouteController {
@Autowired
- private SystemProperties systemProperties;
+ private ServerProperties serverProperties;
/**
* 登录
@@ -48,7 +48,7 @@ public class OAuthRouteController {
@GetMapping("login")
public ModelAndView login(HttpServletRequest request) {
ModelAndView mv = new ModelAndView("login");
- mv.addObject(IUserCenterConst.SERVER_URL, systemProperties.getUrl());
+ mv.addObject(IUserCenterConst.SERVER_URL, serverProperties.getUrl());
if (request.getParameter(IUserCenterConst.ERROR) != null) {
mv.addObject(IUserCenterConst.ERROR_MESSAGE, request.getSession().getAttribute(IUserCenterConst.ERROR_MESSAGE));
}
@@ -69,7 +69,7 @@ public class OAuthRouteController {
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, systemProperties.getSystemTitle());
+ 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) {
@@ -81,7 +81,7 @@ public class OAuthRouteController {
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, systemProperties.getSystemSubTitle());
+ 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) {
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 2b474f35..dd41a33b 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
@@ -66,6 +66,9 @@ public class ConfigVO {
private String scanCodeLogin;
@ApiModelProperty(name = "loginBoxPosition", value = "登录框位置")
private String loginBoxPosition;
+ @ApiModelProperty(name = "menuMode", value = "菜单模式")
+ @CheckEmptyAnnotation(name = "菜单模式", types = {"fixedLeft", "floatLeft"})
+ private String menuMode;
public String getPasswordValidity() {
return passwordValidity == null ? "" : passwordValidity.trim();
@@ -218,4 +221,12 @@ public class ConfigVO {
public void setLoginBoxPosition(String loginBoxPosition) {
this.loginBoxPosition = loginBoxPosition;
}
+
+ public String getMenuMode() {
+ return menuMode == null ? "" : menuMode;
+ }
+
+ public void setMenuMode(String menuMode) {
+ this.menuMode = menuMode;
+ }
}
diff --git a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
index eecdfd65..be9c6bac 100644
--- a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
+++ b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
@@ -1,12 +1,12 @@
package ink.wgink.login.base.security;
import ink.wgink.common.handler.AccessDenyHandler;
-import ink.wgink.login.base.config.BaseConfig;
import ink.wgink.login.base.handler.LoginFailureHandler;
import ink.wgink.login.base.handler.LogoutHandler;
import ink.wgink.login.base.security.user.UserSecurityConfig;
import ink.wgink.login.base.service.user.UserDetailServiceImpl;
import ink.wgink.login.base.service.user.UserLoginService;
+import ink.wgink.properties.BaseProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.security.authentication.AuthenticationManager;
@@ -26,7 +26,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
- private BaseConfig baseConfig;
+ private BaseProperties baseProperties;
@Autowired
private UserDetailServiceImpl userDetailService;
@Autowired
@@ -36,12 +36,12 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
- LoginFailureHandler loginFailureHandler = new LoginFailureHandler(baseConfig.getLoginFailure());
+ LoginFailureHandler loginFailureHandler = new LoginFailureHandler(baseProperties.getLoginFailure());
http
.formLogin()
- .loginPage(baseConfig.getLoginUrl())
- .loginProcessingUrl(baseConfig.getLoginProcess())
- .failureForwardUrl(baseConfig.getLoginUrl())
+ .loginPage(baseProperties.getLoginUrl())
+ .loginProcessingUrl(baseProperties.getLoginProcess())
+ .failureForwardUrl(baseProperties.getLoginUrl())
.failureHandler(loginFailureHandler)
.and()
.logout()
@@ -52,17 +52,17 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.disable()
.and()
.authorizeRequests()
- .antMatchers(baseConfig.getAssetsMatchers(),
- baseConfig.getLoginUrl(),
- baseConfig.getLoginProcess(),
- baseConfig.getLoginFailure(),
+ .antMatchers(baseProperties.getAssetsMatchers(),
+ baseProperties.getLoginUrl(),
+ baseProperties.getLoginProcess(),
+ baseProperties.getLoginFailure(),
"/oauth/**",
"/oauth_client/**",
"/app/**",
"/approute/**",
"/wechat/**",
- "/wechatroute/**",
- "/wxminiapp/**",
+ "/wechat/route/**",
+ "/wechat/miniapp/**",
"/route/file/**",
"/api/sms/getverificationcode/*",
"/api/user/getsignintype/**")
@@ -96,7 +96,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
UserSecurityConfig userSecurityConfig = new UserSecurityConfig();
userSecurityConfig.setUserDetailService(userDetailService);
userSecurityConfig.setPasswordEncoder(passwordEncoder);
- userSecurityConfig.setLoginProcessUrl(baseConfig.getLoginProcess());
+ userSecurityConfig.setLoginProcessUrl(baseProperties.getLoginProcess());
userSecurityConfig.setLoginFailureHandler(loginFailureHandler);
userSecurityConfig.setUserLoginService(userLoginService);
http.apply(userSecurityConfig);
diff --git a/login-base/src/main/resources/templates/config/update.html b/login-base/src/main/resources/templates/config/update.html
index 01b1397c..29ad60c4 100644
--- a/login-base/src/main/resources/templates/config/update.html
+++ b/login-base/src/main/resources/templates/config/update.html
@@ -218,6 +218,13 @@
+