From 563dd3f7231e65564f438d43bd6c8fc6a365a235 Mon Sep 17 00:00:00 2001 From: ywmoyue Date: Mon, 17 Jul 2023 07:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DgRPC=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E4=B8=80=E4=BA=9B=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20(#743)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复一些协议文件错误 * 删除上次提交添加的无效注释 * 修复类型包名错误 * 修复Campus服务返回类型 --- .../bilibili/app/distribution/v1/distribution.proto | 2 ++ grpc_api/bilibili/app/dynamic/v2/campus.proto | 2 +- grpc_api/bilibili/app/dynamic/v2/dynamic.proto | 2 +- grpc_api/bilibili/app/interfaces/v1/history.proto | 2 +- grpc_api/bilibili/app/interfaces/v1/media.proto | 2 +- grpc_api/bilibili/app/interfaces/v1/search.proto | 2 +- grpc_api/bilibili/app/interfaces/v1/space.proto | 2 +- grpc_api/bilibili/app/listener/v1/listener.proto | 2 +- .../bilibili/dagw/component/avatar/v1/avatar.proto | 12 ++++++------ .../bilibili/dagw/component/avatar/v1/plugin.proto | 4 +++- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/grpc_api/bilibili/app/distribution/v1/distribution.proto b/grpc_api/bilibili/app/distribution/v1/distribution.proto index 87972f3..71c9947 100644 --- a/grpc_api/bilibili/app/distribution/v1/distribution.proto +++ b/grpc_api/bilibili/app/distribution/v1/distribution.proto @@ -2,6 +2,8 @@ syntax = "proto3"; package bilibili.app.distribution.v1; +import "google/protobuf/any.proto"; + // APP配置 service Distribution { // 获取云端储存的用户偏好 diff --git a/grpc_api/bilibili/app/dynamic/v2/campus.proto b/grpc_api/bilibili/app/dynamic/v2/campus.proto index 3859c2e..1f94706 100644 --- a/grpc_api/bilibili/app/dynamic/v2/campus.proto +++ b/grpc_api/bilibili/app/dynamic/v2/campus.proto @@ -10,7 +10,7 @@ import "bilibili/app/dynamic/v2/dynamic.proto"; service Campus { // - rpc WaterFlowRcmd (WaterFlowRcmdReq) returns (WaterFlowRcmdReply); + rpc WaterFlowRcmd (WaterFlowRcmdReq) returns (WaterFlowRcmdResp); } // diff --git a/grpc_api/bilibili/app/dynamic/v2/dynamic.proto b/grpc_api/bilibili/app/dynamic/v2/dynamic.proto index 5ca37c9..07e749e 100644 --- a/grpc_api/bilibili/app/dynamic/v2/dynamic.proto +++ b/grpc_api/bilibili/app/dynamic/v2/dynamic.proto @@ -780,7 +780,7 @@ message CampusHomePagesReq { // double lng = 4; // - PlayerArgs player_args = 5; + bilibili.app.archive.middleware.v1.PlayerArgs player_args = 5; // int32 page_type = 6; } diff --git a/grpc_api/bilibili/app/interfaces/v1/history.proto b/grpc_api/bilibili/app/interfaces/v1/history.proto index 7690cac..3723963 100644 --- a/grpc_api/bilibili/app/interfaces/v1/history.proto +++ b/grpc_api/bilibili/app/interfaces/v1/history.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package bilibili.app.interfaces.v1; +package bilibili.app.interface.v1; import "bilibili/app/archive/middleware/v1/preload.proto"; diff --git a/grpc_api/bilibili/app/interfaces/v1/media.proto b/grpc_api/bilibili/app/interfaces/v1/media.proto index ca90359..440430a 100644 --- a/grpc_api/bilibili/app/interfaces/v1/media.proto +++ b/grpc_api/bilibili/app/interfaces/v1/media.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package bilibili.app.interfaces.v1; +package bilibili.app.interface.v1; // service Media { diff --git a/grpc_api/bilibili/app/interfaces/v1/search.proto b/grpc_api/bilibili/app/interfaces/v1/search.proto index 75459da..1654c54 100644 --- a/grpc_api/bilibili/app/interfaces/v1/search.proto +++ b/grpc_api/bilibili/app/interfaces/v1/search.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package bilibili.app.interfaces.v1; +package bilibili.app.interface.v1; // 搜索 service Search { diff --git a/grpc_api/bilibili/app/interfaces/v1/space.proto b/grpc_api/bilibili/app/interfaces/v1/space.proto index 65f6c0b..236dca3 100644 --- a/grpc_api/bilibili/app/interfaces/v1/space.proto +++ b/grpc_api/bilibili/app/interfaces/v1/space.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package bilibili.app.interfaces.v1; +package bilibili.app.interface.v1; import "bilibili/app/archive/middleware/v1/preload.proto"; import "bilibili/app/archive/v1/archive.proto"; diff --git a/grpc_api/bilibili/app/listener/v1/listener.proto b/grpc_api/bilibili/app/listener/v1/listener.proto index 6c431fa..5485e71 100644 --- a/grpc_api/bilibili/app/listener/v1/listener.proto +++ b/grpc_api/bilibili/app/listener/v1/listener.proto @@ -287,7 +287,7 @@ message DetailItem { // string history_tag = 13; // - bilibili.app.interfaces.v1.DeviceType device_type = 14; + bilibili.app.interface.v1.DeviceType device_type = 14; // FavFolder ugc_season_info = 15; } diff --git a/grpc_api/bilibili/dagw/component/avatar/v1/avatar.proto b/grpc_api/bilibili/dagw/component/avatar/v1/avatar.proto index f4ced14..d1be861 100644 --- a/grpc_api/bilibili/dagw/component/avatar/v1/avatar.proto +++ b/grpc_api/bilibili/dagw/component/avatar/v1/avatar.proto @@ -45,7 +45,7 @@ message Layer { // bool visible = 2; // - LayerGeneralSpec general_spec = 3; + bilibili.dagw.component.avatar.common.LayerGeneralSpec general_spec = 3; // LayerConfig layer_config = 4; // @@ -61,7 +61,7 @@ message LayerConfig { // bool allow_over_paint = 3; // - MaskProperty layer_mask = 4; + bilibili.dagw.component.avatar.common.MaskProperty layer_mask = 4; } // @@ -71,7 +71,7 @@ message LayerGroup { // repeated Layer layers = 2; // - MaskProperty group_mask = 3; + bilibili.dagw.component.avatar.common.MaskProperty group_mask = 3; // bool is_critical_group = 4; } @@ -96,17 +96,17 @@ message LayerTagConfig { // message ResAnimation { // - ResourceSource webp_src = 1; + bilibili.dagw.component.avatar.common.ResourceSource webp_src = 1; } // message ResImage { // - ResourceSource image_src = 1; + bilibili.dagw.component.avatar.common.ResourceSource image_src = 1; } // message ResNativeDraw { // - ResourceSource draw_src = 1; + bilibili.dagw.component.avatar.common.ResourceSource draw_src = 1; } \ No newline at end of file diff --git a/grpc_api/bilibili/dagw/component/avatar/v1/plugin.proto b/grpc_api/bilibili/dagw/component/avatar/v1/plugin.proto index a5d3702..7e88289 100644 --- a/grpc_api/bilibili/dagw/component/avatar/v1/plugin.proto +++ b/grpc_api/bilibili/dagw/component/avatar/v1/plugin.proto @@ -2,6 +2,8 @@ syntax = "proto3"; package bilibili.dagw.component.avatar.v1.plugin; +import "bilibili/dagw/component/avatar/common/common.proto"; + // message CommentDoubleClickConfig { // @@ -55,7 +57,7 @@ message LiveAnimeConfig { // message LiveAnimeItem { // - ColorConfig color = 1; + bilibili.dagw.component.avatar.common.ColorConfig color = 1; // double start_ratio = 2; //