Revert "调整链路追踪的字段"

This reverts commit 96ce25a.

context/httpContext.go

@@ -76,7 +76,7 @@ func NewHttpContext(httpRoute *HttpRoute, w http.ResponseWriter, r *http.Request
 	}
 	httpContext.Header = header.ToReadonlyDictionary()
 
-	// WebContentType
+	// ContentType
 	for _, contentType := range strings.Split(httpContext.Header.GetValue("Content-Type"), ";") {
 		if strings.Contains(contentType, "/") {
 			httpContext.ContentType = contentType

context/httpJwt.go

@@ -23,7 +23,7 @@ type HttpJwt struct {
 
 // InitJwt jwt初始化
 func InitJwt() {
-	jwtKey = []byte(configure.GetString("WebApi.Jwt.WatchKey"))
+	jwtKey = []byte(configure.GetString("WebApi.Jwt.Key"))
 	jwtKeyType = configure.GetString("WebApi.Jwt.KeyType")
 	headerName = configure.GetString("WebApi.Jwt.HeaderName")
 	InvalidStatusCode = configure.GetInt("WebApi.Jwt.InvalidStatusCode")

middleware/cors.go

@@ -7,7 +7,7 @@ type Cors struct {
 }
 
 func (receiver *Cors) Invoke(httpContext *context.HttpContext) {
-	httpContext.Response.AddHeader("Access-Control-Allow-WebHeaders", httpContext.Header.GetValue("Access-Control-Request-WebHeaders"))
+	httpContext.Response.AddHeader("Access-Control-Allow-Headers", httpContext.Header.GetValue("Access-Control-Request-Headers"))
 	httpContext.Response.AddHeader("Access-Control-Allow-Methods", httpContext.Header.GetValue("Access-Control-Request-Methods"))
 	httpContext.Response.AddHeader("Access-Control-Allow-Credentials", "true")
 	httpContext.Response.AddHeader("Access-Control-Max-Age", "86400")

middleware/routing.go

@@ -13,7 +13,7 @@ func (receiver *routing) Invoke(httpContext *context.HttpContext) {
 	// 检查method
 	if httpContext.Method != "OPTIONS" && !httpContext.Route.Method.Contains(httpContext.Method) {
 		// 响应码
-		httpContext.Response.Reject(405, "405 WebMethod NotAllowed")
+		httpContext.Response.Reject(405, "405 Method NotAllowed")
 		return
 	}
 

serveMux.go

@@ -148,7 +148,7 @@ func (mux *serveMux) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func (mux *serveMux) serveHTTPHandler(r *http.Request) (route *context.HttpRoute) {
 	// CONNECT requests are not canonicalized.
 	if r.Method == "CONNECT" {
-		// If r.URL.WebPath is /tree and its handler is not registered,
+		// If r.URL.Path is /tree and its handler is not registered,
 		// the /tree -> /tree/ redirect applies to CONNECT requests
 		// but the path canonicalization does not.
 		if u, ok := mux.redirectToPathSlash(r.URL.Host, r.URL.Path, r.URL); ok {

test/controller_test.go

@@ -45,7 +45,7 @@ func (r *TestHeaderController) Hello3() (TValue string) {
 
 func (r *TestHeaderController) OnActionExecuting() {
 	if r.HttpContext.Method != "GET" && r.Header.ContentType == "" {
-		panic("测试失败，未获取到：Header.WebContentType")
+		panic("测试失败，未获取到：Header.ContentType")
 	}
 	r.HttpContext.Response.AddHeader("Executing", "true")
 	r.HttpContext.Response.SetHeader("Set-Header1", "true")

test/jwt_test.go

@@ -14,7 +14,7 @@ import (
 func TestJwt(t *testing.T) {
 	// 测试生成出来的token与head是否一致
 	var buildToken string
-	configure.SetDefault("WebApi.Jwt.WatchKey", "123456888")
+	configure.SetDefault("WebApi.Jwt.Key", "123456888")
 	configure.SetDefault("WebApi.Jwt.KeyType", "HS256")
 	configure.SetDefault("WebApi.Jwt.HeaderName", "Auto_test")
 	configure.SetDefault("WebApi.Jwt.InvalidStatusCode", 403)