From 041b38d8d4d32f0f387e0154fa31941c9f4a3328 Mon Sep 17 00:00:00 2001
From: shiqinfeng <150627601@qq.com>
Date: Tue, 2 Apr 2024 19:18:10 +0800
Subject: [PATCH] update config yaml

---
 app/gomono-bff/api/v1/bff.pb.go               |  2 +-
 app/gomono-bff/api/v1/bff_http.pb.go          | 22 ++++++------
 app/gomono-bff/cmd/bootstrap.go               |  2 +-
 .../api/v1/error_reason.pb.go                 |  2 +-
 app/gomono-biz-trainer/api/v1/trainer.pb.go   |  2 +-
 app/gomono-biz-trainer/cmd/bootstrap.go       |  2 +-
 .../api/v1/error_reason.pb.go                 |  2 +-
 app/gomono-biz-training/api/v1/training.pb.go |  2 +-
 app/gomono-biz-training/cmd/bootstrap.go      |  2 +-
 app/gomono-gateway/cmd/bootstrap.go           |  2 +-
 deploy/docker/biz-bff/bff.yaml                | 19 +++++++++-
 deploy/docker/biz-bff/install.yml             |  2 --
 deploy/docker/biz-bff/public.yaml             | 36 -------------------
 deploy/docker/biz-gateway/gateway.yaml        | 16 +++++++++
 deploy/docker/biz-gateway/install.yml         |  2 --
 deploy/docker/biz-gateway/public.yaml         | 36 -------------------
 deploy/docker/biz/public.yaml                 | 36 -------------------
 deploy/docker/biz/trainer.yaml                | 34 +++++++++++++++++-
 deploy/docker/biz/training.yaml               | 35 +++++++++++++++++-
 deploy/standalone/config/gateway.yaml         | 16 +++++++++
 20 files changed, 137 insertions(+), 135 deletions(-)
 delete mode 100644 deploy/docker/biz-bff/public.yaml
 delete mode 100644 deploy/docker/biz-gateway/public.yaml
 delete mode 100644 deploy/docker/biz/public.yaml

diff --git a/app/gomono-bff/api/v1/bff.pb.go b/app/gomono-bff/api/v1/bff.pb.go
index d258fa0..fb0fe25 100644
--- a/app/gomono-bff/api/v1/bff.pb.go
+++ b/app/gomono-bff/api/v1/bff.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.25.0
 // source: gomono-bff/api/v1/bff.proto
 
diff --git a/app/gomono-bff/api/v1/bff_http.pb.go b/app/gomono-bff/api/v1/bff_http.pb.go
index bda0f95..124cb47 100644
--- a/app/gomono-bff/api/v1/bff_http.pb.go
+++ b/app/gomono-bff/api/v1/bff_http.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-http. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-http v2.7.2
+// - protoc-gen-go-http v2.7.3
 // - protoc             v4.25.0
 // source: gomono-bff/api/v1/bff.proto
 
