瀏覽代碼

纸条分页v2

wfz 2 年之前
父節點
當前提交
d9302e2a70

File diff suppressed because it is too large
+ 436 - 267
api/common/common.pb.go


+ 15 - 0
api/common/common.proto

@@ -767,6 +767,21 @@ message ManagerScripReply {
   int64 nextId = 2;
 }
 
+message ManagerFindScripListV2Request{
+  int64 page = 1;
+  int64 pageSize = 2;
+  int64 scripId = 3;
+  int64 personId = 4;//用户ID (number)
+}
+
+message ManagerScripV2Reply {
+  repeated ManagerScripInfo list = 1;
+  bool last = 2;
+  int64 total = 3;
+  int64 page = 4;
+  int64 pageSize = 5;
+}
+
 message ManagerScripInfo {
   int64 scripId = 1;// 纸条ID
   string personId = 2;// 创建者ID

+ 126 - 113
api/manager/manager.pb.go

@@ -432,7 +432,7 @@ var file_manager_proto_rawDesc = []byte{
 	0x61, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x75, 0x73, 0x65,
 	0x72, 0x57, 0x6f, 0x6d, 0x61, 0x6e, 0x4e, 0x75, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x75, 0x73, 0x65,
 	0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x0c, 0x75, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x32, 0x9c, 0x23,
+	0x0c, 0x75, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x32, 0xaa, 0x24,
 	0x0a, 0x07, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x8a, 0x01, 0x0a, 0x13, 0x4d, 0x61,
 	0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73,
 	0x74, 0x12, 0x28, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d,
@@ -663,63 +663,72 @@ var file_manager_proto_rawDesc = []byte{
 	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x53, 0x63, 0x72,
 	0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x22,
 	0x17, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x86, 0x01, 0x0a, 0x16,
-	0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72,
-	0x69, 0x70, 0x54, 0x65, 0x78, 0x74, 0x12, 0x29, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x54, 0x65, 0x78, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x23, 0x22, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f,
-	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x74, 0x65, 0x78,
-	0x74, 0x3a, 0x01, 0x2a, 0x12, 0x8f, 0x01, 0x0a, 0x19, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x50, 0x69, 0x63, 0x74, 0x75,
-	0x72, 0x65, 0x12, 0x2c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
-	0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72,
-	0x69, 0x70, 0x50, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26,
-	0x22, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x75,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x70, 0x69, 0x63, 0x74,
-	0x75, 0x72, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x67, 0x0a, 0x12, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
-	0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x13, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f,
-	0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x3a, 0x01, 0x2a, 0x12,
-	0x6c, 0x0a, 0x16, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x53, 0x63, 0x72, 0x69, 0x70, 0x4d, 0x6f, 0x72, 0x65, 0x12, 0x0f, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x49, 0x64, 0x73, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70,
-	0x74, 0x79, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x61, 0x70, 0x69,
-	0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x2f,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x6d, 0x6f, 0x72, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x8e, 0x01,
-	0x0a, 0x15, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64,
-	0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x26, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d,
-	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74,
-	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x1d, 0x22, 0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f,
-	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0xab,
-	0x01, 0x0a, 0x1c, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12,
-	0x2f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x44, 0x65,
-	0x74, 0x61, 0x69, 0x6c, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x2d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x44,
-	0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22,
-	0x2b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x22, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x64, 0x65, 0x74,
-	0x61, 0x69, 0x6c, 0x73, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b,
-	0x61, 0x70, 0x69, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35, 0x67,
-	0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x69, 0x70, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x8b, 0x01, 0x0a, 0x16,
+	0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70,
+	0x4c, 0x69, 0x73, 0x74, 0x56, 0x32, 0x12, 0x29, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x53,
+	0x63, 0x72, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d,
+	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x53, 0x63, 0x72, 0x69, 0x70, 0x56, 0x32, 0x52, 0x65, 0x70,
+	0x6c, 0x79, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x22, 0x1a, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x6c,
+	0x69, 0x73, 0x74, 0x2f, 0x76, 0x32, 0x3a, 0x01, 0x2a, 0x12, 0x86, 0x01, 0x0a, 0x16, 0x4d, 0x61,
+	0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70,
+	0x54, 0x65, 0x78, 0x74, 0x12, 0x29, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53,
+	0x63, 0x72, 0x69, 0x70, 0x54, 0x65, 0x78, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22,
+	0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x75, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x74, 0x65, 0x78, 0x74, 0x3a,
+	0x01, 0x2a, 0x12, 0x8f, 0x01, 0x0a, 0x19, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x50, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65,
+	0x12, 0x2c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61,
+	0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70,
+	0x50, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x22, 0x21,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x75, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72,
+	0x65, 0x3a, 0x01, 0x2a, 0x12, 0x67, 0x0a, 0x12, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x13, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a,
+	0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22,
+	0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x64, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x3a, 0x01, 0x2a, 0x12, 0x6c, 0x0a,
+	0x16, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63,
+	0x72, 0x69, 0x70, 0x4d, 0x6f, 0x72, 0x65, 0x12, 0x0f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x49, 0x64, 0x73, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
+	0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d,
+	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x2f, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x2f, 0x6d, 0x6f, 0x72, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x8e, 0x01, 0x0a, 0x15,
+	0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72,
+	0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x26, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69,
+	0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22,
+	0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x72, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0xab, 0x01, 0x0a,
+	0x1c, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x44, 0x65, 0x74, 0x61,
+	0x69, 0x6c, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x44, 0x65, 0x74,
+	0x61, 0x69, 0x6c, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x2b, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x25, 0x22, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x2f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x64, 0x65, 0x74, 0x61, 0x69,
+	0x6c, 0x73, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70,
+	0x69, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74,
+	0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -760,21 +769,23 @@ var file_manager_proto_goTypes = []interface{}{
 	(*common.ManagerFindRoomListRequest)(nil),            // 21: api.common.ManagerFindRoomListRequest
 	(*common.ManagerFindChatRecordListRequest)(nil),      // 22: api.common.ManagerFindChatRecordListRequest
 	(*common.ManagerFindScripListRequest)(nil),           // 23: api.common.ManagerFindScripListRequest
-	(*common.ManagerUpdateScripTextRequest)(nil),         // 24: api.common.ManagerUpdateScripTextRequest
-	(*common.ManagerUpdateScripPictureRequest)(nil),      // 25: api.common.ManagerUpdateScripPictureRequest
-	(*common.IDParam)(nil),                               // 26: api.common.IDParam
-	(*common.Ids)(nil),                                   // 27: api.common.Ids
-	(*common.ManagerFindReportListRequest)(nil),          // 28: api.common.ManagerFindReportListRequest
-	(*common.ManagerFindReportDetailsListRequest)(nil),   // 29: api.common.ManagerFindReportDetailsListRequest
-	(*common.ManagerFindPersonListReply)(nil),            // 30: api.common.ManagerFindPersonListReply
-	(*common.ManagerFindPersonListReply2)(nil),           // 31: api.common.ManagerFindPersonListReply2
-	(*common.ManagerFindCanHandpickUserListReply)(nil),   // 32: api.common.ManagerFindCanHandpickUserListReply
-	(*common.LoginToken)(nil),                            // 33: api.common.LoginToken
-	(*common.ManagerFindRoomListReply)(nil),              // 34: api.common.ManagerFindRoomListReply
-	(*common.ChatRecordListReply)(nil),                   // 35: api.common.ChatRecordListReply
-	(*common.ManagerScripReply)(nil),                     // 36: api.common.ManagerScripReply
-	(*common.ManagerFindReportListReply)(nil),            // 37: api.common.ManagerFindReportListReply
-	(*common.ManagerFindReportDetailsListReply)(nil),     // 38: api.common.ManagerFindReportDetailsListReply
+	(*common.ManagerFindScripListV2Request)(nil),         // 24: api.common.ManagerFindScripListV2Request
+	(*common.ManagerUpdateScripTextRequest)(nil),         // 25: api.common.ManagerUpdateScripTextRequest
+	(*common.ManagerUpdateScripPictureRequest)(nil),      // 26: api.common.ManagerUpdateScripPictureRequest
+	(*common.IDParam)(nil),                               // 27: api.common.IDParam
+	(*common.Ids)(nil),                                   // 28: api.common.Ids
+	(*common.ManagerFindReportListRequest)(nil),          // 29: api.common.ManagerFindReportListRequest
+	(*common.ManagerFindReportDetailsListRequest)(nil),   // 30: api.common.ManagerFindReportDetailsListRequest
+	(*common.ManagerFindPersonListReply)(nil),            // 31: api.common.ManagerFindPersonListReply
+	(*common.ManagerFindPersonListReply2)(nil),           // 32: api.common.ManagerFindPersonListReply2
+	(*common.ManagerFindCanHandpickUserListReply)(nil),   // 33: api.common.ManagerFindCanHandpickUserListReply
+	(*common.LoginToken)(nil),                            // 34: api.common.LoginToken
+	(*common.ManagerFindRoomListReply)(nil),              // 35: api.common.ManagerFindRoomListReply
+	(*common.ChatRecordListReply)(nil),                   // 36: api.common.ChatRecordListReply
+	(*common.ManagerScripReply)(nil),                     // 37: api.common.ManagerScripReply
+	(*common.ManagerScripV2Reply)(nil),                   // 38: api.common.ManagerScripV2Reply
+	(*common.ManagerFindReportListReply)(nil),            // 39: api.common.ManagerFindReportListReply
+	(*common.ManagerFindReportDetailsListReply)(nil),     // 40: api.common.ManagerFindReportDetailsListReply
 }
 var file_manager_proto_depIdxs = []int32{
 	6,  // 0: api.manager.Manager.ManagerFindUserList:input_type -> api.common.ManagerFindPersonListRequest
@@ -803,46 +814,48 @@ var file_manager_proto_depIdxs = []int32{
 	21, // 23: api.manager.Manager.ManagerFindRoomList:input_type -> api.common.ManagerFindRoomListRequest
 	22, // 24: api.manager.Manager.ManagerFindChatRecordList:input_type -> api.common.ManagerFindChatRecordListRequest
 	23, // 25: api.manager.Manager.ManagerFindScripList:input_type -> api.common.ManagerFindScripListRequest
-	24, // 26: api.manager.Manager.ManagerUpdateScripText:input_type -> api.common.ManagerUpdateScripTextRequest
-	25, // 27: api.manager.Manager.ManagerUpdateScripPicture:input_type -> api.common.ManagerUpdateScripPictureRequest
-	26, // 28: api.manager.Manager.ManagerDeleteScrip:input_type -> api.common.IDParam
-	27, // 29: api.manager.Manager.ManagerDeleteScripMore:input_type -> api.common.Ids
-	28, // 30: api.manager.Manager.ManagerFindReportList:input_type -> api.common.ManagerFindReportListRequest
-	29, // 31: api.manager.Manager.ManagerFindReportDetailsList:input_type -> api.common.ManagerFindReportDetailsListRequest
-	30, // 32: api.manager.Manager.ManagerFindUserList:output_type -> api.common.ManagerFindPersonListReply
-	30, // 33: api.manager.Manager.ManagerFindInformationUserList:output_type -> api.common.ManagerFindPersonListReply
-	31, // 34: api.manager.Manager.ManagerFindIsCheckQualityUserList:output_type -> api.common.ManagerFindPersonListReply2
-	30, // 35: api.manager.Manager.ManagerFindHighQualityUserList:output_type -> api.common.ManagerFindPersonListReply
-	32, // 36: api.manager.Manager.ManagerFindCanHandpickUserList:output_type -> api.common.ManagerFindCanHandpickUserListReply
-	20, // 37: api.manager.Manager.ManagerSetHandpickUser:output_type -> google.protobuf.Empty
-	20, // 38: api.manager.Manager.ManagerSetHandpickUserOne:output_type -> google.protobuf.Empty
-	20, // 39: api.manager.Manager.ManagerMarkHighQualityUser:output_type -> google.protobuf.Empty
-	20, // 40: api.manager.Manager.ManagerReMarkHighQualityUser:output_type -> google.protobuf.Empty
-	20, // 41: api.manager.Manager.ManagerMarkHighQualityUserOne:output_type -> google.protobuf.Empty
-	20, // 42: api.manager.Manager.ManagerSetUserBlack:output_type -> google.protobuf.Empty
-	20, // 43: api.manager.Manager.ManagerDeleteHighQualityUser:output_type -> google.protobuf.Empty
-	20, // 44: api.manager.Manager.ManagerUpdateUserSex:output_type -> google.protobuf.Empty
-	20, // 45: api.manager.Manager.ManagerUpdateUserVoice:output_type -> google.protobuf.Empty
-	20, // 46: api.manager.Manager.ManagerUpdateUserPictures:output_type -> google.protobuf.Empty
-	20, // 47: api.manager.Manager.ManagerUpdateUserSignature:output_type -> google.protobuf.Empty
-	20, // 48: api.manager.Manager.ManagerUpdateUserAvatar:output_type -> google.protobuf.Empty
-	20, // 49: api.manager.Manager.ManagerUpdateUserName:output_type -> google.protobuf.Empty
-	20, // 50: api.manager.Manager.ManagerUpdateUserWeight:output_type -> google.protobuf.Empty
-	20, // 51: api.manager.Manager.ManagerUpdateUserIsBlack:output_type -> google.protobuf.Empty
-	20, // 52: api.manager.Manager.ManagerUpdateUserCredit:output_type -> google.protobuf.Empty
-	33, // 53: api.manager.Manager.ManagerLogin:output_type -> api.common.LoginToken
-	5,  // 54: api.manager.Manager.OnlinePerson:output_type -> api.manager.OnlinePersonReply
-	34, // 55: api.manager.Manager.ManagerFindRoomList:output_type -> api.common.ManagerFindRoomListReply
-	35, // 56: api.manager.Manager.ManagerFindChatRecordList:output_type -> api.common.ChatRecordListReply
-	36, // 57: api.manager.Manager.ManagerFindScripList:output_type -> api.common.ManagerScripReply
-	20, // 58: api.manager.Manager.ManagerUpdateScripText:output_type -> google.protobuf.Empty
-	20, // 59: api.manager.Manager.ManagerUpdateScripPicture:output_type -> google.protobuf.Empty
-	20, // 60: api.manager.Manager.ManagerDeleteScrip:output_type -> google.protobuf.Empty
-	20, // 61: api.manager.Manager.ManagerDeleteScripMore:output_type -> google.protobuf.Empty
-	37, // 62: api.manager.Manager.ManagerFindReportList:output_type -> api.common.ManagerFindReportListReply
-	38, // 63: api.manager.Manager.ManagerFindReportDetailsList:output_type -> api.common.ManagerFindReportDetailsListReply
-	32, // [32:64] is the sub-list for method output_type
-	0,  // [0:32] is the sub-list for method input_type
+	24, // 26: api.manager.Manager.ManagerFindScripListV2:input_type -> api.common.ManagerFindScripListV2Request
+	25, // 27: api.manager.Manager.ManagerUpdateScripText:input_type -> api.common.ManagerUpdateScripTextRequest
+	26, // 28: api.manager.Manager.ManagerUpdateScripPicture:input_type -> api.common.ManagerUpdateScripPictureRequest
+	27, // 29: api.manager.Manager.ManagerDeleteScrip:input_type -> api.common.IDParam
+	28, // 30: api.manager.Manager.ManagerDeleteScripMore:input_type -> api.common.Ids
+	29, // 31: api.manager.Manager.ManagerFindReportList:input_type -> api.common.ManagerFindReportListRequest
+	30, // 32: api.manager.Manager.ManagerFindReportDetailsList:input_type -> api.common.ManagerFindReportDetailsListRequest
+	31, // 33: api.manager.Manager.ManagerFindUserList:output_type -> api.common.ManagerFindPersonListReply
+	31, // 34: api.manager.Manager.ManagerFindInformationUserList:output_type -> api.common.ManagerFindPersonListReply
+	32, // 35: api.manager.Manager.ManagerFindIsCheckQualityUserList:output_type -> api.common.ManagerFindPersonListReply2
+	31, // 36: api.manager.Manager.ManagerFindHighQualityUserList:output_type -> api.common.ManagerFindPersonListReply
+	33, // 37: api.manager.Manager.ManagerFindCanHandpickUserList:output_type -> api.common.ManagerFindCanHandpickUserListReply
+	20, // 38: api.manager.Manager.ManagerSetHandpickUser:output_type -> google.protobuf.Empty
+	20, // 39: api.manager.Manager.ManagerSetHandpickUserOne:output_type -> google.protobuf.Empty
+	20, // 40: api.manager.Manager.ManagerMarkHighQualityUser:output_type -> google.protobuf.Empty
+	20, // 41: api.manager.Manager.ManagerReMarkHighQualityUser:output_type -> google.protobuf.Empty
+	20, // 42: api.manager.Manager.ManagerMarkHighQualityUserOne:output_type -> google.protobuf.Empty
+	20, // 43: api.manager.Manager.ManagerSetUserBlack:output_type -> google.protobuf.Empty
+	20, // 44: api.manager.Manager.ManagerDeleteHighQualityUser:output_type -> google.protobuf.Empty
+	20, // 45: api.manager.Manager.ManagerUpdateUserSex:output_type -> google.protobuf.Empty
+	20, // 46: api.manager.Manager.ManagerUpdateUserVoice:output_type -> google.protobuf.Empty
+	20, // 47: api.manager.Manager.ManagerUpdateUserPictures:output_type -> google.protobuf.Empty
+	20, // 48: api.manager.Manager.ManagerUpdateUserSignature:output_type -> google.protobuf.Empty
+	20, // 49: api.manager.Manager.ManagerUpdateUserAvatar:output_type -> google.protobuf.Empty
+	20, // 50: api.manager.Manager.ManagerUpdateUserName:output_type -> google.protobuf.Empty
+	20, // 51: api.manager.Manager.ManagerUpdateUserWeight:output_type -> google.protobuf.Empty
+	20, // 52: api.manager.Manager.ManagerUpdateUserIsBlack:output_type -> google.protobuf.Empty
+	20, // 53: api.manager.Manager.ManagerUpdateUserCredit:output_type -> google.protobuf.Empty
+	34, // 54: api.manager.Manager.ManagerLogin:output_type -> api.common.LoginToken
+	5,  // 55: api.manager.Manager.OnlinePerson:output_type -> api.manager.OnlinePersonReply
+	35, // 56: api.manager.Manager.ManagerFindRoomList:output_type -> api.common.ManagerFindRoomListReply
+	36, // 57: api.manager.Manager.ManagerFindChatRecordList:output_type -> api.common.ChatRecordListReply
+	37, // 58: api.manager.Manager.ManagerFindScripList:output_type -> api.common.ManagerScripReply
+	38, // 59: api.manager.Manager.ManagerFindScripListV2:output_type -> api.common.ManagerScripV2Reply
+	20, // 60: api.manager.Manager.ManagerUpdateScripText:output_type -> google.protobuf.Empty
+	20, // 61: api.manager.Manager.ManagerUpdateScripPicture:output_type -> google.protobuf.Empty
+	20, // 62: api.manager.Manager.ManagerDeleteScrip:output_type -> google.protobuf.Empty
+	20, // 63: api.manager.Manager.ManagerDeleteScripMore:output_type -> google.protobuf.Empty
+	39, // 64: api.manager.Manager.ManagerFindReportList:output_type -> api.common.ManagerFindReportListReply
+	40, // 65: api.manager.Manager.ManagerFindReportDetailsList:output_type -> api.common.ManagerFindReportDetailsListReply
+	33, // [33:66] is the sub-list for method output_type
+	0,  // [0:33] is the sub-list for method input_type
 	0,  // [0:0] is the sub-list for extension type_name
 	0,  // [0:0] is the sub-list for extension extendee
 	0,  // [0:0] is the sub-list for field type_name

+ 7 - 0
api/manager/manager.proto

@@ -194,6 +194,13 @@ service Manager {
       body:"*"
     };
   };
+  // 管理员查询纸条列表
+  rpc ManagerFindScripListV2 (common.ManagerFindScripListV2Request) returns (common.ManagerScripV2Reply){
+    option (google.api.http) = {
+      post: "/api/manager/scrip/list/v2",
+      body:"*"
+    };
+  };
   // 管理员更新纸条文字
   rpc ManagerUpdateScripText (common.ManagerUpdateScripTextRequest) returns (google.protobuf.Empty){
     option (google.api.http) = {

+ 38 - 0
api/manager/manager_grpc.pb.go

@@ -72,6 +72,8 @@ type ManagerClient interface {
 	ManagerFindChatRecordList(ctx context.Context, in *common.ManagerFindChatRecordListRequest, opts ...grpc.CallOption) (*common.ChatRecordListReply, error)
 	// 管理员查询纸条列表
 	ManagerFindScripList(ctx context.Context, in *common.ManagerFindScripListRequest, opts ...grpc.CallOption) (*common.ManagerScripReply, error)
+	// 管理员查询纸条列表
+	ManagerFindScripListV2(ctx context.Context, in *common.ManagerFindScripListV2Request, opts ...grpc.CallOption) (*common.ManagerScripV2Reply, error)
 	// 管理员更新纸条文字
 	ManagerUpdateScripText(ctx context.Context, in *common.ManagerUpdateScripTextRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 管理员更新纸条图片
@@ -328,6 +330,15 @@ func (c *managerClient) ManagerFindScripList(ctx context.Context, in *common.Man
 	return out, nil
 }
 
+func (c *managerClient) ManagerFindScripListV2(ctx context.Context, in *common.ManagerFindScripListV2Request, opts ...grpc.CallOption) (*common.ManagerScripV2Reply, error) {
+	out := new(common.ManagerScripV2Reply)
+	err := c.cc.Invoke(ctx, "/api.manager.Manager/ManagerFindScripListV2", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *managerClient) ManagerUpdateScripText(ctx context.Context, in *common.ManagerUpdateScripTextRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/api.manager.Manager/ManagerUpdateScripText", in, out, opts...)
@@ -438,6 +449,8 @@ type ManagerServer interface {
 	ManagerFindChatRecordList(context.Context, *common.ManagerFindChatRecordListRequest) (*common.ChatRecordListReply, error)
 	// 管理员查询纸条列表
 	ManagerFindScripList(context.Context, *common.ManagerFindScripListRequest) (*common.ManagerScripReply, error)
+	// 管理员查询纸条列表
+	ManagerFindScripListV2(context.Context, *common.ManagerFindScripListV2Request) (*common.ManagerScripV2Reply, error)
 	// 管理员更新纸条文字
 	ManagerUpdateScripText(context.Context, *common.ManagerUpdateScripTextRequest) (*emptypb.Empty, error)
 	// 管理员更新纸条图片
@@ -535,6 +548,9 @@ func (UnimplementedManagerServer) ManagerFindChatRecordList(context.Context, *co
 func (UnimplementedManagerServer) ManagerFindScripList(context.Context, *common.ManagerFindScripListRequest) (*common.ManagerScripReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ManagerFindScripList not implemented")
 }
+func (UnimplementedManagerServer) ManagerFindScripListV2(context.Context, *common.ManagerFindScripListV2Request) (*common.ManagerScripV2Reply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ManagerFindScripListV2 not implemented")
+}
 func (UnimplementedManagerServer) ManagerUpdateScripText(context.Context, *common.ManagerUpdateScripTextRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ManagerUpdateScripText not implemented")
 }
@@ -1034,6 +1050,24 @@ func _Manager_ManagerFindScripList_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Manager_ManagerFindScripListV2_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ManagerFindScripListV2Request)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ManagerServer).ManagerFindScripListV2(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.manager.Manager/ManagerFindScripListV2",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ManagerServer).ManagerFindScripListV2(ctx, req.(*common.ManagerFindScripListV2Request))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Manager_ManagerUpdateScripText_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.ManagerUpdateScripTextRequest)
 	if err := dec(in); err != nil {
@@ -1253,6 +1287,10 @@ var Manager_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ManagerFindScripList",
 			Handler:    _Manager_ManagerFindScripList_Handler,
 		},
+		{
+			MethodName: "ManagerFindScripListV2",
+			Handler:    _Manager_ManagerFindScripListV2_Handler,
+		},
 		{
 			MethodName: "ManagerUpdateScripText",
 			Handler:    _Manager_ManagerUpdateScripText_Handler,

+ 43 - 0
api/manager/manager_http.pb.go

@@ -40,6 +40,7 @@ type ManagerHTTPServer interface {
 	ManagerFindReportList(context.Context, *common.ManagerFindReportListRequest) (*common.ManagerFindReportListReply, error)
 	ManagerFindRoomList(context.Context, *common.ManagerFindRoomListRequest) (*common.ManagerFindRoomListReply, error)
 	ManagerFindScripList(context.Context, *common.ManagerFindScripListRequest) (*common.ManagerScripReply, error)
+	ManagerFindScripListV2(context.Context, *common.ManagerFindScripListV2Request) (*common.ManagerScripV2Reply, error)
 	ManagerFindUserList(context.Context, *common.ManagerFindPersonListRequest) (*common.ManagerFindPersonListReply, error)
 	ManagerLogin(context.Context, *common.ManagerLoginRequest) (*common.LoginToken, error)
 	ManagerMarkHighQualityUser(context.Context, *ManagerMarkHighQualityUserRequest) (*emptypb.Empty, error)
@@ -90,6 +91,7 @@ func RegisterManagerHTTPServer(s *http.Server, srv ManagerHTTPServer) {
 	r.POST("/api/manager/room/list", _Manager_ManagerFindRoomList0_HTTP_Handler(srv))
 	r.POST("/api/manager/chat/list", _Manager_ManagerFindChatRecordList0_HTTP_Handler(srv))
 	r.POST("/api/manager/scrip/list", _Manager_ManagerFindScripList0_HTTP_Handler(srv))
+	r.POST("/api/manager/scrip/list/v2", _Manager_ManagerFindScripListV20_HTTP_Handler(srv))
 	r.POST("/api/manager/update/scrip/text", _Manager_ManagerUpdateScripText0_HTTP_Handler(srv))
 	r.POST("/api/manager/update/scrip/picture", _Manager_ManagerUpdateScripPicture0_HTTP_Handler(srv))
 	r.POST("/api/manager/delete/scrip", _Manager_ManagerDeleteScrip0_HTTP_Handler(srv))
@@ -800,6 +802,33 @@ func _Manager_ManagerFindScripList0_HTTP_Handler(srv ManagerHTTPServer) func(ctx
 	}
 }
 
+func _Manager_ManagerFindScripListV20_HTTP_Handler(srv ManagerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ManagerFindScripListV2Request
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.manager.Manager/ManagerFindScripListV2")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.ManagerFindScripListV2(ctx, req.(*common.ManagerFindScripListV2Request))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 func _Manager_ManagerUpdateScripText0_HTTP_Handler(srv ManagerHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
 		var in common.ManagerUpdateScripTextRequest
@@ -975,6 +1004,7 @@ type ManagerHTTPClient interface {
 	ManagerFindReportList(ctx context.Context, req *common.ManagerFindReportListRequest, opts ...http.CallOption) (rsp *common.ManagerFindReportListReply, err error)
 	ManagerFindRoomList(ctx context.Context, req *common.ManagerFindRoomListRequest, opts ...http.CallOption) (rsp *common.ManagerFindRoomListReply, err error)
 	ManagerFindScripList(ctx context.Context, req *common.ManagerFindScripListRequest, opts ...http.CallOption) (rsp *common.ManagerScripReply, err error)
+	ManagerFindScripListV2(ctx context.Context, req *common.ManagerFindScripListV2Request, opts ...http.CallOption) (rsp *common.ManagerScripV2Reply, err error)
 	ManagerFindUserList(ctx context.Context, req *common.ManagerFindPersonListRequest, opts ...http.CallOption) (rsp *common.ManagerFindPersonListReply, err error)
 	ManagerLogin(ctx context.Context, req *common.ManagerLoginRequest, opts ...http.CallOption) (rsp *common.LoginToken, err error)
 	ManagerMarkHighQualityUser(ctx context.Context, req *ManagerMarkHighQualityUserRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
@@ -1161,6 +1191,19 @@ func (c *ManagerHTTPClientImpl) ManagerFindScripList(ctx context.Context, in *co
 	return &out, err
 }
 
+func (c *ManagerHTTPClientImpl) ManagerFindScripListV2(ctx context.Context, in *common.ManagerFindScripListV2Request, opts ...http.CallOption) (*common.ManagerScripV2Reply, error) {
+	var out common.ManagerScripV2Reply
+	pattern := "/api/manager/scrip/list/v2"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.manager.Manager/ManagerFindScripListV2"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *ManagerHTTPClientImpl) ManagerFindUserList(ctx context.Context, in *common.ManagerFindPersonListRequest, opts ...http.CallOption) (*common.ManagerFindPersonListReply, error) {
 	var out common.ManagerFindPersonListReply
 	pattern := "/api/manager/user/list"

+ 14 - 0
js/api/common/common_pb.ts

@@ -1013,6 +1013,20 @@ export interface ManagerScripReply{
     list?:Array<ManagerScripInfo>;
     nextId?:number;
 }
+export interface ManagerFindScripListV2Request{
+    page?:number;
+    pageSize?:number;
+    scripId?:number;
+    /** 用户ID (number) */
+    personId?:number;
+}
+export interface ManagerScripV2Reply{
+    list?:Array<ManagerScripInfo>;
+    last?:boolean;
+    total?:number;
+    page?:number;
+    pageSize?:number;
+}
 export interface ManagerScripInfo{
     /**  纸条ID */
     scripId?:number;

+ 6 - 1
js/api/manager/manager_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,ManagerFindCanHandpickUserListRequest,ManagerFindCanHandpickUserListReply,ManagerSetHandpickUserRequest,ManagerSetHandpickUserOneRequest,PersonIDParam,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,ManagerLoginRequest,LoginToken,ManagerFindRoomListRequest,ManagerFindRoomListReply,ManagerFindChatRecordListRequest,ChatRecordListReply,ManagerFindScripListRequest,ManagerScripReply,ManagerUpdateScripTextRequest,ManagerUpdateScripPictureRequest,IDParam,Ids,ManagerFindReportListRequest,ManagerFindReportListReply,ManagerFindReportDetailsListRequest,ManagerFindReportDetailsListReply} from "../common/common_pb";
+import {ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,ManagerFindCanHandpickUserListRequest,ManagerFindCanHandpickUserListReply,ManagerSetHandpickUserRequest,ManagerSetHandpickUserOneRequest,PersonIDParam,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,ManagerLoginRequest,LoginToken,ManagerFindRoomListRequest,ManagerFindRoomListReply,ManagerFindChatRecordListRequest,ChatRecordListReply,ManagerFindScripListRequest,ManagerScripReply,ManagerFindScripListV2Request,ManagerScripV2Reply,ManagerUpdateScripTextRequest,ManagerUpdateScripPictureRequest,IDParam,Ids,ManagerFindReportListRequest,ManagerFindReportListReply,ManagerFindReportDetailsListRequest,ManagerFindReportDetailsListReply} from "../common/common_pb";
 import {ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserSexRequest,ManagerUpdateUserCreditRequest,OnlinePersonReply} from "./manager_pb";
 
 const ManagerService = {
@@ -134,6 +134,11 @@ const ManagerService = {
 	const res = await request.post<{ data: ManagerScripReply, code: string, message: string }>('/api/manager/scrip/list', req);
     return res.data.data;
   },
+  /**  管理员查询纸条列表 */
+  ManagerFindScripListV2: async (req?: ManagerFindScripListV2Request) => {
+	const res = await request.post<{ data: ManagerScripV2Reply, code: string, message: string }>('/api/manager/scrip/list/v2', req);
+    return res.data.data;
+  },
   /**  管理员更新纸条文字 */
   ManagerUpdateScripText: async (req?: ManagerUpdateScripTextRequest) => {
 	const res = await request.post('/api/manager/update/scrip/text', req);

Some files were not shown because too many files changed in this diff