[*] migrate to gou v0.10.3 (50%)

meigamarmot · Feb 1, 2023 · a807899 · a807899
1 parent 8d40c8e
commit a807899
Show file tree

Hide file tree

Showing 224 changed files with 1,648 additions and 6,624 deletions.
diff --git a/api/api.go b/api/api.go
@@ -1,60 +1,17 @@
 package api
 
 import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/yaoapp/gou"
-	"github.com/yaoapp/kun/log"
+	"github.com/yaoapp/gou/api"
+	"github.com/yaoapp/gou/application"
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/share"
 )
 
-// Load 加载API
+// Load apis
 func Load(cfg config.Config) error {
-	if share.BUILDIN {
-		return LoadBuildIn("apis", "")
-	}
-	return LoadFrom(filepath.Join(cfg.Root, "apis"), "")
-}
-
-// LoadFrom 从特定目录加载
-func LoadFrom(dir string, prefix string) error {
-	if share.DirNotExists(dir) {
-		return fmt.Errorf("%s does not exists", dir)
-	}
-
-	messages := []string{}
-	err := share.Walk(dir, ".http.json", func(root, filename string) {
-		name := prefix + share.SpecName(root, filename)
-		content := share.ReadFile(filename)
-		_, err := gou.LoadAPIReturn(string(content), name, "bearer-jwt")
-		if err != nil {
-			log.With(log.F{"root": root, "file": filename}).Error(err.Error())
-			messages = append(messages, fmt.Sprintf("%s %s", name, err.Error()))
-		}
-	})
-
-	// Load WebSocket Server
-	err = share.Walk(dir, ".ws.json", func(root, filename string) {
-		name := prefix + share.SpecName(root, filename)
-		content := share.ReadFile(filename)
-		_, err := gou.LoadWebSocketServer(string(content), name)
-		if err != nil {
-			log.With(log.F{"root": root, "file": filename}).Error(err.Error())
-			messages = append(messages, fmt.Sprintf("%s %s", name, err.Error()))
-		}
-	})
-
-	if len(messages) > 0 {
-		return fmt.Errorf("%s", strings.Join(messages, ";"))
-	}
-
-	return err
-}
-
-// LoadBuildIn 从制品中读取
-func LoadBuildIn(dir string, prefix string) error {
-	return nil
+	exts := []string{"*.http.yao", "*.http.json", "*.http.jsonc"}
+	return application.App.Walk("apis", func(root, file string, isdir bool) error {
+		_, err := api.Load(file, share.ID(root, file))
+		return err
+	}, exts...)
 }
diff --git a/api/api_test.go b/api/api_test.go
@@ -4,21 +4,19 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/yaoapp/gou"
+	"github.com/yaoapp/gou/api"
 	"github.com/yaoapp/gou/websocket"
 	"github.com/yaoapp/yao/config"
 )
 
 func TestLoad(t *testing.T) {
-	gou.APIs = make(map[string]*gou.API)
 	Load(config.Conf)
-	LoadFrom("not a path", "404.")
 	check(t)
 }
 
 func check(t *testing.T) {
 	keys := []string{}
-	for key := range gou.APIs {
+	for key := range api.APIs {
 		keys = append(keys, key)
 	}
 

diff --git a/app/README.md b/app/README.md
diff --git a/app/app.go b/app/app.go
diff --git a/app/app_test.go b/app/app_test.go
diff --git a/brain/README.md b/brain/README.md
diff --git a/brain/behaviors/listen/listen.go b/brain/behaviors/listen/listen.go
diff --git a/brain/behaviors/send/send.go b/brain/behaviors/send/send.go
diff --git a/brain/behaviors/zouyu/README.md b/brain/behaviors/zouyu/README.md
diff --git a/brain/behaviors/zouyu/types.go b/brain/behaviors/zouyu/types.go
diff --git a/brain/behaviors/zouyu/zouyu.go b/brain/behaviors/zouyu/zouyu.go
diff --git a/brain/brain.go b/brain/brain.go
diff --git a/brain/brain_test.go b/brain/brain_test.go
diff --git a/brain/cli/README.md b/brain/cli/README.md
diff --git a/brain/cli/cli.go b/brain/cli/cli.go
diff --git a/brain/cloud/README.md b/brain/cloud/README.md
diff --git a/brain/types.go b/brain/types.go
diff --git a/brain/web/README.md b/brain/web/README.md
diff --git a/cert/cert.go b/cert/cert.go
@@ -1,35 +1,17 @@
 package cert
 
 import (
-	"fmt"
-	"path/filepath"
-
+	"github.com/yaoapp/gou/application"
 	"github.com/yaoapp/gou/ssl"
-	"github.com/yaoapp/kun/log"
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/share"
 )
 
 // Load 加载API
 func Load(cfg config.Config) error {
-	var root = filepath.Join(cfg.Root, "certs")
-	return LoadFrom(root, "")
-}
-
-// LoadFrom 从特定目录加载
-func LoadFrom(dir string, prefix string) error {
-
-	if share.DirNotExists(dir) {
-		return fmt.Errorf("%s does not exists", dir)
-	}
-
-	err := share.Walk(dir, ".pem", func(root, filename string) {
-		name := prefix + share.SpecName(root, filename)
-		_, err := ssl.LoadCertificateFrom(filename, name)
-		if err != nil {
-			log.With(log.F{"root": root, "file": filename}).Error(err.Error())
-		}
-	})
-
-	return err
+	exts := []string{"*.pem", "*.key", "*.pub"}
+	return application.App.Walk("certs", func(root, file string, isdir bool) error {
+		_, err := ssl.Load(file, share.ID(root, file))
+		return err
+	}, exts...)
 }
diff --git a/cert/cert_test.go b/cert/cert_test.go
@@ -4,21 +4,20 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/yaoapp/gou"
+	"github.com/yaoapp/gou/process"
 	"github.com/yaoapp/gou/ssl"
 	"github.com/yaoapp/yao/config"
 )
 
 func TestLoad(t *testing.T) {
 	Load(config.Conf)
-	LoadFrom("not a path", "404.")
 	check(t)
 }
 
 func TestProcessSign(t *testing.T) {
 	Load(config.Conf)
 	args := []interface{}{"hello world", "private", "SHA256"}
-	signature, err := gou.NewProcess("ssl.Sign", args...).Exec()
+	signature, err := process.New("ssl.Sign", args...).Exec()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -29,7 +28,7 @@ func TestProcessVerify(t *testing.T) {
 	Load(config.Conf)
 	signature := "EDHf3C9TXEk7y8LzIk5czLefXZyGxcMDVMcbNuBBegDkTqnPsRQnhFtNOgCdox8lI3MzLatwjoljoMY4Qk+sHGd5mAHMpiREa1gRFSVYpA2xvXZ3+KsfOHAdICQrfUdy59QaJGo6iGPNGG8PQOXHPTVNn6LMfryat9+f4l21DPAZiT0RyCUgFZE3/Qv8Z/6J4AsIXMSKZD6BGPPHUxGe7UBrXZvcR5dX25EiNjuH2OO38YJnDiTRVw14UI5fk/mQrwRdezj5tSKFCyHt912BZExXtkHISiYFNTZ/2RhOup5Xx6o3GvrEOdshrnN80Lwu1Aaju+lnZp13hDz4P6hU7w=="
 	args := []interface{}{"hello world", signature, "cert", "SHA256"}
-	res, err := gou.NewProcess("ssl.Verify", args...).Exec()
+	res, err := process.New("ssl.Verify", args...).Exec()
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/chart/REAME.md b/chart/REAME.md