mnt-ltd
/
moredoc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

只有用户自己才能访问自己的收藏

Browse Source
dev
truthhun 1 year ago
parent ed794e326b
commit acc2ad732a
4 changed files with 45 additions and 86 deletions
Show Stats Download Patch File Download Diff File

111
api/v1/favorite.pb.go
Unescape View File

@ -197,9 +197,8 @@ func (m *DeleteFavoriteRequest) GetId() []int64 {
// 查询用户的收藏
type ListFavoriteRequest struct {
Page int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"`
Size_ int64 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"`
UserId int64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
Page int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"`
Size_ int64 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"`
}
func (m *ListFavoriteRequest) Reset() { *m = ListFavoriteRequest{} }
@ -249,13 +248,6 @@ func (m *ListFavoriteRequest) GetSize_() int64 {
return 0
}
func (m *ListFavoriteRequest) GetUserId() int64 {
if m != nil {
return m.UserId
}
return 0
}
// 查询用户的收藏
type ListFavoriteReply struct {
Total int64 `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`
@ -366,42 +358,42 @@ func init() { proto.RegisterFile("api/v1/favorite.proto", fileDescriptor_a5e19a1
var fileDescriptor_a5e19a182b4c8c61 = []byte{
// 576 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x4d, 0x8f, 0xd2, 0x40,
0x18, 0x66, 0x5a, 0x60, 0xe1, 0xc5, 0x10, 0x76, 0x5c, 0xdc, 0x5a, 0xdc, 0x42, 0x7a, 0x91, 0x6c,
0x4c, 0x1b, 0x30, 0x7b, 0xd1, 0x83, 0x61, 0xfd, 0x0a, 0x89, 0x87, 0x95, 0xf8, 0x91, 0x78, 0xd9,
0xcc, 0xd2, 0x59, 0x32, 0x49, 0x61, 0x6a, 0x3b, 0x10, 0xf1, 0xa6, 0xbf, 0x60, 0x13, 0xff, 0x8f,
0x67, 0x8f, 0x9b, 0x78, 0xf1, 0xa6, 0x01, 0x7f, 0x88, 0xe9, 0x74, 0x4a, 0xd8, 0x96, 0x83, 0xb7,
0xf7, 0xf3, 0x79, 0xe7, 0x7d, 0x9e, 0xb7, 0x85, 0x26, 0x09, 0x98, 0xbb, 0xe8, 0xb9, 0x97, 0x64,
0xc1, 0x43, 0x26, 0xa8, 0x13, 0x84, 0x5c, 0x70, 0x5c, 0x26, 0x01, 0x73, 0x16, 0x3d, 0xb3, 0x3d,
0xe1, 0x7c, 0xe2, 0x53, 0x57, 0x46, 0x2f, 0xe6, 0x97, 0xae, 0x60, 0x53, 0x1a, 0x09, 0x32, 0x0d,
0x92, 0x42, 0xf3, 0x60, 0xc2, 0x27, 0x5c, 0x9a, 0x6e, 0x6c, 0xa9, 0xe8, 0x3d, 0xd5, 0x16, 0x83,
0x93, 0xd9, 0x8c, 0x0b, 0x22, 0x18, 0x9f, 0x45, 0x2a, 0xdb, 0xca, 0x82, 0xd2, 0x69, 0x20, 0x96,
0x49, 0xd2, 0xfe, 0xae, 0x41, 0xe5, 0x85, 0x7a, 0x0c, 0xae, 0x83, 0xc6, 0x3c, 0x03, 0x75, 0x50,
0x57, 0x1f, 0x69, 0xcc, 0xc3, 0x87, 0xb0, 0x37, 0x8f, 0x68, 0x78, 0xce, 0x3c, 0x43, 0x93, 0xc1,
0x72, 0xec, 0x0e, 0x3d, 0xdc, 0x86, 0x9a, 0xc7, 0xc7, 0xf3, 0x29, 0x9d, 0x89, 0x38, 0xa9, 0xcb,
0x24, 0xa4, 0xa1, 0xa1, 0x87, 0x0f, 0xa0, 0x24, 0x98, 0xf0, 0xa9, 0x51, 0xee, 0xa0, 0x6e, 0x75,
0x94, 0x38, 0xb8, 0x01, 0x3a, 0xfd, 0x24, 0x8c, 0x3d, 0x19, 0x8b, 0xcd, 0xb8, 0x2e, 0x1a, 0xf3,
0x90, 0x1a, 0x95, 0x0e, 0xea, 0x96, 0x46, 0x89, 0x83, 0x31, 0x14, 0x23, 0xf6, 0x99, 0x1a, 0x55,
0x89, 0x2b, 0xed, 0xb8, 0x32, 0x20, 0x13, 0x1a, 0x19, 0x90, 0x54, 0x4a, 0x07, 0x3f, 0x01, 0x18,
0x87, 0x94, 0x08, 0xea, 0x9d, 0x13, 0x61, 0x14, 0x3b, 0xa8, 0x5b, 0xeb, 0x9b, 0x4e, 0xb2, 0xb0,
0x93, 0x2e, 0xec, 0xbc, 0x49, 0x59, 0x3c, 0x2d, 0x5e, 0xfd, 0x6e, 0xa3, 0x51, 0x55, 0xf5, 0x0c,
0x44, 0x0c, 0x30, 0x0f, 0xbc, 0x14, 0xa0, 0xf4, 0xbf, 0x00, 0xaa, 0x67, 0x20, 0xec, 0xfb, 0xd0,
0x7c, 0x46, 0x7d, 0x2a, 0x68, 0xca, 0xe2, 0x88, 0x7e, 0x9c, 0xd3, 0x48, 0x6c, 0xc8, 0xd4, 0x13,
0x32, 0xed, 0x77, 0x70, 0xfb, 0x15, 0x8b, 0x44, 0xb6, 0x0c, 0x43, 0x31, 0x5e, 0x45, 0xb1, 0x2e,
0xed, 0xcd, 0xfe, 0xda, 0xd6, 0xfe, 0x5b, 0x5a, 0xe8, 0xdb, 0x5a, 0xd8, 0xef, 0x61, 0xff, 0x26,
0x6e, 0xe0, 0x2f, 0x25, 0xff, 0x5c, 0x10, 0x5f, 0xc1, 0x26, 0x0e, 0x7e, 0x00, 0x95, 0xf4, 0xf0,
0x0c, 0xad, 0xa3, 0x77, 0x6b, 0xfd, 0x86, 0x93, 0x5c, 0x9e, 0xb3, 0x69, 0xdf, 0x54, 0xd8, 0x27,
0x80, 0x5f, 0xd2, 0xdc, 0x7b, 0x33, 0xd2, 0xa3, 0xac, 0xf4, 0xfd, 0x2f, 0x3a, 0xd4, 0xd2, 0xa6,
0xc1, 0xd9, 0x10, 0xbf, 0x86, 0xfa, 0x53, 0x49, 0xf7, 0xe6, 0xcc, 0x72, 0x43, 0xcd, 0x5c, 0xc4,
0x6e, 0x7d, 0xfd, 0xf9, 0xf7, 0x9b, 0xd6, 0xb4, 0x1b, 0x6e, 0xe6, 0x8b, 0x79, 0x84, 0x8e, 0x31,
0x81, 0xfa, 0x4d, 0xce, 0xf1, 0x51, 0x0a, 0xb0, 0x53, 0x0b, 0xf3, 0x4e, 0x4e, 0xd1, 0xe7, 0xf1,
0x37, 0x60, 0x1b, 0x72, 0x0a, 0x3e, 0xce, 0x4d, 0xc1, 0x6f, 0xa1, 0xb6, 0xb5, 0x3c, 0x36, 0x53,
0xfc, 0x3c, 0x23, 0x3b, 0x1e, 0xaf, 0x60, 0x71, 0x1e, 0x96, 0xc2, 0xad, 0x6d, 0xb1, 0x70, 0x2b,
0xed, 0xdd, 0x71, 0x1a, 0xe6, 0xdd, 0xdd, 0xc9, 0xc0, 0x5f, 0xda, 0x47, 0x72, 0xc2, 0x21, 0x6e,
0x66, 0x27, 0xb8, 0x3e, 0x8b, 0xc4, 0xe9, 0xc9, 0x8f, 0x95, 0x85, 0xae, 0x57, 0x16, 0xfa, 0xb3,
0xb2, 0xd0, 0xd5, 0xda, 0x2a, 0x5c, 0xaf, 0xad, 0xc2, 0xaf, 0xb5, 0x55, 0x00, 0xf5, 0xa7, 0x39,
0x43, 0x1f, 0xf6, 0xa7, 0x3c, 0xa4, 0x1e, 0x1f, 0x2b, 0x84, 0xc7, 0x8b, 0xde, 0x45, 0x59, 0xd2,
0xf3, 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x8c, 0x60, 0x34, 0xa6, 0x04, 0x00, 0x00,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
0x10, 0xee, 0xda, 0x6e, 0x9a, 0x4c, 0x50, 0x94, 0x2e, 0x0d, 0x35, 0x0e, 0x75, 0x22, 0x5f, 0x88,
0x2a, 0x64, 0x2b, 0x41, 0xbd, 0xc0, 0x01, 0xa5, 0xe5, 0x47, 0x41, 0x1c, 0x4a, 0x04, 0x42, 0xe2,
0x52, 0x6d, 0xe3, 0x6d, 0xb4, 0x92, 0x93, 0x35, 0xf6, 0x26, 0x22, 0xdc, 0xe0, 0x09, 0x2a, 0xf1,
0x3e, 0x9c, 0x39, 0x56, 0xe2, 0xc2, 0x0d, 0x94, 0xf0, 0x20, 0xc8, 0xeb, 0x75, 0x68, 0xed, 0x1c,
0xb8, 0xcd, 0xef, 0x37, 0xfb, 0x7d, 0x33, 0x36, 0x34, 0x48, 0xc8, 0xbc, 0x79, 0xd7, 0xbb, 0x20,
0x73, 0x1e, 0x31, 0x41, 0xdd, 0x30, 0xe2, 0x82, 0xe3, 0x12, 0x09, 0x99, 0x3b, 0xef, 0x5a, 0xad,
0x31, 0xe7, 0xe3, 0x80, 0x7a, 0x32, 0x7a, 0x3e, 0xbb, 0xf0, 0x04, 0x9b, 0xd0, 0x58, 0x90, 0x49,
0x98, 0x16, 0x5a, 0x7b, 0x63, 0x3e, 0xe6, 0xd2, 0xf4, 0x12, 0x4b, 0x45, 0xef, 0xa9, 0xb6, 0x04,
0x9c, 0x4c, 0xa7, 0x5c, 0x10, 0xc1, 0xf8, 0x34, 0x56, 0xd9, 0x66, 0x1e, 0x94, 0x4e, 0x42, 0xb1,
0x48, 0x93, 0xce, 0x37, 0x0d, 0xca, 0xcf, 0xd5, 0x63, 0x70, 0x0d, 0x34, 0xe6, 0x9b, 0xa8, 0x8d,
0x3a, 0xfa, 0x50, 0x63, 0x3e, 0xde, 0x87, 0x9d, 0x59, 0x4c, 0xa3, 0x33, 0xe6, 0x9b, 0x9a, 0x0c,
0x96, 0x12, 0x77, 0xe0, 0xe3, 0x16, 0x54, 0x7d, 0x3e, 0x9a, 0x4d, 0xe8, 0x54, 0x24, 0x49, 0x5d,
0x26, 0x21, 0x0b, 0x0d, 0x7c, 0xbc, 0x07, 0xdb, 0x82, 0x89, 0x80, 0x9a, 0xa5, 0x36, 0xea, 0x54,
0x86, 0xa9, 0x83, 0xeb, 0xa0, 0xd3, 0x8f, 0xc2, 0xdc, 0x91, 0xb1, 0xc4, 0x4c, 0xea, 0xe2, 0x11,
0x8f, 0xa8, 0x59, 0x6e, 0xa3, 0xce, 0xf6, 0x30, 0x75, 0x30, 0x06, 0x23, 0x66, 0x9f, 0xa8, 0x59,
0x91, 0xb8, 0xd2, 0x4e, 0x2a, 0x43, 0x32, 0xa6, 0xb1, 0x09, 0x69, 0xa5, 0x74, 0xf0, 0x13, 0x80,
0x51, 0x44, 0x89, 0xa0, 0xfe, 0x19, 0x11, 0xa6, 0xd1, 0x46, 0x9d, 0x6a, 0xcf, 0x72, 0x53, 0xc2,
0x6e, 0x46, 0xd8, 0x7d, 0x93, 0xa9, 0x78, 0x6c, 0x5c, 0xfe, 0x6a, 0xa1, 0x61, 0x45, 0xf5, 0xf4,
0x45, 0x02, 0x30, 0x0b, 0xfd, 0x0c, 0x60, 0xfb, 0x7f, 0x01, 0x54, 0x4f, 0x5f, 0x38, 0xf7, 0xa1,
0xf1, 0x94, 0x06, 0x54, 0xd0, 0x4c, 0xc5, 0x21, 0xfd, 0x30, 0xa3, 0xb1, 0x58, 0x8b, 0xa9, 0xa7,
0x62, 0x3a, 0x27, 0x70, 0xfb, 0x15, 0x8b, 0x45, 0xbe, 0x0c, 0x83, 0x91, 0x50, 0x51, 0xaa, 0x4b,
0x7b, 0xcd, 0x5f, 0xfb, 0xc7, 0xff, 0xa5, 0x51, 0xd6, 0xeb, 0x86, 0xf3, 0x0e, 0x76, 0x6f, 0x82,
0x84, 0xc1, 0x42, 0x8a, 0xcd, 0x05, 0x09, 0x14, 0x46, 0xea, 0xe0, 0x07, 0x50, 0xce, 0xae, 0xcc,
0xd4, 0xda, 0x7a, 0xa7, 0xda, 0xab, 0xbb, 0xe9, 0x99, 0xb9, 0xeb, 0xf6, 0x75, 0x85, 0x73, 0x04,
0xf8, 0x05, 0x2d, 0x3c, 0x2e, 0xb7, 0x67, 0x94, 0xdf, 0x73, 0xef, 0xb3, 0x0e, 0xd5, 0xac, 0xa9,
0x7f, 0x3a, 0xc0, 0xaf, 0xa1, 0x76, 0x22, 0xb5, 0x5d, 0xdf, 0x54, 0x61, 0xa8, 0x55, 0x88, 0x38,
0xcd, 0x2f, 0x3f, 0xfe, 0x7c, 0xd5, 0x1a, 0x4e, 0xdd, 0xcb, 0x7d, 0x1e, 0x8f, 0xd0, 0x21, 0x26,
0x50, 0xbb, 0x29, 0x30, 0x3e, 0xc8, 0x00, 0x36, 0x0a, 0x6f, 0xdd, 0x29, 0xac, 0xef, 0x59, 0x72,
0xf0, 0x8e, 0x29, 0xa7, 0xe0, 0xc3, 0xc2, 0x14, 0xfc, 0x16, 0xaa, 0xd7, 0xc8, 0x63, 0x2b, 0xc3,
0x2f, 0x2a, 0xb2, 0xe1, 0xf1, 0x0a, 0x16, 0x17, 0x61, 0x29, 0xdc, 0xba, 0xbe, 0x2c, 0xdc, 0xcc,
0x7a, 0x37, 0xdc, 0x81, 0x75, 0x77, 0x73, 0x32, 0x0c, 0x16, 0xce, 0x81, 0x9c, 0xb0, 0x8f, 0x1b,
0xf9, 0x09, 0x5e, 0xc0, 0x62, 0x71, 0x7c, 0xf4, 0x7d, 0x69, 0xa3, 0xab, 0xa5, 0x8d, 0x7e, 0x2f,
0x6d, 0x74, 0xb9, 0xb2, 0xb7, 0xae, 0x56, 0xf6, 0xd6, 0xcf, 0x95, 0xbd, 0x05, 0xea, 0xb7, 0x72,
0x8a, 0xde, 0xef, 0x4e, 0x78, 0x44, 0x7d, 0x3e, 0x52, 0x08, 0x8f, 0xe7, 0xdd, 0xf3, 0x92, 0x94,
0xe7, 0xe1, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x2f, 0x23, 0x1b, 0x93, 0x04, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -749,11 +741,6 @@ func (m *ListFavoriteRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if m.UserId != 0 {
i = encodeVarintFavorite(dAtA, i, uint64(m.UserId))
i--
dAtA[i] = 0x18
}
if m.Size_ != 0 {
i = encodeVarintFavorite(dAtA, i, uint64(m.Size_))
i--
@ -919,9 +906,6 @@ func (m *ListFavoriteRequest) Size() (n int) {
if m.Size_ != 0 {
n += 1 + sovFavorite(uint64(m.Size_))
}
if m.UserId != 0 {
n += 1 + sovFavorite(uint64(m.UserId))
}
return n
}
@ -1454,25 +1438,6 @@ func (m *ListFavoriteRequest) Unmarshal(dAtA []byte) error {
break
}
}
case 3:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field UserId", wireType)
}
m.UserId = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowFavorite
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.UserId |= int64(b&0x7F) << shift
if b < 0x80 {
break
}
}
default:
iNdEx = preIndex
skippy, err := skipFavorite(dAtA[iNdEx:])

3
api/v1/favorite.proto
Unescape View File

@ -33,7 +33,8 @@ message DeleteFavoriteRequest { repeated int64 id = 1; }
message ListFavoriteRequest {
int64 page = 1;
int64 size = 2;
int64 user_id = 3;
// int64 user_id = 3;
reserved 3;
}
// 查询用户的收藏

15
biz/favorite.go
Unescape View File

@ -87,16 +87,9 @@ func (s *FavoriteAPIService) GetFavorite(ctx context.Context, req *pb.GetFavorit
// 获取用户自身的收藏列表
func (s *FavoriteAPIService) ListFavorite(ctx context.Context, req *pb.ListFavoriteRequest) (*pb.ListFavoriteReply, error) {
documentStatus := []int{model.DocumentStatusConverted, model.DocumentStatusConverting, model.DocumentStatusPending, model.DocumentStatusFailed}
userId := req.UserId
userClaims, err := s.checkLogin(ctx)
if err == nil {
if req.UserId == userClaims.UserId {
documentStatus = []int{}
}
if userId <= 0 {
userId = userClaims.UserId
}
if err != nil {
return nil, err
}
favorites, total, err := s.dbModel.GetFavoriteList(&model.OptionGetFavoriteList{
@ -104,9 +97,9 @@ func (s *FavoriteAPIService) ListFavorite(ctx context.Context, req *pb.ListFavor
Size: int(req.Size_),
WithCount: true,
QueryIn: map[string][]interface{}{
"user_id": {userId},
"user_id": {userClaims.UserId},
},
}, documentStatus...)
})
if err != nil {
return nil, status.Errorf(codes.Internal, "获取失败:"+err.Error())
}

2
web/components/UserFavorite.vue
Unescape View File

@ -130,7 +130,7 @@ export default {
const res = await listFavorite({
page: this.query.page,
size: this.query.size,
user_id: this.userId,
// user_id: this.userId,
})
if (res.status === 200) {
let favorites = res.data.favorite || []

Write Preview
Loading…
Cancel
Save