diff --git a/basic-properties/src/main/java/ink/wgink/properties/oauth2/client/OAuth2ClientServerProperties.java b/basic-properties/src/main/java/ink/wgink/properties/oauth2/client/OAuth2ClientServerProperties.java index 180cf240..62752cae 100644 --- a/basic-properties/src/main/java/ink/wgink/properties/oauth2/client/OAuth2ClientServerProperties.java +++ b/basic-properties/src/main/java/ink/wgink/properties/oauth2/client/OAuth2ClientServerProperties.java @@ -25,14 +25,14 @@ public class OAuth2ClientServerProperties { * 访问地址 */ private String url; - /** - * WebSocket 地址 - */ - private String ws; /** * 系统主标题 */ private String systemTitle; + /** + * 导航页面 + */ + private String navPage; /** * 默认 index 页面 */ @@ -58,12 +58,12 @@ public class OAuth2ClientServerProperties { this.url = url; } - public String getWs() { - return ws == null ? "" : ws.trim(); + public String getNavPage() { + return navPage == null ? "" : navPage.trim(); } - public void setWs(String ws) { - this.ws = ws; + public void setNavPage(String navPage) { + this.navPage = navPage; } public String getSystemTitle() { diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java index d66c9e1c..9ff00117 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java @@ -61,7 +61,7 @@ public class IndexRouteController { Map config = new HashMap<>(); // 先加载系统短标题,没有加载主标题,没有加载配置文件系统标题 mv.addObject("systemTitle", oAuth2ClientServerProperties.getSystemTitle()); - mv.addObject("ws", oAuth2ClientServerProperties.getWs()); + mv.addObject("navPage", oAuth2ClientServerProperties.getNavPage()); List menus; if (StringUtils.equalsIgnoreCase(ISystemConstant.ADMIN, userInfoBO.getUserUsername())) { diff --git a/login-oauth2-client/src/main/resources/templates/default-main.html b/login-oauth2-client/src/main/resources/templates/default-main.html index 58bafa24..d30ff03e 100644 --- a/login-oauth2-client/src/main/resources/templates/default-main.html +++ b/login-oauth2-client/src/main/resources/templates/default-main.html @@ -42,7 +42,7 @@
  • - +