test

2023-08-18 19:34:23 +08:00
parent d012ef5f83
commit 3f9c050ca5
13 changed files with 2 additions and 34 deletions
--- a/server/render/etc/render.yaml
+++ b/server/render/etc/render.yaml
@@ -1,11 +1,8 @@
 Name: render
 Host: 0.0.0.0
 Port: 9919
-<<<<<<< HEAD
 ReplicaId: 55
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
    AccessSecret: fusen2023