From afa8e6023a3c51157453cf637c5a6f00da7283d5 Mon Sep 17 00:00:00 2001
From: wangbing <wangbing@wbsite.xyz>
Date: Wed, 22 Apr 2020 22:59:11 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 348a2c11019d6dec0ec5b3e76d51c36a8f27ceb0
---
 .../modules/SpringBoot/java/action/GlobalController.java      | 4 ++--
 .../modules/SpringBoot/java/config/SecurityConfig.java        | 2 +-
 .../modules/SpringBoot/java/config/WebMvcConfig.java          | 2 +-
 .../modules/SpringBoot/resources/application-dev.ftl          | 4 ++--
 .../modules/SpringBoot/resources/application-prod.ftl         | 4 ++--
 src/main/resources/modules/SpringBoot/test/application.ftl    | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
index 423b7603..0cfae06f 100644
--- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
+++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
@@ -67,9 +67,9 @@ public class GlobalController implements ErrorController {
 
     @Value("${r'${server.servlet.context-path}'}")
     private String context;
-    @Value("${r'${web.home.page}'}")
+    @Value("${r'${web.url.index}'}")
     private String homePage;
-    @Value("${r'${web.login.page}'}")
+    @Value("${r'${web.url.login}'}")
     private String loginPage;
     @Autowired
     private FreeMarkerViewResolver viewResolver;
diff --git a/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java b/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java
index ab15b95f..8abec889 100644
--- a/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java
+++ b/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java
@@ -40,7 +40,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     private String[] excluded;
     @Value("${r'${spring.mvc.static-path-pattern}'}")
     private String[] staticPath;
-    @Value("${r'${web.login.page}'}")
+    @Value("${r'${web.url.login}'}")
     private String loginPage;
 
     @Override
diff --git a/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java b/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java
index 6cb16c28..a38c24e8 100644
--- a/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java
+++ b/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java
@@ -19,7 +19,7 @@ import java.util.List;
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
-    @Value("${r'${web.home.page}'}")
+    @Value("${r'${web.url.index}'}")
     private String homePage;
     @Value("${r'${spring.mvc.static-path-pattern}'}")
     private String[] staticPath;
diff --git a/src/main/resources/modules/SpringBoot/resources/application-dev.ftl b/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
index cadd011a..cc6a01ab 100644
--- a/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
@@ -122,9 +122,9 @@ server.tomcat.max-http-post-size=-1
 
 # 自定义配置
 # 根路径默认页,'/'跳转至该页
-web.home.page=/index.htm
+web.url.index=/index.htm
 # 登录页
-web.login.page=/login.htm
+web.url.login=/login.htm
 # 拦截验证
 web.url.auth.included=/,/**/*.htm,/ajax/**,/api/**
 # 直接放行
diff --git a/src/main/resources/modules/SpringBoot/resources/application-prod.ftl b/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
index 4e4cd571..5ea887c0 100644
--- a/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
@@ -122,9 +122,9 @@ server.tomcat.max-http-post-size=-1
 
 # 自定义配置
 # 根路径默认页,'/'跳转至该页
-web.home.page=/index.htm
+web.url.index=/index.htm
 # 登录页
-web.login.page=/login.htm
+web.url.login=/login.htm
 # 拦截验证
 web.url.auth.included=/,/**/*.htm,/ajax/**,/api/**
 # 直接放行
diff --git a/src/main/resources/modules/SpringBoot/test/application.ftl b/src/main/resources/modules/SpringBoot/test/application.ftl
index 64136795..e2472fbb 100644
--- a/src/main/resources/modules/SpringBoot/test/application.ftl
+++ b/src/main/resources/modules/SpringBoot/test/application.ftl
@@ -122,9 +122,9 @@ server.tomcat.max-http-post-size=-1
 
 # 自定义配置
 # 根路径默认页,'/'跳转至该页
-web.home.page=/index.htm
+web.url.index=/index.htm
 # 登录页
-web.login.page=/login.htm
+web.url.login=/login.htm
 # 拦截验证
 web.url.auth.included=/,/**/*.htm,/ajax/**,/api/**
 # 直接放行