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

server/data-transfer/data-transfer.go

@@ -8,7 +8,6 @@ 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"
@@ -21,7 +20,6 @@ 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) {
 

server/data-transfer/etc/data-transfer.yaml

@@ -1,7 +1,11 @@
 Name: data-transfer
 Host: localhost
 Port: 9903
+<<<<<<< HEAD
 ReplicaId: 20
+=======
+Timeout: 15000 #服务超时时间
+>>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
   AccessSecret: fusen2023