From a6f87e75b8243b8df670083cd15fc4b8727ae188 Mon Sep 17 00:00:00 2001
From: "menghaiwen@fusen.cn" <menghaiwen@fusen.cn>
Date: Tue, 5 Dec 2023 15:20:02 +0800
Subject: [PATCH 1/4] update

---
 service/resource.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/resource.proto b/service/resource.proto
index 3fae88e..5526e2b 100644
--- a/service/resource.proto
+++ b/service/resource.proto
@@ -13,7 +13,7 @@ import "google/protobuf/any.proto";
 service resource { 
  
     // 获取资源详情
-    rpc GetResourceInfo(GetResourceInfoReq) returns (basic.Response) {
+    rpc GetResourceInfo(GetResourceInfoReq) returns (GetResourceInfoRes) {
         option (google.api.http) = {
             get: "/api/resource/info"
         };

From 2c936c6536451094987ff53639dee0b4b990d5fe Mon Sep 17 00:00:00 2001
From: "menghaiwen@fusen.cn" <menghaiwen@fusen.cn>
Date: Tue, 5 Dec 2023 15:40:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
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 5526e2b..35ea3aa 100644
--- a/service/resource.proto
+++ b/service/resource.proto
@@ -13,7 +13,7 @@ import "google/protobuf/any.proto";
 service resource { 
  
     // 获取资源详情
-    rpc GetResourceInfo(GetResourceInfoReq) returns (GetResourceInfoRes) {
+    rpc GetResourceInfo(GetResourceInfoReq) returns (basic.Response) {
         option (google.api.http) = {
             get: "/api/resource/info"
         };
@@ -43,7 +43,7 @@ message GetResourceInfoRes {
     string bucket_name = 8;
     string source = 9;
     string uploaded_at = 10;
-    // google.protobuf.Struct metadata = 11;
-    google.protobuf.Any metadata =11;
+    google.protobuf.Struct metadata = 11;
+    // google.protobuf.Any metadata =11;
 }
 /* 获取资源详情 */
\ No newline at end of file

From c467d31915254ecc59196c85b14f86f3a5c2d1c8 Mon Sep 17 00:00:00 2001
From: "menghaiwen@fusen.cn" <menghaiwen@fusen.cn>
Date: Tue, 5 Dec 2023 16:12:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/resource.proto | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/service/resource.proto b/service/resource.proto
index 35ea3aa..3a2f9ee 100644
--- a/service/resource.proto
+++ b/service/resource.proto
@@ -18,7 +18,30 @@ service resource {
             get: "/api/resource/info"
         };
     }
+
+    // 获取资源列表
+    rpc GetResourceList(GetResourceListReq) returns (basic.Response) {
+        option (google.api.http) = {
+            get: "/api/resource/list"
+        };
+    }
 }
+/* 获取资源列表 */
+message GetResourceList{
+    optional string resource_id = 1;
+    optional int64 guest_id =2;
+    optional int64 user_id =3;
+    optional string resource_type = 4;
+    optional string resource_url = 5;
+    optional string version = 6;
+    optional int64 api_type = 7;
+    optional string bucket_name = 8;
+    optional string source = 9;
+
+    optional int64 current_page =100;
+    optional int64 per_page =200;
+}
+/* 获取资源列表 */
 
 /* 获取资源详情 */
 message GetResourceInfoReq{
@@ -32,18 +55,4 @@ message GetResourceInfoReq{
     optional string bucket_name = 8;
     optional string source = 9;
 }
-message GetResourceInfoRes {
-    string resource_id = 1;
-    int64 guest_id =2;
-    int64 user_id =3;
-    string resource_type = 4;
-    string resource_url = 5;
-    string version = 6;
-    int64 api_type = 7;
-    string bucket_name = 8;
-    string source = 9;
-    string uploaded_at = 10;
-    google.protobuf.Struct metadata = 11;
-    // google.protobuf.Any metadata =11;
-}
 /* 获取资源详情 */
\ No newline at end of file

From c09b26bc8b5a60f085c44c9c978c44735a8260ed Mon Sep 17 00:00:00 2001
From: "menghaiwen@fusen.cn" <menghaiwen@fusen.cn>
Date: Tue, 5 Dec 2023 16:19:54 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
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 3a2f9ee..8624b69 100644
--- a/service/resource.proto
+++ b/service/resource.proto
@@ -27,7 +27,7 @@ service resource {
     }
 }
 /* 获取资源列表 */
-message GetResourceList{
+message GetResourceListReq{
     optional string resource_id = 1;
     optional int64 guest_id =2;
     optional int64 user_id =3;