From 3dbeb25a09bfbd0a124193b3f327b8e7e3fc04b1 Mon Sep 17 00:00:00 2001
From: Tim <nagisa12164@163.com>
Date: Tue, 29 Jul 2025 19:12:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=8D=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E9=87=8D=E6=96=B0=E5=8F=91=E6=94=BEtoken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 open-isle-cli/src/views/SettingsPageView.vue       | 14 +++++++++++---
 .../com/openisle/controller/UserController.java    |  8 ++++++--
 .../com/openisle/service/SubscriptionService.java  | 10 +++++++---
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/open-isle-cli/src/views/SettingsPageView.vue b/open-isle-cli/src/views/SettingsPageView.vue
index 05b2df93e..7c243eae6 100644
--- a/open-isle-cli/src/views/SettingsPageView.vue
+++ b/open-isle-cli/src/views/SettingsPageView.vue
@@ -55,7 +55,7 @@
 
 <script>
 import { API_BASE_URL, toast } from '../main'
-import { getToken, fetchCurrentUser } from '../utils/auth'
+import { getToken, fetchCurrentUser, setToken } from '../utils/auth'
 import BaseInput from '../components/BaseInput.vue'
 import Dropdown from '../components/Dropdown.vue'
 import { hatch } from 'ldrs'
@@ -91,6 +91,9 @@ export default {
       if (this.role === 'ADMIN') {
         this.loadAdminConfig()
       }
+    } else {
+      toast.error('请先登录')
+      this.$router.push('/login')
     }
     this.isLoadingPage = false
   },
@@ -154,7 +157,7 @@ export default {
       this.isSaving = true
 
       do {
-        const token = getToken()
+        let token = getToken()
         this.usernameError = ''
         if (!this.username) {
           this.usernameError = '用户名不能为空'
@@ -184,11 +187,16 @@ export default {
           headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
           body: JSON.stringify({ username: this.username, introduction: this.introduction })
         })
+
+        const data = await res.json()
         if (!res.ok) {
-          const data = await res.json()
           toast.error(data.error || '保存失败')
           break
         }
+        if (data.token) {
+          setToken(data.token)
+          token = data.token
+        }
         if (this.role === 'ADMIN') {
           await fetch(`${API_BASE_URL}/api/admin/config`, {
             method: 'POST',
diff --git a/src/main/java/com/openisle/controller/UserController.java b/src/main/java/com/openisle/controller/UserController.java
index 1ffddcb38..4809e0e67 100644
--- a/src/main/java/com/openisle/controller/UserController.java
+++ b/src/main/java/com/openisle/controller/UserController.java
@@ -28,6 +28,7 @@ public class UserController {
     private final PostReadService postReadService;
     private final UserVisitService userVisitService;
     private final LevelService levelService;
+    private final JwtService jwtService;
 
     @Value("${app.upload.check-type:true}")
     private boolean checkImageType;
@@ -73,10 +74,13 @@ public class UserController {
     }
 
     @PutMapping("/me")
-    public ResponseEntity<UserDto> updateProfile(@RequestBody UpdateProfileDto dto,
+    public ResponseEntity<?> updateProfile(@RequestBody UpdateProfileDto dto,
                                                  Authentication auth) {
         User user = userService.updateProfile(auth.getName(), dto.getUsername(), dto.getIntroduction());
-        return ResponseEntity.ok(toDto(user, auth));
+        return ResponseEntity.ok(Map.of(
+                "token", jwtService.generateToken(user.getUsername()),
+                "user", toDto(user, auth)
+        ));
     }
 
     @PostMapping("/me/signin")
diff --git a/src/main/java/com/openisle/service/SubscriptionService.java b/src/main/java/com/openisle/service/SubscriptionService.java
index 8f31a78c5..841fad659 100644
--- a/src/main/java/com/openisle/service/SubscriptionService.java
+++ b/src/main/java/com/openisle/service/SubscriptionService.java
@@ -122,9 +122,13 @@ public class SubscriptionService {
         if (subscriberName == null || targetName == null || subscriberName.equals(targetName)) {
             return false;
         }
-        User subscriber = userRepo.findByUsername(subscriberName).orElseThrow();
-        User target = findUser(targetName).orElseThrow();
-        return userSubRepo.findBySubscriberAndTarget(subscriber, target).isPresent();
+        Optional<User> subscriber = userRepo.findByUsername(subscriberName);
+        Optional<User> target = findUser(targetName);
+        if (subscriber.isEmpty() || target.isEmpty()) {
+            // 修改个人信息会出现，先不抛出错误
+            return false;
+        }
+        return userSubRepo.findBySubscriberAndTarget(subscriber.get(), target.get()).isPresent();
     }
 
     public boolean isPostSubscribed(String username, Long postId) {