jiangjiazhi / yimiao

Commit d129c54f93bbc1dffe339b3cad39ab544b12ad1c

Authored by landong2015 about 9 years ago

Exists in master

修改获取token方式

Showing 1 changed file with 17 additions and 11 deletions

webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java

...	...	@@ -25,10 +25,7 @@
25	25
26	26	import javax.servlet.http.HttpServletRequest;
27	27	import javax.servlet.http.HttpServletResponse;
28		-import java.util.Date;
29		-import java.util.HashMap;
30		-import java.util.List;
31		-import java.util.Map;
	28	+import java.util.*;
32	29
33	30	/**
34	31	*
...	...	@@ -153,7 +150,8 @@
153	150
154	151	LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
155	152
156		- System.out.println("+++++++++++++++"+loginContext.getId());
	153	+ List<Map> list = new ArrayList<>();
	154	+
157	155	//取到当前登陆用户的id
158	156	YmUsers users = usersService.getYmUsers(loginContext.getId());
159	157	Map<String,Object> map = new HashMap<>();
...	...	@@ -162,7 +160,9 @@
162	160	//如果没有头像,返回默认头像
163	161	map.put("avatar", QiniuUtil.buildImg(users.getAvatar()!=null ? users.getAvatar() : ImageUtil.DEFAULTUSERAVATAR));
164	162
165		- writeJson(response, JsonUtil.obj2JsonString(map));
	163	+ list.add(map);
	164	+
	165	+ ResultUtils.buildSuccessResultAndWrite(response,list);
166	166	}
167	167
168	168	/**
169	169
170	170
...	...	@@ -173,9 +173,12 @@
173	173	@RequestMapping(value = "/updatePhone", method = RequestMethod.PUT)
174	174	@TokenRequired
175	175	public void updateUserPhone(HttpServletResponse response,
	176	+ HttpServletRequest request,
176	177	@RequestParam("phone") String phone) {
	178	+ LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
	179	+
177	180	//取到当前登陆用户的id
178		- YmUsers users = usersService.getYmUsers(ContextHolder.getContext().getUserId());
	181	+ YmUsers users = usersService.getYmUsers(loginContext.getId());
179	182	if (PhoneUtil.isMobileNO(phone)){
180	183	users.setPhone(phone);
181	184	users.setModified(new Date());
182	185
183	186
...	...	@@ -192,13 +195,16 @@
192	195	* @param avatar
193	196	* @param nickname
194	197	*/
195		- @RequestMapping(value = "/usersInfo", method = RequestMethod.PUT)
	198	+ @RequestMapping(value = "/userInfo", method = RequestMethod.PUT)
196	199	@TokenRequired
197	200	public void updateUser(HttpServletResponse response,
198		- @RequestParam(value = "avatar",required = false) String avatar,
199		- @RequestParam(value = "nickname",required = false)String nickname) {
	201	+ HttpServletRequest request,
	202	+ @RequestParam(value = "avatar",required = false) String avatar,
	203	+ @RequestParam(value = "nickname",required = false)String nickname) {
	204	+ LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
	205	+
200	206	//取到当前登陆用户的id
201		- YmUsers users = usersService.getYmUsers(ContextHolder.getContext().getUserId());
	207	+ YmUsers users = usersService.getYmUsers(loginContext.getId());
202	208	users.setNickname(nickname);
203	209	users.setAvatar(avatar);
204	210	users.setModified(new Date());