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

server/map-library/etc/map-library.yaml

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

server/map-library/map-library.go

@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
-	"time"
 
 	"fusenapi/server/map-library/internal/config"
 	"fusenapi/server/map-library/internal/handler"
@@ -22,7 +21,6 @@ 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) {