|
|
@@ -1,22 +1,21 @@
|
|
|
package com.ym.mec.auth.web.controller;
|
|
|
|
|
|
-import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
-import com.ym.mec.auth.api.entity.SysUser;
|
|
|
-import com.ym.mec.auth.service.SysUserService;
|
|
|
-import com.ym.mec.common.controller.BaseController;
|
|
|
-import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
-import com.ym.mec.common.security.AuthUser;
|
|
|
-import com.ym.mec.common.security.SecurityUtils;
|
|
|
-
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
|
+import java.io.IOException;
|
|
|
+import java.util.Base64;
|
|
|
+import java.util.Map;
|
|
|
+
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.http.*;
|
|
|
-import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
+import org.springframework.http.HttpEntity;
|
|
|
+import org.springframework.http.HttpHeaders;
|
|
|
+import org.springframework.http.HttpMethod;
|
|
|
+import org.springframework.http.MediaType;
|
|
|
+import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.security.oauth2.common.OAuth2AccessToken;
|
|
|
import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
|
|
|
import org.springframework.util.LinkedMultiValueMap;
|
|
|
@@ -27,9 +26,13 @@ import org.springframework.web.bind.annotation.RequestHeader;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
-import java.io.IOException;
|
|
|
-import java.util.Base64;
|
|
|
-import java.util.Map;
|
|
|
+import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
+import com.ym.mec.auth.api.entity.SysUser;
|
|
|
+import com.ym.mec.auth.service.SysUserService;
|
|
|
+import com.ym.mec.common.controller.BaseController;
|
|
|
+import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
+import com.ym.mec.common.security.AuthUser;
|
|
|
+import com.ym.mec.common.security.SecurityUtils;
|
|
|
|
|
|
@RestController
|
|
|
@Api(tags = "认证服务")
|
|
|
@@ -68,7 +71,6 @@ public class TokenController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "获取用户信息")
|
|
|
@GetMapping("/api/queryUserInfo")
|
|
|
- @PreAuthorize("@pcs.hasPermissions('/api/queryUserInfo')")
|
|
|
public Object apiQueryUserInfo() {
|
|
|
AuthUser authUser = SecurityUtils.getUser();
|
|
|
if(authUser != null){
|
|
|
@@ -88,7 +90,6 @@ public class TokenController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping(value = "/refreshToken",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
|
|
|
- @PreAuthorize("@pcs.hasPermissions('refreshToken')")
|
|
|
@ApiOperation(value = "刷新token")
|
|
|
public HttpResponseResult refreshToken(String refreshToken, String clientId, String clientSecret) throws IOException {
|
|
|
String url = "http://auth-server/oauth/token";
|
|
|
@@ -111,7 +112,6 @@ public class TokenController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping(value = "exit",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
|
|
|
- @PreAuthorize("@pcs.hasPermissions('exit')")
|
|
|
@ApiOperation(value = "退出登录")
|
|
|
public HttpResponseResult logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION) String authHeader) {
|
|
|
if (StringUtils.isBlank(authHeader)) {
|
yonge