From 7b3228b6dfd9f8311650d00c6ad69ed8aa5c36f4 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Fri, 19 Jan 2024 18:21:00 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/service/resource.proto b/service/resource.proto index b2cf776..6320d5d 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -154,38 +154,44 @@ message LogoCombineRes { /* 后端上传--分片上传 */ message UploadFileBackendFragmentReq { string file_name = 1; // 文件名 + string file_type = 2; // 文件类型 bytes file_content = 3; // 文件流 bytes file_header = 4; // 文件头 string file_data = 5; // base64 - int64 chunk_number = 6; // 当前分片号:1、2、3 - int64 total_chunks = 7; // 总分片数:3 + string file_key = 6; // 哈希 - int64 api_type = 10; // 请求类型：1=对外，2=对内 - int64 upload_bucket = 11; // 上传桶类型：1=持久，2=缓存 - string file_key = 12; // 哈希 - string source = 13;// 来源 - bytes metadata = 14; // json格式 + int64 chunk_number = 7; // 当前分片号:1、2、3 + int64 total_chunks = 8; // 总分片数:3 + + + int64 upload_bucket = 10; // 上传桶类型：1=持久，2=缓存 + string upload_type = 11; // 上传方式：s3 + string upload_id = 12; // 分片上传id + int64 api_type = 13; // 请求类型：1=对外，2=对内 + string source = 14;// 来源 int64 refresh = 15; // 是否覆盖 string resource_id = 16; // 资源ID string backup_type = 17; // 资源备份：oss - string upload_type = 18; // 上传方式：s3 + bytes metadata = 18; // json格式 int64 cache_type = 100; // 缓存类型：0=不缓存 1=存储数据库 int64 user_id = 101; int64 guest_id = 102; } message UploadFileBackendFragmentRes { - string resource_type = 5; // 资源类型 - string resource_id = 4;// 资源ID - string resource_url = 6;// 资源链接 + string upload_id = 1; // 分片上传id + string resource_type = 2; // 资源类型 + string resource_id = 3;// 资源ID + string resource_url = 4;// 资源链接 } /* 后端上传--分片上传 */ /* 后端上传--单文件 */ message UploadFileBackendReq { string file_name = 1; // 文件名 - bytes file_content = 2; // 文件流 - bytes file_header = 3; // 文件头 + string file_type = 2; // 文件类型 + bytes file_content = 3; // 文件流 + bytes file_header = 4; // 文件头 string file_data = 6; // base64 int64 api_type = 10; // 请求类型：1=对外，2=对内 From 5980a393304978705d149eba26748d37421c2ad6 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Fri, 19 Jan 2024 19:03:13 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/service/resource.proto b/service/resource.proto index 6320d5d..afd1974 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -173,6 +173,7 @@ message UploadFileBackendFragmentReq { string resource_id = 16; // 资源ID string backup_type = 17; // 资源备份：oss bytes metadata = 18; // json格式 + int64 content_length = 19; // json格式 int64 cache_type = 100; // 缓存类型：0=不缓存 1=存储数据库 int64 user_id = 101; From 05744cee77ecf18fe15ecdf6bbb97ab22acd0614 Mon Sep 17 00:00:00 2001 From: "laodaming@fusen.cn" Date: Mon, 22 Jan 2024 14:44:26 +0800 Subject: [PATCH 03/16] fix --- service/ldap.proto | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/service/ldap.proto b/service/ldap.proto index 4b07ffa..0ee10a2 100644 --- a/service/ldap.proto +++ b/service/ldap.proto @@ -46,7 +46,8 @@ service ldap { rpc GetLdapUsers(GetLdapUsersReq) returns (GetLdapUsersRsp) {} //登录 rpc LdapUserLogin(LdapUserLoginReq) returns (LdapUserLoginRsp) {} - + //解析token + rpc LdapParseLogin(LdapParseLoginReq) returns (LdapParseLoginRsp) {} //获取权限组列表 rpc GetLdapGroups(GetLdapGroupsReq) returns (GetLdapGroupsRsp); @@ -298,4 +299,12 @@ message LdapUserLoginReq{ } message LdapUserLoginRsp{ string token = 1; +} +//解析token +message LdapParseLoginReq{ + string token = 1; +} +message LdapParseLoginRsp{ + string UserDn = 1; + int64 UserId = 2; } \ No newline at end of file From a8273ad6ad782eee541c4e7d3e6e59199dc7fdb2 Mon Sep 17 00:00:00 2001 From: "laodaming@fusen.cn" Date: Mon, 22 Jan 2024 14:54:07 +0800 Subject: [PATCH 04/16] fix --- service/ldap.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ldap.proto b/service/ldap.proto index 0ee10a2..e1f8fc5 100644 --- a/service/ldap.proto +++ b/service/ldap.proto @@ -47,7 +47,7 @@ service ldap { //登录 rpc LdapUserLogin(LdapUserLoginReq) returns (LdapUserLoginRsp) {} //解析token - rpc LdapParseLogin(LdapParseLoginReq) returns (LdapParseLoginRsp) {} + rpc LdapParseToken(LdapParseTokenReq) returns (LdapParseTokenRsp) {} //获取权限组列表 rpc GetLdapGroups(GetLdapGroupsReq) returns (GetLdapGroupsRsp); @@ -301,10 +301,10 @@ message LdapUserLoginRsp{ string token = 1; } //解析token -message LdapParseLoginReq{ +message LdapParseTokenReq{ string token = 1; } -message LdapParseLoginRsp{ +message LdapParseTokenRsp{ string UserDn = 1; int64 UserId = 2; } \ No newline at end of file From d4d8c66ee48401a65236f6a5ecbb5de897d2d7be Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Mon, 22 Jan 2024 15:02:31 +0800 Subject: [PATCH 05/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/service/resource.proto b/service/resource.proto index afd1974..f48441c 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -41,7 +41,25 @@ service resource { // logo缩略处理 rpc LogoResize(LogoResizeReq) returns (LogoResizeRes) {} + // logo算法信息提取 + rpc LogoAiInfoGet(LogoAiInfoGetReq) returns (LogoAiInfoGetRes) {} + } + +/* logo算法信息提取 */ +message LogoAiInfoGetReq { + string logo_url = 1;// logo地址 + string version = 2;// 算法版本 + string is_reverse = 3; // 是否反白 + string logo_crop_type = 4; // 可拆类型 + repeated string recommend_templates = 5; // 推荐模版 + string is_all_template = 6; // 是否全部模版 +} +message LogoAiInfoGetRes { + bytes metadata =1; +} +/* logo算法信息提取 */ + /* logo缩略处理 */ message LogoResizeReq{ string resource_id=1; // 资源ID From c096c2625a9533fc6b392a630a443784ef4f0ba1 Mon Sep 17 00:00:00 2001 From: "laodaming@fusen.cn" Date: Mon, 22 Jan 2024 15:10:17 +0800 Subject: [PATCH 06/16] fix --- service/ldap.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/service/ldap.proto b/service/ldap.proto index e1f8fc5..dbf6e52 100644 --- a/service/ldap.proto +++ b/service/ldap.proto @@ -307,4 +307,5 @@ message LdapParseTokenReq{ message LdapParseTokenRsp{ string UserDn = 1; int64 UserId = 2; + string UserEmail = 3; } \ No newline at end of file From 665047fdbc154df4274be2277d971572e18b70d7 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Mon, 22 Jan 2024 16:02:38 +0800 Subject: [PATCH 07/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/service/resource.proto b/service/resource.proto index f48441c..8e74be9 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -54,9 +54,10 @@ message LogoAiInfoGetReq { string logo_crop_type = 4; // 可拆类型 repeated string recommend_templates = 5; // 推荐模版 string is_all_template = 6; // 是否全部模版 + bytes preprocess_logo_metadata =7; // logo数据库额外参数 } message LogoAiInfoGetRes { - bytes metadata =1; + bytes metadata =1; // AI返回基础信息 } /* logo算法信息提取 */ From 545785561bf16ea20359329d0eee3e7c3fbb342c Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Mon, 22 Jan 2024 16:13:31 +0800 Subject: [PATCH 08/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/service/resource.proto b/service/resource.proto index 8e74be9..8d1a9f8 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -49,12 +49,13 @@ service resource { /* logo算法信息提取 */ message LogoAiInfoGetReq { string logo_url = 1;// logo地址 - string version = 2;// 算法版本 - string is_reverse = 3; // 是否反白 - string logo_crop_type = 4; // 可拆类型 - repeated string recommend_templates = 5; // 推荐模版 - string is_all_template = 6; // 是否全部模版 - bytes preprocess_logo_metadata =7; // logo数据库额外参数 + string logo_id = 2;// logoID + string version = 3;// 算法版本 + string is_reverse = 4; // 是否反白 + string logo_crop_type = 5; // 可拆类型 + string is_all_template = 7; // 是否全部模版 + repeated string recommend_templates = 6; // 推荐模版 + bytes preprocess_logo_metadata =8; // logo数据库额外参数 } message LogoAiInfoGetRes { bytes metadata =1; // AI返回基础信息 From 256443f963b8a8af035bc55dca1871ee7e4e3a3a Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Mon, 22 Jan 2024 16:19:53 +0800 Subject: [PATCH 09/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/resource.proto b/service/resource.proto index 8d1a9f8..44c1fcd 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -49,7 +49,7 @@ service resource { /* logo算法信息提取 */ message LogoAiInfoGetReq { string logo_url = 1;// logo地址 - string logo_id = 2;// logoID + int64 logo_id = 2;// logoID string version = 3;// 算法版本 string is_reverse = 4; // 是否反白 string logo_crop_type = 5; // 可拆类型 From e4c7d23772ab91f9966546d5af73ef87152ad5f5 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Mon, 22 Jan 2024 16:23:36 +0800 Subject: [PATCH 10/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/service/resource.proto b/service/resource.proto index 44c1fcd..75aef07 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -44,7 +44,19 @@ service resource { // logo算法信息提取 rpc LogoAiInfoGet(LogoAiInfoGetReq) returns (LogoAiInfoGetRes) {} + // 设置示例logo + rpc SetExample(SetExampleReq) returns (SetExampleRes) {} + } +/* 设置示例logo */ +message SetExampleReq { + int64 is_example = 1; + int64 logo_id = 2; +} +message SetExampleRes { + +} +/* 设置示例logo */ /* logo算法信息提取 */ message LogoAiInfoGetReq { From 138bcb304d4d7040ad4d2c56e2567716dae49567 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Mon, 22 Jan 2024 16:42:00 +0800 Subject: [PATCH 11/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/service/resource.proto b/service/resource.proto index 75aef07..6a33061 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -61,13 +61,17 @@ message SetExampleRes { /* logo算法信息提取 */ message LogoAiInfoGetReq { string logo_url = 1;// logo地址 - int64 logo_id = 2;// logoID - string version = 3;// 算法版本 - string is_reverse = 4; // 是否反白 - string logo_crop_type = 5; // 可拆类型 - string is_all_template = 7; // 是否全部模版 + optional int64 logo_id = 2;// logoID + optional string version = 3;// 算法版本 + optional string is_reverse = 4; // 是否反白 + optional string logo_crop_type = 5; // 可拆类型 + optional string is_all_template = 7; // 是否全部模版 + repeated string recommend_templates = 6; // 推荐模版 - bytes preprocess_logo_metadata =8; // logo数据库额外参数 + bytes preprocess_logo_metadata = 8; // logo数据库额外参数 + + optional int64 user_id = 101; // 用户ID + optional int64 guest_id = 102; // 访客ID } message LogoAiInfoGetRes { bytes metadata =1; // AI返回基础信息 From d8779d5c083a72b02cfcbe096b6ad1418fe61281 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Mon, 22 Jan 2024 16:44:07 +0800 Subject: [PATCH 12/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/resource.proto b/service/resource.proto index 6a33061..d55e3e6 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -65,7 +65,7 @@ message LogoAiInfoGetReq { optional string version = 3;// 算法版本 optional string is_reverse = 4; // 是否反白 optional string logo_crop_type = 5; // 可拆类型 - optional string is_all_template = 7; // 是否全部模版 + optional int64 is_all_template = 7; // 是否全部模版 repeated string recommend_templates = 6; // 推荐模版 bytes preprocess_logo_metadata = 8; // logo数据库额外参数 From 9ae8afd49ed1e3055f002f7cbcbffd15e4889cf5 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Tue, 23 Jan 2024 14:23:46 +0800 Subject: [PATCH 13/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/resource.proto b/service/resource.proto index d55e3e6..2a91461 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -45,15 +45,15 @@ service resource { rpc LogoAiInfoGet(LogoAiInfoGetReq) returns (LogoAiInfoGetRes) {} // 设置示例logo - rpc SetExample(SetExampleReq) returns (SetExampleRes) {} + rpc SetExampleLogo(SetExampleLogoReq) returns (SetExampleLogoRes) {} } /* 设置示例logo */ -message SetExampleReq { +message SetExampleLogoReq { int64 is_example = 1; int64 logo_id = 2; } -message SetExampleRes { +message SetExampleLogoRes { } /* 设置示例logo */ From 83e598caa21b2c83bb8e041c2b153ef34270de80 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Tue, 23 Jan 2024 17:05:17 +0800 Subject: [PATCH 14/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/basic.proto | 4 +--- service/resource.proto | 50 ++++++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 24 deletions(-) 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; // 合图算法时间 From b79c053e002b817cea01dd234d3eb9ef4c1321b5 Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Tue, 23 Jan 2024 17:40:10 +0800 Subject: [PATCH 15/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/service/resource.proto b/service/resource.proto index b4d23f5..7703071 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -73,9 +73,11 @@ message LogoAiInfoGetReq { optional int64 user_id = 101; // 用户ID optional int64 guest_id = 102; // 访客ID + optional string get_type = 103; // 获取类型：user_material=用户素材 temporary =临时 } message LogoAiInfoGetRes { - bytes metadata =1; // AI返回基础信息 + bytes metadata =1; // AI返回基础信息--logo + bytes metadata_preprocess_logo =2; // AI返回基础信息--logo数据库 } /* logo算法信息提取 */ From 77243bf29ecdaaf36cbc24808c789a22cade66fa Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Wed, 24 Jan 2024 10:04:50 +0800 Subject: [PATCH 16/16] =?UTF-8?q?logo=E7=AE=97=E6=B3=95=E8=A3=81=E5=89=AA?= =?UTF-8?q?=E5=8E=BB=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/resource.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/resource.proto b/service/resource.proto index 7703071..91aee26 100644 --- a/service/resource.proto +++ b/service/resource.proto @@ -37,7 +37,7 @@ service resource { rpc LogoInfoSet(LogoInfoSetReq) returns (LogoInfoSetRes) {} // logo裁剪处理 - rpc LogoCropping(LogoCroppingReq) returns (LogoCroppingRes) {} + rpc LogoAiCropping(LogoAiCroppingReq) returns (LogoAiCroppingRes) {} // logo缩略处理 rpc LogoResize(LogoResizeReq) returns (LogoResizeRes) {} @@ -117,7 +117,7 @@ message ResourceDeleteRes {} /* 删除资源详情 */ /* logo裁剪处理 */ -message LogoCroppingReq { +message LogoAiCroppingReq { string is_remove_bg=1; //是否去背景 string logo_file=2; // 资源 string width=3; // 宽 @@ -128,7 +128,7 @@ message LogoCroppingReq { int64 user_id = 101; // 用户ID int64 guest_id = 102; // 访客ID } -message LogoCroppingRes { +message LogoAiCroppingRes { string resource_id=1;// 资源ID string resource_url=2;// 资源链接 bool ismax_proportion=3; // 最大