update config yaml

shiqinfeng1 · Apr 2, 2024 · 041b38d · 041b38d
1 parent 0d1f876
commit 041b38d
Show file tree

Hide file tree

Showing 20 changed files with 137 additions and 135 deletions.
diff --git a/app/gomono-bff/api/v1/bff.pb.go b/app/gomono-bff/api/v1/bff.pb.go
diff --git a/app/gomono-bff/api/v1/bff_http.pb.go b/app/gomono-bff/api/v1/bff_http.pb.go
diff --git a/app/gomono-bff/cmd/bootstrap.go b/app/gomono-bff/cmd/bootstrap.go
@@ -24,7 +24,7 @@ func Bootstrap() {
 	}
 	scan := []cconf.ScanTarget{
 		{
-			File:   "public.yaml",
+			File:   "bff.yaml",
 			Field:  "public",
 			Target: &pubCfg,
 		},

diff --git a/app/gomono-biz-trainer/api/v1/error_reason.pb.go b/app/gomono-biz-trainer/api/v1/error_reason.pb.go
diff --git a/app/gomono-biz-trainer/api/v1/trainer.pb.go b/app/gomono-biz-trainer/api/v1/trainer.pb.go
diff --git a/app/gomono-biz-trainer/cmd/bootstrap.go b/app/gomono-biz-trainer/cmd/bootstrap.go
@@ -24,7 +24,7 @@ func Bootstrap() {
 	}
 	scan := []cconf.ScanTarget{
 		{
-			File:   "public.yaml",
+			File:   "trainer.yaml",
 			Field:  "public",
 			Target: &pubCfg,
 		},

diff --git a/app/gomono-biz-training/api/v1/error_reason.pb.go b/app/gomono-biz-training/api/v1/error_reason.pb.go
diff --git a/app/gomono-biz-training/api/v1/training.pb.go b/app/gomono-biz-training/api/v1/training.pb.go
diff --git a/app/gomono-biz-training/cmd/bootstrap.go b/app/gomono-biz-training/cmd/bootstrap.go
@@ -22,7 +22,7 @@ func Bootstrap() {
 	}
 	scan := []cconf.ScanTarget{
 		{
-			File:   "public.yaml",
+			File:   "training.yaml",
 			Field:  "public",
 			Target: &pubCfg,
 		},

diff --git a/app/gomono-gateway/cmd/bootstrap.go b/app/gomono-gateway/cmd/bootstrap.go
@@ -47,7 +47,7 @@ func Bootstrap() {
 			Target: &gatewayCfg,
 		},
 		{
-			File:   "public.yaml",
+			File:   "gateway.yaml",
 			Field:  "public",
 			Target: &pubCfg,
 		},

diff --git a/deploy/docker/biz-bff/bff.yaml b/deploy/docker/biz-bff/bff.yaml
@@ -5,4 +5,21 @@ server:
   # 本服务的服务注册地址
   register:
     endpoints:
-      - "{{bff_host}}:{{bff_port}}"
+      - "{{bff_host}}:{{bff_port}}"
+
+public:
+  log:
+    level: debug
+    monitor:  # 日志服务地址
+      endpoint: tcp://127.0.0.1:23224
+    file:
+      max_size:    50  # megabytes
+      max_backups: 7    # file numbers
+      max_age:     28   # days
+      compress:    true
+      local_time:  true
+  trace:  # 链路跟踪服务地址
+    endpoint: "{{jaeger_host}}:{{jaeger_collector_otlp_http_port}}"
+  discovery:  # 服务发现的服务地址
+    endpoints:
+      - "{{nacos_host}}:{{nacos1_srv_port}}"
diff --git a/deploy/docker/biz-bff/install.yml b/deploy/docker/biz-bff/install.yml
@@ -44,7 +44,6 @@
       dest: "{{bff_config_dir}}/{{ item }}"
       force: true
     loop:
-      - "public.yaml"
       - "bff.yaml"
 
   - name: Backup BFF config Files
@@ -55,7 +54,6 @@
       force: true
       mode: 0777
     loop:
-      - "public.yaml"
       - "bff.yaml"
 
   - name: Start BFF

diff --git a/deploy/docker/biz-bff/public.yaml b/deploy/docker/biz-bff/public.yaml
diff --git a/deploy/docker/biz-gateway/gateway.yaml b/deploy/docker/biz-gateway/gateway.yaml
@@ -50,3 +50,19 @@ endpoints:
         - byHeader:
             name: 'Grpc-Status'
             value: '14'
+
+
+public:
+  log:
+    level: debug
+    monitor:  # 日志服务地址
+      endpoint: tcp://127.0.0.1:23224
+    file:
+      max_size:    50  # megabytes
+      max_backups: 7    # file numbers
+      max_age:     28   # days
+      compress:    true
+      local_time:  true
+  discovery:  # 服务发现的服务地址
+    endpoints:
+      - "{{nacos_host}}:{{nacos1_srv_port}}"
diff --git a/deploy/docker/biz-gateway/install.yml b/deploy/docker/biz-gateway/install.yml
@@ -44,7 +44,6 @@
       force: true
     loop:
       - "gateway.yaml"
-      - "public.yaml"
 
   - name: Backup Gateway config Files
     delegate_to: localhost
@@ -55,7 +54,6 @@
       mode: 0777
     loop:
       - "gateway.yaml"
-      - "public.yaml"
 
   - name: Start Gateway
     shell:

diff --git a/deploy/docker/biz-gateway/public.yaml b/deploy/docker/biz-gateway/public.yaml
diff --git a/deploy/docker/biz/public.yaml b/deploy/docker/biz/public.yaml