@@ -310,7 +310,7 @@ func (c *BFFHTTPClientImpl) ApproveRescheduleTraining(ctx context.Context, in *v
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) CancelTraining(ctx context.Context, in *v1.CancelTrainingRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
@@ -323,7 +323,7 @@ func (c *BFFHTTPClientImpl) CancelTraining(ctx context.Context, in *v1.CancelTra
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) CreateTraining(ctx context.Context, in *v1.CreateTrainingRequest, opts ...http.CallOption) (*v1.CreateTrainingResponse, error) {
@@ -336,7 +336,7 @@ func (c *BFFHTTPClientImpl) CreateTraining(ctx context.Context, in *v1.CreateTra
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) GetTrainerAvailableHours(ctx context.Context, in *GetTrainerAvailableHoursRequest, opts ...http.CallOption) (*GetTrainerAvailableHoursRespone, error) {
@@ -349,7 +349,7 @@ func (c *BFFHTTPClientImpl) GetTrainerAvailableHours(ctx context.Context, in *Ge
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) GetTraining(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*v1.GetTrainingResponse, error) {
@@ -362,7 +362,7 @@ func (c *BFFHTTPClientImpl) GetTraining(ctx context.Context, in *emptypb.Empty,
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) MakeHourAvailable(ctx context.Context, in *MakeHourAvailableRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
@@ -375,7 +375,7 @@ func (c *BFFHTTPClientImpl) MakeHourAvailable(ctx context.Context, in *MakeHourA
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) MakeHourUnavailable(ctx context.Context, in *MakeHourUnavailableRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
@@ -388,7 +388,7 @@ func (c *BFFHTTPClientImpl) MakeHourUnavailable(ctx context.Context, in *MakeHou
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) RejectRescheduleTraining(ctx context.Context, in *v1.RejectRescheduleTrainingRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
@@ -401,7 +401,7 @@ func (c *BFFHTTPClientImpl) RejectRescheduleTraining(ctx context.Context, in *v1
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) RequestRescheduleTraining(ctx context.Context, in *v1.RequestRescheduleTrainingRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
@@ -414,7 +414,7 @@ func (c *BFFHTTPClientImpl) RequestRescheduleTraining(ctx context.Context, in *v
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
 
 func (c *BFFHTTPClientImpl) RescheduleTraining(ctx context.Context, in *v1.RescheduleTrainingRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
@@ -427,5 +427,5 @@ func (c *BFFHTTPClientImpl) RescheduleTraining(ctx context.Context, in *v1.Resch
 	if err != nil {
 		return nil, err
 	}
-	return &out, err
+	return &out, nil
 }
diff --git a/app/gomono-bff/cmd/bootstrap.go b/app/gomono-bff/cmd/bootstrap.go
index eee2997..d081ea3 100644
--- 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
index 1393aeb..edad4a2 100644
--- a/app/gomono-biz-trainer/api/v1/error_reason.pb.go
+++ b/app/gomono-biz-trainer/api/v1/error_reason.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.25.0
 // source: gomono-biz-trainer/api/v1/error_reason.proto
 
diff --git a/app/gomono-biz-trainer/api/v1/trainer.pb.go b/app/gomono-biz-trainer/api/v1/trainer.pb.go
index d44b312..e5b02f3 100644
--- a/app/gomono-biz-trainer/api/v1/trainer.pb.go
+++ b/app/gomono-biz-trainer/api/v1/trainer.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.25.0
 // source: gomono-biz-trainer/api/v1/trainer.proto
 
diff --git a/app/gomono-biz-trainer/cmd/bootstrap.go b/app/gomono-biz-trainer/cmd/bootstrap.go
index 9ffa92b..36f9bb1 100644
--- 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
index a37d366..6c85d3b 100644
--- a/app/gomono-biz-training/api/v1/error_reason.pb.go
+++ b/app/gomono-biz-training/api/v1/error_reason.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.25.0
 // source: gomono-biz-training/api/v1/error_reason.proto
 
diff --git a/app/gomono-biz-training/api/v1/training.pb.go b/app/gomono-biz-training/api/v1/training.pb.go
index d30885c..db11c0e 100644
--- a/app/gomono-biz-training/api/v1/training.pb.go
+++ b/app/gomono-biz-training/api/v1/training.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.25.0
 // source: gomono-biz-training/api/v1/training.proto
 
diff --git a/app/gomono-biz-training/cmd/bootstrap.go b/app/gomono-biz-training/cmd/bootstrap.go
index bcbf4eb..1c02990 100644
--- 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
index 5fc8707..58c3b71 100644
--- 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
index d57ec8b..b9b7e15 100644
--- 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}}"
\ No newline at end of file
+      - "{{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
index 098d62d..b7cf66e 100644
--- 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
deleted file mode 100644
index a010ff4..0000000
--- a/deploy/docker/biz-bff/public.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-public:
-  adapter:
-    database:  # 数据库服务地址
-      driver: mysql
-      source: "root:root@tcp({{mysql_host}}:43306)/test" # todo: 数据库名需要更新
-    redis: # redis的服务地址
-      addr: "{{redis_host}}:{{redis_srv_port}}"
-      read_timeout: 0.2s
-      write_timeout: 0.2s
-  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
-
-  registry:  # 注册中心的服务地址
-    addrs:
-      - "{{nacos_host}}:{{nacos1_srv_port}}"
-      - "{{nacos_host}}:{{nacos2_srv_port}}"
-      - "{{nacos_host}}:{{nacos3_srv_port}}"
-  trace:  # 链路跟踪服务地址
-    endpoint: "{{jaeger_host}}:{{jaeger_collector_otlp_http_port}}"
-
-  discovery:  # 服务发现的服务地址
-    endpoints:
-      - "{{nacos_host}}:{{nacos1_srv_port}}"
-
-  gateway_register: # 网关服务地址
-    endpoints:
-      - "{{proxy_host}}:{{proxy_port1}}"
\ No newline at end of file
diff --git a/deploy/docker/biz-gateway/gateway.yaml b/deploy/docker/biz-gateway/gateway.yaml
index 3190c1c..2985fa7 100644
--- 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
index ed69efa..165c646 100644
--- 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
deleted file mode 100644
index a010ff4..0000000
--- a/deploy/docker/biz-gateway/public.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-public:
-  adapter:
-    database:  # 数据库服务地址
-      driver: mysql
-      source: "root:root@tcp({{mysql_host}}:43306)/test" # todo: 数据库名需要更新
-    redis: # redis的服务地址
-      addr: "{{redis_host}}:{{redis_srv_port}}"
-      read_timeout: 0.2s
-      write_timeout: 0.2s
-  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
-
-  registry:  # 注册中心的服务地址
-    addrs:
-      - "{{nacos_host}}:{{nacos1_srv_port}}"
-      - "{{nacos_host}}:{{nacos2_srv_port}}"
-      - "{{nacos_host}}:{{nacos3_srv_port}}"
-  trace:  # 链路跟踪服务地址
-    endpoint: "{{jaeger_host}}:{{jaeger_collector_otlp_http_port}}"
-
-  discovery:  # 服务发现的服务地址
-    endpoints:
-      - "{{nacos_host}}:{{nacos1_srv_port}}"
-
-  gateway_register: # 网关服务地址
-    endpoints:
-      - "{{proxy_host}}:{{proxy_port1}}"
\ No newline at end of file
diff --git a/deploy/docker/biz/public.yaml b/deploy/docker/biz/public.yaml
deleted file mode 100644
index f4da13f..0000000
--- a/deploy/docker/biz/public.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-public:
-  adapter:
-    database:  # 数据库服务地址
-      driver: mysql
-      source: "root:root@tcp({{mysql_host}}:23306)/test" # todo: 数据库名需要更新
-    redis: # redis的服务地址
-      addr: "{{redis_host}}:{{redis_srv_port}}"
-      read_timeout: 0.2s
-      write_timeout: 0.2s
-  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
-
-  registry:  # 注册中心的服务地址
-    addrs:
-      - "{{nacos_host}}:{{nacos1_srv_port}}"
-      - "{{nacos_host}}:{{nacos2_srv_port}}"
-      - "{{nacos_host}}:{{nacos3_srv_port}}"
-  trace:  # 链路跟踪服务地址
-    endpoint: "{{jaeger_host}}:{{jaeger_collector_otlp_http_port}}"
-
-  discovery:  # 服务发现的服务地址
-    endpoints:
-      - "{{nacos_host}}:{{nacos1_srv_port}}"
-
-  gateway_register: # 网关服务地址
-    endpoints:
-      - "{{proxy_host}}:{{proxy_port1}}"
\ No newline at end of file
diff --git a/deploy/docker/biz/trainer.yaml b/deploy/docker/biz/trainer.yaml
index 6185815..52bed7a 100644
--- a/deploy/docker/biz/trainer.yaml
+++ b/deploy/docker/biz/trainer.yaml
@@ -6,4 +6,36 @@ server:
   # 本服务的服务注册地址
   register:
     endpoints:
-      - "{{biz_trainer_host}}:{{biz_trainer_port}}"
\ No newline at end of file
+      - "{{biz_trainer_host}}:{{biz_trainer_port}}"
+
+public:
+  adapter:
+    database:  # 数据库服务地址
+      driver: mysql
+      source: "root:root@tcp({{mysql_host}}:23306)/test" # todo: 数据库名需要更新
+    redis: # redis的服务地址
+      addr: "{{redis_host}}:{{redis_srv_port}}"
+      read_timeout: 0.2s
+      write_timeout: 0.2s
+  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
+
+  registry:  # 注册中心的服务地址
+    addrs:
+      - "{{nacos_host}}:{{nacos1_srv_port}}"
+      - "{{nacos_host}}:{{nacos2_srv_port}}"
+      - "{{nacos_host}}:{{nacos3_srv_port}}"
+  trace:  # 链路跟踪服务地址
+    endpoint: "{{jaeger_host}}:{{jaeger_collector_otlp_http_port}}"
+
+  discovery:  # 服务发现的服务地址
+    endpoints:
+      - "{{nacos_host}}:{{nacos1_srv_port}}"
\ No newline at end of file
diff --git a/deploy/docker/biz/training.yaml b/deploy/docker/biz/training.yaml
index c9733fd..8413fb1 100644
--- a/deploy/docker/biz/training.yaml
+++ b/deploy/docker/biz/training.yaml
@@ -6,4 +6,37 @@ server:
   # 本服务的服务注册地址
   register:
     endpoints:
-      - "{{biz_training_host}}:{{biz_training_port}}"
\ No newline at end of file
+      - "{{biz_training_host}}:{{biz_training_port}}"
+
+
+public:
+  adapter:
+    database:  # 数据库服务地址
+      driver: mysql
+      source: "root:root@tcp({{mysql_host}}:23306)/test" # todo: 数据库名需要更新
+    redis: # redis的服务地址
+      addr: "{{redis_host}}:{{redis_srv_port}}"
+      read_timeout: 0.2s
+      write_timeout: 0.2s
+  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
+
+  registry:  # 注册中心的服务地址
+    addrs:
+      - "{{nacos_host}}:{{nacos1_srv_port}}"
+      - "{{nacos_host}}:{{nacos2_srv_port}}"
+      - "{{nacos_host}}:{{nacos3_srv_port}}"
+  trace:  # 链路跟踪服务地址
+    endpoint: "{{jaeger_host}}:{{jaeger_collector_otlp_http_port}}"
+
+  discovery:  # 服务发现的服务地址
+    endpoints:
+      - "{{nacos_host}}:{{nacos1_srv_port}}"
diff --git a/deploy/standalone/config/gateway.yaml b/deploy/standalone/config/gateway.yaml
index 2734ba3..049f32e 100755
--- a/deploy/standalone/config/gateway.yaml
+++ b/deploy/standalone/config/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:
+      - "192.168.72.84:8848"