更新登录注册代码

Author: yqz

.cursor/rules/rule.mdc

@@ -4,7 +4,7 @@ alwaysApply: true
 
 前端规则：
 
-任何前端代码的编写都要求和之前项目整体的前端的，字体大小风格，颜色搭配保持一致
+任何前端代码的编写都要求和之前项目整体的前端的，字体大小风格，默认为不添加任何颜色
 
 
 后端规则：

src/main/java/com/yqz/openblog/article/service/ArticleService.java

@@ -49,7 +49,7 @@ public ArticleListItemResponse mapListItem(Article a) {
         resp.setCoverMediaKey(a.getCoverMediaKey());
         resp.setAuthorId(a.getAuthorId());
         User author = userMapper.selectById(a.getAuthorId());
-        resp.setAuthorNickname(author == null ? null : author.getNickname());
+        resp.setAuthorNickname(author == null ? null : author.getUsername());
         resp.setPublishedAt(a.getPublishedAt());
         resp.setStatus(a.getStatus());
         resp.setLikeCount(a.getLikeCount());
@@ -68,7 +68,7 @@ public ArticleDetailResponse mapDetail(Article a) {
         resp.setCoverMediaKey(a.getCoverMediaKey());
         resp.setAuthorId(a.getAuthorId());
         User author = userMapper.selectById(a.getAuthorId());
-        resp.setAuthorNickname(author == null ? null : author.getNickname());
+        resp.setAuthorNickname(author == null ? null : author.getUsername());
         resp.setPublishedAt(a.getPublishedAt());
         resp.setStatus(a.getStatus());
         resp.setLikeCount(a.getLikeCount());

src/main/java/com/yqz/openblog/comment/service/CommentService.java

@@ -160,9 +160,7 @@ private CommentUserResponse toUser(User u, Long uid) {
             cu.setAvatarUrl(null);
             return cu;
         }
-        String nn = u.getNickname();
-        if (nn == null || nn.isBlank()) nn = u.getUsername();
-        cu.setNickname(nn);
+        cu.setNickname(u.getUsername());
         cu.setAvatarUrl(u.getAvatarUrl());
         return cu;
     }

src/main/java/com/yqz/openblog/user/controller/PublicProfileController.java

@@ -31,14 +31,14 @@ public PublicProfileController(UserMapper userMapper, CurrentUser currentUser, M
     @GetMapping("/profile")
     public ApiResponse<PublicProfileResponse> profile() {
         // 如果前端携带了 JWT，则优先返回“当前登录用户”的公开信息
-        // 这样在管理员/作者编辑后，前台页面也能立刻反映你改的昵称/签名/头像。
+        // 这样在管理员/作者编辑后，前台页面也能立刻反映你改的用户名/签名/头像。
         Long uid = currentUser.userId();
         if (uid != null) {
             User u = userMapper.selectById(uid);
             if (u != null) {
                 PublicProfileResponse resp = new PublicProfileResponse();
                 resp.setUserId(u.getId());
-                resp.setNickname(u.getNickname());
+                resp.setUsername(u.getUsername());
                 resp.setAvatarUrl(mediaService.normalizePublicMediaUrl(u.getAvatarUrl()));
                 resp.setBio(u.getBio());
                 return ApiResponse.ok(resp);
@@ -69,7 +69,7 @@ public ApiResponse<PublicProfileResponse> profile() {
 
         PublicProfileResponse resp = new PublicProfileResponse();
         resp.setUserId(u.getId());
-        resp.setNickname(u.getNickname());
+        resp.setUsername(u.getUsername());
         resp.setAvatarUrl(mediaService.normalizePublicMediaUrl(u.getAvatarUrl()));
         resp.setBio(u.getBio());
         return ApiResponse.ok(resp);

src/main/java/com/yqz/openblog/user/controller/UserAdminController.java

@@ -0,0 +1,69 @@
+package com.yqz.openblog.user.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yqz.openblog.common.ApiResponse;
+import com.yqz.openblog.common.BizException;
+import com.yqz.openblog.user.dto.PendingUserResponse;
+import com.yqz.openblog.user.entity.User;
+import com.yqz.openblog.user.entity.UserRole;
+import com.yqz.openblog.user.repo.UserMapper;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1")
+@CrossOrigin(origins = "*")
+public class UserAdminController {
+
+    private final UserMapper userMapper;
+
+    public UserAdminController(UserMapper userMapper) {
+        this.userMapper = userMapper;
+    }
+
+    @GetMapping("/admin/users/pending")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ApiResponse<List<PendingUserResponse>> listPendingReaders() {
+        List<User> users = userMapper.selectList(
+                Wrappers.lambdaQuery(User.class)
+                        .eq(User::getStatus, "PENDING")
+                        .eq(User::getRole, UserRole.READER)
+                        .orderByDesc(User::getCreatedAt));
+        List<PendingUserResponse> list = users.stream().map(this::toPending).toList();
+        return ApiResponse.ok(list);
+    }
+
+    @PostMapping("/admin/users/{userId}/approve")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ApiResponse<Void> approveReader(@PathVariable("userId") Long userId) {
+        User u = userMapper.selectById(userId);
+        if (u == null) {
+            throw new BizException(4041, "用户不存在");
+        }
+        if (u.getRole() != UserRole.READER) {
+            throw new BizException(4000, "仅支持审核读者账号");
+        }
+        if (!"PENDING".equals(u.getStatus())) {
+            throw new BizException(4000, "该账号不在待审核状态");
+        }
+        u.setStatus("ACTIVE");
+        userMapper.updateById(u);
+        return ApiResponse.ok();
+    }
+
+    private PendingUserResponse toPending(User u) {
+        PendingUserResponse r = new PendingUserResponse();
+        r.setUserId(u.getId());
+        r.setUsername(u.getUsername());
+        r.setEmail(u.getEmail());
+        r.setCreatedAt(u.getCreatedAt());
+        return r;
+    }
+}

src/main/java/com/yqz/openblog/user/dto/MeResponse.java

@@ -5,7 +5,6 @@
 public class MeResponse {
     private Long userId;
     private String username;
-    private String nickname;
     private String avatarUrl;
     private String bio;
     private UserRole role;
@@ -26,14 +25,6 @@ public void setUsername(String username) {
         this.username = username;
     }
 
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
     public String getAvatarUrl() {
         return avatarUrl;
     }

src/main/java/com/yqz/openblog/user/dto/PendingUserResponse.java

@@ -0,0 +1,43 @@
+package com.yqz.openblog.user.dto;
+
+import java.time.Instant;
+
+public class PendingUserResponse {
+
+    private Long userId;
+    private String username;
+    private String email;
+    private Instant createdAt;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Instant getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Instant createdAt) {
+        this.createdAt = createdAt;
+    }
+}

src/main/java/com/yqz/openblog/user/dto/PublicProfileResponse.java

@@ -2,7 +2,7 @@
 
 public class PublicProfileResponse {
     private Long userId;
-    private String nickname;
+    private String username;
     private String avatarUrl;
     private String bio;
 
@@ -14,12 +14,12 @@ public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public String getNickname() {
-        return nickname;
+    public String getUsername() {
+        return username;
     }
 
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
     public String getAvatarUrl() {

src/main/java/com/yqz/openblog/user/dto/RegisterRequest.java

@@ -19,9 +19,6 @@ public class RegisterRequest {
     @Size(min = 6, max = 72)
     private String password;
 
-    @Size(max = 32)
-    private String nickname;
-
     private String sliderChallengeId;
 
     public String getUsername() {
@@ -48,14 +45,6 @@ public void setPassword(String password) {
         this.password = password;
     }
 
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
     public String getSliderChallengeId() {
         return sliderChallengeId;
     }

src/main/java/com/yqz/openblog/user/dto/UserUpdateRequest.java

@@ -9,9 +9,6 @@ public class UserUpdateRequest {
     @Size(min = 3, max = 32)
     private String username;
 
-    @Size(max = 32)
-    private String nickname;
-
     @Size(max = 512)
     private String bio;
 
@@ -30,14 +27,6 @@ public void setUsername(String username) {
         this.username = username;
     }
 
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
     public String getBio() {
         return bio;
     }