From 3c95cecdbff7ffd796e68c7a5f063d8a166cf31f Mon Sep 17 00:00:00 2001 From: zhouhao Date: Wed, 9 May 2018 09:24:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=93=8D=E5=BA=94=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hsweb-authorization-api/pom.xml | 6 ++ .../web/UserTokenController.java | 63 +++++++++++-------- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/hsweb-authorization/hsweb-authorization-api/pom.xml b/hsweb-authorization/hsweb-authorization-api/pom.xml index 808939785..356c1b94e 100644 --- a/hsweb-authorization/hsweb-authorization-api/pom.xml +++ b/hsweb-authorization/hsweb-authorization-api/pom.xml @@ -35,6 +35,12 @@ spring-webmvc true + + org.hswebframework.web + hsweb-commons-controller + ${project.version} + true + io.swagger swagger-annotations diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/web/UserTokenController.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/web/UserTokenController.java index b8defd3d9..690deca87 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/web/UserTokenController.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/web/UserTokenController.java @@ -10,12 +10,15 @@ import org.hswebframework.web.authorization.token.TokenState; import org.hswebframework.web.authorization.token.UserToken; import org.hswebframework.web.authorization.token.UserTokenHolder; import org.hswebframework.web.authorization.token.UserTokenManager; +import org.hswebframework.web.controller.message.ResponseMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; +import static org.hswebframework.web.controller.message.ResponseMessage.*; + @RestController @RequestMapping @Authorize(permission = "user-token", description = "用户令牌信息管理") @@ -40,118 +43,124 @@ public class UserTokenController { @GetMapping("/user-token/reset") @Authorize(merge = false) @ApiOperation("重置当前用户的令牌") - public boolean resetToken() { + public ResponseMessage resetToken() { UserToken token = UserTokenHolder.currentToken(); if (token != null) { userTokenManager.signOutByToken(token.getToken()); } - return true; + return ok(true); } @PutMapping("/user-token/check") @ApiOperation("检查所有已过期的token并移除") @Authorize(action = Permission.ACTION_UPDATE) - public boolean checkExpiredToken() { + public ResponseMessage checkExpiredToken() { userTokenManager.checkExpiredToken(); - return true; + return ok(true); } @GetMapping("/user-token/token/{token}") @ApiOperation("根据token获取令牌信息") @Authorize(action = Permission.ACTION_GET) - public UserToken getByToken(@PathVariable String token) { - return userTokenManager.getByToken(token); + public ResponseMessage getByToken(@PathVariable String token) { + return ok(userTokenManager.getByToken(token)); } @GetMapping("/user-token/user/{userId}") @ApiOperation("根据用户ID获取全部令牌信息") @Authorize(action = Permission.ACTION_GET) - public List getByUserId(@PathVariable String userId) { - return userTokenManager.getByUserId(userId); + public ResponseMessage> getByUserId(@PathVariable String userId) { + return ok(userTokenManager.getByUserId(userId)); } @GetMapping("/user-token/user/{userId}/logged") @ApiOperation("根据用户ID判断用户是否已经登录") @Authorize(action = Permission.ACTION_GET) - public boolean userIsLoggedIn(@PathVariable String userId) { - return userTokenManager.userIsLoggedIn(userId); + public ResponseMessage userIsLoggedIn(@PathVariable String userId) { + return ok(userTokenManager.userIsLoggedIn(userId)); } @GetMapping("/user-token/token/{token}/logged") @ApiOperation("根据令牌判断用户是否已经登录") @Authorize(action = Permission.ACTION_GET) - public boolean tokenIsLoggedIn(@PathVariable String token) { - return userTokenManager.tokenIsLoggedIn(token); + public ResponseMessage tokenIsLoggedIn(@PathVariable String token) { + return ok(userTokenManager.tokenIsLoggedIn(token)); } @GetMapping("/user-token/user/total") @ApiOperation("获取当前已经登录的用户数量") @Authorize(action = Permission.ACTION_GET) - public long totalUser() { - return userTokenManager.totalUser(); + public ResponseMessage totalUser() { + return ok(userTokenManager.totalUser()); } @GetMapping("/user-token/token/total") @ApiOperation("获取当前已经登录的令牌数量") @Authorize(action = Permission.ACTION_GET) - public long totalToken() { - return userTokenManager.totalToken(); + public ResponseMessage totalToken() { + return ok(userTokenManager.totalToken()); } @GetMapping("/user-token") @ApiOperation("获取全部用户令牌信息") @Authorize(action = Permission.ACTION_GET) - public List allLoggedUser() { - return userTokenManager.allLoggedUser(); + public ResponseMessage> allLoggedUser() { + return ok(userTokenManager.allLoggedUser()); } @DeleteMapping("/user-token/user/{userId}") @ApiOperation("根据用户id将用户踢下线") @Authorize(action = Permission.ACTION_UPDATE) - public void signOutByUserId(@PathVariable String userId) { + public ResponseMessage signOutByUserId(@PathVariable String userId) { userTokenManager.signOutByUserId(userId); + return ok(); } @DeleteMapping("/user-token/token/{token}") @ApiOperation("根据令牌将用户踢下线") @Authorize(action = Permission.ACTION_UPDATE) - public void signOutByToken(@PathVariable String token) { + public ResponseMessage signOutByToken(@PathVariable String token) { userTokenManager.signOutByToken(token); + return ok(); } @PutMapping("/user-token/user/{userId}/{state}") @ApiOperation("根据用户id更新用户令牌状态") @Authorize(action = Permission.ACTION_UPDATE) - public void changeUserState(@PathVariable String userId, @PathVariable TokenState state) { + public ResponseMessage changeUserState(@PathVariable String userId, @PathVariable TokenState state) { + userTokenManager.changeUserState(userId, state); + return ok(); } @PutMapping("/user-token/token/{token}/{state}") @ApiOperation("根据令牌更新用户令牌状态") @Authorize(action = Permission.ACTION_UPDATE) - public void changeTokenState(@PathVariable String token, @PathVariable TokenState state) { + public ResponseMessage changeTokenState(@PathVariable String token, @PathVariable TokenState state) { userTokenManager.changeTokenState(token, state); + return ok(); } @PostMapping("/user-token/{token}/{type}/{userId}/{maxInactiveInterval}") @ApiOperation("将用户设置为登录") @Authorize(action = Permission.ACTION_ADD) - public UserToken signIn(@PathVariable String token, @PathVariable String type, @PathVariable String userId, @PathVariable long maxInactiveInterval) { - return userTokenManager.signIn(token, type, userId, maxInactiveInterval); + public ResponseMessage signIn(@PathVariable String token, @PathVariable String type, @PathVariable String userId, @PathVariable long maxInactiveInterval) { + return ok(userTokenManager.signIn(token, type, userId, maxInactiveInterval)); } @GetMapping("/user-token/{token}/touch") @ApiOperation("更新token有效期") @Authorize(action = Permission.ACTION_UPDATE) - public void touch(@PathVariable String token) { + public ResponseMessage touch(@PathVariable String token) { userTokenManager.touch(token); + return ok(); } @GetMapping("/user-auth/{userId}") @ApiOperation("根据用户id获取用户的权限信息") @Authorize(action = Permission.ACTION_GET) - public Authentication userAuthInfo(@PathVariable String userId) { - return authenticationManager.getByUserId(userId); + public ResponseMessage userAuthInfo(@PathVariable String userId) { + return ok(authenticationManager.getByUserId(userId)); } }