From f86180b93c097d12095002e1585e5d59d054df53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Tue, 19 Oct 2021 19:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86HTTP=20Header=E4=B8=ADEdge-=E6=94=B9?=
 =?UTF-8?q?=E6=88=90X-Edge-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/nodes/rest_server.go | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/internal/nodes/rest_server.go b/internal/nodes/rest_server.go
index 41ea3332..5672e19a 100644
--- a/internal/nodes/rest_server.go
+++ b/internal/nodes/rest_server.go
@@ -45,7 +45,13 @@ func (this *RestServer) handle(writer http.ResponseWriter, req *http.Request) {
 	path := req.URL.Path
 
 	// 是否显示Pretty后的JSON
-	shouldPretty := req.Header.Get("Edge-Response-Pretty") == "on"
+	shouldPretty := req.Header.Get("X-Edge-Response-Pretty") == "on"
+
+	// 兼容老的Header
+	var oldShouldPretty = req.Header.Get("Edge-Response-Pretty")
+	if len(oldShouldPretty) > 0 {
+		shouldPretty = oldShouldPretty == "on"
+	}
 
 	// 欢迎页
 	if path == "/" {
@@ -98,14 +104,17 @@ func (this *RestServer) handle(writer http.ResponseWriter, req *http.Request) {
 
 	if serviceName != "APIAccessTokenService" || (methodName != "GetAPIAccessToken" && methodName != "getAPIAccessToken") {
 		// 校验TOKEN
-		token := req.Header.Get("Edge-Access-Token")
+		token := req.Header.Get("X-Edge-Access-Token")
 		if len(token) == 0 {
-			this.writeJSON(writer, maps.Map{
-				"code":    400,
-				"data":    maps.Map{},
-				"message": "require 'Edge-Access-Token' header",
-			}, shouldPretty)
-			return
+			token = req.Header.Get("Edge-Access-Token")
+			if len(token) == 0 {
+				this.writeJSON(writer, maps.Map{
+					"code":    400,
+					"data":    maps.Map{},
+					"message": "require 'X-Edge-Access-Token' header",
+				}, shouldPretty)
+				return
+			}
 		}
 
 		accessToken, err := models.SharedAPIAccessTokenDAO.FindAccessToken(nil, token)