1 files changed, 14 insertions, 10 deletions
diff --git a/src/main/java/com/juick/server/www/controllers/Settings.java b/src/main/java/com/juick/server/www/controllers/Settings.java
index d5a21d09..370c2154 100644
--- a/src/main/java/com/juick/server/www/controllers/Settings.java
+++ b/src/main/java/com/juick/server/www/controllers/Settings.java
@@ -20,9 +20,9 @@ import com.juick.User;
 import com.juick.model.NotifyOpts;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.server.util.HttpUtils;
-import com.juick.server.util.UserUtils;
 import com.juick.server.www.WebApp;
 import com.juick.service.*;
+import com.juick.service.security.annotation.Visitor;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -79,8 +79,10 @@ public class Settings {
     private WebApp webApp;
 
     @GetMapping("/settings")
-    protected String doGet(HttpServletRequest request, HttpServletResponse response, ModelMap model) throws IOException {
-        com.juick.User visitor = UserUtils.getCurrentUser();
+    protected String doGet(
+            @Visitor User visitor,
+            HttpServletRequest request,
+            HttpServletResponse response, ModelMap model) throws IOException {
         if (visitor.isAnonymous()) {
             response.sendRedirect("/login");
         }
@@ -119,11 +121,12 @@ public class Settings {
     }
 
     @PostMapping("/settings")
-    protected String doPost(HttpServletRequest request, HttpServletResponse response,
-                            @RequestParam(required = false) MultipartFile avatar,
-                            ModelMap model)
+    protected String doPost(
+            @Visitor User visitor,
+            HttpServletRequest request, HttpServletResponse response,
+            @RequestParam(required = false) MultipartFile avatar,
+            ModelMap model)
             throws IOException {
-        com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.isAnonymous()) {
             throw new HttpBadRequestException();
         }
@@ -261,9 +264,10 @@ public class Settings {
         return "views/settings_result";
     }
     @PostMapping("/settings/unsubscribe")
-    public String unsubscribeOneClick(@RequestParam(name = "List-Unsubscribe") String unsubscribe,
-                                      ModelMap model) {
-        User user = UserUtils.getCurrentUser();
+    public String unsubscribeOneClick(
+            @Visitor User user,
+            @RequestParam(name = "List-Unsubscribe") String unsubscribe,
+            ModelMap model) {
         if (!user.isAnonymous()) {
             if (unsubscribe.equals("One-Click")) {
                 emailService.setNotificationsEmail(user.getUid(), StringUtils.EMPTY);