From ef4e128af73e8e425eece1dbe5cef772f947d4de Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Thu, 26 Sep 2019 15:54:13 +0800
Subject: [PATCH] fix issue in cors

---
 .example/net/ghttp/server/static/static.go | 2 +-
 go.mod                                     | 2 ++
 net/ghttp/ghttp_request.go                 | 4 ++--
 net/ghttp/ghttp_request_request.go         | 4 +++-
 net/ghttp/ghttp_response_cors.go           | 4 ++--
 net/ghttp/ghttp_server_handler.go          | 1 -
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.example/net/ghttp/server/static/static.go b/.example/net/ghttp/server/static/static.go
index 980cd194a..5512aa705 100644
--- a/.example/net/ghttp/server/static/static.go
+++ b/.example/net/ghttp/server/static/static.go
@@ -6,7 +6,7 @@ import "github.com/gogf/gf/frame/g"
 func main() {
 	s := g.Server()
 	s.SetIndexFolder(true)
-	s.SetServerRoot("/Users/john/Temp")
+	s.SetServerRoot("/Users/john/Downloads")
 	s.AddSearchPath("/Users/john/Documents")
 	s.SetPort(8199)
 	s.Run()
diff --git a/go.mod b/go.mod
index bbd2da087..427ef104c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,7 @@
 module github.com/gogf/gf
 
+go 1.10
+
 require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/clbanning/mxj v1.8.4
diff --git a/net/ghttp/ghttp_request.go b/net/ghttp/ghttp_request.go
index 89afaa1c8..20daacdd2 100644
--- a/net/ghttp/ghttp_request.go
+++ b/net/ghttp/ghttp_request.go
@@ -83,8 +83,8 @@ func (r *Request) WebSocket() (*WebSocket, error) {
 	}
 }
 
-// 获得指定名称的参数字符串(Router/GET/POST)，同 GetRequestString
-// 这是常用方法的简化别名
+// Get是GetRequest方法的别名，用于获得指定名称的参数值，注意键值可能是字符串、数组、Map类型。
+// 大多数场景下，你可能需要的是 GetString/GetVar。
 func (r *Request) Get(key string, def ...interface{}) interface{} {
 	return r.GetRequest(key, def...)
 }
diff --git a/net/ghttp/ghttp_request_request.go b/net/ghttp/ghttp_request_request.go
index 543cfdc57..c1dd5a019 100644
--- a/net/ghttp/ghttp_request_request.go
+++ b/net/ghttp/ghttp_request_request.go
@@ -23,7 +23,9 @@ func (r *Request) initRaw() {
 	}
 }
 
-// 获得router、post或者get提交的参数，如果有同名参数，那么按照router->get->post优先级进行覆盖
+// 获得router、post或者get提交的参数值，如果有同名参数，
+// 那么按照 router->get->post->OtherHttpMethod 优先级进行覆盖。
+// 注意获得参数值可能是字符串、数组、Map三种类型。
 func (r *Request) GetRequest(key string, def ...interface{}) interface{} {
 	v := r.GetRouterValue(key)
 	if v == nil {
diff --git a/net/ghttp/ghttp_response_cors.go b/net/ghttp/ghttp_response_cors.go
index 796c06c95..5da9ad10b 100644
--- a/net/ghttp/ghttp_response_cors.go
+++ b/net/ghttp/ghttp_response_cors.go
@@ -32,10 +32,10 @@ func (r *Response) DefaultCORSOptions() CORSOptions {
 		AllowOrigin:      "*",
 		AllowMethods:     HTTP_METHODS,
 		AllowCredentials: "true",
-		AllowHeaders:     "Origin, X-Requested-With, Content-Type, Accept, Key",
+		AllowHeaders:     "Origin,Content-Type,Accept,User-Agent,Cookie,Authorization,X-Auth-Token,X-Requested-With",
 		MaxAge:           3628800,
 	}
-	if origin := r.Header().Get("Origin"); origin != "" {
+	if origin := r.Request.Header.Get("Origin"); origin != "" {
 		options.AllowOrigin = origin
 	} else if referer := r.Request.Referer(); referer != "" {
 		if p := gstr.PosR(referer, "/", 6); p != -1 {
diff --git a/net/ghttp/ghttp_server_handler.go b/net/ghttp/ghttp_server_handler.go
index ae447e064..508a803db 100644
--- a/net/ghttp/ghttp_server_handler.go
+++ b/net/ghttp/ghttp_server_handler.go
@@ -261,7 +261,6 @@ func (s *Server) serveFile(r *Request, f *staticServeFile, allowIndex ...bool) {
 			r.Response.WriteStatus(http.StatusForbidden)
 		}
 	} else {
-		// 读取文件内容返回, no buffer
 		http.ServeContent(r.Response.Writer, r.Request, info.Name(), info.ModTime(), file)
 	}
 }