saturneric/ASE-New
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: saturneric:develop
Branches Tags
saturneric:develop
saturneric:master
saturneric:fileSystem_added
saturneric:test
..
compare: saturneric:test
Branches Tags
saturneric:master
saturneric:fileSystem_added
saturneric:develop
saturneric:test

No commits in common. "develop" and "test" have entirely different histories.
develop ... test

20 changed files with 138 additions and 308 deletions
Show Stats Expand all files Collapse all files

7
pom.xml
View File

@ -138,13 +138,6 @@
<version>1.1.71.android</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.5.4</version>
</dependency>
</dependencies>
<build>

38
src/main/java/com/codesdream/ase/component/datamanager/JSONParameter.java
View File

@ -58,6 +58,44 @@ public class JSONParameter {
return JSON.toJSONString(object);
}
// 根据对象构造获得标准的JSON响应字符串返回
public String getJSONStandardRespond(Integer status, String msg, Object dataObject){
JSONBaseRespondObject respondObject = new JSONBaseRespondObject(status, msg);
respondObject.setData(dataObject);
return getJSONString(respondObject);
}
// 获得标准的JSON响应字符串返回(404状态)
public String getJSONStandardRespond404(String msg){
JSONBaseRespondObject respondObject = new JSONBaseRespondObject(404, msg);
return getJSONString(respondObject);
}
// 获得标准的JSON响应字符串返回(500状态)
public String getJSONStandardRespond500(String msg){
JSONBaseRespondObject respondObject = new JSONBaseRespondObject(500, msg);
return getJSONString(respondObject);
}
// 获得标准的JSON响应字符串返回(200状态)
public String getJSONStandardRespond200(Object dataObject){
JSONBaseRespondObject respondObject = new JSONBaseRespondObject(200, "ok");
respondObject.setData(dataObject);
return getJSONString(respondObject);
}
// 获得标准的JSON响应字符串返回(403状态)
public String getJSONStandardRespond403(){
JSONBaseRespondObject respondObject = new JSONBaseRespondObject(403, "Forbidden");
return getJSONString(respondObject);
}
// 获得标准的JSON响应字符串返回(401状态)
public String getJSONStandardRespond401(){
JSONBaseRespondObject respondObject = new JSONBaseRespondObject(401, "Unauthorized");
return getJSONString(respondObject);
}
// 由JSON对象获得对应的Java对象
public <T> T getJavaObject(JSONObject json, Class<T> type){
return json.toJavaObject(type);

80
src/main/java/com/codesdream/ase/component/datamanager/QuickJSONRespond.java
View File

@ -1,80 +0,0 @@
package com.codesdream.ase.component.datamanager;
import com.codesdream.ase.component.json.respond.EmptyDataObjectRespond;
import com.codesdream.ase.component.json.respond.JSONBaseRespondObject;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component
public class QuickJSONRespond {
@Resource
private JSONParameter jsonParameter;
// 根据对象构造获得标准的JSON响应字符串返回
public String getJSONStandardRespond(Integer status, String msg, String info, Object dataObject){
JSONBaseRespondObject respondObject = new JSONBaseRespondObject(status, msg);
if(info != null) respondObject.setInfo(info);
else respondObject.setInfo(null);
respondObject.setData(dataObject);
return jsonParameter.getJSONString(respondObject);
}
// 获得标准的JSON响应字符串返回特定状态码的和解释息
public String getJSONStandardRespond(Integer code, String msg, String info){
JSONBaseRespondObject respondObject = new JSONBaseRespondObject(code, msg);
if(info != null) respondObject.setInfo(info);
else respondObject.setInfo(null);
respondObject.setData(null);
return jsonParameter.getJSONString(respondObject);
}
// 获得标准的JSON响应字符串返回(404状态)
public String getRespond404(String info){
return getJSONStandardRespond(404, "Not Found", info);
}
// 获得标准的JSON响应字符串返回(500状态)
public String getRespond500(String info){
return getJSONStandardRespond(500, "Internal Server Error", info);
}
// 获得标准的JSON响应字符串返回(200状态)
public String getRespond200(String info){
return getJSONStandardRespond(200, "Ok", info);
}
// 获得标准的JSON响应字符串返回(200状态)
public String getRespond200(String info, Object object){
return getJSONStandardRespond(200, "Ok", info, object);
}
// 获得标准的JSON响应字符串返回(403状态)
public String getRespond403(String info){
return getJSONStandardRespond(403, "Forbidden", info);
}
// 获得标准的JSON响应字符串返回(403状态)
public String getRespond406(String info){
return getJSONStandardRespond(406, "Not Acceptable", info);
}
// 获得标准的JSON响应字符串返回(501态)
public String getRespond501(String info){
return getJSONStandardRespond(501, "Not Implemented", info) ;
}
// 获得标准的JSON响应字符串返回(401状态)
public String getRespond401(String info){
return getJSONStandardRespond(401, "Unauthorized", info);
}
// 获得标准的JSON响应字符串返回(400状态)
public String getRespond400(String info){
return getJSONStandardRespond(400, "Bad Request", info);
}
}

19
src/main/java/com/codesdream/ase/component/json/request/UserRegisterChecker.java
View File

@ -1,19 +0,0 @@
package com.codesdream.ase.component.json.request;
import lombok.Data;
@Data
public class UserRegisterChecker {
// 学号
private String studentId;
// 密码
private String password;
// 密保问题
private String userQuestion;
// 密保答案
private String userAnswer;
}

12
src/main/java/com/codesdream/ase/component/json/respond/ErrorInfoJSONRespond.java
View File

@ -1,12 +0,0 @@
package com.codesdream.ase.component.json.respond;
import lombok.Data;
import java.util.Date;
@Data
public class ErrorInfoJSONRespond {
String exception = null;
String exceptionMessage = null;
Date date = null;
}

3
src/main/java/com/codesdream/ase/component/json/respond/JSONBaseRespondObject.java
View File

@ -17,9 +17,6 @@ public class JSONBaseRespondObject extends JSONBaseObject {
// 存放响应信息提示
private String msg = "";
// 额外信息
private String info = null;
// 状态
private Integer status = 200;

3
src/main/java/com/codesdream/ase/component/json/respond/UserLoginCheckerJSONRespond.java
View File

@ -9,8 +9,7 @@ public class UserLoginCheckerJSONRespond {
Boolean userExist = null;
Boolean userBanned = null;
Boolean loginStatus = null;
String respondInformation = null;
String respondInformation = "";
String token = null;
String uid = null;
}

5
src/main/java/com/codesdream/ase/component/permission/ASEAccessDeniedHandler.java
View File

@ -1,7 +1,6 @@
package com.codesdream.ase.component.permission;
import com.codesdream.ase.component.datamanager.JSONParameter;
import com.codesdream.ase.component.datamanager.QuickJSONRespond;
import com.codesdream.ase.component.json.respond.UserLoginCheckerJSONRespond;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.AccessDeniedException;
@ -20,7 +19,7 @@ import java.io.IOException;
public class ASEAccessDeniedHandler implements AccessDeniedHandler {
@Resource
private QuickJSONRespond quickJSONRespond;
private JSONParameter jsonParameter;
@Override
public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException)
@ -28,7 +27,7 @@ public class ASEAccessDeniedHandler implements AccessDeniedHandler {
log.info("ASEAccessDeniedHandler Found!");
// 对无权限操作返回403
response.getWriter().print(quickJSONRespond.getRespond403(null));
response.getWriter().print(jsonParameter.getJSONStandardRespond403());
}

8
src/main/java/com/codesdream/ase/component/permission/ASEAuthenticationEntryPoint.java
View File

@ -1,7 +1,6 @@
package com.codesdream.ase.component.permission;
import com.codesdream.ase.component.datamanager.JSONParameter;
import com.codesdream.ase.component.datamanager.QuickJSONRespond;
import com.codesdream.ase.component.json.respond.JSONBaseRespondObject;
import com.codesdream.ase.component.json.respond.UserLoginCheckerJSONRespond;
import lombok.extern.slf4j.Slf4j;
@ -20,14 +19,13 @@ import java.io.IOException;
@Component
public class ASEAuthenticationEntryPoint implements AuthenticationEntryPoint {
@Resource
private QuickJSONRespond quickJSONRespond;
private JSONParameter jsonParameter;
@Override
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException)
throws IOException {
throws IOException, ServletException {
// 对匿名用户返回401
response.getWriter().print(quickJSONRespond.getRespond401(null));
response.getWriter().print(jsonParameter.getJSONStandardRespond401());
}
}

23
src/main/java/com/codesdream/ase/component/permission/ASEAuthenticationFailureHandler.java
View File

@ -1,8 +1,6 @@
package com.codesdream.ase.component.permission;
import com.codesdream.ase.component.datamanager.JSONParameter;
import com.codesdream.ase.component.datamanager.QuickJSONRespond;
import com.codesdream.ase.component.json.respond.ErrorInfoJSONRespond;
import com.codesdream.ase.component.json.respond.UserLoginCheckerJSONRespond;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.AuthenticationException;
@ -14,7 +12,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
// 认证失败返回
@Slf4j
@ -22,25 +19,21 @@ import java.util.Date;
public class ASEAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
@Resource
private QuickJSONRespond quickJSONRespond;
private JSONParameter jsonParameter;
@Override
public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception)
throws IOException
{
log.info("ASEAuthenticationFailureHandler Login Fail!");
UserLoginCheckerJSONRespond respond = new UserLoginCheckerJSONRespond();
// 填写异常信息存储对象
ErrorInfoJSONRespond errorInfoJSONRespond = new ErrorInfoJSONRespond();
errorInfoJSONRespond.setDate(new Date());
errorInfoJSONRespond.setExceptionMessage(exception.getMessage());
errorInfoJSONRespond.setException(exception.getClass().getSimpleName());
respond.setUserExist(null);
respond.setUserBanned(null);
respond.setLoginStatus(false);
respond.setRespondInformation("Authentication Failed");
// 认证失败返回406
response.getWriter().write(quickJSONRespond.getJSONStandardRespond(
406,
"Not Acceptable",
"Authentication Failure",
errorInfoJSONRespond));
// 填充response对象
response.getWriter().write(jsonParameter.getJSONStandardRespond200(respond));
}
}

