Merge remote-tracking branch 'origin/master'

# Conflicts:
#	hack/config.yaml
#	internal/router/router.go
#	manifest/config/config.yaml

hack/config.yaml

@@ -14,7 +14,7 @@ gfcli:
     extra: ""
   gen:
     dao:
-      - link: "mysql:nodemonitor:m4A6zLaDnRCNd4xw@tcp(156.234.193.212:33060)/nodemonitor?loc=Local&parseTime=true"
+      - link: "mysql:root:123456@tcp(127.0.0.1:3306)/nodeMonitor"
         # tables: "sys_user"
         # removePrefix: "gf_"
         descriptionTag: true

internal/router/router.go

@@ -5,15 +5,9 @@ import (
 	"nodeMonitor/internal/controller"
 )
 
-func MiddlewareCORS(r *ghttp.Request) {
-	corsOptions := r.Response.DefaultCORSOptions()
-	//corsOptions.AllowDomain = []string{"goframe.org", "baidu.com"}
-	r.Response.CORS(corsOptions)
-	r.Middleware.Next()
-}
 func BindController(group *ghttp.RouterGroup) {
 	group.Group("/api/v1", func(group *ghttp.RouterGroup) {
-		group.Middleware(ghttp.MiddlewareHandlerResponse, MiddlewareCORS)
+		group.Middleware(ghttp.MiddlewareHandlerResponse)
 		//group.Middleware(middleware.Middleware().CORS)
 		//group.Middleware(ghttp.MiddlewareCORS())
 		NodeRouter(group)

manifest/config/config.yaml

@@ -31,8 +31,7 @@ database:
     Path: "resource/log/sql"
 
   default:
-    link: "mysql:nodeMonitor:m4A6zLaDnRCNd4xw@tcp(127.0.0.1:3306)/nodemonitor?loc=Local&parseTime=true"
-    #link: "mysql:nodeMonitor:m4A6zLaDnRCNd4xw@tcp(127.0.0.1:3306)/nodemonitor?loc=Local&parseTime=true"
+    link: "mysql:nodeMonitor:NNmeANyDyftp2Nan@tcp(127.0.0.1:8366)/nodemonitor?loc=Local&parseTime=true"
     debug: true
     charset: "utf8mb4" #数据库编码
     dryRun: false #空跑
@@ -50,9 +49,6 @@ node:
   sshCommand: "" #用于执行ssh 命令
   sshPassword: "" #ssh密码
   sshUsername: "root"
-  nodePing: 1 #用于表示是不是检测PING的节点
-
-
 #gfToken:
 #  cacheKey: "gfToken_"
 #  timeOut: 10800