diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/OauthController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/OauthController.java
new file mode 100644
index 00000000..50ec2c59
--- /dev/null
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/OauthController.java
@@ -0,0 +1,53 @@
+package com.ruoyi.auth.controller;
+
+import com.ruoyi.common.core.domain.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.annotation.*;
+
+import java.security.Principal;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 自定义OauthController  替换默认tokenEndpoint  以便返回数据格式化同一
+ */
+@RestController
+@RequestMapping("/oauth")
+public class OauthController {
+
+    @Autowired
+    private TokenEndpoint tokenEndpoint;
+
+    /**
+     *
+     * @param principal
+     * @param parameters
+     * @return
+     * @throws HttpRequestMethodNotSupportedException
+     */
+    @GetMapping("/token")
+    public R<?> getAccessToken(Principal principal, @RequestParam Map<String, String> parameters) throws HttpRequestMethodNotSupportedException {
+        return custom(tokenEndpoint.getAccessToken(principal, parameters).getBody());
+    }
+
+    @PostMapping("/token")
+    public R<?> postAccessToken(Principal principal, @RequestParam Map<String, String> parameters) throws HttpRequestMethodNotSupportedException {
+        return custom(tokenEndpoint.postAccessToken(principal, parameters).getBody());
+    }
+
+    //自定义返回格式
+    private R<?> custom(OAuth2AccessToken accessToken) {
+        DefaultOAuth2AccessToken token = (DefaultOAuth2AccessToken) accessToken;
+//        Map<String, Object> data = new LinkedHashMap(token.getAdditionalInformation());
+//        data.put(OAuth2AccessToken.ACCESS_TOKEN, token.getValue());
+//        if (token.getRefreshToken() != null) {
+//            data.put(OAuth2AccessToken.REFRESH_TOKEN, token.getRefreshToken().getValue());
+//        }
+        return R.ok(token);
+    }
+
+}