7
src/main/java/com/codesdream/ase/component/permission/ASEAuthenticationSuccessHandler.java
View File

@ -2,7 +2,6 @@ package com.codesdream.ase.component.permission;
import com.codesdream.ase.component.auth.JSONTokenAuthenticationToken;
import com.codesdream.ase.component.datamanager.JSONParameter;
import com.codesdream.ase.component.datamanager.QuickJSONRespond;
import com.codesdream.ase.component.json.respond.UserLoginCheckerJSONRespond;
import com.codesdream.ase.model.permission.User;
@ -28,7 +27,7 @@ import java.util.Optional;
@Component
public class ASEAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
@Resource
private QuickJSONRespond quickJSONRespond;
private JSONParameter jsonParameter;
@Resource
private IAuthService authService;
@ -41,6 +40,7 @@ public class ASEAuthenticationSuccessHandler extends SavedRequestAwareAuthentica
UserLoginCheckerJSONRespond respond = new UserLoginCheckerJSONRespond();
respond.setUserExist(authentication.isAuthenticated());
respond.setLoginStatus(authentication.isAuthenticated());
respond.setRespondInformation("Authentication Success");
// 获得 JSONTokenAuthenticationToken
JSONTokenAuthenticationToken authenticationToken = (JSONTokenAuthenticationToken) authentication;
@ -55,8 +55,7 @@ public class ASEAuthenticationSuccessHandler extends SavedRequestAwareAuthentica
}
else respond.setToken("");
// 认证成功返回200
response.getWriter().write(quickJSONRespond.getRespond200("Authentication Success", respond));
response.getWriter().write(jsonParameter.getJSONStandardRespond200(respond));
}
}

