diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/common/JwtUtil.java b/Spring-ZY-crud/src/main/java/com/ycjy/common/JwtUtil.java index 911678a..d9376ab 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/common/JwtUtil.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/common/JwtUtil.java @@ -36,4 +36,10 @@ public class JwtUtil { return null; } } + + // 从 Authorization 头解析 JWT 格式Bearer xxx失败返回 null + public static Claims parseBearer(String auth) { + if (auth == null || !auth.startsWith("Bearer ")) return null; + return parse(auth.substring(7)); + } } diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/common/Result.java b/Spring-ZY-crud/src/main/java/com/ycjy/common/Result.java index cd72fd9..26cd018 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/common/Result.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/common/Result.java @@ -28,9 +28,4 @@ public class Result { public static Result error(String message) { return new Result<>(ResultCode.BAD_REQUEST.getCode(), message, null); } - - /** 失败(指定错误码) */ - public static Result error(Integer code, String message) { - return new Result<>(code, message, null); - } } diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/common/ResultCode.java b/Spring-ZY-crud/src/main/java/com/ycjy/common/ResultCode.java index 2e910dc..982da2a 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/common/ResultCode.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/common/ResultCode.java @@ -5,8 +5,7 @@ import lombok.Getter; @Getter public enum ResultCode { SUCCESS(200, "成功"), - BAD_REQUEST(400, "参数错误"), - UNAUTHORIZED(401, "未登录"); + BAD_REQUEST(400, "参数错误"); private final Integer code; private final String message; diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/config/AuthInterceptor.java b/Spring-ZY-crud/src/main/java/com/ycjy/config/AuthInterceptor.java index f80e66b..77fdb5b 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/config/AuthInterceptor.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/config/AuthInterceptor.java @@ -24,7 +24,7 @@ public class AuthInterceptor implements HandlerInterceptor { String auth = request.getHeader("Authorization");// 请求头 Authorization // 已登录就把 username 放进 request,供 Controller 取用 - Claims claims = parse(auth); + Claims claims = JwtUtil.parseBearer(auth); if (claims != null) { request.setAttribute("username", claims.get("username", String.class)); } @@ -49,10 +49,4 @@ public class AuthInterceptor implements HandlerInterceptor { return true; } - - // 解析 token,失败返回 null - private Claims parse(String auth) { - if (auth == null || !auth.startsWith("Bearer ")) return null; - return JwtUtil.parse(auth.substring(7)); - } } diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/config/WebAppConfig.java b/Spring-ZY-crud/src/main/java/com/ycjy/config/WebAppConfig.java index d5d0b2d..b82090a 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/config/WebAppConfig.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/config/WebAppConfig.java @@ -79,7 +79,7 @@ public class WebAppConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(authInterceptor) .addPathPatterns("/api/**") - .excludePathPatterns("/api/login", "/api/upload", "/api/me", "/api/prodect", "/api/logs"); + .excludePathPatterns("/api/login", "/api/upload", "/api/prodect", "/api/logs"); } @Override diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/controller/UploadController.java b/Spring-ZY-crud/src/main/java/com/ycjy/controller/UploadController.java index c042d41..12f52c2 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/controller/UploadController.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/controller/UploadController.java @@ -20,11 +20,12 @@ public class UploadController { String ext = originalFilename.substring(originalFilename.lastIndexOf(".")); String fileName = UUID.randomUUID().toString().replace("-", "") + ext; - // 固定目录:放在部署目录之外,重新编译/部署也不会丢失图片 + // 如果上传目录不存在就创建 File dir = new File(UploadConstants.UPLOAD_DIR); if (!dir.exists()) dir.mkdirs(); file.transferTo(new File(dir, fileName)); + // 返回上传成功后的URL路径 Map data = new HashMap<>(); data.put("url", "/upload/" + fileName); return Result.success(data); diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/controller/UserController.java b/Spring-ZY-crud/src/main/java/com/ycjy/controller/UserController.java index 8408c51..aac7c84 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/controller/UserController.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/controller/UserController.java @@ -2,11 +2,9 @@ package com.ycjy.controller; import com.ycjy.common.JwtUtil; import com.ycjy.common.Result; -import com.ycjy.common.ResultCode; import com.ycjy.dao.User; import com.ycjy.dto.LoginDTO; import com.ycjy.service.UserService; -import io.jsonwebtoken.Claims; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,16 +30,4 @@ public class UserController { data.put("user", user); return Result.success(data); } - - @GetMapping("/me") - public Result me(@RequestHeader(value = "Authorization", required = false) String auth) { - if (auth == null || !auth.startsWith("Bearer ")) return Result.error(ResultCode.UNAUTHORIZED.getCode(), "未登录"); - Claims claims = JwtUtil.parse(auth.substring(7)); - if (claims == null) return Result.error(ResultCode.UNAUTHORIZED.getCode(), "登录已失效"); - Integer userId = Integer.valueOf(claims.getSubject()); - User user = userService.getById(userId); - if (user == null) return Result.error(ResultCode.UNAUTHORIZED.getCode(), "用户不存在"); - user.setPassword(null); - return Result.success(user); - } } \ No newline at end of file diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/mapper/UserMapper.java b/Spring-ZY-crud/src/main/java/com/ycjy/mapper/UserMapper.java index 39142d1..ad86c23 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/mapper/UserMapper.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/mapper/UserMapper.java @@ -6,5 +6,4 @@ import org.apache.ibatis.annotations.Param; public interface UserMapper { User getUser(@Param("username") String username); - User getById(@Param("id") Integer id); } diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/service/UserService.java b/Spring-ZY-crud/src/main/java/com/ycjy/service/UserService.java index 013741f..4b5d9af 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/service/UserService.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/service/UserService.java @@ -16,8 +16,4 @@ public class UserService { if (user == null || !password.equals(user.getPassword())) return null; return user; } - - public User getById(Integer id) { - return userMapper.getById(id); - } } diff --git a/Spring-ZY-crud/src/main/resources/mappers/UserMapper.xml b/Spring-ZY-crud/src/main/resources/mappers/UserMapper.xml index 7ac6e21..e53e30a 100644 --- a/Spring-ZY-crud/src/main/resources/mappers/UserMapper.xml +++ b/Spring-ZY-crud/src/main/resources/mappers/UserMapper.xml @@ -11,10 +11,4 @@ WHERE username = #{username} LIMIT 1 - - \ No newline at end of file