From 55eabd5caecbca521ece79a5690f99c9f642fb4b Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 12 Jul 2023 10:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A1=86=E6=9E=B6=E7=9A=84?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=B8=BA=2015=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 goctl_template/api/main.tpl                       |  3 ++-
 goctl_template/gateway/main.tpl                   |  3 ++-
 goctl_template/rpc/main.tpl                       |  3 ++-
 goctl_template_backend/api/main.tpl               |  3 ++-
 goctl_template_backend/gateway/main.tpl           |  3 ++-
 goctl_template_backend/rpc/main.tpl               |  3 ++-
 proxyserver/main_test.go                          | 15 +++++++--------
 server/backend/backend.go                         |  2 ++
 server/canteen/canteen.go                         |  4 ++++
 server/data-transfer/data-transfer.go             |  2 ++
 server/home-user-auth/home-user-auth.go           |  2 ++
 server/inventory/inventory.go                     |  2 ++
 server/map-library/map-library.go                 |  2 ++
 server/orders/orders.go                           |  2 ++
 server/product-model/product-model.go             |  2 ++
 server/product-template/product-template.go       |  2 ++
 server/product/product.go                         |  2 ++
 .../shopping-cart-confirmation.go                 |  2 ++
 server/upload/upload.go                           |  2 ++
 server/webset/webset.go                           |  2 ++
 20 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/goctl_template/api/main.tpl b/goctl_template/api/main.tpl
