Compare commits

..

No commits in common. "55e40288df6a6980d718fe8e6266d48ab9671c99" and "af4a0f9684b4e8602a533d382e9b800a15f0ba64" have entirely different histories.

4 changed files with 30 additions and 42 deletions

View File

@ -2,15 +2,9 @@ package org.cmh.backend.Utils;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.web.bind.MissingServletRequestParameterException;
import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@ControllerAdvice @ControllerAdvice
public class GlobalExceptionHandler { public class GlobalExceptionHandler {
@ -18,17 +12,4 @@ public class GlobalExceptionHandler {
public ResponseEntity<Object> handleJwtInvalidException(JwtValidationException ex) { public ResponseEntity<Object> handleJwtInvalidException(JwtValidationException ex) {
return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
} }
@ExceptionHandler(MissingServletRequestParameterException.class)
public ResponseEntity<Map<String, String>> handleMissingServletRequestParameterException(MissingServletRequestParameterException ex) {
HashMap<String, String> response = new HashMap<>();
response.put("error", ex.getMessage());
response.put("stackTrace", Arrays.toString(ex.getStackTrace()));
return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
}
@ExceptionHandler(HttpMessageNotReadableException.class)
public ResponseEntity<String> handleHttpMessageNotReadableException(HttpMessageNotReadableException ex) {
return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
}
} }

View File

@ -1,6 +1,5 @@
package org.cmh.backend.Utils; package org.cmh.backend.Utils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -8,26 +7,14 @@ import org.springframework.stereotype.Component;
@Aspect @Aspect
@Component @Component
public class JwtVerifyAspect { public class JwtVerifyAspect {
@Before("@annotation(JwtVerify)&&args(..)") @Before("@annotation(JwtVerify) && args(request,..)")
public void verifyJwtToken(JoinPoint joinPoint) throws JwtValidationException { public void verifyJwtToken(Object request) throws JwtValidationException {
Object[] args = joinPoint.getArgs(); if (request instanceof JwtRequest) {
for (Object arg : args) { String token = ((JwtRequest) request).getToken();
if (arg instanceof JwtRequest jwtRequest) { if (!JwtUtil.isTokenValid(token)) {
String token = jwtRequest.getToken(); throw new JwtValidationException("JWT token is invalid");
if (!JwtUtil.isTokenValid(token)) {
throw new JwtValidationException("请求未正确携带身份令牌");
}
return; // 只接受第一个 JwtRequest 对象收到后不再校验其他参数
}
// JWTRequest对象优先否则再检查其他字符串参数
if (arg instanceof String token){
if (JwtUtil.isTokenValid(token)){
// 验证成功就直接退出
return;
}
} }
} }
throw new JwtValidationException("请求未正确携带身份令牌");
} }
} }

View File

@ -0,0 +1,23 @@
package org.cmh.backend.authentication.controller;
import org.cmh.backend.authentication.model.UserHS;
import org.cmh.backend.authentication.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/users")
public class UserController {
@Autowired
private UserService userService;
@GetMapping("/{username}")
public ResponseEntity<UserHS> getUser(@PathVariable String username) {
UserHS user = userService.getUserByUsername(username);
return ResponseEntity.ok(user);
}
}

View File

@ -22,8 +22,5 @@ server.servlet.encoding.force=true
server.servlet.encoding.charset=utf-8 server.servlet.encoding.charset=utf-8
# verificationCode # verificationCode
verification.code.images.path=src/main/resources/static/verificationCodeImages verification.code.images.path=src/main/resources/static/verificationCodeImages
# set the max size of a single file
spring.servlet.multipart.max-file-size=50MB
# set the max size of the total request
spring.servlet.multipart.max-request-size=50MB