zhengshilong/IUQT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

朋友圈功能完善&bug修改

Browse Source
This commit is contained in:
郑诗龙
2025-07-24 15:42:30 +08:00
parent 5e7d77a66b
commit ab9db0e883
9 changed files with 406 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

342
acquaintances/biz/model/user/user.go
View File

@@ -1154,6 +1154,8 @@ type UserInfoReq struct {
Address string `thrift:"address,11" form:"address" json:"address" query:"address"`
//id
UserID string `thrift:"user_id,12" form:"user_id" json:"user_id" query:"user_id"`
//备注
Remark string `thrift:"remark,13" form:"remark" json:"remark" query:"remark"`
}
func NewUserInfoReq() *UserInfoReq {
@@ -1211,6 +1213,10 @@ func (p *UserInfoReq) GetUserID() (v string) {
return p.UserID
}
func (p *UserInfoReq) GetRemark() (v string) {
return p.Remark
}
var fieldIDToName_UserInfoReq = map[int16]string{
1: "user_name",
2: "gender",
@@ -1224,6 +1230,7 @@ var fieldIDToName_UserInfoReq = map[int16]string{
10: "alias",
11: "address",
12: "user_id",
13: "remark",
}
func (p *UserInfoReq) Read(iprot thrift.TProtocol) (err error) {
@@ -1340,6 +1347,14 @@ func (p *UserInfoReq) Read(iprot thrift.TProtocol) (err error) {
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
case 13:
if fieldTypeId == thrift.STRING {
if err = p.ReadField13(iprot); err != nil {
goto ReadFieldError
}
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
default:
if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
@@ -1501,6 +1516,17 @@ func (p *UserInfoReq) ReadField12(iprot thrift.TProtocol) error {
p.UserID = _field
return nil
}
func (p *UserInfoReq) ReadField13(iprot thrift.TProtocol) error {
var _field string
if v, err := iprot.ReadString(); err != nil {
return err
} else {
_field = v
}
p.Remark = _field
return nil
}
func (p *UserInfoReq) Write(oprot thrift.TProtocol) (err error) {
var fieldId int16
@@ -1556,6 +1582,10 @@ func (p *UserInfoReq) Write(oprot thrift.TProtocol) (err error) {
fieldId = 12
goto WriteFieldError
}
if err = p.writeField13(oprot); err != nil {
fieldId = 13
goto WriteFieldError
}
}
if err = oprot.WriteFieldStop(); err != nil {
goto WriteFieldStopError
@@ -1766,6 +1796,22 @@ WriteFieldBeginError:
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 12 end error: ", p), err)
}
func (p *UserInfoReq) writeField13(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("remark", thrift.STRING, 13); err != nil {
goto WriteFieldBeginError
}
if err := oprot.WriteString(p.Remark); err != nil {
return err
}
if err = oprot.WriteFieldEnd(); err != nil {
goto WriteFieldEndError
}
return nil
WriteFieldBeginError:
return thrift.PrependError(fmt.Sprintf("%T write field 13 begin error: ", p), err)
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 13 end error: ", p), err)
}
func (p *UserInfoReq) String() string {
if p == nil {
@@ -1776,11 +1822,11 @@ func (p *UserInfoReq) String() string {
}
type CreateUserRequest struct {
Name string `thrift:"name,1" form:"name" json:"name" vd:"(len($) > 0 && len($) < 100)"`
Name string `thrift:"name,1" form:"name" form:"name" json:"name" vd:"(len($) > 0 && len($) < 100)"`
Gender Gender `thrift:"gender,2" form:"gender" form:"gender" json:"gender" vd:"($ == 1||$ == 2)"`
Age int64 `thrift:"age,3" form:"age" json:"age" vd:"$>0"`
Mobile string `thrift:"mobile,4" form:"mobile" form:"mobile" json:"mobile" vd:"(len($) > 0 && len($) < 12)"`
Area int64 `thrift:"area,5" form:"area" form:"area" json:"area" vd:"$>0"`
Area int64 `thrift:"area,5" form:"area" json:"area" vd:"$>0"`
UserPassword string `thrift:"user_password,6" form:"user_password" json:"user_password" vd:"(len($) > 0 && len($) < 15)"`
}
@@ -11842,14 +11888,8 @@ type MomentComment struct {
Content string `thrift:"content,5" form:"content" json:"content" query:"content"`
// 父评论ID，用于回复
ParentID int64 `thrift:"parent_id,6" form:"parent_id" json:"parent_id" query:"parent_id"`
// 父评论信息
ParentComment *MomentComment `thrift:"parent_comment,7" form:"parent_comment" json:"parent_comment" query:"parent_comment"`
// 状态
Status ContentStatus `thrift:"status,8" form:"status" json:"status" query:"status"`
// 创建时间
CreatedAt string `thrift:"created_at,9" form:"created_at" json:"created_at" query:"created_at"`
// 更新时间
UpdatedAt string `thrift:"updated_at,10" form:"updated_at" json:"updated_at" query:"updated_at"`
CreatedAt string `thrift:"created_at,7" form:"created_at" json:"created_at" query:"created_at"`
}
func NewMomentComment() *MomentComment {
@@ -11888,48 +11928,24 @@ func (p *MomentComment) GetParentID() (v int64) {
return p.ParentID
}
var MomentComment_ParentComment_DEFAULT *MomentComment
func (p *MomentComment) GetParentComment() (v *MomentComment) {
if !p.IsSetParentComment() {
return MomentComment_ParentComment_DEFAULT
}
return p.ParentComment
}
func (p *MomentComment) GetStatus() (v ContentStatus) {
return p.Status
}
func (p *MomentComment) GetCreatedAt() (v string) {
return p.CreatedAt
}
func (p *MomentComment) GetUpdatedAt() (v string) {
return p.UpdatedAt
}
var fieldIDToName_MomentComment = map[int16]string{
1: "id",
2: "moment_id",
3: "user_id",
4: "user",
5: "content",
6: "parent_id",
7: "parent_comment",
8: "status",
9: "created_at",
10: "updated_at",
1: "id",
2: "moment_id",
3: "user_id",
4: "user",
5: "content",
6: "parent_id",
7: "created_at",
}
func (p *MomentComment) IsSetUser() bool {
return p.User != nil
}
func (p *MomentComment) IsSetParentComment() bool {
return p.ParentComment != nil
}
func (p *MomentComment) Read(iprot thrift.TProtocol) (err error) {
var fieldTypeId thrift.TType
var fieldId int16
@@ -11997,37 +12013,13 @@ func (p *MomentComment) Read(iprot thrift.TProtocol) (err error) {
goto SkipFieldError
}
case 7:
if fieldTypeId == thrift.STRUCT {
if fieldTypeId == thrift.STRING {
if err = p.ReadField7(iprot); err != nil {
goto ReadFieldError
}
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
case 8:
if fieldTypeId == thrift.I32 {
if err = p.ReadField8(iprot); err != nil {
goto ReadFieldError
}
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
case 9:
if fieldTypeId == thrift.STRING {
if err = p.ReadField9(iprot); err != nil {
goto ReadFieldError
}
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
case 10:
if fieldTypeId == thrift.STRING {
if err = p.ReadField10(iprot); err != nil {
goto ReadFieldError
}
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
default:
if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
@@ -12121,25 +12113,6 @@ func (p *MomentComment) ReadField6(iprot thrift.TProtocol) error {
return nil
}
func (p *MomentComment) ReadField7(iprot thrift.TProtocol) error {
_field := NewMomentComment()
if err := _field.Read(iprot); err != nil {
return err
}
p.ParentComment = _field
return nil
}
func (p *MomentComment) ReadField8(iprot thrift.TProtocol) error {
var _field ContentStatus
if v, err := iprot.ReadI32(); err != nil {
return err
} else {
_field = ContentStatus(v)
}
p.Status = _field
return nil
}
func (p *MomentComment) ReadField9(iprot thrift.TProtocol) error {
var _field string
if v, err := iprot.ReadString(); err != nil {
@@ -12150,17 +12123,6 @@ func (p *MomentComment) ReadField9(iprot thrift.TProtocol) error {
p.CreatedAt = _field
return nil
}
func (p *MomentComment) ReadField10(iprot thrift.TProtocol) error {
var _field string
if v, err := iprot.ReadString(); err != nil {
return err
} else {
_field = v
}
p.UpdatedAt = _field
return nil
}
func (p *MomentComment) Write(oprot thrift.TProtocol) (err error) {
var fieldId int16
@@ -12196,18 +12158,6 @@ func (p *MomentComment) Write(oprot thrift.TProtocol) (err error) {
fieldId = 7
goto WriteFieldError
}
if err = p.writeField8(oprot); err != nil {
fieldId = 8
goto WriteFieldError
}
if err = p.writeField9(oprot); err != nil {
fieldId = 9
goto WriteFieldError
}
if err = p.writeField10(oprot); err != nil {
fieldId = 10
goto WriteFieldError
}
}
if err = oprot.WriteFieldStop(); err != nil {
goto WriteFieldStopError
@@ -12323,39 +12273,7 @@ WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 6 end error: ", p), err)
}
func (p *MomentComment) writeField7(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("parent_comment", thrift.STRUCT, 7); err != nil {
goto WriteFieldBeginError
}
if err := p.ParentComment.Write(oprot); err != nil {
return err
}
if err = oprot.WriteFieldEnd(); err != nil {
goto WriteFieldEndError
}
return nil
WriteFieldBeginError:
return thrift.PrependError(fmt.Sprintf("%T write field 7 begin error: ", p), err)
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 7 end error: ", p), err)
}
func (p *MomentComment) writeField8(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("status", thrift.I32, 8); err != nil {
goto WriteFieldBeginError
}
if err := oprot.WriteI32(int32(p.Status)); err != nil {
return err
}
if err = oprot.WriteFieldEnd(); err != nil {
goto WriteFieldEndError
}
return nil
WriteFieldBeginError:
return thrift.PrependError(fmt.Sprintf("%T write field 8 begin error: ", p), err)
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 8 end error: ", p), err)
}
func (p *MomentComment) writeField9(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("created_at", thrift.STRING, 9); err != nil {
if err = oprot.WriteFieldBegin("created_at", thrift.STRING, 7); err != nil {
goto WriteFieldBeginError
}
if err := oprot.WriteString(p.CreatedAt); err != nil {
@@ -12366,25 +12284,9 @@ func (p *MomentComment) writeField9(oprot thrift.TProtocol) (err error) {
}
return nil
WriteFieldBeginError:
return thrift.PrependError(fmt.Sprintf("%T write field 9 begin error: ", p), err)
return thrift.PrependError(fmt.Sprintf("%T write field 7 begin error: ", p), err)
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 9 end error: ", p), err)
}
func (p *MomentComment) writeField10(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("updated_at", thrift.STRING, 10); err != nil {
goto WriteFieldBeginError
}
if err := oprot.WriteString(p.UpdatedAt); err != nil {
return err
}
if err = oprot.WriteFieldEnd(); err != nil {
goto WriteFieldEndError
}
return nil
WriteFieldBeginError:
return thrift.PrependError(fmt.Sprintf("%T write field 10 begin error: ", p), err)
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 10 end error: ", p), err)
return thrift.PrependError(fmt.Sprintf("%T write field 7 end error: ", p), err)
}
func (p *MomentComment) String() string {
@@ -15437,11 +15339,9 @@ func (p *ListMomentLikesRequest) String() string {
type ListMomentLikesResponse struct {
Code Code `thrift:"code,1" form:"code" json:"code" query:"code"`
// 点赞列表
Likes []*MomentLike `thrift:"likes,2" form:"likes" json:"likes" query:"likes"`
Likes []*UserInfoReq `thrift:"likes,2" form:"likes" json:"likes" query:"likes"`
// 总数量
Total int32 `thrift:"total,3" form:"total" json:"total" query:"total"`
// 提示信息
Message string `thrift:"message,4" form:"message" json:"message" query:"message"`
}
func NewListMomentLikesResponse() *ListMomentLikesResponse {
@@ -15455,7 +15355,7 @@ func (p *ListMomentLikesResponse) GetCode() (v Code) {
return p.Code
}
func (p *ListMomentLikesResponse) GetLikes() (v []*MomentLike) {
func (p *ListMomentLikesResponse) GetLikes() (v []*UserInfoReq) {
return p.Likes
}
@@ -15463,15 +15363,10 @@ func (p *ListMomentLikesResponse) GetTotal() (v int32) {
return p.Total
}
func (p *ListMomentLikesResponse) GetMessage() (v string) {
return p.Message
}
var fieldIDToName_ListMomentLikesResponse = map[int16]string{
1: "code",
2: "likes",
3: "total",
4: "message",
}
func (p *ListMomentLikesResponse) Read(iprot thrift.TProtocol) (err error) {
@@ -15516,14 +15411,6 @@ func (p *ListMomentLikesResponse) Read(iprot thrift.TProtocol) (err error) {
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
case 4:
if fieldTypeId == thrift.STRING {
if err = p.ReadField4(iprot); err != nil {
goto ReadFieldError
}
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
default:
if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
@@ -15569,8 +15456,8 @@ func (p *ListMomentLikesResponse) ReadField2(iprot thrift.TProtocol) error {
if err != nil {
return err
}
_field := make([]*MomentLike, 0, size)
values := make([]MomentLike, size)
_field := make([]*UserInfoReq, 0, size)
values := make([]UserInfoReq, size)
for i := 0; i < size; i++ {
_elem := &values[i]
_elem.InitDefault()
@@ -15598,17 +15485,6 @@ func (p *ListMomentLikesResponse) ReadField3(iprot thrift.TProtocol) error {
p.Total = _field
return nil
}
func (p *ListMomentLikesResponse) ReadField4(iprot thrift.TProtocol) error {
var _field string
if v, err := iprot.ReadString(); err != nil {
return err
} else {
_field = v
}
p.Message = _field
return nil
}
func (p *ListMomentLikesResponse) Write(oprot thrift.TProtocol) (err error) {
var fieldId int16
@@ -15628,10 +15504,6 @@ func (p *ListMomentLikesResponse) Write(oprot thrift.TProtocol) (err error) {
fieldId = 3
goto WriteFieldError
}
if err = p.writeField4(oprot); err != nil {
fieldId = 4
goto WriteFieldError
}
}
if err = oprot.WriteFieldStop(); err != nil {
goto WriteFieldStopError
@@ -15706,22 +15578,6 @@ WriteFieldBeginError:
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err)
}
func (p *ListMomentLikesResponse) writeField4(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("message", thrift.STRING, 4); err != nil {
goto WriteFieldBeginError
}
if err := oprot.WriteString(p.Message); err != nil {
return err
}
if err = oprot.WriteFieldEnd(); err != nil {
goto WriteFieldEndError
}
return nil
WriteFieldBeginError:
return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err)
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err)
}
func (p *ListMomentLikesResponse) String() string {
if p == nil {
@@ -16201,12 +16057,10 @@ func (p *CommentMomentResponse) String() string {
type ListMomentCommentsRequest struct {
// 动态ID
MomentID int64 `thrift:"moment_id,1" form:"moment_id" json:"moment_id" query:"moment_id"`
// 父评论ID，用于获取回复
ParentID int64 `thrift:"parent_id,2" form:"parent_id" json:"parent_id" query:"parent_id"`
// 页码，默认1
Page int32 `thrift:"page,3" form:"page" json:"page" query:"page"`
// 每页数量，默认20
PageSize int32 `thrift:"page_size,4" form:"page_size" json:"page_size" query:"page_size"`
Page int32 `thrift:"page,2" form:"page" json:"page" query:"page"`
// 每页数量，默认10
PageSize int32 `thrift:"page_size,3" form:"page_size" json:"page_size" query:"page_size"`
}
func NewListMomentCommentsRequest() *ListMomentCommentsRequest {
@@ -16220,10 +16074,6 @@ func (p *ListMomentCommentsRequest) GetMomentID() (v int64) {
return p.MomentID
}
func (p *ListMomentCommentsRequest) GetParentID() (v int64) {
return p.ParentID
}
func (p *ListMomentCommentsRequest) GetPage() (v int32) {
return p.Page
}
@@ -16234,9 +16084,8 @@ func (p *ListMomentCommentsRequest) GetPageSize() (v int32) {
var fieldIDToName_ListMomentCommentsRequest = map[int16]string{
1: "moment_id",
2: "parent_id",
3: "page",
4: "page_size",
2: "page",
3: "page_size",
}
func (p *ListMomentCommentsRequest) Read(iprot thrift.TProtocol) (err error) {
@@ -16266,7 +16115,7 @@ func (p *ListMomentCommentsRequest) Read(iprot thrift.TProtocol) (err error) {
goto SkipFieldError
}
case 2:
if fieldTypeId == thrift.I64 {
if fieldTypeId == thrift.I32 {
if err = p.ReadField2(iprot); err != nil {
goto ReadFieldError
}
@@ -16281,14 +16130,6 @@ func (p *ListMomentCommentsRequest) Read(iprot thrift.TProtocol) (err error) {
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
case 4:
if fieldTypeId == thrift.I32 {
if err = p.ReadField4(iprot); err != nil {
goto ReadFieldError
}
} else if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
}
default:
if err = iprot.Skip(fieldTypeId); err != nil {
goto SkipFieldError
@@ -16331,17 +16172,6 @@ func (p *ListMomentCommentsRequest) ReadField1(iprot thrift.TProtocol) error {
}
func (p *ListMomentCommentsRequest) ReadField2(iprot thrift.TProtocol) error {
var _field int64
if v, err := iprot.ReadI64(); err != nil {
return err
} else {
_field = v
}
p.ParentID = _field
return nil
}
func (p *ListMomentCommentsRequest) ReadField3(iprot thrift.TProtocol) error {
var _field int32
if v, err := iprot.ReadI32(); err != nil {
return err
@@ -16351,7 +16181,7 @@ func (p *ListMomentCommentsRequest) ReadField3(iprot thrift.TProtocol) error {
p.Page = _field
return nil
}
func (p *ListMomentCommentsRequest) ReadField4(iprot thrift.TProtocol) error {
func (p *ListMomentCommentsRequest) ReadField3(iprot thrift.TProtocol) error {
var _field int32
if v, err := iprot.ReadI32(); err != nil {
@@ -16381,10 +16211,6 @@ func (p *ListMomentCommentsRequest) Write(oprot thrift.TProtocol) (err error) {
fieldId = 3
goto WriteFieldError
}
if err = p.writeField4(oprot); err != nil {
fieldId = 4
goto WriteFieldError
}
}
if err = oprot.WriteFieldStop(); err != nil {
goto WriteFieldStopError
@@ -16420,10 +16246,10 @@ WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err)
}
func (p *ListMomentCommentsRequest) writeField2(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("parent_id", thrift.I64, 2); err != nil {
if err = oprot.WriteFieldBegin("page", thrift.I32, 2); err != nil {
goto WriteFieldBeginError
}
if err := oprot.WriteI64(p.ParentID); err != nil {
if err := oprot.WriteI32(p.Page); err != nil {
return err
}
if err = oprot.WriteFieldEnd(); err != nil {
@@ -16436,23 +16262,7 @@ WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err)
}
func (p *ListMomentCommentsRequest) writeField3(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("page", thrift.I32, 3); err != nil {
goto WriteFieldBeginError
}
if err := oprot.WriteI32(p.Page); err != nil {
return err
}
if err = oprot.WriteFieldEnd(); err != nil {
goto WriteFieldEndError
}
return nil
WriteFieldBeginError:
return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err)
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err)
}
func (p *ListMomentCommentsRequest) writeField4(oprot thrift.TProtocol) (err error) {
if err = oprot.WriteFieldBegin("page_size", thrift.I32, 4); err != nil {
if err = oprot.WriteFieldBegin("page_size", thrift.I32, 3); err != nil {
goto WriteFieldBeginError
}
if err := oprot.WriteI32(p.PageSize); err != nil {
@@ -16463,9 +16273,9 @@ func (p *ListMomentCommentsRequest) writeField4(oprot thrift.TProtocol) (err err
}
return nil
WriteFieldBeginError:
return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err)
return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err)
WriteFieldEndError:
return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err)
return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err)
}
func (p *ListMomentCommentsRequest) String() string {