diff --git a/src/main/java/com/fstack/FstackForumApplication.java b/src/main/java/com/fstack/FstackForumApplication.java index c3a6a4dd1da48d6871a26268bedbdc7953f62b30..625dc274c1eb352ddcb2a5da45934762d3427865 100644 --- a/src/main/java/com/fstack/FstackForumApplication.java +++ b/src/main/java/com/fstack/FstackForumApplication.java @@ -1,6 +1,7 @@ package com.fstack; import java.util.Locale; +import java.util.TimeZone; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -10,6 +11,8 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.web.servlet.LocaleResolver; import org.springframework.web.servlet.i18n.SessionLocaleResolver; +import javax.annotation.PostConstruct; + @MapperScan("com.fstack.persistence.dao") @EnableAsync @SpringBootApplication @@ -26,4 +29,9 @@ public class FstackForumApplication { return sessionLocaleResolver; } + @PostConstruct + void setDefaultTimezone() { + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); + } + } \ No newline at end of file diff --git a/src/main/java/com/fstack/validator/NewUserPwdValidator.java b/src/main/java/com/fstack/validator/NewUserPwdValidator.java index f2f88788d6f8e0b86fe08ea6d622e6c408befdfe..9f1d06e167da4cf15a94cd74f6a4922c4324e582 100644 --- a/src/main/java/com/fstack/validator/NewUserPwdValidator.java +++ b/src/main/java/com/fstack/validator/NewUserPwdValidator.java @@ -31,7 +31,7 @@ public class NewUserPwdValidator implements Validator { public void validate(Object object, Errors errors) { UserPwdDto userForm = (UserPwdDto) object; - // email validation + // token validation ValidationUtils.rejectIfEmptyOrWhitespace(errors, "token", "NotEmpty"); if (userForm.getToken() != null && !userForm.getToken().isEmpty()) { VerificationToken byToken = userService.findByToken(userForm.getToken()); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 4275b23833f5093c4e35ddc56ac80e07a36bab21..da173a457ebf8d94f9aaa846fc540610ffcb9a49 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -2,7 +2,7 @@ # MySQL connection config # ============================== spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fangrong?serverTimezone=GMT%2B8&useSSL=false&useUnicode=true&characterEncoding=UTF-8 spring.datasource.username = fangrong spring.datasource.password = GsWJAHJtNc2R85xx spring.datasource.type=com.zaxxer.hikari.HikariDataSource diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 3e3a6d6978cfbef75835e45951680f7d00a65110..db10391966b7964396792941109784736c18e973 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -2,7 +2,7 @@ # MySQL connection config # ============================== spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://192.168.1.204:3306/forum?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.url = jdbc:mysql://192.168.1.204:3306/forum?serverTimezone=GMT%2B8&useSSL=false&useUnicode=true&characterEncoding=UTF-8 spring.datasource.username = root spring.datasource.password = root spring.datasource.type=com.zaxxer.hikari.HikariDataSource diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties index 664f81d908dd5e074d8ba36e200ccab83e2e6688..55dabdb6efaf77875baf27e7c2b946db1e8ea983 100644 --- a/src/main/resources/application-pro.properties +++ b/src/main/resources/application-pro.properties @@ -2,7 +2,7 @@ # MySQL connection config # ============================== spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fs_forum?zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fs_forum?zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=GMT%2B8&useSSL=false&useUnicode=true&characterEncoding=UTF-8 spring.datasource.username = fstack spring.datasource.password = fstack spring.datasource.type=com.zaxxer.hikari.HikariDataSource diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index d0a73710132248c3d90e522c4ef744676ec49a4b..bf0c18d5f65e22e4274e5c7beb29ba13a58a2130 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -4,7 +4,7 @@