diff --git a/pom.xml b/pom.xml
index b66f69d..aaa6cb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,13 @@
1.1.71.android
+
+ org.mariadb.jdbc
+ mariadb-java-client
+ 2.5.4
+
+
+
diff --git a/src/main/java/com/codesdream/ase/component/permission/ASEUsernamePasswordAuthenticationFilter.java b/src/main/java/com/codesdream/ase/component/permission/ASEUsernamePasswordAuthenticationFilter.java
index 7c78ae6..d09f9d2 100644
--- a/src/main/java/com/codesdream/ase/component/permission/ASEUsernamePasswordAuthenticationFilter.java
+++ b/src/main/java/com/codesdream/ase/component/permission/ASEUsernamePasswordAuthenticationFilter.java
@@ -40,7 +40,7 @@ public class ASEUsernamePasswordAuthenticationFilter extends UsernamePasswordAut
String timestamp = request.getHeader("timestamp");
// 检查时间戳是否合理(60秒内)
- if(!timestampExpiredChecker.checkTimestampBeforeMaxTime(timestamp, 60)){
+ if(timestamp == null || !timestampExpiredChecker.checkTimestampBeforeMaxTime(timestamp, 60)){
throw new AuthenticationServiceException("Timestamp Expired.");
}
diff --git a/src/main/java/com/codesdream/ase/controller/LoginController.java b/src/main/java/com/codesdream/ase/controller/LoginController.java
index db99311..e9c539c 100644
--- a/src/main/java/com/codesdream/ase/controller/LoginController.java
+++ b/src/main/java/com/codesdream/ase/controller/LoginController.java
@@ -61,11 +61,11 @@ public class LoginController {
// 构造返回对象
UserLoginCheckerJSONRespond respond = new UserLoginCheckerJSONRespond();
respond.setUserExist(existStatus);
- return jsonParameter.getJSONString(respond);
+ return jsonParameter.getJSONStandardRespond200(respond);
}
else {
// 返回失败对象
- return jsonParameter.getJSONString(new JSONStandardFailedRespond());
+ return jsonParameter.getJSONStandardRespond500("Error");
}
}
@@ -82,11 +82,11 @@ public class LoginController {
if(loginChecker.getCheckType().equals("UIDGeneratorChecker")) {
UserLoginCheckerJSONRespond respond = new UserLoginCheckerJSONRespond();
respond.setRespondInformation(userService.getUsernameByStudentId(loginChecker.getUsername()));
- return jsonParameter.getJSONString(respond);
+ return jsonParameter.getJSONStandardRespond200(respond);
}
else {
// 返回失败对象
- return jsonParameter.getJSONString(new JSONStandardFailedRespond());
+ return jsonParameter.getJSONStandardRespond500("Error");
}
diff --git a/src/main/java/com/codesdream/ase/controller/RegisterController.java b/src/main/java/com/codesdream/ase/controller/RegisterController.java
index 01a4835..62ce6b3 100644
--- a/src/main/java/com/codesdream/ase/controller/RegisterController.java
+++ b/src/main/java/com/codesdream/ase/controller/RegisterController.java
@@ -16,10 +16,10 @@ import java.util.Map;
@Controller
public class RegisterController {
@Resource
- UserService userService;
+ private UserService userService;
@Resource
- BaseInformationService baseInformationService;
+ private BaseInformationService baseInformationService;
@RequestMapping(value = "/register")
String registerView(Model model){
diff --git a/src/main/java/com/codesdream/ase/service/BaseInformationService.java b/src/main/java/com/codesdream/ase/service/BaseInformationService.java
index 870a816..072ec94 100644
--- a/src/main/java/com/codesdream/ase/service/BaseInformationService.java
+++ b/src/main/java/com/codesdream/ase/service/BaseInformationService.java
@@ -20,25 +20,25 @@ import java.util.Vector;
public class BaseInformationService implements IBaseInformationService {
@Resource
- BaseAdministrativeDivisionRepository administrativeDivisionRepository;
+ private BaseAdministrativeDivisionRepository administrativeDivisionRepository;
@Resource
- BaseCandidateCategoryRepository candidateCategoryRepository;
+ private BaseCandidateCategoryRepository candidateCategoryRepository;
@Resource
- BaseCollegeRepository collegeRepository;
+ private BaseCollegeRepository collegeRepository;
@Resource
- BaseEthnicRepository ethnicRepository;
+ private BaseEthnicRepository ethnicRepository;
@Resource
- BaseMajorRepository majorRepository;
+ private BaseMajorRepository majorRepository;
@Resource
- BasePoliticalStatusRepository politicalStatusRepository;
+ private BasePoliticalStatusRepository politicalStatusRepository;
@Resource
- BaseStudentInfoRepository studentInfoRepository;
+ private BaseStudentInfoRepository studentInfoRepository;
@Override
public boolean checkAdministrativeDivision(String name) {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 41c87dc..8693bdc 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -7,14 +7,15 @@ spring.thymeleaf.encoding=UTF-8
spring.jpa.generate-ddl=false
spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=none
-spring.jooq.sql-dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.hibernate.ddl-auto=update
+spring.jooq.sql-dialect=org.hibernate.dialect.MariaDB102Dialect
spring.jpa.open-in-view=true
spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.datasource.url=jdbc:mysql://${MYSQL_HOST:39.100.94.111}:3306/ase?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+spring.datasource.url=jdbc:mariadb://39.100.94.111:3306/ase?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
spring.datasource.username=codedream
-spring.datasource.password=zP1+LKi?,{Kyv)uyYgd8
+spring.datasource.password=codedreampasswd
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
server.error.whitelabel.enabled=false