From d129c54f93bbc1dffe339b3cad39ab544b12ad1c Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Mon, 2 May 2016 18:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96token?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yimiao/web/controller/v1/UserController.java   | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
index 7e26e14..45a3c27 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
@@ -25,10 +25,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *
@@ -153,7 +150,8 @@ public class UserController extends BaseController {
 
         LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
 
-        System.out.println("+++++++++++++++"+loginContext.getId());
+        List<Map> list = new ArrayList<>();
+
         //取到当前登陆用户的id
         YmUsers users = usersService.getYmUsers(loginContext.getId());
         Map<String,Object> map = new HashMap<>();
@@ -162,7 +160,9 @@ public class UserController extends BaseController {
         //如果没有头像,返回默认头像
         map.put("avatar", QiniuUtil.buildImg(users.getAvatar()!=null ? users.getAvatar() : ImageUtil.DEFAULTUSERAVATAR));
 
-        writeJson(response, JsonUtil.obj2JsonString(map));
+        list.add(map);
+
+        ResultUtils.buildSuccessResultAndWrite(response,list);
     }
 
     /**
@@ -173,9 +173,12 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/updatePhone", method = RequestMethod.PUT)
     @TokenRequired
     public void updateUserPhone(HttpServletResponse response,
+                                HttpServletRequest request,
                                 @RequestParam("phone") String phone) {
+        LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
+
         //取到当前登陆用户的id
-        YmUsers users = usersService.getYmUsers(ContextHolder.getContext().getUserId());
+        YmUsers users = usersService.getYmUsers(loginContext.getId());
         if (PhoneUtil.isMobileNO(phone)){
             users.setPhone(phone);
             users.setModified(new Date());
@@ -192,13 +195,16 @@ public class UserController extends BaseController {
      * @param avatar
      * @param nickname
      */
-    @RequestMapping(value = "/usersInfo", method = RequestMethod.PUT)
+    @RequestMapping(value = "/userInfo", method = RequestMethod.PUT)
     @TokenRequired
     public void updateUser(HttpServletResponse response,
-                               @RequestParam(value = "avatar",required = false) String avatar,
-                               @RequestParam(value = "nickname",required = false)String nickname) {
+                           HttpServletRequest request,
+                           @RequestParam(value = "avatar",required = false) String avatar,
+                           @RequestParam(value = "nickname",required = false)String nickname) {
+        LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
+
         //取到当前登陆用户的id
-        YmUsers users = usersService.getYmUsers(ContextHolder.getContext().getUserId());
+        YmUsers users = usersService.getYmUsers(loginContext.getId());
         users.setNickname(nickname);
         users.setAvatar(avatar);
         users.setModified(new Date());
-- 
1.8.3.1