diff --git a/service/basic.proto b/service/basic.proto index 443e886..7e7cf23 100644 --- a/service/basic.proto +++ b/service/basic.proto @@ -3,7 +3,6 @@ syntax = "proto3"; //版本声明,使用v3版本 package basic; option go_package = ".;service"; -import "google/protobuf/any.proto"; import "google/protobuf/struct.proto"; // 定义请求消息类型. @@ -36,5 +35,4 @@ message Meta { int64 page_count=2; int64 current_page=3; int64 per_page=4; -} - \ No newline at end of file +} \ No newline at end of file diff --git a/service/resource.proto b/service/resource.proto index 2a91461..b4d23f5 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -6,6 +6,7 @@ option go_package = "gitlab.fusenpack.com/backend/resource;service"; // 导入google/api/annotations.proto 注释依赖 import "google/api/annotations.proto"; import "service/basic.proto"; +import "service/auth.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/any.proto"; @@ -30,7 +31,7 @@ service resource { rpc UploadFileBackendFragment(UploadFileBackendFragmentReq) returns (UploadFileBackendFragmentRes) {} // logo合图 - rpc LogoCombine(LogoCombineReq) returns (LogoCombineRes) {} + rpc LogoAiCombine(LogoAiCombineReq) returns (LogoAiCombineRes) {} // logo基础信息 rpc LogoInfoSet(LogoInfoSetReq) returns (LogoInfoSetRes) {} @@ -66,7 +67,7 @@ message LogoAiInfoGetReq { optional string is_reverse = 4; // 是否反白 optional string logo_crop_type = 5; // 可拆类型 optional int64 is_all_template = 7; // 是否全部模版 - + repeated string recommend_templates = 6; // 推荐模版 bytes preprocess_logo_metadata = 8; // logo数据库额外参数 @@ -145,26 +146,33 @@ message LogoInfoSetRes { /* logo基础信息 */ /* logo合图 */ -message LogoCombineReq { - int64 product_template_v2_info_id =1; - string product_template_v2_info_material_img =2; - string product_template_v2_info_template_info =3; - string template_tag =4; - string website=5; - string slogan=6; - string address=7; - string phone=8; - string qrcode=9; - string logo_url=10; - string resolution=11; - TemplateTagColor template_tag_color=12; - string logo_metadata=13; - repeated TemplateTagGroups template_tag_groups=14; +message LogoAiCombineReq { + optional string logo_url = 1; // logo资源链接 + optional int64 logo_material_id = 2; // logo素材ID + optional bytes logo_material_metadata = 3; // logo素材额外参数 + optional int64 preprocess_logo_id = 4; // logo数据库ID - int64 handle_type = 100; // 类型:1=缓存 2=重新 3=临时 - int64 user_id = 101; // 用户ID - int64 guest_id = 102; // 访客ID + optional string template_tag = 5; // 模版标签 + optional bytes template_tag_color = 6; // 模版标签颜色 + + optional bytes product_template_v2_info = 7; // 商品模版详情 + optional bytes product_template_tag_groups = 8; // 商品模版标签组信息 + + optional string resolution = 9; // 合图分辨率 + optional string slogan = 10; // 合图Slogan + optional string website = 11; // 合图网站 + optional string address = 12; // 合图地址 + optional string phone = 13; // 合图电话号码 + optional string qrcode = 14; // 合图二维码 + + auth.Debug debug = 100; // 调试模式 + int64 handle_type = 101; // 类型:1=缓存 2=重新 3=临时 + int64 user_id = 102; // 用户ID + int64 guest_id = 103; // 访客ID + string trace_id = 104; // 业务链路 + string resource_source = 105; // 资源来源 } + message TemplateTagColor { repeated Color color =1; int64 index = 2; @@ -178,7 +186,7 @@ message TemplateTagGroups { string value =3; int64 fixed =4; } -message LogoCombineRes { +message LogoAiCombineRes { string resource_id = 4; // 资源ID string resource_url = 6; // 资源链接 int64 diff_time_logo_combine=15; // 合图算法时间