还原

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -22,7 +22,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.security.oauth2.provider.token.ResourceServerTokenServices;
 import org.springframework.security.oauth2.provider.token.TokenStore;
 import org.springframework.util.LinkedMultiValueMap;
@@ -43,6 +42,7 @@ import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.security.AuthUser;
 import com.ym.mec.common.security.SecurityConstants;
+import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.im.ImFeignService;
 
 @RestController
@@ -81,10 +81,8 @@ public class TokenController extends BaseController {
     }
 
     @GetMapping("/queryUserInfo")
-    public SysUser queryUserInfo(HttpServletRequest request) {
-		
-		AuthUser authUser = getAuthUser(request);
-    	
+    public SysUser queryUserInfo() {
+		AuthUser authUser = SecurityUtils.getUser();
 		if(authUser != null){
 			SysUser sysUser = userService.get(authUser.getUserId());
 			if(StringUtils.isEmpty(sysUser.getImToken())){
@@ -100,10 +98,8 @@ public class TokenController extends BaseController {
 
 	@ApiOperation(value = "获取用户信息")
     @GetMapping("/api/queryUserInfo")
-    public Object apiQueryUserInfo(HttpServletRequest request) {
-		
-		AuthUser authUser = getAuthUser(request);
-		
+    public Object apiQueryUserInfo() {
+		AuthUser authUser = SecurityUtils.getUser();
 		if(authUser != null){
 			return succeed(userService.queryUserInfo(authUser.getUserId()));
 		}
@@ -207,22 +203,5 @@ public class TokenController extends BaseController {
 
 		return succeed();
 	}
-	
-	private AuthUser getAuthUser(HttpServletRequest request){
-		String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
-		if (StringUtils.isBlank(authHeader)) {
-			return null;
-		}
-
-		String token = authHeader.toLowerCase().replace(OAuth2AccessToken.BEARER_TYPE.toLowerCase(), StringUtils.EMPTY).trim();
-		
-		OAuth2AccessToken oAuth2AccessToken = tokenStore.readAccessToken(token);
-    	if (null != oAuth2AccessToken) {
-    	    OAuth2Authentication auth2Authentication = tokenStore.readAuthentication(token);
-    	    return (AuthUser) auth2Authentication.getUserAuthentication().getPrincipal();
-    	}
-    	
-    	return null;
-	}
 
 }