4
src/main/java/com/codesdream/ase/component/permission/ASESecurityAuthenticationProvider.java
View File

@ -43,8 +43,10 @@ public class ASESecurityAuthenticationProvider implements AuthenticationProvider
// 判断用户是否存在
UserDetails userInfo = userDetailsService.loadUserByUsername(username);
log.info(String.format("SecurityAuthentication: %s %s", username, password));
if (userInfo == null) {
throw new UsernameNotFoundException("User Not Exist");
throw new UsernameNotFoundException("User IS Not Existing");
}
// 判断密码是否正确

22
src/main/java/com/codesdream/ase/component/permission/ASEUsernamePasswordAuthenticationFilter.java
View File

@ -40,7 +40,7 @@ public class ASEUsernamePasswordAuthenticationFilter extends UsernamePasswordAut
String timestamp = request.getHeader("timestamp");
// 检查时间戳是否合理(60秒内)
if(timestamp == null || !timestampExpiredChecker.checkTimestampBeforeMaxTime(timestamp, 60)){
if(!timestampExpiredChecker.checkTimestampBeforeMaxTime(timestamp, 60)){
throw new AuthenticationServiceException("Timestamp Expired.");
}
@ -49,24 +49,16 @@ public class ASEUsernamePasswordAuthenticationFilter extends UsernamePasswordAut
throw new AuthenticationServiceException("Authentication method not supported: NOT Ajax Method.");
}
Optional<UserLoginChecker> checkerOptional = jsonParameter.getJavaObjectByRequest(request, UserLoginChecker.class);
if(!checkerOptional.isPresent()) throw new BadCredentialsException("Invalid AJAX JSON Request");
Optional<UserLoginChecker> checker = jsonParameter.getJavaObjectByRequest(request, UserLoginChecker.class);
if(!checker.isPresent()) throw new BadCredentialsException("Invalid AJAX JSON Request");
UserLoginChecker checker = checkerOptional.get();
if(checker.getUsername() == null
|| checker.getPassword() == null
|| checker.getClientCode() == null
|| checker.getCheckType() == null)
throw new AuthenticationServiceException("Request Data IS Incomplete");
if (!checker.getCheckType().equals("UsernamePasswordChecker"))
if (!checker.get().getCheckType().equals("UsernamePasswordChecker"))
throw new AuthenticationServiceException("Authentication not supported: NOT Username Password Type.");
// 获得相应的用户名密码
String username = checker.getUsername();
String password = checker.getPassword();
String clientCode = checker.getClientCode();
String username = checker.get().getUsername();
String password = checker.get().getPassword();
String clientCode = checker.get().getClientCode();
if (username == null) username = "";
if (password == null) password = "";

