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

2023-08-22 16:35:28 +08:00 · 2023-08-22 16:35:28 +08:00 · dab3dd7d85
commit dab3dd7d85
parent a073257723 6313c37ec0
18 changed files with 19 additions and 17 deletions
--- a/config_replica_id.sh
+++ b/config_replica_id.sh
@ -26,7 +26,7 @@ change_config(){
 }

 # 读取server目录,忽略指定的三个目录
-server_dirs=($(cd server && ls | grep -vE "backend|product-template|product-model"))
+server_dirs=($(cd server && ls | grep -vE "backend|product-model"))

 for server_dir in "${server_dirs[@]}"; do
  change_config $server_dir  
--- a/server/base/etc/base.yaml
+++ b/server/base/etc/base.yaml
@ -1,6 +1,7 @@
 Name: base
 Host: 0.0.0.0
 Port: 9920
+ReplicaId: 15
 Timeout: 15000 #服务超时时间(毫秒)
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/canteen/etc/canteen.yaml
+++ b/server/canteen/etc/canteen.yaml
@ -1,7 +1,7 @@
 Name: canteen
 Host: localhost
 Port: 9902
-ReplicaId: 15
+ReplicaId: 20
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/data-transfer/etc/data-transfer.yaml
+++ b/server/data-transfer/etc/data-transfer.yaml
@ -1,7 +1,7 @@
 Name: data-transfer
 Host: localhost
 Port: 9903
-ReplicaId: 20
+ReplicaId: 25
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/home-user-auth/etc/home-user-auth.yaml
+++ b/server/home-user-auth/etc/home-user-auth.yaml
@ -1,7 +1,7 @@
 Name: home-user-auth
 Host: localhost
 Port: 9904
-ReplicaId: 25
+ReplicaId: 30
 Timeout: 15000 #服务超时时间
 MainAddress: "http://localhost:9900"
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
--- a/server/inventory/etc/inventory.yaml
+++ b/server/inventory/etc/inventory.yaml
@ -1,7 +1,7 @@
 Name: inventory
 Host: localhost
 Port: 9905
-ReplicaId: 30
+ReplicaId: 35
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/map-library/etc/map-library.yaml
+++ b/server/map-library/etc/map-library.yaml
@ -1,7 +1,7 @@
 Name: map-library
 Host: localhost
 Port: 9906
-ReplicaId: 35
+ReplicaId: 40
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/orders/etc/orders.yaml
+++ b/server/orders/etc/orders.yaml
@ -1,7 +1,7 @@
 Name: orders
 Host: localhost
 Port: 9907
-ReplicaId: 40
+ReplicaId: 45
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/pay/etc/pay.yaml
+++ b/server/pay/etc/pay.yaml
@ -1,7 +1,7 @@
 Name: pay
 Host: 0.0.0.0
 Port: 9915
-ReplicaId: 45
+ReplicaId: 50
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/product-template-tag/etc/product-template-tag.yaml
+++ b/server/product-template-tag/etc/product-template-tag.yaml
@ -1,6 +1,6 @@
 Name: product-template-tag
 Host: 0.0.0.0
-ReplicaId: 10
+ReplicaId: 65
 Port: 9917
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
--- a/server/product-template/etc/product-template.yaml
+++ b/server/product-template/etc/product-template.yaml
@ -1,6 +1,7 @@
 Name: product-template
 Host: localhost
 Port: 9910
+ReplicaId: 60
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/product/etc/product.yaml
+++ b/server/product/etc/product.yaml
@ -1,7 +1,7 @@
 Name: product
 Host: localhost
 Port: 9908
-ReplicaId: 50
+ReplicaId: 55
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/render/etc/render.yaml
+++ b/server/render/etc/render.yaml
@ -1,7 +1,7 @@
 Name: render
 Host: 0.0.0.0
 Port: 9919
-ReplicaId: 55
+ReplicaId: 70
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/resource/etc/resource.yaml
+++ b/server/resource/etc/resource.yaml
@ -1,7 +1,7 @@
 Name: resource
 Host: 0.0.0.0
 Port: 9916
-ReplicaId: 60
+ReplicaId: 75
 Timeout: 150000 #服务超时时间(毫秒)
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/shopping-cart-confirmation/etc/shopping-cart-confirmation.yaml
+++ b/server/shopping-cart-confirmation/etc/shopping-cart-confirmation.yaml
@ -1,7 +1,7 @@
 Name: shopping-cart-confirmation
 Host: localhost
 Port: 9911
-ReplicaId: 65
+ReplicaId: 80
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth:
--- a/server/upload/etc/upload.yaml
+++ b/server/upload/etc/upload.yaml
@ -1,7 +1,7 @@
 Name: upload
 Host: localhost
 Port: 9912
-ReplicaId: 70
+ReplicaId: 85
 Timeout: 150000 #服务超时时间
 MaxBytes: 104857600 #传输字节大小
 SourceMysql: "fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen"
--- a/server/webset/etc/webset.yaml
+++ b/server/webset/etc/webset.yaml
@ -1,7 +1,7 @@
 Name: webset
 Host: localhost
 Port: 9913
-ReplicaId: 75
+ReplicaId: 90
 Timeout: 15000 #服务超时时间
 SourceMysql: "fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen"
 Auth:
--- a/server/websocket/etc/websocket.yaml
+++ b/server/websocket/etc/websocket.yaml
@ -1,7 +1,7 @@
 Name: websocket
 Host: 0.0.0.0
 Port: 9914
-ReplicaId: 80
+ReplicaId: 95
 Timeout: 15000 #服务超时时间
 SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
 Auth: