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

2023-08-16 10:43:33 +08:00
parent 66de41adbb ac1800bb26
commit 6fe706e9e7
63 changed files with 367 additions and 238 deletions
--- a/server/pay/etc/pay.yaml
+++ b/server/pay/etc/pay.yaml
@@ -1,7 +1,11 @@
 Name: pay
 Host: 0.0.0.0
 Port: 9915
+<<<<<<< HEAD
 ReplicaId: 45
+=======
+Timeout: 15000 #服务超时时间
+>>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
    AccessSecret: fusen2023