20
src/main/java/com/codesdream/ase/controller/ASEControllerAdvice.java
View File

@ -1,31 +1,23 @@
package com.codesdream.ase.controller;
import com.codesdream.ase.component.error.ErrorResponse;
import com.codesdream.ase.component.json.respond.ErrorInfoJSONRespond;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationServiceException;
import org.springframework.security.core.AuthenticationException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.context.request.WebRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@RestControllerAdvice
@ControllerAdvice
public class ASEControllerAdvice {
@ExceptionHandler(value = {RuntimeException.class})
public final Object handleRuntimeException(RuntimeException e, WebRequest webRequest){
ErrorInfoJSONRespond errorInfoJSONRespond = new ErrorInfoJSONRespond();
errorInfoJSONRespond.setDate(new Date());
errorInfoJSONRespond.setExceptionMessage(e.getMessage());
errorInfoJSONRespond.setException(e.getClass().getName());
return errorInfoJSONRespond;
public final ResponseEntity<Object> handleRuntimeException(RuntimeException e, WebRequest webRequest){
List<String> details = new ArrayList<>();
details.add(e.getLocalizedMessage());
ErrorResponse errorResponse = new ErrorResponse("Runtime Error", details);
return new ResponseEntity<>(errorResponse, HttpStatus.INTERNAL_SERVER_ERROR);
}
}

35
src/main/java/com/codesdream/ase/controller/ASEErrorController.java
View File

@ -1,8 +1,6 @@
package com.codesdream.ase.controller;
import com.codesdream.ase.component.datamanager.QuickJSONRespond;
import com.codesdream.ase.component.error.ErrorResponse;
import com.codesdream.ase.component.json.respond.ErrorInfoJSONRespond;
import org.springframework.boot.web.servlet.error.ErrorController;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -11,10 +9,8 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.context.request.WebRequest;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
@ -23,7 +19,7 @@ import java.util.List;
@Controller
public class ASEErrorController implements ErrorController {
/* @RequestMapping("/error")
@RequestMapping("/error")
public String handleError(HttpServletRequest request, Model model){
Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");
Exception exception = (Exception) request.getAttribute("javax.servlet.error.exception");
@ -53,36 +49,7 @@ public class ASEErrorController implements ErrorController {
model.addAttribute("exception_date", new Date());
}
return "error";
}*/
@Resource
private QuickJSONRespond quickJSONRespond;
@RequestMapping("/error")
@ResponseBody
public String handleError(HttpServletRequest request){
Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");
Exception exception = (Exception) request.getAttribute("javax.servlet.error.exception");
// 检查返回的状态
if (statusCode == HttpStatus.NOT_FOUND.value()) return quickJSONRespond.getRespond404(null);
ErrorInfoJSONRespond errorInfoJSONRespond = new ErrorInfoJSONRespond();
// 检查是否含有引发异常
if (exception.getCause() == null) {
errorInfoJSONRespond.setException(exception.getClass().getName());
errorInfoJSONRespond.setExceptionMessage(exception.getMessage());
} else {
errorInfoJSONRespond.setException(exception.getCause().getClass().getName());
errorInfoJSONRespond.setExceptionMessage(exception.getCause().getMessage());
}
errorInfoJSONRespond.setDate(new Date());
return quickJSONRespond.getJSONStandardRespond(
statusCode,
"Error Controller Handle",
null,
errorInfoJSONRespond);
}
@Override

14
src/main/java/com/codesdream/ase/controller/LoginController.java
View File

@ -2,7 +2,6 @@ package com.codesdream.ase.controller;
import com.alibaba.fastjson.JSONObject;
import com.codesdream.ase.component.datamanager.JSONParameter;
import com.codesdream.ase.component.datamanager.QuickJSONRespond;
import com.codesdream.ase.component.json.respond.JSONStandardFailedRespond;
import com.codesdream.ase.component.json.respond.JSONBaseRespondObject;
import com.codesdream.ase.component.permission.ASEUsernameEncoder;
@ -31,9 +30,6 @@ public class LoginController {
@Resource
private JSONParameter jsonParameter;
@Resource
private QuickJSONRespond quickJSONRespond;
@Resource
private IUserService userService;
@ -65,11 +61,11 @@ public class LoginController {
// 构造返回对象
UserLoginCheckerJSONRespond respond = new UserLoginCheckerJSONRespond();
respond.setUserExist(existStatus);
return quickJSONRespond.getRespond200(null, respond);
return jsonParameter.getJSONString(respond);
}
else {
// 返回失败对象
return quickJSONRespond.getRespond400("CheckType Mismatch");
return jsonParameter.getJSONString(new JSONStandardFailedRespond());
}
}
@ -85,12 +81,12 @@ public class LoginController {
if(loginChecker.getCheckType().equals("UIDGeneratorChecker")) {
UserLoginCheckerJSONRespond respond = new UserLoginCheckerJSONRespond();
respond.setUid(userService.getUsernameByStudentId(loginChecker.getUsername()));
return quickJSONRespond.getRespond200(null, respond);
respond.setRespondInformation(userService.getUsernameByStudentId(loginChecker.getUsername()));
return jsonParameter.getJSONString(respond);
}
else {
// 返回失败对象
return quickJSONRespond.getRespond400("CheckType Mismatch");
return jsonParameter.getJSONString(new JSONStandardFailedRespond());
}

112
src/main/java/com/codesdream/ase/controller/RegisterController.java
View File

@ -1,8 +1,5 @@
package com.codesdream.ase.controller;
import com.codesdream.ase.component.datamanager.JSONParameter;
import com.codesdream.ase.component.datamanager.QuickJSONRespond;
import com.codesdream.ase.component.json.request.UserRegisterChecker;
import com.codesdream.ase.model.information.BaseStudentInfo;
import com.codesdream.ase.model.permission.User;
import com.codesdream.ase.service.BaseInformationService;
@ -11,25 +8,18 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Optional;
import java.util.Map;
@Controller
public class RegisterController {
@Resource
private UserService userService;
UserService userService;
@Resource
private BaseInformationService baseInformationService;
@Resource
private JSONParameter jsonParameter;
@Resource
private QuickJSONRespond quickJSONRespond;
BaseInformationService baseInformationService;
@RequestMapping(value = "/register")
String registerView(Model model){
@ -37,61 +27,55 @@ public class RegisterController {
}
// 处理注册表单
@PostMapping(value = "/register/do_register")
@ResponseBody
String doRegister(HttpServletRequest request){
@PostMapping(value = "/register")
String doRegister(Model model, HttpServletRequest request){
Map<String, String[]> parameterMap= request.getParameterMap();
Optional<UserRegisterChecker> registerCheckerOptional =
jsonParameter.getJavaObjectByRequest(request, UserRegisterChecker.class);
// 进行处理前的检查
if(parameterMap.containsKey("student-id")
&& parameterMap.containsKey("password")
&& parameterMap.containsKey("retry-password")
&& parameterMap.containsKey("user-question")
&& parameterMap.containsKey("user-answer")
) {
// 获得提交学号
String student_id = parameterMap.get("student-id")[0].toString();
// 获得密保问题
String user_question = parameterMap.get("user-question")[0].toString();
// 获得密保答案
String user_answer = parameterMap.get("user-answer")[0].toString();
// 检查用户的基本信息是否录入系统
if(!baseInformationService.checkStudentInfo(student_id))
throw new RuntimeException("Student ID Not Found In Base Information Service");
// 查找对应的基本信息
BaseStudentInfo studentInfo = baseInformationService.findStudentInfoByStudentId(student_id);
// 根据基本信息生成对应用户
User user = userService.getUserByStudentInfo(studentInfo);
// 填充密保问题
user.getUserAuth().setUserQuestion(user_question);
user.getUserAuth().setUserAnswer(user_answer);
user.getUserAuth().setMail("");
String password = parameterMap.get("password")[0].toString();
String retry_password = parameterMap.get("retry-password")[0].toString();
if (password.equals(retry_password)) {
user.setPassword(password);
userService.save(user);
// 返回登录界面
return "login";
}
else{
throw new RuntimeException("Retry Password Not Correct");
}
// 检查JSON是否完整
if(!registerCheckerOptional.isPresent()){
return quickJSONRespond.getRespond400("Illegal JSON Format");
}
// 检查数据是否完整
UserRegisterChecker registerChecker = registerCheckerOptional.get();
if(registerChecker.getPassword() == null
|| registerChecker.getStudentId() == null
|| registerChecker.getUserAnswer() == null
|| registerChecker.getUserQuestion() == null){
return quickJSONRespond.getRespond400("Incomplete Data");
}
// 获得提交学号
String student_id = registerChecker.getStudentId();
// 获得密保问题
String user_question = registerChecker.getUserQuestion();
// 获得密保答案
String user_answer = registerChecker.getUserAnswer();
// 检查用户的基本信息是否录入系统
if(!baseInformationService.checkStudentInfo(student_id))
return quickJSONRespond.getRespond500("StudentID Base Information Not Found");
// 检查学号是否已被注册
if(userService.checkIfUserExists(userService.getUsernameByStudentId(student_id)).getKey()){
return quickJSONRespond.getRespond500("StudentID Already Used");
}
// 查找对应的基本信息
BaseStudentInfo studentInfo = baseInformationService.findStudentInfoByStudentId(student_id);
// 根据基本信息生成对应用户
User user = userService.getUserByStudentInfo(studentInfo);
// 填充密保问题
user.getUserAuth().setUserQuestion(user_question);
user.getUserAuth().setUserAnswer(user_answer);
user.getUserAuth().setMail("");
String password = registerChecker.getPassword();
user.setPassword(password);
userService.save(user);
// 成功注册
return quickJSONRespond.getRespond200("Register Success");
return "register";
}
}

15
src/main/java/com/codesdream/ase/service/ASEUserDetailsService.java
View File

@ -1,9 +1,7 @@
package com.codesdream.ase.service;
import com.codesdream.ase.component.permission.UserAuthoritiesGenerator;
import com.codesdream.ase.exception.UserNotFoundException;
import com.codesdream.ase.model.permission.User;
import org.springframework.security.authentication.AuthenticationServiceException;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
@ -23,14 +21,9 @@ public class ASEUserDetailsService implements UserDetailsService {
@Override
@Transactional
public UserDetails loadUserByUsername(String s) {
try {
User user = userService.findUserByUsername(s);
user.setAuthorities(userAuthoritiesGenerator.grantedAuthorities(user));
return user;
} catch (UserNotFoundException e){
throw new AuthenticationServiceException("User Not Exist");
}
public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException {
User user = userService.findUserByUsername(s);
user.setAuthorities(userAuthoritiesGenerator.grantedAuthorities(user));
return user;
}
}

14
src/main/java/com/codesdream/ase/service/BaseInformationService.java
View File

@ -20,25 +20,25 @@ import java.util.Vector;
public class BaseInformationService implements IBaseInformationService {
@Resource
private BaseAdministrativeDivisionRepository administrativeDivisionRepository;
BaseAdministrativeDivisionRepository administrativeDivisionRepository;
@Resource
private BaseCandidateCategoryRepository candidateCategoryRepository;
BaseCandidateCategoryRepository candidateCategoryRepository;
@Resource
private BaseCollegeRepository collegeRepository;
BaseCollegeRepository collegeRepository;
@Resource
private BaseEthnicRepository ethnicRepository;
BaseEthnicRepository ethnicRepository;
@Resource
private BaseMajorRepository majorRepository;
BaseMajorRepository majorRepository;
@Resource
private BasePoliticalStatusRepository politicalStatusRepository;
BasePoliticalStatusRepository politicalStatusRepository;
@Resource
private BaseStudentInfoRepository studentInfoRepository;
BaseStudentInfoRepository studentInfoRepository;
@Override
public boolean checkAdministrativeDivision(String name) {

5
src/main/resources/application.properties
View File

@ -8,14 +8,13 @@ spring.thymeleaf.encoding=UTF-8
spring.jpa.generate-ddl=false
spring.jpa.show-sql=true
spring.jpa.hibernate.ddl-auto=update
spring.jooq.sql-dialect=org.hibernate.dialect.MariaDB102Dialect
spring.jooq.sql-dialect=org.hibernate.dialect.MySQL5InnoDBDialect
spring.jpa.open-in-view=true
spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
spring.datasource.url=jdbc:mariadb://39.100.94.111:3306/ase?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
spring.datasource.url=jdbc:mysql://${MYSQL_HOST:119.23.9.34}:3306/ase?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
spring.datasource.username=codedream
spring.datasource.password=codedreampasswd
spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
server.error.whitelabel.enabled=false