shiyang / regional-platform

Commit 1272e8b4adacd230deff2f0e476452aa274e875d

Authored by jiangjiazhi over 9 years ago

增加退出登录接口

Showing 3 changed files with 95 additions and 81 deletions

platform-biz-service/src/main/resources/mainOrm/Permissions.xml
platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java

...	...	@@ -97,12 +97,12 @@
97	97
98	98
99	99	<sql id="orderAndLimit">
100		-<if test="sort != null and sort != '' ">
101		-order by ${sort}
	100	+
	101	+order by weight
102	102	<if test="need != null">
103	103	limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
104	104	</if>
105		-</if>
	105	+
106	106	</sql>
107	107
108	108

...	...	@@ -25,7 +25,7 @@
25	25	int statusCode = post.getStatusCode();
26	26	String result = new String(post.getResponseBodyAsString());
27	27	post.releaseConnection();
28		- if(200 == statusCode) {
	28	+ if (200 == statusCode) {
29	29	LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
30	30	return loginState;
31	31	}
32	32
...	...	@@ -51,9 +51,9 @@
51	51	String result = new String(post.getResponseBodyAsString());
52	52
53	53	post.releaseConnection();
54		- if(200 == statusCode) {
	54	+ if (200 == statusCode) {
55	55	LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
56		- if(0 == loginState.getErrorcode()) {
	56	+ if (0 == loginState.getErrorcode()) {
57	57	return loginState.getId();
58	58	}
59	59	}
60	60
...	...	@@ -79,9 +79,9 @@
79	79	String result = new String(post.getResponseBodyAsString());
80	80
81	81	post.releaseConnection();
82		- if(200 == statusCode) {
	82	+ if (200 == statusCode) {
83	83	LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
84		- if(0 == loginState.getErrorcode()) {
	84	+ if (0 == loginState.getErrorcode()) {
85	85	return loginState.getToken();
86	86	}
87	87	}
88	88
...	...	@@ -107,9 +107,9 @@
107	107	String result = new String(post.getResponseBodyAsString());
108	108
109	109	post.releaseConnection();
110		- if(200 == statusCode) {
	110	+ if (200 == statusCode) {
111	111	LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
112		- if(0 == loginState.getErrorcode()) {
	112	+ if (0 == loginState.getErrorcode()) {
113	113	return loginState.getToken();
114	114	}
115	115	}
...	...	@@ -119,6 +119,17 @@
119	119	return null;
120	120	}
121	121
	122	+ public static void deleteToken(String token) {
	123	+ try {
	124	+ MessageUtil.UTF8GetMethod utf8GetMethod = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/logout.action");
	125	+ utf8GetMethod.setRequestHeader("Authorization", token);
	126	+ HttpClient client = new HttpClient();
	127	+ client.executeMethod(utf8GetMethod);
	128	+ } catch (Exception e) {
	129	+ ExceptionUtils.catchException(e, "delete token , " + e.getMessage());
	130	+ }
	131	+ }
	132	+
122	133	public static LoginContext sendVerCode(String phone, String typeId, String token) {
123	134	HttpClient client = new HttpClient();
124	135	String query = "?phone=" + phone + "&typeId=" + typeId + "&token=" + token + "&userType=2";
...	...	@@ -130,7 +141,7 @@
130	141	int statusCode = get.getStatusCode();
131	142	String result = new String(get.getResponseBodyAsString());
132	143	get.releaseConnection();
133		- if(200 == statusCode) {
	144	+ if (200 == statusCode) {
134	145	LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
135	146	return loginState;
136	147	}
...	...	@@ -144,7 +155,7 @@
144	155	public static LoginContext checkLoginState(String token) {
145	156	LoginContext loginState = new LoginContext();
146	157	HttpClient client = new HttpClient();
147		- String query = "?token=" + token ;
	158	+ String query = "?token=" + token;
148	159	GetMethod get = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/check.action" + query);
149	160	get.setRequestHeader("Authorization", token);
150	161	try {
...	...	@@ -152,7 +163,7 @@
152	163	int statusCode = get.getStatusCode();
153	164	String result = new String(get.getResponseBodyAsString());
154	165	get.releaseConnection();
155		- if(200 == statusCode) {
	166	+ if (200 == statusCode) {
156	167	loginState = JsonUtil.str2Obj(result, LoginContext.class);
157	168	return loginState;
158	169	}
159	170
...	...	@@ -163,11 +174,9 @@
163	174	}
164	175
165	176
166		-
167		-
168	177	public static String md5(String plainText) {
169	178	try {
170		- if(plainText==null){
	179	+ if (plainText == null) {
171	180	return null;
172	181	}
173	182	MessageDigest md = MessageDigest.getInstance("MD5");

...	...	@@ -7,7 +7,9 @@
7	7	import com.lyms.platform.common.constants.ConstantInterface;
8	8	import com.lyms.platform.common.constants.ErrorCodeConstants;
9	9	import com.lyms.platform.common.enums.YnEnums;
10		-import com.lyms.platform.common.utils.*;
	10	+import com.lyms.platform.common.utils.JsonUtil;
	11	+import com.lyms.platform.common.utils.LoginUtil;
	12	+import com.lyms.platform.common.utils.ResultUtils;
11	13	import com.lyms.platform.operate.web.result.FrontEndResult;
12	14	import com.lyms.platform.permission.model.*;
13	15	import com.lyms.platform.permission.service.*;
...	...	@@ -54,7 +56,6 @@
54	56	private static final String LYMS = "龙源美生";
55	57
56	58
57		-
58	59	/**
59	60	* 获取管理员列表
60	61	*/
...	...	@@ -62,10 +63,10 @@
62	63	@ResponseBody
63	64	@TokenRequired
64	65	public FrontEndResult getAdminList(HttpServletResponse response,
65		- @RequestParam(value = "keyword", required = false) String keyword,
66		- @RequestParam(value = "rolesId", required = false) Integer rolesId,
67		- @RequestParam(value = "page", required = false) Integer page,
68		- @RequestParam(value = "limit", required = false) Integer limit) {
	66	+ @RequestParam(value = "keyword", required = false) String keyword,
	67	+ @RequestParam(value = "rolesId", required = false) Integer rolesId,
	68	+ @RequestParam(value = "page", required = false) Integer page,
	69	+ @RequestParam(value = "limit", required = false) Integer limit) {
69	70
70	71	limit = limit == null ? 10 : limit;
71	72	page = page == null ? 1 : page;
...	...	@@ -82,7 +83,7 @@
82	83
83	84	List<Users> users = usersService.queryUsers2(usersQuery);
84	85	//设置用户角色信息
85		- for(Users user : users) {
	86	+ for (Users user : users) {
86	87	user.setRoles(this.getUserRoles(user.getId()));
87	88	user.setOrganization(organizationService.getOrganization(user.getOrgId()));
88	89	user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
...	...	@@ -97,7 +98,6 @@
97	98	}
98	99
99	100
100		-
101	101	/**
102	102	* 获取用户列表
103	103	*/
...	...	@@ -105,12 +105,12 @@
105	105	@TokenRequired
106	106	@ResponseBody
107	107	public FrontEndResult getPermissions(HttpServletResponse response,
108		- @RequestParam(value = "keyword", required = false) String keyword,
109		- @RequestParam(value = "rolesId", required = false) Integer rolesId,
110		- @RequestParam(value = "page", required = false) Integer page,
111		- @RequestParam(value = "limit", required = false) Integer limit,
112		- @RequestParam(value = "orgId", required = false) Integer orgId,
113		- @RequestParam(value = "deptId", required = false) Integer deptId) {
	108	+ @RequestParam(value = "keyword", required = false) String keyword,
	109	+ @RequestParam(value = "rolesId", required = false) Integer rolesId,
	110	+ @RequestParam(value = "page", required = false) Integer page,
	111	+ @RequestParam(value = "limit", required = false) Integer limit,
	112	+ @RequestParam(value = "orgId", required = false) Integer orgId,
	113	+ @RequestParam(value = "deptId", required = false) Integer deptId) {
114	114
115	115	limit = limit == null ? 10 : limit;
116	116	page = page == null ? 1 : page;
...	...	@@ -131,7 +131,7 @@
131	131	List<Users> users = usersService.queryUsers2(usersQuery);
132	132
133	133	//设置用户角色信息
134		- for(Users user : users) {
	134	+ for (Users user : users) {
135	135	user.setRoles(this.getUserRoles(user.getId()));
136	136	user.setOrganization(organizationService.getOrganization(user.getOrgId()));
137	137	user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
138	138
...	...	@@ -147,13 +147,13 @@
147	147	}
148	148
149	149	//获取用户角色信息
150		- private List<Roles> getUserRoles(Integer userId) {
	150	+ private List<Roles> getUserRoles(Integer userId) {
151	151	UserRoleMapsQuery query = new UserRoleMapsQuery();
152	152	query.setUserId(userId);
153	153	query.setYn(YnEnums.YES.getId());
154	154	List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
155	155	List<Roles> roles = new ArrayList<>();
156		- for(UserRoleMaps roleMaps : userRoleMapses) {
	156	+ for (UserRoleMaps roleMaps : userRoleMapses) {
157	157	roles.add(rolesService.getRoles(roleMaps.getRoleId()));
158	158	}
159	159	return roles;
160	160
...	...	@@ -179,13 +179,13 @@
179	179	UsersQuery usersQuery = new UsersQuery();
180	180	usersQuery.setPhone(account);
181	181	List<Users> users = usersService.queryUsers(usersQuery);
182		- if(0 == users.size()) {
	182	+ if (0 == users.size()) {
183	183	ResultUtils.buildParameterErrorResultAndWrite(response, "该账户不存在");
184	184	return;
185	185	}
186	186
187		- String key =LoginUtil.login(account, code, typeId, token);
188		- if(null != key) {
	187	+ String key = LoginUtil.login(account, code, typeId, token);
	188	+ if (null != key) {
189	189	Users users1 = new Users();
190	190	users1.setId(users.get(0).getId());
191	191	users1.setLastLoginTime(new Date());
...	...	@@ -194,7 +194,7 @@
194	194	Map<String, Object> result = new HashMap<>();
195	195	result.put("token", key);
196	196	ResultUtils.buildSuccessResultAndWrite(response, result);
197		- }else {
	197	+ } else {
198	198	ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.PARAMETER_ERROR, "登录失败,手机或验证码错误");
199	199	}
200	200	}
201	201
202	202
...	...	@@ -217,18 +217,18 @@
217	217	usersQuery.setPhone(phone);
218	218	usersQuery.setYn(YnEnums.YES.getId());
219	219	List<Users> list = usersService.queryUsers(usersQuery);
220		- if(0 == list.size()) {
	220	+ if (0 == list.size()) {
221	221	ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户不存在");
222	222	return;
223	223	}
224	224
225		- if(list.get(0).getEnable().equals(2)) {
	225	+ if (list.get(0).getEnable().equals(2)) {
226	226	ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户已被禁用");
227	227	return;
228	228	}
229	229
230	230	LoginContext loginContext = LoginUtil.sendVerCode(phone, typeId, token);
231		- if(null != loginContext) {
	231	+ if (null != loginContext) {
232	232	ResultUtils.buildResultAndWrite(httpServletResponse, loginContext.getErrorcode(), loginContext.getErrormsg());
233	233	return;
234	234	}
...	...	@@ -245,7 +245,7 @@
245	245	public void usersLoginMsg(HttpServletResponse response, HttpServletRequest request) {
246	246	LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
247	247	Users users = null;
248		- if(null != loginContext) {
	248	+ if (null != loginContext) {
249	249	users = usersService.getUsers(loginContext.getId());
250	250	}
251	251
...	...	@@ -256,8 +256,8 @@
256	256	List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query);
257	257	List<Roles> roles = new ArrayList<>();
258	258	List<Permissions> permissions = null;
259		- RolePermissionMapsQuery rolePermissionMapsQuery ;
260		- for(Integer roleMaps : userRoleMapses) {
	259	+ RolePermissionMapsQuery rolePermissionMapsQuery;
	260	+ for (Integer roleMaps : userRoleMapses) {
261	261	roles.add(rolesService.getRoles(roleMaps));
262	262
263	263	//获取角色权限信息
264	264
...	...	@@ -265,10 +265,10 @@
265	265	rolePermissionMapsQuery.setRoleId(roleMaps);
266	266	rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
267	267	List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
268		- for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
	268	+ for (RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
269	269	Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
270		- if(null != permissions1) {
271		- if(null == permissions) {
	270	+ if (null != permissions1) {
	271	+ if (null == permissions) {
272	272	permissions = new ArrayList<>();
273	273	}
274	274	permissions.add(permissions1);
275	275
...	...	@@ -292,12 +292,12 @@
292	292	@RequestMapping(value = "/users/userRole/{id}", method = RequestMethod.GET)
293	293	@TokenRequired
294	294	public void userRole(HttpServletResponse response, HttpServletRequest request, @PathVariable(value = "id") Integer id) {
295		- UserRoleMapsQuery query = new UserRoleMapsQuery();
	295	+ UserRoleMapsQuery query = new UserRoleMapsQuery();
296	296	query.setUserId(id);
297	297	query.setYn(YnEnums.YES.getId());
298	298	List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
299	299	List<Roles> roles = new ArrayList<>();
300		- for(UserRoleMaps roleMaps : userRoleMapses) {
	300	+ for (UserRoleMaps roleMaps : userRoleMapses) {
301	301	roles.add(rolesService.getRoles(roleMaps.getRoleId()));
302	302	}
303	303
304	304
...	...	@@ -305,13 +305,12 @@
305	305	}
306	306
307	307
308		-
309	308	/**
310	309	* 管理员权限设置
311	310	*/
312	311	@RequestMapping(value = "/adminPermissions", method = RequestMethod.POST)
313	312	@TokenRequired
314		- public void adminPermissions(HttpServletResponse response,@RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids){
	313	+ public void adminPermissions(HttpServletResponse response, @RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids) {
315	314
316	315	if (ids == null) {
317	316	ResultUtils.buildParameterErrorResultAndWrite(response);
...	...	@@ -330,7 +329,7 @@
330	329	return;
331	330	}
332	331
333		- if(!usersList.get(0).getType().equals(0)) {
	332	+ if (!usersList.get(0).getType().equals(0)) {
334	333	ResultUtils.buildParameterErrorResultAndWrite(response, "用户错误");
335	334	}
336	335
...	...	@@ -338,8 +337,8 @@
338	337	UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
339	338	userOrganizationMapsQuery.setUserId(userId);
340	339	List<UserOrganizationMaps> userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
341		- if(0 < userOrganizationMapsList.size()) {
342		- for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
	340	+ if (0 < userOrganizationMapsList.size()) {
	341	+ for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
343	342	userOrganizationMaps.setYn(YnEnums.NO.getId());
344	343	userOrganizationMapsService.updateUserOrganizationMaps(userOrganizationMaps);
345	344	}
346	345
...	...	@@ -347,12 +346,12 @@
347	346
348	347	//添加最新权限映射
349	348	String[] roleArrayIds = ids.split(",");
350		- Users user = usersList.get(0);
	349	+ Users user = usersList.get(0);
351	350	UserOrganizationMaps userOrganizationMaps = null;
352	351	Organization organization = null;
353	352	for (String id : roleArrayIds) {
354	353	organization = organizationService.getOrganization(Integer.valueOf(id));
355		- if(null != organization) {
	354	+ if (null != organization) {
356	355	userOrganizationMaps = new UserOrganizationMaps();
357	356	userOrganizationMaps.setUserId(user.getId());
358	357	userOrganizationMaps.setOrgId(Integer.valueOf(id));
...	...	@@ -378,7 +377,7 @@
378	377	public void addAdmin(HttpServletResponse response,
379	378	HttpServletRequest request,
380	379	@RequestParam(value = "name", required = false) String name,
381		- @RequestParam(value = "account", required = false)String account,
	380	+ @RequestParam(value = "account", required = false) String account,
382	381	@RequestParam(value = "phone") String phone,
383	382	@RequestParam(value = "enable") Integer enable,
384	383	@RequestParam(value = "remarks", required = false) String remarks,
...	...	@@ -391,7 +390,7 @@
391	390
392	391
393	392	if (StringUtils.isBlank(roleIds) \|\|
394		- StringUtils.isBlank(name) \|\| StringUtils.isBlank(phone) \|\| null == user ) {
	393	+ StringUtils.isBlank(name) \|\| StringUtils.isBlank(phone) \|\| null == user) {
395	394	ResultUtils.buildParameterErrorResultAndWrite(response);
396	395	return;
397	396	}
...	...	@@ -428,7 +427,7 @@
428	427
429	428	//关联登录中心ID
430	429	LoginContext loginContext = LoginUtil.register(phone, token, typeId);
431		- if(!loginContext.getErrorcode().equals(0)) {
	430	+ if (!loginContext.getErrorcode().equals(0)) {
432	431	ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
433	432	return;
434	433	}
...	...	@@ -442,7 +441,7 @@
442	441	UserRoleMaps userRoleMaps = new UserRoleMaps();
443	442
444	443	String[] roleArrayIds = roleIds.split(",");
445		- List<Users> user1 = usersService.queryUsers(usersQuery);
	444	+ List<Users> user1 = usersService.queryUsers(usersQuery);
446	445	for (String id : roleArrayIds) {
447	446	Roles roles = rolesService.getRoles(Integer.valueOf(id));
448	447	if (roles == null \|\| roles.getYn() == YnEnums.NO.getId()) {
...	...	@@ -472,7 +471,7 @@
472	471	@RequestParam(value = "deptId", required = false) Integer deptId,
473	472	@RequestParam(value = "ksId", required = false) Integer ksId,
474	473	@RequestParam(value = "name", required = false) String name,
475		- @RequestParam(value = "account", required = false)String account,
	474	+ @RequestParam(value = "account", required = false) String account,
476	475	@RequestParam(value = "phone") String phone,
477	476	@RequestParam(value = "enable") Integer enable,
478	477	@RequestParam(value = "remarks", required = false) String remarks,
479	478
...	...	@@ -484,11 +483,11 @@
484	483	Users user = usersService.getUsers(loginState.getId());
485	484
486	485
487		- if ( StringUtils.isBlank(roleIds) \|\| StringUtils.isBlank(phone) \|\| null == user ) {
	486	+ if (StringUtils.isBlank(roleIds) \|\| StringUtils.isBlank(phone) \|\| null == user) {
488	487	ResultUtils.buildParameterErrorResultAndWrite(response);
489	488	return;
490	489	}
491		- if(deptId == null && ksId == null) {
	490	+ if (deptId == null && ksId == null) {
492	491	ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required");
493	492	return;
494	493	}
...	...	@@ -528,7 +527,7 @@
528	527
529	528	//关联登录中心ID
530	529	LoginContext loginContext = LoginUtil.register(phone, token, typeId);
531		- if(!loginContext.getErrorcode().equals(0)) {
	530	+ if (!loginContext.getErrorcode().equals(0)) {
532	531	ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
533	532	return;
534	533	}
...	...	@@ -541,7 +540,7 @@
541	540	UserRoleMaps userRoleMaps = new UserRoleMaps();
542	541
543	542	String[] roleArrayIds = roleIds.split(",");
544		- List<Users> user1 = usersService.queryUsers(usersQuery);
	543	+ List<Users> user1 = usersService.queryUsers(usersQuery);
545	544	for (String id : roleArrayIds) {
546	545	Roles roles = rolesService.getRoles(Integer.valueOf(id));
547	546	if (roles == null \|\| roles.getYn() == YnEnums.NO.getId()) {
...	...	@@ -560,7 +559,6 @@
560	559	}
561	560
562	561
563		-
564	562	// /**
565	563	// * 添加用户信息
566	564	// */
567	565
...	...	@@ -665,18 +663,16 @@
665	663	public void updateUsers(HttpServletResponse response,
666	664	HttpServletRequest request,
667	665	@PathVariable(value = "id") Integer id,
668		- @RequestParam(value = "name",required = false) String name,
669		- @RequestParam(value = "account",required = false)String account,
670		- @RequestParam(value = "phone",required = false) String phone,
671		- @RequestParam(value = "enable",required = false) Integer enable,
672		- @RequestParam(value = "remarks",required = false) String remarks,
673		- @RequestParam(value = "roleIds",required = false) String roleIds,
674		- @RequestParam(value = "orgId",required = false) Integer orgId,
675		- @RequestParam(value = "deptId",required = false) Integer deptId) {
	666	+ @RequestParam(value = "name", required = false) String name,
	667	+ @RequestParam(value = "account", required = false) String account,
	668	+ @RequestParam(value = "phone", required = false) String phone,
	669	+ @RequestParam(value = "enable", required = false) Integer enable,
	670	+ @RequestParam(value = "remarks", required = false) String remarks,
	671	+ @RequestParam(value = "roleIds", required = false) String roleIds,
	672	+ @RequestParam(value = "orgId", required = false) Integer orgId,
	673	+ @RequestParam(value = "deptId", required = false) Integer deptId) {
676	674
677	675
678		-
679		-
680	676	//获取登录用户
681	677	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
682	678	Users user = usersService.getUsers(loginState.getId());
...	...	@@ -709,7 +705,7 @@
709	705
710	706
711	707	//如有角色,则对用户角色中间表先删除后新增
712		- if(null != roleIds) {
	708	+ if (null != roleIds) {
713	709
714	710	Integer _userId = usersList.get(0).getId();
715	711	UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
...	...	@@ -746,7 +742,7 @@
746	742	*/
747	743	@RequestMapping(value = "/users/enable", method = RequestMethod.POST)
748	744	@TokenRequired
749		- public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) {
	745	+ public void enableUsers(HttpServletResponse response, @RequestParam Integer id, @RequestParam Integer flag) {
750	746
751	747
752	748	//检查账户是否存在
753	749
...	...	@@ -770,14 +766,12 @@
770	766	}
771	767
772	768
773		-
774		-
775	769	/**
776	770	* 用户删除
777	771	*/
778	772	@RequestMapping(value = "/users/{id}", method = RequestMethod.DELETE)
779	773	@TokenRequired
780		- public void deleteUsers(HttpServletResponse response,@PathVariable Integer id) {
	774	+ public void deleteUsers(HttpServletResponse response, @PathVariable Integer id) {
781	775	if (null == id) {
782	776	ResultUtils.buildIdIsNull(response);
783	777	return;
...	...	@@ -819,7 +813,6 @@
819	813	}
820	814
821	815
822		-
823	816	/**
824	817	* 修改用户密码
825	818	*/
...	...	@@ -876,6 +869,18 @@
876	869	users.setModified(new Date());
877	870	usersService.updateUsers(users);
878	871	ResultUtils.buildSuccessResultAndWrite(response);
	872	+ }
	873	+
	874	+ @RequestMapping(value = "/logout", method = RequestMethod.GET)
	875	+ @ResponseBody
	876	+ public Map<String, Object> resetToken(@RequestHeader(value = "Authorization", required = false) String token) {
	877	+ if (StringUtils.isNotEmpty(token)) {
	878	+ LoginUtil.deleteToken(token);
	879	+ }
	880	+ Map<String, Object> result = new HashMap<>();
	881	+ result.put("errorcode", ConstantInterface.SUCCESS);
	882	+ result.put("errormsg", "update");
	883	+ return result;
879	884	}
880	885	}