Merge branch 'grok_inner' into pre

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -40,6 +40,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.Cookie;
@@ -572,10 +573,22 @@ public class MirrorController {
      * Grok车票跳转登录
      *
      */
-    @PostMapping("/grok/oauth")
+    @PostMapping(value = "/grok/oauth", consumes = MediaType.APPLICATION_JSON_VALUE)
     public String grokOauth(@RequestBody GrokAuthReq authReq) {
+        return doGrokOauth(authReq.getUserToken());
+    }
+
+    @PostMapping(value = "/grok/oauth", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    public String grokOauthForm(GrokAuthReq authReq) {
+        String userToken = authReq.getUserToken();
+        if (StringUtils.isBlank(userToken)) {
+            userToken = request.getParameter("usertoken");
+        }
+        return doGrokOauth(userToken);
+    }
+
+    private String doGrokOauth(String userToken) {
         try {
-            String userToken = authReq.getUserToken();
             log.info("用户通过userToken:{}访问grok镜像", userToken);
             GrokUser user = grokService.findByUserTokenAndExpireTimeAfter(userToken, LocalDateTime.now());
             JSONObject result = new JSONObject();