Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

server/home-user-auth/home-user-auth.go

@@ -29,23 +29,3 @@ func main() {
 	fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
 	server.Start()
 }
-
-// 测试代码 可以直接复制新建
-
-// var testConfigFile = flag.String("f", "../etc/home-user-auth.yaml", "the config file")
-// var cnf config.Config
-
-// func GetTestServer() *rest.Server {
-// 	flag.Parse()
-
-// 	conf.MustLoad(*testConfigFile, &cnf)
-
-// 	server := rest.MustNewServer(cnf.RestConf)
-// 	defer server.Stop()
-
-// 	ctx := svc.NewServiceContext(cnf)
-// 	handler.RegisterHandlers(server, ctx)
-
-// 	fmt.Printf("Starting server at %s:%d...\n", cnf.Host, cnf.Port)
-// 	return server
-// }

server/home-user-auth/test/acceptcookielogic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"

server/home-user-auth/test/basic.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"
@@ -6,6 +6,7 @@ import (
 	"fusenapi/server/home-user-auth/internal/handler"
 	"fusenapi/server/home-user-auth/internal/svc"
 	"fusenapi/utils/fstests"
+	"runtime"
 
 	"log"
 
@@ -13,7 +14,6 @@ import (
 	"github.com/zeromicro/go-zero/rest"
 )
 
-var testConfigFile = "home-user-auth"
 var cnf config.Config
 var gserver *rest.Server
 
@@ -24,10 +24,14 @@ func init() {
 
 func GetTestServer() *rest.Server {
 
-	conf.MustLoad(fstests.GetEtcYamlPathAuto(testConfigFile), &cnf)
+	conf.MustLoad(fstests.GetEtcYamlPathAuto(), &cnf)
 
 	server := rest.MustNewServer(cnf.RestConf)
-	defer server.Stop()
+	runtime.SetFinalizer(server, func(server *rest.Server) {
+		if server != nil {
+			server.Stop()
+		}
+	})
 
 	ctx := svc.NewServiceContext(cnf)
 	handler.RegisterHandlers(server, ctx)

server/home-user-auth/test/useraddaddresslogic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"

server/home-user-auth/test/useraddresslistlogic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"

server/home-user-auth/test/userbasicinfologic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"

server/home-user-auth/test/usercontactservicelogic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"

server/home-user-auth/test/userfontslogic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"

server/home-user-auth/test/usergettypelogic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"

server/home-user-auth/test/useroderdeletelogic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"

server/home-user-auth/test/usersavebasicinfologic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"encoding/json"

server/home-user-auth/test/userstatusconfiglogic_test.go

@@ -1,4 +1,4 @@
-package test
+package homeuserauthtest
 
 import (
 	"fmt"