feat: 1. upgrade go.mod; 2. regenerate proto; 3. refactor consul regi…

…stry config.go
tx7do · Sep 14, 2023 · 6de157c · 6de157c
1 parent 1487596
commit 6de157c
Show file tree

Hide file tree

Showing 71 changed files with 565 additions and 346 deletions.
diff --git a/blog-backend/api/common/conf/registry.proto b/blog-backend/api/common/conf/registry.proto
@@ -12,7 +12,11 @@ message Registry {
   message Consul {
     string scheme = 1;  // 网络样式
     string address = 2; // 服务端地址
-    bool health_check = 3;  // 健康检查
+    optional string data_center = 3; // 数据中心
+    optional google.protobuf.Duration timeout = 4; // 超时时间
+    optional bool heartbeat = 5;  // 心跳检查
+    optional bool health_check = 6;  // 健康检查
+    optional int32 health_check_interval = 7;  // 健康检查时间间隔
   }
 
   // Etcd

diff --git a/blog-backend/app/admin/service/configs/registry.yaml b/blog-backend/app/admin/service/configs/registry.yaml
@@ -4,7 +4,9 @@ registry:
   consul:
     address: "localhost:8500"
     scheme: "http"
+    heartbeat: false
     health_check: false
+    health_check_interval: 5
 
   etcd:
     endpoints:

diff --git a/blog-backend/app/core/service/configs/registry.yaml b/blog-backend/app/core/service/configs/registry.yaml
@@ -4,7 +4,9 @@ registry:
   consul:
     address: "localhost:8500"
     scheme: "http"
+    heartbeat: false
     health_check: false
+    health_check_interval: 5
 
   etcd:
     endpoints:

diff --git a/blog-backend/app/front/service/configs/registry.yaml b/blog-backend/app/front/service/configs/registry.yaml
@@ -4,7 +4,9 @@ registry:
   consul:
     address: "localhost:8500"
     scheme: "http"
+    heartbeat: false
     health_check: false
+    health_check_interval: 5
 
   etcd:
     endpoints:

diff --git a/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.go b/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_attachment_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_attachment_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_authentication_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_authentication_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_category.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_category.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_category_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_category_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_comment_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_comment_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_link.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_link.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_link_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_link_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_menu_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_menu_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_photo_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_photo_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_post.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_post.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_post_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_post_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_system.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_system.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_system_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_system_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_tag_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_tag_http.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_user.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_user.pb.go
diff --git a/blog-backend/gen/api/go/admin/service/v1/i_user_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_user_http.pb.go
diff --git a/blog-backend/gen/api/go/comment/service/v1/comment.pb.go b/blog-backend/gen/api/go/comment/service/v1/comment.pb.go
diff --git a/blog-backend/gen/api/go/common/conf/bootstrap.pb.go b/blog-backend/gen/api/go/common/conf/bootstrap.pb.go
diff --git a/blog-backend/gen/api/go/common/conf/client.pb.go b/blog-backend/gen/api/go/common/conf/client.pb.go
diff --git a/blog-backend/gen/api/go/common/conf/config.pb.go b/blog-backend/gen/api/go/common/conf/config.pb.go
diff --git a/blog-backend/gen/api/go/common/conf/data.pb.go b/blog-backend/gen/api/go/common/conf/data.pb.go
diff --git a/blog-backend/gen/api/go/common/conf/logger.pb.go b/blog-backend/gen/api/go/common/conf/logger.pb.go
diff --git a/blog-backend/gen/api/go/common/conf/middleware.pb.go b/blog-backend/gen/api/go/common/conf/middleware.pb.go