fix: global proto name conflict

This commit is contained in:
tx7do
2023-10-26 17:46:41 +08:00
parent 7028636494
commit f8d53ccd85
37 changed files with 1373 additions and 1356 deletions

View File

@@ -1,28 +0,0 @@
syntax = "proto3";
package conf;
option go_package = "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1;conf";
import "conf/v1/tracer.proto";
import "conf/v1/data.proto";
import "conf/v1/server.proto";
import "conf/v1/client.proto";
import "conf/v1/logger.proto";
import "conf/v1/registry.proto";
import "conf/v1/oss.proto";
import "conf/v1/config.proto";
import "conf/v1/notify.proto";
// 引导信息
message Bootstrap {
Server server = 1;
Client client = 2;
Data data = 3;
Tracer trace = 4;
Logger logger = 5;
Registry registry = 6;
RemoteConfig config = 7;
OSS oss = 8;
Notification notify = 9;
}

View File

@@ -0,0 +1,28 @@
syntax = "proto3";
package conf;
option go_package = "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1;conf";
import "conf/v1/kratos_conf_tracer.proto";
import "conf/v1/kratos_conf_data.proto";
import "conf/v1/kratos_conf_server.proto";
import "conf/v1/kratos_conf_client.proto";
import "conf/v1/kratos_conf_logger.proto";
import "conf/v1/kratos_conf_registry.proto";
import "conf/v1/kratos_conf_oss.proto";
import "conf/v1/kratos_conf_config.proto";
import "conf/v1/kratos_conf_notify.proto";
// 引导信息
message Bootstrap {
Server server = 1;
Client client = 2;
Data data = 3;
Tracer trace = 4;
Logger logger = 5;
Registry registry = 6;
RemoteConfig config = 7;
OSS oss = 8;
Notification notify = 9;
}

View File

@@ -5,7 +5,7 @@ package conf;
option go_package = "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1;conf";
import "google/protobuf/duration.proto";
import "conf/v1/middleware.proto";
import "conf/v1/kratos_conf_middleware.proto";
//
message Client {

View File

@@ -5,7 +5,7 @@ package conf;
option go_package = "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1;conf";
import "google/protobuf/duration.proto";
import "conf/v1/middleware.proto";
import "conf/v1/kratos_conf_middleware.proto";
//
message Server {