index e631d7d7..6d173f86 100644
--- a/goctl_template/api/main.tpl
+++ b/goctl_template/api/main.tpl
@@ -13,7 +13,8 @@ func main() {
 	flag.Parse()
 
 	var c config.Config
-	conf.MustLoad(*configFile, &c)
+ 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 		server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/goctl_template/gateway/main.tpl b/goctl_template/gateway/main.tpl
index 62734516..dafdd982 100644
--- a/goctl_template/gateway/main.tpl
+++ b/goctl_template/gateway/main.tpl
@@ -13,7 +13,8 @@ func main() {
 	flag.Parse()
 
 	var c gateway.GatewayConf
-	conf.MustLoad(*configFile, &c)
+ 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 	gw := gateway.MustNewServer(c)
 	defer gw.Stop()
 	gw.Start()
diff --git a/goctl_template/rpc/main.tpl b/goctl_template/rpc/main.tpl
index 58cb6760..f095b259 100644
--- a/goctl_template/rpc/main.tpl
+++ b/goctl_template/rpc/main.tpl
@@ -19,7 +19,8 @@ func main() {
 	flag.Parse()
 
 	var c config.Config
-	conf.MustLoad(*configFile, &c)
+ 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 	ctx := svc.NewServiceContext(c)
 
 	s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) {
diff --git a/goctl_template_backend/api/main.tpl b/goctl_template_backend/api/main.tpl
index c7055076..1b353bcb 100644
--- a/goctl_template_backend/api/main.tpl
+++ b/goctl_template_backend/api/main.tpl
@@ -13,7 +13,8 @@ func main() {
 	flag.Parse()
 
 	var c config.Config
-	conf.MustLoad(*configFile, &c)
+ 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 		server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/goctl_template_backend/gateway/main.tpl b/goctl_template_backend/gateway/main.tpl
index 62734516..dafdd982 100644
--- a/goctl_template_backend/gateway/main.tpl
+++ b/goctl_template_backend/gateway/main.tpl
@@ -13,7 +13,8 @@ func main() {
 	flag.Parse()
 
 	var c gateway.GatewayConf
-	conf.MustLoad(*configFile, &c)
+ 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 	gw := gateway.MustNewServer(c)
 	defer gw.Stop()
 	gw.Start()
diff --git a/goctl_template_backend/rpc/main.tpl b/goctl_template_backend/rpc/main.tpl
index 58cb6760..f095b259 100644
--- a/goctl_template_backend/rpc/main.tpl
+++ b/goctl_template_backend/rpc/main.tpl
@@ -19,7 +19,8 @@ func main() {
 	flag.Parse()
 
 	var c config.Config
-	conf.MustLoad(*configFile, &c)
+ 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 	ctx := svc.NewServiceContext(c)
 
 	s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) {
diff --git a/proxyserver/main_test.go b/proxyserver/main_test.go
index 12e84202..efe83c53 100644
--- a/proxyserver/main_test.go
+++ b/proxyserver/main_test.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -9,10 +8,10 @@ func TestProxy(t *testing.T) {
 	main()
 }
 
-func TestCapture(t *testing.T) {
-	rootDir := "../server" // Change this to your root directory
-	results := GetZeroInfo(rootDir)
-	for _, result := range results {
-		fmt.Printf("FolderName: %s, Host: %s, Port: %d, PrefixRoute: %v\n", result.FolderName, result.Host, result.Port, result.PrefixRoute)
-	}
-}
+// func TestCapture(t *testing.T) {
+// 	rootDir := "../server" // Change this to your root directory
+// 	results := GetZeroInfo(rootDir)
+// 	for _, result := range results {
+// 		fmt.Printf("FolderName: %s, Host: %s, Port: %d, PrefixRoute: %v\n", result.FolderName, result.Host, result.Port, result.PrefixRoute)
+// 	}
+// }
diff --git a/server/backend/backend.go b/server/backend/backend.go
index 099cb974..83ae4af9 100644
--- a/server/backend/backend.go
+++ b/server/backend/backend.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/backend/internal/config"
 	"fusenapi/server/backend/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/canteen/canteen.go b/server/canteen/canteen.go
index c408570d..993573fb 100644
--- a/server/canteen/canteen.go
+++ b/server/canteen/canteen.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/canteen/internal/config"
 	"fusenapi/server/canteen/internal/handler"
@@ -20,7 +21,10 @@ func main() {
 	flag.Parse()
 
 	var c config.Config
+
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/data-transfer/data-transfer.go b/server/data-transfer/data-transfer.go
index 8ad3fa67..af86ccc2 100644
--- a/server/data-transfer/data-transfer.go
+++ b/server/data-transfer/data-transfer.go
@@ -8,6 +8,7 @@ import (
 	svc2 "fusenapi/server/data-transfer/internal/svc"
 	"fusenapi/utils/auth"
 	"net/http"
+	"time"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,6 +21,7 @@ func main() {
 
 	var c config2.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/home-user-auth/home-user-auth.go b/server/home-user-auth/home-user-auth.go
index 55820779..14b4587f 100644
--- a/server/home-user-auth/home-user-auth.go
+++ b/server/home-user-auth/home-user-auth.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/home-user-auth/internal/config"
 	"fusenapi/server/home-user-auth/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/inventory/inventory.go b/server/inventory/inventory.go
index 10661756..f623a627 100644
--- a/server/inventory/inventory.go
+++ b/server/inventory/inventory.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/inventory/internal/config"
 	"fusenapi/server/inventory/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/map-library/map-library.go b/server/map-library/map-library.go
index b8f7e38b..54ee66f6 100644
--- a/server/map-library/map-library.go
+++ b/server/map-library/map-library.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/map-library/internal/config"
 	"fusenapi/server/map-library/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/orders/orders.go b/server/orders/orders.go
index fc951aa8..a4707bea 100644
--- a/server/orders/orders.go
+++ b/server/orders/orders.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/orders/internal/config"
 	"fusenapi/server/orders/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/product-model/product-model.go b/server/product-model/product-model.go
index a6374de1..e0cabc28 100644
--- a/server/product-model/product-model.go
+++ b/server/product-model/product-model.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/product-model/internal/config"
 	"fusenapi/server/product-model/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/product-template/product-template.go b/server/product-template/product-template.go
index 3819752a..522be699 100644
--- a/server/product-template/product-template.go
+++ b/server/product-template/product-template.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/product-template/internal/config"
 	"fusenapi/server/product-template/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/product/product.go b/server/product/product.go
index 13fba403..6b212bba 100644
--- a/server/product/product.go
+++ b/server/product/product.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/product/internal/config"
 	"fusenapi/server/product/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/shopping-cart-confirmation/shopping-cart-confirmation.go b/server/shopping-cart-confirmation/shopping-cart-confirmation.go
index c5f6711c..55f29602 100644
--- a/server/shopping-cart-confirmation/shopping-cart-confirmation.go
+++ b/server/shopping-cart-confirmation/shopping-cart-confirmation.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/shopping-cart-confirmation/internal/config"
 	"fusenapi/server/shopping-cart-confirmation/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/upload/upload.go b/server/upload/upload.go
index bea4af45..603fe25a 100644
--- a/server/upload/upload.go
+++ b/server/upload/upload.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/upload/internal/config"
 	"fusenapi/server/upload/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 
diff --git a/server/webset/webset.go b/server/webset/webset.go
index ab154b3b..0b8d0ea7 100644
--- a/server/webset/webset.go
+++ b/server/webset/webset.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"time"
 
 	"fusenapi/server/webset/internal/config"
 	"fusenapi/server/webset/internal/handler"
@@ -21,6 +22,7 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	c.Timeout = int64(time.Second * 15)
 
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {