refactor: 小重构，update README.md

Author: j2go

README.md

@@ -31,7 +31,7 @@
 
 # 开发指南
 
-0. go version > 1.16
+0. go version >= 1.13
 1. 准备数据库
 
 ```shell
@@ -41,4 +41,5 @@ docker run -d -p3306:3306 --name mysql -e MYSQL_ROOT_PASSWORD=1234qwer  mysql:8
 2. 创建数据库，导入 [SQL](https://gitee.com/tomyang1898/APIJSON-Demo/blob/master/MySQL/sys.sql)
 3. 根据数据库参数修改 main.go 的 db.Init 参数
 4. 运行 `go run main.go`
-5. HTTP 数据测试可以看根目录的 [test.http](https://gitee.com/tiangao/apijson-go/blob/master/test.http)
+5. HTTP 数据测试可以看根目录的 [test.http](https://gitee.com/tiangao/apijson-go/blob/master/test.http)
+6. 或者使用 APIAuto 测试更方便 [APIAuto](https://github.com/TommyLemon/APIAuto)

handler/handler.go

@@ -1,93 +1,87 @@
 package handler
 
 import (
-  "bytes"
-  "encoding/json"
-  "github.com/j2go/apijson/logger"
-  "io/ioutil"
-  "net/http"
-  "strings"
+	"bytes"
+	"encoding/json"
+	"github.com/j2go/apijson/logger"
+	"io/ioutil"
+	"net/http"
+	"strings"
 )
 
 func commonHandle(w http.ResponseWriter, r *http.Request, bodyHandler func(map[string]interface{}) map[string]interface{}) {
-  if r.Method == http.MethodOptions {
-    //logger.Infof("%v", r.Header)
-    cors(w, r)
-    w.WriteHeader(http.StatusOK)
-    return
-  }
-  if data, err := ioutil.ReadAll(r.Body); err != nil {
-    logger.Error("请求参数有问题: " + err.Error())
-    w.WriteHeader(http.StatusBadRequest)
-    return
-  } else {
-    logger.Infof("request: %s", string(data))
-    var bodyMap map[string]interface{}
-    if err = json.Unmarshal(data, &bodyMap); err != nil {
-      logger.Error("请求体 JSON 格式有问题: " + err.Error())
-      w.WriteHeader(http.StatusBadRequest)
-      return
-    }
-    cors(w, r)
-    dataMap := bodyHandler(bodyMap)
-    var response []byte
-    if response, err = json.Marshal(dataMap); err != nil {
-      w.WriteHeader(http.StatusInternalServerError)
-    } else {
-      //logger.Debugf("返回数据 %s", string(respBody))
-      if _, err = w.Write(response); err != nil {
-        w.WriteHeader(http.StatusInternalServerError)
-      } else {
-        w.WriteHeader(http.StatusOK)
-      }
-    }
-  }
+	if r.Method == http.MethodOptions {
+		//logger.Infof("%v", r.Header)
+		cors(w, r)
+		w.WriteHeader(http.StatusOK)
+		return
+	}
+	if data, err := ioutil.ReadAll(r.Body); err != nil {
+		logger.Error("请求参数有问题: " + err.Error())
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	} else {
+		logger.Infof("request: %s", string(data))
+		var bodyMap map[string]interface{}
+		if err = json.Unmarshal(data, &bodyMap); err != nil {
+			logger.Error("请求体 JSON 格式有问题: " + err.Error())
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+		cors(w, r)
+		dataMap := bodyHandler(bodyMap)
+		var response []byte
+		if response, err = json.Marshal(dataMap); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+		} else {
+			//logger.Debugf("返回数据 %s", string(respBody))
+			if _, err = w.Write(response); err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
+			} else {
+				w.WriteHeader(http.StatusOK)
+			}
+		}
+	}
 }
 
 func cors(w http.ResponseWriter, r *http.Request) {
-  host := r.Header.Get("Origin")
-  headers := r.Header
-  hs := []string{"Accept", "Content-Type", "Content-Length", "Accept-Encoding", "Authorization", "X-CSRF-Token"}
-  if len(headers) > 0 {
-    for k, _ := range headers {
-      if len(k) > 0 {
-        find := false
-        for _, h := range hs {
-          if h == k {
-            find = true
-            break
-          }
-        }
-
-        if find {
-          continue
-        }
-
-        hs = append(hs, k)
-      }
-    }
-  }
+	allowHeaders := []string{"Accept", "Content-Type", "Content-Length", "Accept-Encoding", "Authorization", "X-CSRF-Token"}
+	for k, _ := range r.Header {
+		if len(k) > 0 {
+			if notContains(allowHeaders, k) {
+				allowHeaders = append(allowHeaders, k)
+			}
+		}
+	}
+	host := r.Header.Get("Origin")
+	if len(host) > 0 {
+		w.Header().Set("Access-Control-Allow-Origin", host)
+	} else {
+		w.Header().Set("Access-Control-Allow-Origin", "http://apijson.cn")
+	}
+	w.Header().Set("Access-Control-Allow-Credentials", "true")
+	w.Header().Set("Access-Control-Allow-Headers", strings.Join(allowHeaders, ", ")) // 无效 "*")
+	w.Header().Set("Access-Control-Request-Methods", "GET, POST, HEAD, PUT, DELETE, PATCH, OPTIONS")
+}
 
-  if len(host) > 0 {
-    w.Header().Set("Access-Control-Allow-Origin", host)
-  } else {
-    w.Header().Set("Access-Control-Allow-Origin", "http://apijson.cn")
-  }
-  w.Header().Set("Access-Control-Allow-Credentials", "true")
-  w.Header().Set("Access-Control-Allow-Headers", strings.Join(hs, ", ")) // 无效 "*")
-  //w.Header().Set("Access-Control-Request-Method", "POST")
-  w.Header().Set("Access-Control-Request-Methods", "GET, POST, HEAD, PUT, DELETE, PATCH, OPTIONS")
+func notContains(arr []string, k string) bool {
+	for _, h := range arr {
+		if h == k {
+			return false
+		}
+	}
+	return true
 }
 
 func genPlaceholder(n int) string {
-  if n == 1 {
-    return "?"
-  } else {
-    buf := bytes.Buffer{}
-    buf.WriteString("?")
-    for i := 1; i < n; i++ {
-      buf.WriteString(",?")
-    }
-    return buf.String()
-  }
+	if n == 1 {
+		return "?"
+	} else {
+		buf := bytes.Buffer{}
+		buf.WriteString("?")
+		for i := 1; i < n; i++ {
+			buf.WriteString(",?")
+		}
+		return buf.String()
+	}
 }