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/** # 直接放行