mir: optimize source code layout for import go-mir

docs/openapi/embed.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 //go:build docs
 // +build docs
 

internal/broker/broker.go

@@ -0,0 +1,5 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package broker

internal/broker/migration/migration.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 //go:build !migration
 // +build !migration
 

internal/broker/migration/migration_embed.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 //go:build migration
 // +build migration
 

internal/conf/conf.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package conf
 
 import (

internal/conf/db.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package conf
 
 import (

internal/conf/db_cgo.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 //go:build cgo
 // +build cgo
 

internal/conf/db_nocgo.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 //go:build !cgo
 // +build !cgo
 

internal/conf/logger.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package conf
 
 import (

internal/conf/logger_meili.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package conf
 
 import (

internal/conf/logger_zinc.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package conf
 
 import (

internal/conf/settting.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package conf
 
 import (

internal/core/authority.go

@@ -1,7 +1,10 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
 	"github.com/rocboss/paopao-ce/pkg/types"
 )
 
@@ -33,23 +36,17 @@ const (
 	ActCreateActivationCode
 )
 
-type act uint8
+type (
-
+	act uint8
-type FriendFilter map[int64]types.Empty
-type FriendSet map[string]types.Empty
 
-type Action struct {
+	FriendFilter map[int64]types.Empty
-	Act    act
+	FriendSet    map[string]types.Empty
-	UserId int64
-}
 
-// AuthorizationManageService 授权管理服务
+	Action struct {
-type AuthorizationManageService interface {
+		Act    act
-	IsAllow(user *model.User, action *Action) bool
+		UserId int64
-	BeFriendFilter(userId int64) FriendFilter
+	}
-	BeFriendIds(userId int64) ([]int64, error)
+)
-	MyFriendSet(userId int64) FriendSet
-}
 
 func (f FriendFilter) IsFriend(userId int64) bool {
 	_, yeah := f[userId]
@@ -57,7 +54,7 @@ func (f FriendFilter) IsFriend(userId int64) bool {
 }
 
 // IsAllow default true if user is admin
-func (a act) IsAllow(user *model.User, userId int64, isFriend bool, isActivation bool) bool {
+func (a act) IsAllow(user *User, userId int64, isFriend bool, isActivation bool) bool {
 	if user.IsAdmin {
 		return true
 	}
@@ -116,3 +113,11 @@ func (a act) IsAllow(user *model.User, userId int64, isFriend bool, isActivation
 
 	return false
 }
+
+// AuthorizationManageService 授权管理服务
+type AuthorizationManageService interface {
+	IsAllow(user *User, action *Action) bool
+	BeFriendFilter(userId int64) FriendFilter
+	BeFriendIds(userId int64) ([]int64, error)
+	MyFriendSet(userId int64) FriendSet
+}

internal/core/cache.go

@@ -1,6 +1,12 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
-import "github.com/rocboss/paopao-ce/internal/model"
+import (
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
+)
 
 const (
 	IdxActNop IdxAct = iota + 1
@@ -15,7 +21,7 @@ type IdxAct uint8
 
 type IndexAction struct {
 	Act  IdxAct
-	Post *model.Post
+	Post *dbr.Post
 }
 
 func (a IdxAct) String() string {
@@ -37,7 +43,7 @@ func (a IdxAct) String() string {
 	}
 }
 
-func NewIndexAction(act IdxAct, post *model.Post) *IndexAction {
+func NewIndexAction(act IdxAct, post *dbr.Post) *IndexAction {
 	return &IndexAction{
 		Act:  act,
 		Post: post,
@@ -48,5 +54,5 @@ func NewIndexAction(act IdxAct, post *model.Post) *IndexAction {
 type CacheIndexService interface {
 	IndexPostsService
 
-	SendAction(act IdxAct, post *model.Post)
+	SendAction(act IdxAct, post *dbr.Post)
 }

internal/core/comments.go

@@ -1,24 +1,36 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
+)
+
+type (
+	Comment              = dbr.Comment
+	CommentFormated      = dbr.CommentFormated
+	CommentReply         = dbr.CommentReply
+	CommentContent       = dbr.CommentContent
+	CommentReplyFormated = dbr.CommentReplyFormated
 )
 
 // CommentService 评论检索服务
 type CommentService interface {
-	GetComments(conditions *model.ConditionsT, offset, limit int) ([]*model.Comment, error)
+	GetComments(conditions *ConditionsT, offset, limit int) ([]*Comment, error)
-	GetCommentByID(id int64) (*model.Comment, error)
+	GetCommentByID(id int64) (*Comment, error)
-	GetCommentCount(conditions *model.ConditionsT) (int64, error)
+	GetCommentCount(conditions *ConditionsT) (int64, error)
-	GetCommentReplyByID(id int64) (*model.CommentReply, error)
+	GetCommentReplyByID(id int64) (*CommentReply, error)
-	GetCommentContentsByIDs(ids []int64) ([]*model.CommentContent, error)
+	GetCommentContentsByIDs(ids []int64) ([]*CommentContent, error)
-	GetCommentRepliesByID(ids []int64) ([]*model.CommentReplyFormated, error)
+	GetCommentRepliesByID(ids []int64) ([]*CommentReplyFormated, error)
 }
 
 // CommentManageService 评论管理服务
 type CommentManageService interface {
-	DeleteComment(comment *model.Comment) error
+	DeleteComment(comment *Comment) error
-	CreateComment(comment *model.Comment) (*model.Comment, error)
+	CreateComment(comment *Comment) (*Comment, error)
-	CreateCommentReply(reply *model.CommentReply) (*model.CommentReply, error)
+	CreateCommentReply(reply *CommentReply) (*CommentReply, error)
-	DeleteCommentReply(reply *model.CommentReply) error
+	DeleteCommentReply(reply *CommentReply) error
-	CreateCommentContent(content *model.CommentContent) (*model.CommentContent, error)
+	CreateCommentContent(content *CommentContent) (*CommentContent, error)
 }

internal/core/core.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 // DataService 数据服务集成

internal/core/messages.go

@@ -1,15 +1,36 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
+)
+
+const (
+	MsgTypePost             = dbr.MsgTypePost
+	MsgtypeComment          = dbr.MsgtypeComment
+	MsgTypeReply            = dbr.MsgTypeReply
+	MsgTypeWhisper          = dbr.MsgTypeWhisper
+	MsgTypeRequestingFriend = dbr.MsgTypeRequestingFriend
+	MsgTypeSystem           = dbr.MsgTypeSystem
+
+	MsgStatusUnread = dbr.MsgStatusUnread
+	MsgStatusReaded = dbr.MsgStatusReaded
+)
+
+type (
+	Message         = dbr.Message
+	MessageFormated = dbr.MessageFormated
 )
 
 // MessageService 消息服务
 type MessageService interface {
-	CreateMessage(msg *model.Message) (*model.Message, error)
+	CreateMessage(msg *Message) (*Message, error)
 	GetUnreadCount(userID int64) (int64, error)
-	GetMessageByID(id int64) (*model.Message, error)
+	GetMessageByID(id int64) (*Message, error)
-	ReadMessage(message *model.Message) error
+	ReadMessage(message *Message) error
-	GetMessages(conditions *model.ConditionsT, offset, limit int) ([]*model.MessageFormated, error)
+	GetMessages(conditions *ConditionsT, offset, limit int) ([]*MessageFormated, error)
-	GetMessageCount(conditions *model.ConditionsT) (int64, error)
+	GetMessageCount(conditions *ConditionsT) (int64, error)
 }

internal/core/search.go

@@ -1,7 +1,11 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 )
 
 const (
@@ -9,28 +13,39 @@ const (
 	SearchTypeTag     SearchType = "tag"
 )
 
-type SearchType string
+const (
+	PostVisitPublic  = dbr.PostVisitPublic
+	PostVisitPrivate = dbr.PostVisitPrivate
+	PostVisitFriend  = dbr.PostVisitFriend
+	PostVisitInvalid = dbr.PostVisitInvalid
+)
 
-type QueryReq struct {
+type (
-	Query      string
+	PostVisibleT = dbr.PostVisibleT
-	Visibility []model.PostVisibleT
-	Type       SearchType
-}
 
-type QueryResp struct {
+	SearchType string
-	Items []*model.PostFormated
-	Total int64
-}
 
-type TsDocItem struct {
+	QueryReq struct {
-	Post    *model.Post
+		Query      string
-	Content string
+		Visibility []PostVisibleT
-}
+		Type       SearchType
+	}
+
+	QueryResp struct {
+		Items []*PostFormated
+		Total int64
+	}
+
+	TsDocItem struct {
+		Post    *Post
+		Content string
+	}
+)
 
 // TweetSearchService tweet search service interface
 type TweetSearchService interface {
 	IndexName() string
 	AddDocuments(data []TsDocItem, primaryKey ...string) (bool, error)
 	DeleteDocuments(identifiers []string) error
-	Search(user *model.User, q *QueryReq, offset, limit int) (*QueryResp, error)
+	Search(user *User, q *QueryReq, offset, limit int) (*QueryResp, error)
 }

internal/core/security.go

@@ -1,13 +1,21 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
+)
+
+type (
+	Captcha = dbr.Captcha
 )
 
 // SecurityService 安全相关服务
 type SecurityService interface {
-	GetLatestPhoneCaptcha(phone string) (*model.Captcha, error)
+	GetLatestPhoneCaptcha(phone string) (*Captcha, error)
-	UsePhoneCaptcha(captcha *model.Captcha) error
+	UsePhoneCaptcha(captcha *Captcha) error
 	SendPhoneCaptcha(phone string) error
 }
 

internal/core/storage.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (

internal/core/topics.go

@@ -1,13 +1,22 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
+)
+
+type (
+	Tag         = dbr.Tag
+	TagFormated = dbr.TagFormated
 )
 
 // TopicService 话题服务
 type TopicService interface {
-	CreateTag(tag *model.Tag) (*model.Tag, error)
+	CreateTag(tag *Tag) (*Tag, error)
-	DeleteTag(tag *model.Tag) error
+	DeleteTag(tag *Tag) error
-	GetTags(conditions *model.ConditionsT, offset, limit int) ([]*model.Tag, error)
+	GetTags(conditions *ConditionsT, offset, limit int) ([]*Tag, error)
-	GetTagsByKeyword(keyword string) ([]*model.Tag, error)
+	GetTagsByKeyword(keyword string) ([]*Tag, error)
 }

internal/core/tweets.go

@@ -1,49 +1,83 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
-	"github.com/rocboss/paopao-ce/internal/model/rest"
+)
+
+const (
+	AttachmentTypeImage = dbr.AttachmentTypeImage
+	AttachmentTypeVideo = dbr.AttachmentTypeVideo
+	AttachmentTypeOther = dbr.AttachmentTypeOther
+
+	// 类型，1标题，2文字段落，3图片地址，4视频地址，5语音地址，6链接地址，7附件资源
+	ContentTypeTitle            = dbr.ContentTypeTitle
+	ContentTypeText             = dbr.ContentTypeText
+	ContentTypeImage            = dbr.ContentTypeImage
+	ContentTypeVideo            = dbr.ContentTypeVideo
+	ContentTypeAudio            = dbr.ContentTypeAudio
+	ContentTypeLink             = dbr.ContentTypeLink
+	ContentTypeAttachment       = dbr.ContentTypeAttachment
+	ContentTypeChargeAttachment = dbr.ContentTypeChargeAttachment
+)
+
+type (
+	PostStar           = dbr.PostStar
+	PostCollection     = dbr.PostCollection
+	PostAttachmentBill = dbr.PostAttachmentBill
+	PostContent        = dbr.PostContent
+	Attachment         = dbr.Attachment
+	AttachmentType     = dbr.AttachmentType
+	PostContentT       = dbr.PostContentT
+
+	IndexTweetList struct {
+		Tweets []*PostFormated
+		Total  int64
+	}
 )
 
 // TweetService 推文检索服务
 type TweetService interface {
-	GetPostByID(id int64) (*model.Post, error)
+	GetPostByID(id int64) (*Post, error)
-	GetPosts(conditions *model.ConditionsT, offset, limit int) ([]*model.Post, error)
+	GetPosts(conditions *ConditionsT, offset, limit int) ([]*Post, error)
-	GetPostCount(conditions *model.ConditionsT) (int64, error)
+	GetPostCount(conditions *ConditionsT) (int64, error)
-	GetUserPostStar(postID, userID int64) (*model.PostStar, error)
+	GetUserPostStar(postID, userID int64) (*PostStar, error)
-	GetUserPostStars(userID int64, offset, limit int) ([]*model.PostStar, error)
+	GetUserPostStars(userID int64, offset, limit int) ([]*PostStar, error)
 	GetUserPostStarCount(userID int64) (int64, error)
-	GetUserPostCollection(postID, userID int64) (*model.PostCollection, error)
+	GetUserPostCollection(postID, userID int64) (*PostCollection, error)
-	GetUserPostCollections(userID int64, offset, limit int) ([]*model.PostCollection, error)
+	GetUserPostCollections(userID int64, offset, limit int) ([]*PostCollection, error)
 	GetUserPostCollectionCount(userID int64) (int64, error)
-	GetPostAttatchmentBill(postID, userID int64) (*model.PostAttachmentBill, error)
+	GetPostAttatchmentBill(postID, userID int64) (*PostAttachmentBill, error)
-	GetPostContentsByIDs(ids []int64) ([]*model.PostContent, error)
+	GetPostContentsByIDs(ids []int64) ([]*PostContent, error)
-	GetPostContentByID(id int64) (*model.PostContent, error)
+	GetPostContentByID(id int64) (*PostContent, error)
 }
 
 // TweetManageService 推文管理服务，包括创建/删除/更新推文
 type TweetManageService interface {
-	CreateAttachment(attachment *model.Attachment) (*model.Attachment, error)
+	CreateAttachment(attachment *Attachment) (*Attachment, error)
-	CreatePost(post *model.Post) (*model.Post, error)
+	CreatePost(post *Post) (*Post, error)
-	DeletePost(post *model.Post) ([]string, error)
+	DeletePost(post *Post) ([]string, error)
-	LockPost(post *model.Post) error
+	LockPost(post *Post) error
-	StickPost(post *model.Post) error
+	StickPost(post *Post) error
-	VisiblePost(post *model.Post, visibility model.PostVisibleT) error
+	VisiblePost(post *Post, visibility PostVisibleT) error
-	UpdatePost(post *model.Post) error
+	UpdatePost(post *Post) error
-	CreatePostStar(postID, userID int64) (*model.PostStar, error)
+	CreatePostStar(postID, userID int64) (*PostStar, error)
-	DeletePostStar(p *model.PostStar) error
+	DeletePostStar(p *PostStar) error
-	CreatePostCollection(postID, userID int64) (*model.PostCollection, error)
+	CreatePostCollection(postID, userID int64) (*PostCollection, error)
-	DeletePostCollection(p *model.PostCollection) error
+	DeletePostCollection(p *PostCollection) error
-	CreatePostContent(content *model.PostContent) (*model.PostContent, error)
+	CreatePostContent(content *PostContent) (*PostContent, error)
 }
 
 // TweetHelpService 推文辅助服务
 type TweetHelpService interface {
-	RevampPosts(posts []*model.PostFormated) ([]*model.PostFormated, error)
+	RevampPosts(posts []*PostFormated) ([]*PostFormated, error)
-	MergePosts(posts []*model.Post) ([]*model.PostFormated, error)
+	MergePosts(posts []*Post) ([]*PostFormated, error)
 }
 
 // IndexPostsService 广场首页推文列表服务
 type IndexPostsService interface {
-	IndexPosts(user *model.User, offset int, limit int) (*rest.IndexTweetsResp, error)
+	IndexPosts(user *User, offset int, limit int) (*IndexTweetList, error)
 }

internal/core/types.go

@@ -0,0 +1,24 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package core
+
+import (
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
+)
+
+const (
+	UserStatusNormal = dbr.UserStatusNormal
+	UserStatusClosed = dbr.UserStatusClosed
+)
+
+type (
+	User                = dbr.User
+	Post                = dbr.Post
+	ConditionsT         = dbr.ConditionsT
+	PostFormated        = dbr.PostFormated
+	UserFormated        = dbr.UserFormated
+	PostContentFormated = dbr.PostContentFormated
+	Model               = dbr.Model
+)

internal/core/user.go

@@ -1,19 +1,33 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
-import (
+type (
-	"github.com/rocboss/paopao-ce/internal/model"
+	ContactItem struct {
-	"github.com/rocboss/paopao-ce/internal/model/rest"
+		UserId   int64  `json:"user_id"`
+		UserName string `json:"username"`
+		Nickname string `json:"nickname"`
+		Avatar   string `json:"avatar"`
+		Phone    string `json:"phone"`
+	}
+
+	ContactList struct {
+		Contacts []ContactItem `json:"contacts"`
+		Total    int64         `json:"total"`
+	}
 )
 
 // UserManageService 用户管理服务
 type UserManageService interface {
-	GetUserByID(id int64) (*model.User, error)
+	GetUserByID(id int64) (*User, error)
-	GetUserByUsername(username string) (*model.User, error)
+	GetUserByUsername(username string) (*User, error)
-	GetUserByPhone(phone string) (*model.User, error)
+	GetUserByPhone(phone string) (*User, error)
-	GetUsersByIDs(ids []int64) ([]*model.User, error)
+	GetUsersByIDs(ids []int64) ([]*User, error)
-	GetUsersByKeyword(keyword string) ([]*model.User, error)
+	GetUsersByKeyword(keyword string) ([]*User, error)
-	CreateUser(user *model.User) (*model.User, error)
+	CreateUser(user *User) (*User, error)
-	UpdateUser(user *model.User) error
+	UpdateUser(user *User) error
 }
 
 // ContactManageService 联系人管理服务
@@ -22,6 +36,6 @@ type ContactManageService interface {
 	AddFriend(userId int64, friendId int64) error
 	RejectFriend(userId int64, friendId int64) error
 	DeleteFriend(userId int64, friendId int64) error
-	GetContacts(userId int64, offset int, limit int) (*rest.ContactsResp, error)
+	GetContacts(userId int64, offset int, limit int) (*ContactList, error)
 	IsFriend(userID int64, friendID int64) bool
 }

internal/core/version.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (

internal/core/wallet.go

@@ -1,15 +1,24 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package core
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
+)
+
+type (
+	WalletStatement = dbr.WalletStatement
+	WalletRecharge  = dbr.WalletRecharge
 )
 
 // WalletService wallet service interface
 type WalletService interface {
-	GetUserWalletBills(userID int64, offset, limit int) ([]*model.WalletStatement, error)
+	GetUserWalletBills(userID int64, offset, limit int) ([]*WalletStatement, error)
 	GetUserWalletBillCount(userID int64) (int64, error)
-	GetRechargeByID(id int64) (*model.WalletRecharge, error)
+	GetRechargeByID(id int64) (*WalletRecharge, error)
-	CreateRecharge(userId, amount int64) (*model.WalletRecharge, error)
+	CreateRecharge(userId, amount int64) (*WalletRecharge, error)
-	HandleRechargeSuccess(recharge *model.WalletRecharge, tradeNo string) error
+	HandleRechargeSuccess(recharge *WalletRecharge, tradeNo string) error
-	HandlePostAttachmentBought(post *model.Post, user *model.User) error
+	HandlePostAttachmentBought(post *Post, user *User) error
 }

internal/dao/cache/bigcache.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package cache
 
 import (
@@ -11,8 +15,6 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/allegro/bigcache/v3"
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
-	"github.com/rocboss/paopao-ce/internal/model/rest"
 	"github.com/rocboss/paopao-ce/pkg/types"
 	"github.com/sirupsen/logrus"
 )
@@ -24,7 +26,7 @@ var (
 
 type postsEntry struct {
 	key    string
-	tweets *rest.IndexTweetsResp
+	tweets *core.IndexTweetList
 }
 
 type bigCacheIndexServant struct {
@@ -38,7 +40,7 @@ type bigCacheIndexServant struct {
 	preventDuration    time.Duration
 }
 
-func (s *bigCacheIndexServant) IndexPosts(user *model.User, offset int, limit int) (*rest.IndexTweetsResp, error) {
+func (s *bigCacheIndexServant) IndexPosts(user *core.User, offset int, limit int) (*core.IndexTweetList, error) {
 	key := s.keyFrom(user, offset, limit)
 	posts, err := s.getPosts(key)
 	if err == nil {
@@ -54,7 +56,7 @@ func (s *bigCacheIndexServant) IndexPosts(user *model.User, offset int, limit in
 	return posts, nil
 }
 
-func (s *bigCacheIndexServant) getPosts(key string) (*rest.IndexTweetsResp, error) {
+func (s *bigCacheIndexServant) getPosts(key string) (*core.IndexTweetList, error) {
 	data, err := s.cache.Get(key)
 	if err != nil {
 		logrus.Debugf("bigCacheIndexServant.getPosts get posts by key: %s from cache err: %v", key, err)
@@ -62,7 +64,7 @@ func (s *bigCacheIndexServant) getPosts(key string) (*rest.IndexTweetsResp, erro
 	}
 	buf := bytes.NewBuffer(data)
 	dec := gob.NewDecoder(buf)
-	var resp rest.IndexTweetsResp
+	var resp core.IndexTweetList
 	if err := dec.Decode(&resp); err != nil {
 		logrus.Debugf("bigCacheIndexServant.getPosts get posts from cache in decode err: %v", err)
 		return nil, err
@@ -70,7 +72,7 @@ func (s *bigCacheIndexServant) getPosts(key string) (*rest.IndexTweetsResp, erro
 	return &resp, nil
 }
 
-func (s *bigCacheIndexServant) cachePosts(key string, tweets *rest.IndexTweetsResp) {
+func (s *bigCacheIndexServant) cachePosts(key string, tweets *core.IndexTweetList) {
 	entry := &postsEntry{key: key, tweets: tweets}
 	select {
 	case s.cachePostsCh <- entry:
@@ -96,7 +98,7 @@ func (s *bigCacheIndexServant) setPosts(entry *postsEntry) {
 	logrus.Debugf("bigCacheIndexServant.setPosts setPosts set cache by key: %s", entry.key)
 }
 
-func (s *bigCacheIndexServant) keyFrom(user *model.User, offset int, limit int) string {
+func (s *bigCacheIndexServant) keyFrom(user *core.User, offset int, limit int) string {
 	var userId int64 = -1
 	if user != nil {
 		userId = user.ID
@@ -104,7 +106,7 @@ func (s *bigCacheIndexServant) keyFrom(user *model.User, offset int, limit int)
 	return fmt.Sprintf("index:%d:%d:%d", userId, offset, limit)
 }
 
-func (s *bigCacheIndexServant) SendAction(act core.IdxAct, post *model.Post) {
+func (s *bigCacheIndexServant) SendAction(act core.IdxAct, post *core.Post) {
 	action := core.NewIndexAction(act, post)
 	select {
 	case s.indexActionCh <- action:
@@ -134,7 +136,7 @@ func (s *bigCacheIndexServant) handleIndexAction(action *core.IndexAction) {
 	// 创建/删除 私密推文特殊处理
 	switch act {
 	case core.IdxActCreatePost, core.IdxActDeletePost:
-		if post.Visibility == model.PostVisitPrivate {
+		if post.Visibility == core.PostVisitPrivate {
 			s.deleteCacheByUserId(post.UserID, true)
 			return
 		}

internal/dao/cache/cache.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package cache
 
 import (

internal/dao/cache/none.go

@@ -1,10 +1,12 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package cache
 
 import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
-	"github.com/rocboss/paopao-ce/internal/model/rest"
 )
 
 var (
@@ -16,11 +18,11 @@ type noneCacheIndexServant struct {
 	ips core.IndexPostsService
 }
 
-func (s *noneCacheIndexServant) IndexPosts(user *model.User, offset int, limit int) (*rest.IndexTweetsResp, error) {
+func (s *noneCacheIndexServant) IndexPosts(user *core.User, offset int, limit int) (*core.IndexTweetList, error) {
 	return s.ips.IndexPosts(user, offset, limit)
 }
 
-func (s *noneCacheIndexServant) SendAction(_act core.IdxAct, _post *model.Post) {
+func (s *noneCacheIndexServant) SendAction(_act core.IdxAct, _post *core.Post) {
 	// empty
 }
 

internal/dao/cache/simple.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package cache
 
 import (
@@ -6,8 +10,6 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
-	"github.com/rocboss/paopao-ce/internal/model/rest"
 	"github.com/sirupsen/logrus"
 )
 
@@ -20,21 +22,21 @@ type simpleCacheIndexServant struct {
 	ips core.IndexPostsService
 
 	indexActionCh   chan core.IdxAct
-	indexPosts      *rest.IndexTweetsResp
+	indexPosts      *core.IndexTweetList
 	atomicIndex     atomic.Value
 	maxIndexSize    int
 	checkTick       *time.Ticker
 	expireIndexTick *time.Ticker
 }
 
-func (s *simpleCacheIndexServant) IndexPosts(user *model.User, offset int, limit int) (*rest.IndexTweetsResp, error) {
+func (s *simpleCacheIndexServant) IndexPosts(user *core.User, offset int, limit int) (*core.IndexTweetList, error) {
-	cacheResp := s.atomicIndex.Load().(*rest.IndexTweetsResp)
+	cacheResp := s.atomicIndex.Load().(*core.IndexTweetList)
 	end := offset + limit
 	if cacheResp != nil {
 		size := len(cacheResp.Tweets)
 		logrus.Debugf("simpleCacheIndexServant.IndexPosts get index posts from cache posts: %d offset:%d limit:%d start:%d, end:%d", size, offset, limit, offset, end)
 		if size >= end {
-			return &rest.IndexTweetsResp{
+			return &core.IndexTweetList{
 				Tweets: cacheResp.Tweets[offset:end],
 				Total:  cacheResp.Total,
 			}, nil
@@ -45,7 +47,7 @@ func (s *simpleCacheIndexServant) IndexPosts(user *model.User, offset int, limit
 	return s.ips.IndexPosts(user, offset, limit)
 }
 
-func (s *simpleCacheIndexServant) SendAction(act core.IdxAct, _post *model.Post) {
+func (s *simpleCacheIndexServant) SendAction(act core.IdxAct, _post *core.Post) {
 	select {
 	case s.indexActionCh <- act:
 		logrus.Debugf("simpleCacheIndexServant.SendAction send indexAction by chan: %s", act)

internal/dao/dao.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package dao
 
 import (

internal/dao/jinzhu/authority.go

@@ -1,8 +1,12 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"github.com/rocboss/paopao-ce/pkg/types"
 	"gorm.io/gorm"
 )
@@ -21,7 +25,7 @@ func newAuthorizationManageService(db *gorm.DB) core.AuthorizationManageService
 	}
 }
 
-func (s *authorizationManageServant) IsAllow(user *model.User, action *core.Action) bool {
+func (s *authorizationManageServant) IsAllow(user *core.User, action *core.Action) bool {
 	// user is activation if had bind phone
 	isActivation := (len(user.Phone) != 0)
 	isFriend := s.isFriend(user.ID, action.UserId)
@@ -30,7 +34,7 @@ func (s *authorizationManageServant) IsAllow(user *model.User, action *core.Acti
 }
 
 func (s *authorizationManageServant) MyFriendSet(userId int64) core.FriendSet {
-	ids, err := (&model.Contact{UserId: userId}).MyFriendIds(s.db)
+	ids, err := (&dbr.Contact{UserId: userId}).MyFriendIds(s.db)
 	if err != nil {
 		return core.FriendSet{}
 	}
@@ -43,7 +47,7 @@ func (s *authorizationManageServant) MyFriendSet(userId int64) core.FriendSet {
 }
 
 func (s *authorizationManageServant) BeFriendFilter(userId int64) core.FriendFilter {
-	ids, err := (&model.Contact{FriendId: userId}).BeFriendIds(s.db)
+	ids, err := (&dbr.Contact{FriendId: userId}).BeFriendIds(s.db)
 	if err != nil {
 		return core.FriendFilter{}
 	}
@@ -56,12 +60,12 @@ func (s *authorizationManageServant) BeFriendFilter(userId int64) core.FriendFil
 }
 
 func (s *authorizationManageServant) BeFriendIds(userId int64) ([]int64, error) {
-	return (&model.Contact{FriendId: userId}).BeFriendIds(s.db)
+	return (&dbr.Contact{FriendId: userId}).BeFriendIds(s.db)
 }
 
 func (s *authorizationManageServant) isFriend(userId int64, friendId int64) bool {
-	contact, err := (&model.Contact{UserId: friendId, FriendId: userId}).GetByUserFriend(s.db)
+	contact, err := (&dbr.Contact{UserId: friendId, FriendId: userId}).GetByUserFriend(s.db)
-	if err == nil || contact.Status == model.ContactStatusAgree {
+	if err == nil || contact.Status == dbr.ContactStatusAgree {
 		return true
 	}
 	return false

internal/dao/jinzhu/comments.go

@@ -1,8 +1,12 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"gorm.io/gorm"
 )
 
@@ -31,42 +35,42 @@ func newCommentManageService(db *gorm.DB) core.CommentManageService {
 	}
 }
 
-func (s *commentServant) GetComments(conditions *model.ConditionsT, offset, limit int) ([]*model.Comment, error) {
+func (s *commentServant) GetComments(conditions *core.ConditionsT, offset, limit int) ([]*core.Comment, error) {
-	return (&model.Comment{}).List(s.db, conditions, offset, limit)
+	return (&dbr.Comment{}).List(s.db, conditions, offset, limit)
 }
 
-func (s *commentServant) GetCommentByID(id int64) (*model.Comment, error) {
+func (s *commentServant) GetCommentByID(id int64) (*core.Comment, error) {
-	comment := &model.Comment{
+	comment := &dbr.Comment{
-		Model: &model.Model{
+		Model: &dbr.Model{
 			ID: id,
 		},
 	}
 	return comment.Get(s.db)
 }
 
-func (s *commentServant) GetCommentReplyByID(id int64) (*model.CommentReply, error) {
+func (s *commentServant) GetCommentReplyByID(id int64) (*core.CommentReply, error) {
-	reply := &model.CommentReply{
+	reply := &dbr.CommentReply{
-		Model: &model.Model{
+		Model: &dbr.Model{
 			ID: id,
 		},
 	}
 	return reply.Get(s.db)
 }
 
-func (s *commentServant) GetCommentCount(conditions *model.ConditionsT) (int64, error) {
+func (s *commentServant) GetCommentCount(conditions *core.ConditionsT) (int64, error) {
-	return (&model.Comment{}).Count(s.db, conditions)
+	return (&dbr.Comment{}).Count(s.db, conditions)
 }
 
-func (s *commentServant) GetCommentContentsByIDs(ids []int64) ([]*model.CommentContent, error) {
+func (s *commentServant) GetCommentContentsByIDs(ids []int64) ([]*core.CommentContent, error) {
-	commentContent := &model.CommentContent{}
+	commentContent := &dbr.CommentContent{}
-	return commentContent.List(s.db, &model.ConditionsT{
+	return commentContent.List(s.db, &dbr.ConditionsT{
 		"comment_id IN ?": ids,
 	}, 0, 0)
 }
 
-func (s *commentServant) GetCommentRepliesByID(ids []int64) ([]*model.CommentReplyFormated, error) {
+func (s *commentServant) GetCommentRepliesByID(ids []int64) ([]*core.CommentReplyFormated, error) {
-	CommentReply := &model.CommentReply{}
+	CommentReply := &dbr.CommentReply{}
-	replies, err := CommentReply.List(s.db, &model.ConditionsT{
+	replies, err := CommentReply.List(s.db, &dbr.ConditionsT{
 		"comment_id IN ?": ids,
 	}, 0, 0)
 
@@ -83,7 +87,7 @@ func (s *commentServant) GetCommentRepliesByID(ids []int64) ([]*model.CommentRep
 	if err != nil {
 		return nil, err
 	}
-	repliesFormated := []*model.CommentReplyFormated{}
+	repliesFormated := []*core.CommentReplyFormated{}
 	for _, reply := range replies {
 		replyFormated := reply.Format()
 		for _, user := range users {
@@ -101,22 +105,22 @@ func (s *commentServant) GetCommentRepliesByID(ids []int64) ([]*model.CommentRep
 	return repliesFormated, nil
 }
 
-func (s *commentManageServant) DeleteComment(comment *model.Comment) error {
+func (s *commentManageServant) DeleteComment(comment *core.Comment) error {
 	return comment.Delete(s.db)
 }
 
-func (s *commentManageServant) CreateComment(comment *model.Comment) (*model.Comment, error) {
+func (s *commentManageServant) CreateComment(comment *core.Comment) (*core.Comment, error) {
 	return comment.Create(s.db)
 }
 
-func (s *commentManageServant) CreateCommentReply(reply *model.CommentReply) (*model.CommentReply, error) {
+func (s *commentManageServant) CreateCommentReply(reply *core.CommentReply) (*core.CommentReply, error) {
 	return reply.Create(s.db)
 }
 
-func (s *commentManageServant) DeleteCommentReply(reply *model.CommentReply) error {
+func (s *commentManageServant) DeleteCommentReply(reply *core.CommentReply) error {
 	return reply.Delete(s.db)
 }
 
-func (s *commentManageServant) CreateCommentContent(content *model.CommentContent) (*model.CommentContent, error) {
+func (s *commentManageServant) CreateCommentContent(content *core.CommentContent) (*core.CommentContent, error) {
 	return content.Create(s.db)
 }

internal/dao/jinzhu/contacts.go

@@ -1,11 +1,14 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
 	"time"
 
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
-	"github.com/rocboss/paopao-ce/internal/model/rest"
 	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
@@ -24,14 +27,14 @@ func newContactManageService(db *gorm.DB) core.ContactManageService {
 	}
 }
 
-func (s *contactManageServant) fetchOrNewContact(db *gorm.DB, userId int64, friendId int64, status int8) (*model.Contact, error) {
+func (s *contactManageServant) fetchOrNewContact(db *gorm.DB, userId int64, friendId int64, status int8) (*dbr.Contact, error) {
-	contact := &model.Contact{
+	contact := &dbr.Contact{
 		UserId:   userId,
 		FriendId: friendId,
 	}
 	contact, err := contact.FetchUser(db)
 	if err != nil {
-		contact = &model.Contact{
+		contact = &dbr.Contact{
 			UserId:   userId,
 			FriendId: friendId,
 			Status:   status,
@@ -54,17 +57,17 @@ func (s *contactManageServant) RequestingFriend(userId int64, friendId int64, gr
 		}
 	}()
 
-	contact, e := s.fetchOrNewContact(db, userId, friendId, model.ContactStatusRequesting)
+	contact, e := s.fetchOrNewContact(db, userId, friendId, dbr.ContactStatusRequesting)
 	if e != nil {
 		err = e
 		return
 	}
 
 	// 如果已经好友，啥也不干
-	if contact.Status == model.ContactStatusAgree {
+	if contact.Status == dbr.ContactStatusAgree {
 		return nil
-	} else if contact.Status == model.ContactStatusReject || contact.Status == model.ContactStatusDeleted {
+	} else if contact.Status == dbr.ContactStatusReject || contact.Status == dbr.ContactStatusDeleted {
-		contact.Status = model.ContactStatusRequesting
+		contact.Status = dbr.ContactStatusRequesting
 		contact.IsDel = 0 // remove deleted flag if needed
 		if err = contact.UpdateInUnscoped(db); err != nil {
 			logrus.Errorf("contactManageServant.RequestingFriend update exsit contact err:%s", err)
@@ -72,13 +75,13 @@ func (s *contactManageServant) RequestingFriend(userId int64, friendId int64, gr
 		}
 	}
 
-	msg := &model.Message{
+	msg := &dbr.Message{
 		SenderUserID:   userId,
 		ReceiverUserID: friendId,
-		Type:           model.MsgTypeRequestingFriend,
+		Type:           dbr.MsgTypeRequestingFriend,
 		Brief:          "请求添加好友，并附言:",
 		Content:        greetings,
-		ReplyID:        int64(model.ContactStatusRequesting),
+		ReplyID:        int64(dbr.ContactStatusRequesting),
 	}
 	if _, err = msg.Create(db); err != nil {
 		logrus.Errorf("contactManageServant.RequestingFriend create message err:%s", err)
@@ -97,7 +100,7 @@ func (s *contactManageServant) AddFriend(userId int64, friendId int64) (err erro
 		}
 	}()
 
-	contact := &model.Contact{
+	contact := &dbr.Contact{
 		UserId:   friendId,
 		FriendId: userId,
 	}
@@ -105,23 +108,23 @@ func (s *contactManageServant) AddFriend(userId int64, friendId int64) (err erro
 		return
 	}
 	// 如果还不是请求好友，啥也不干
-	if contact.Status != model.ContactStatusRequesting {
+	if contact.Status != dbr.ContactStatusRequesting {
 		logrus.Debugf("contactManageServant.AddFriend not reuesting status now so skip")
 		return nil
 	}
-	contact.Status = model.ContactStatusAgree
+	contact.Status = dbr.ContactStatusAgree
 	if err = contact.Update(db); err != nil {
 		return err
 	}
 
-	contact, err = s.fetchOrNewContact(db, userId, friendId, model.ContactStatusAgree)
+	contact, err = s.fetchOrNewContact(db, userId, friendId, dbr.ContactStatusAgree)
 	if err != nil {
 		return
 	}
 
 	// 如果已经好友，啥也不干
-	if contact.Status != model.ContactStatusAgree {
+	if contact.Status != dbr.ContactStatusAgree {
-		contact.Status = model.ContactStatusAgree
+		contact.Status = dbr.ContactStatusAgree
 		contact.IsDel = 0 // remove deleted flag
 		if err = contact.UpdateInUnscoped(db); err != nil {
 			logrus.Errorf("contactManageServant.AddFriend update contact err:%s", err)
@@ -129,8 +132,8 @@ func (s *contactManageServant) AddFriend(userId int64, friendId int64) (err erro
 		}
 	}
 
-	args := []any{userId, friendId, friendId, userId, model.MsgTypeRequestingFriend, model.ContactStatusRequesting}
+	args := []any{userId, friendId, friendId, userId, dbr.MsgTypeRequestingFriend, dbr.ContactStatusRequesting}
-	msgs, e := (&model.Message{}).FetchBy(db, model.Predicates{
+	msgs, e := (&dbr.Message{}).FetchBy(db, dbr.Predicates{
 		"((sender_user_id = ? AND receiver_user_id = ?) OR (sender_user_id = ? AND receiver_user_id = ?)) AND type = ? AND reply_id = ?": args,
 	})
 	if e != nil {
@@ -138,7 +141,7 @@ func (s *contactManageServant) AddFriend(userId int64, friendId int64) (err erro
 		return
 	}
 	for _, msg := range msgs {
-		msg.ReplyID = int64(model.ContactStatusAgree)
+		msg.ReplyID = int64(dbr.ContactStatusAgree)
 		if err = msg.Update(db); err != nil {
 			return
 		}
@@ -156,7 +159,7 @@ func (s *contactManageServant) RejectFriend(userId int64, friendId int64) (err e
 		}
 	}()
 
-	contact := &model.Contact{
+	contact := &dbr.Contact{
 		UserId:   friendId,
 		FriendId: userId,
 	}
@@ -164,16 +167,16 @@ func (s *contactManageServant) RejectFriend(userId int64, friendId int64) (err e
 		return
 	}
 	// 如果还不是请求好友，啥也不干
-	if contact.Status != model.ContactStatusRequesting {
+	if contact.Status != dbr.ContactStatusRequesting {
 		return nil
 	}
-	contact.Status = model.ContactStatusReject
+	contact.Status = dbr.ContactStatusReject
 	if err = contact.Update(db); err != nil {
 		return err
 	}
 
-	args := []any{friendId, userId, model.MsgTypeRequestingFriend, model.ContactStatusRequesting}
+	args := []any{friendId, userId, dbr.MsgTypeRequestingFriend, dbr.ContactStatusRequesting}
-	msgs, e := (&model.Message{}).FetchBy(db, model.Predicates{
+	msgs, e := (&dbr.Message{}).FetchBy(db, dbr.Predicates{
 		"sender_user_id = ? AND receiver_user_id = ? AND type = ? AND reply_id = ?": args,
 	})
 	if e != nil {
@@ -181,7 +184,7 @@ func (s *contactManageServant) RejectFriend(userId int64, friendId int64) (err e
 		return
 	}
 	for _, msg := range msgs {
-		msg.ReplyID = int64(model.ContactStatusReject)
+		msg.ReplyID = int64(dbr.ContactStatusReject)
 		if err = msg.Update(db); err != nil {
 			return
 		}
@@ -199,7 +202,7 @@ func (s *contactManageServant) DeleteFriend(userId int64, friendId int64) (err e
 		}
 	}()
 
-	contact := &model.Contact{
+	contact := &dbr.Contact{
 		UserId:   userId,
 		FriendId: friendId,
 	}
@@ -210,10 +213,10 @@ func (s *contactManageServant) DeleteFriend(userId int64, friendId int64) (err e
 
 	for _, contact := range contacts {
 		// 如果还不是好友，啥也不干
-		if contact.Status != model.ContactStatusAgree {
+		if contact.Status != dbr.ContactStatusAgree {
 			continue
 		}
-		contact.Status = model.ContactStatusDeleted
+		contact.Status = dbr.ContactStatusDeleted
 		contact.DeletedOn = time.Now().Unix()
 		contact.IsDel = 1
 		if err = contact.Update(db); err != nil {
@@ -223,11 +226,11 @@ func (s *contactManageServant) DeleteFriend(userId int64, friendId int64) (err e
 	return nil
 }
 
-func (s *contactManageServant) GetContacts(userId int64, offset int, limit int) (*rest.ContactsResp, error) {
+func (s *contactManageServant) GetContacts(userId int64, offset int, limit int) (*core.ContactList, error) {
-	contact := &model.Contact{}
+	contact := &dbr.Contact{}
-	condition := model.ConditionsT{
+	condition := dbr.ConditionsT{
 		"user_id": userId,
-		"status":  model.ContactStatusAgree,
+		"status":  dbr.ContactStatusAgree,
 	}
 	contacts, err := contact.List(s.db, condition, offset, limit)
 	if err != nil {
@@ -237,13 +240,13 @@ func (s *contactManageServant) GetContacts(userId int64, offset int, limit int)
 	if err != nil {
 		return nil, err
 	}
-	resp := &rest.ContactsResp{
+	resp := &core.ContactList{
-		Contacts: make([]rest.ContactItem, 0, len(contacts)),
+		Contacts: make([]core.ContactItem, 0, len(contacts)),
 		Total:    total,
 	}
 	for _, c := range contacts {
 		if c.User != nil {
-			resp.Contacts = append(resp.Contacts, rest.ContactItem{
+			resp.Contacts = append(resp.Contacts, core.ContactItem{
 				UserId:   c.FriendId,
 				UserName: c.User.Username,
 				Nickname: c.User.Nickname,
@@ -256,12 +259,12 @@ func (s *contactManageServant) GetContacts(userId int64, offset int, limit int)
 }
 
 func (s *contactManageServant) IsFriend(userId int64, friendId int64) bool {
-	contact := &model.Contact{
+	contact := &dbr.Contact{
 		UserId:   friendId,
 		FriendId: userId,
 	}
 	contact, err := contact.GetByUserFriend(s.db)
-	if err == nil && contact.Status == model.ContactStatusAgree {
+	if err == nil && contact.Status == dbr.ContactStatusAgree {
 		return true
 	}
 	return false

internal/dao/jinzhu/dbr/attachment.go

@@ -1,13 +1,17 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import "gorm.io/gorm"
 
 type AttachmentType int
 
 const (
-	ATTACHMENT_TYPE_IMAGE AttachmentType = iota + 1
+	AttachmentTypeImage AttachmentType = iota + 1
-	ATTACHMENT_TYPE_VIDEO
+	AttachmentTypeVideo
-	ATTACHMENT_TYPE_OTHER
+	AttachmentTypeOther
 )
 
 type Attachment struct {

internal/dao/jinzhu/dbr/captcha.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import "gorm.io/gorm"
 

internal/dao/jinzhu/dbr/comment.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"time"

internal/dao/jinzhu/dbr/comment_content.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"time"
@@ -47,7 +51,7 @@ func (c *CommentContent) Create(db *gorm.DB) (*CommentContent, error) {
 }
 
 func (c *CommentContent) MediaContentsByCommentId(db *gorm.DB, commentIds []int64) (contents []string, err error) {
-	err = db.Model(c).Where("comment_id IN ? AND type = ?", commentIds, CONTENT_TYPE_IMAGE).Select("content").Find(&contents).Error
+	err = db.Model(c).Where("comment_id IN ? AND type = ?", commentIds, ContentTypeImage).Select("content").Find(&contents).Error
 	return
 }
 

internal/dao/jinzhu/dbr/comment_reply.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"time"

internal/dao/jinzhu/dbr/contact.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"github.com/sirupsen/logrus"

internal/dao/jinzhu/dbr/dbr.go

@@ -1,36 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-	"gorm.io/plugin/soft_delete"
-)
-
-// Model 公共Model
-type Model struct {
-	ID         int64                 `gorm:"primary_key" json:"id"`
-	CreatedOn  int64                 `json:"created_on"`
-	ModifiedOn int64                 `json:"modified_on"`
-	DeletedOn  int64                 `json:"deleted_on"`
-	IsDel      soft_delete.DeletedAt `gorm:"softDelete:flag" json:"is_del"`
-}
-
-type ConditionsT map[string]any
-type Predicates map[string][]any
-
-func (m *Model) BeforeCreate(tx *gorm.DB) (err error) {
-	nowTime := time.Now().Unix()
-
-	tx.Statement.SetColumn("created_on", nowTime)
-	tx.Statement.SetColumn("modified_on", nowTime)
-	return
-}
-
-func (m *Model) BeforeUpdate(tx *gorm.DB) (err error) {
-	if !tx.Statement.Changed("modified_on") {
-		tx.Statement.SetColumn("modified_on", time.Now().Unix())
-	}
-
-	return
-}

internal/dao/jinzhu/dbr/message.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import "gorm.io/gorm"
 

internal/dao/jinzhu/dbr/model.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"time"

internal/dao/jinzhu/dbr/post.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"strings"

internal/dao/jinzhu/dbr/post_attachment_bill.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import "gorm.io/gorm"
 

internal/dao/jinzhu/dbr/post_collection.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"time"

internal/dao/jinzhu/dbr/post_content.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"time"
@@ -7,27 +11,26 @@ import (
 )
 
 // 类型，1标题，2文字段落，3图片地址，4视频地址，5语音地址，6链接地址，7附件资源
-
 type PostContentT int
 
 const (
-	CONTENT_TYPE_TITLE PostContentT = iota + 1
+	ContentTypeTitle PostContentT = iota + 1
-	CONTENT_TYPE_TEXT
+	ContentTypeText
-	CONTENT_TYPE_IMAGE
+	ContentTypeImage
-	CONTENT_TYPE_VIDEO
+	ContentTypeVideo
-	CONTENT_TYPE_AUDIO
+	ContentTypeAudio
-	CONTENT_TYPE_LINK
+	ContentTypeLink
-	CONTENT_TYPE_ATTACHMENT
+	ContentTypeAttachment
-	CONTENT_TYPE_CHARGE_ATTACHMENT
+	ContentTypeChargeAttachment
 )
 
 var (
 	mediaContentType = []PostContentT{
-		CONTENT_TYPE_IMAGE,
+		ContentTypeImage,
-		CONTENT_TYPE_VIDEO,
+		ContentTypeVideo,
-		CONTENT_TYPE_AUDIO,
+		ContentTypeAudio,
-		CONTENT_TYPE_ATTACHMENT,
+		ContentTypeAttachment,
-		CONTENT_TYPE_CHARGE_ATTACHMENT,
+		ContentTypeChargeAttachment,
 	}
 )
 

internal/dao/jinzhu/dbr/post_star.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"time"

internal/dao/jinzhu/dbr/tag.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import (
 	"time"

internal/dao/jinzhu/dbr/user.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import "gorm.io/gorm"
 

internal/dao/jinzhu/dbr/wallet_recharge.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import "gorm.io/gorm"
 

internal/dao/jinzhu/dbr/wallet_statement.go

@@ -1,4 +1,8 @@
-package model
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package dbr
 
 import "gorm.io/gorm"
 

internal/dao/jinzhu/index.go

@@ -1,9 +1,12 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
-	"github.com/rocboss/paopao-ce/internal/model/rest"
 	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
@@ -40,20 +43,20 @@ func newSimpleIndexPostsService(db *gorm.DB) core.IndexPostsService {
 }
 
 // IndexPosts 根据userId查询广场推文列表，简单做到不同用户的主页都是不同的；
-func (s *indexPostsServant) IndexPosts(user *model.User, offset int, limit int) (*rest.IndexTweetsResp, error) {
+func (s *indexPostsServant) IndexPosts(user *core.User, offset int, limit int) (*core.IndexTweetList, error) {
-	predicates := model.Predicates{
+	predicates := dbr.Predicates{
 		"ORDER": []any{"is_top DESC, latest_replied_on DESC"},
 	}
 	if user == nil {
-		predicates["visibility = ?"] = []any{model.PostVisitPublic}
+		predicates["visibility = ?"] = []any{dbr.PostVisitPublic}
 	} else if !user.IsAdmin {
 		friendIds, _ := s.ams.BeFriendIds(user.ID)
 		friendIds = append(friendIds, user.ID)
-		args := []any{model.PostVisitPublic, model.PostVisitPrivate, user.ID, model.PostVisitFriend, friendIds}
+		args := []any{dbr.PostVisitPublic, dbr.PostVisitPrivate, user.ID, dbr.PostVisitFriend, friendIds}
 		predicates["visibility = ? OR (visibility = ? AND user_id = ?) OR (visibility = ? AND user_id IN ?)"] = args
 	}
 
-	posts, err := (&model.Post{}).Fetch(s.db, predicates, offset, limit)
+	posts, err := (&dbr.Post{}).Fetch(s.db, predicates, offset, limit)
 	if err != nil {
 		logrus.Debugf("gormIndexPostsServant.IndexPosts err: %v", err)
 		return nil, err
@@ -63,25 +66,25 @@ func (s *indexPostsServant) IndexPosts(user *model.User, offset int, limit int)
 		return nil, err
 	}
 
-	total, err := (&model.Post{}).CountBy(s.db, predicates)
+	total, err := (&dbr.Post{}).CountBy(s.db, predicates)
 	if err != nil {
 		return nil, err
 	}
 
-	return &rest.IndexTweetsResp{
+	return &core.IndexTweetList{
 		Tweets: formatPosts,
 		Total:  total,
 	}, nil
 }
 
 // simpleCacheIndexGetPosts simpleCacheIndex 专属获取广场推文列表函数
-func (s *simpleIndexPostsServant) IndexPosts(_user *model.User, offset int, limit int) (*rest.IndexTweetsResp, error) {
+func (s *simpleIndexPostsServant) IndexPosts(_user *core.User, offset int, limit int) (*core.IndexTweetList, error) {
-	predicates := model.Predicates{
+	predicates := dbr.Predicates{
-		"visibility = ?": []any{model.PostVisitPublic},
+		"visibility = ?": []any{dbr.PostVisitPublic},
 		"ORDER":          []any{"is_top DESC, latest_replied_on DESC"},
 	}
 
-	posts, err := (&model.Post{}).Fetch(s.db, predicates, offset, limit)
+	posts, err := (&dbr.Post{}).Fetch(s.db, predicates, offset, limit)
 	if err != nil {
 		logrus.Debugf("gormSimpleIndexPostsServant.IndexPosts err: %v", err)
 		return nil, err
@@ -92,12 +95,12 @@ func (s *simpleIndexPostsServant) IndexPosts(_user *model.User, offset int, limi
 		return nil, err
 	}
 
-	total, err := (&model.Post{}).CountBy(s.db, predicates)
+	total, err := (&dbr.Post{}).CountBy(s.db, predicates)
 	if err != nil {
 		return nil, err
 	}
 
-	return &rest.IndexTweetsResp{
+	return &core.IndexTweetList{
 		Tweets: formatPosts,
 		Total:  total,
 	}, nil

internal/dao/jinzhu/jinzhu.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 // Core service implement base gorm+mysql/postgresql/sqlite3.
 // Jinzhu is the primary developer of gorm so use his name as
 // package name as a saluter.

internal/dao/jinzhu/messages.go

@@ -1,8 +1,12 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"gorm.io/gorm"
 )
 
@@ -20,37 +24,37 @@ func newMessageService(db *gorm.DB) core.MessageService {
 	}
 }
 
-func (d *messageServant) CreateMessage(msg *model.Message) (*model.Message, error) {
+func (d *messageServant) CreateMessage(msg *core.Message) (*core.Message, error) {
 	return msg.Create(d.db)
 }
 
 func (d *messageServant) GetUnreadCount(userID int64) (int64, error) {
-	return (&model.Message{}).Count(d.db, &model.ConditionsT{
+	return (&dbr.Message{}).Count(d.db, &dbr.ConditionsT{
 		"receiver_user_id": userID,
-		"is_read":          model.MsgStatusUnread,
+		"is_read":          dbr.MsgStatusUnread,
 	})
 }
 
-func (d *messageServant) GetMessageByID(id int64) (*model.Message, error) {
+func (d *messageServant) GetMessageByID(id int64) (*core.Message, error) {
-	return (&model.Message{
+	return (&dbr.Message{
-		Model: &model.Model{
+		Model: &dbr.Model{
 			ID: id,
 		},
 	}).Get(d.db)
 }
 
-func (d *messageServant) ReadMessage(message *model.Message) error {
+func (d *messageServant) ReadMessage(message *core.Message) error {
 	message.IsRead = 1
 	return message.Update(d.db)
 }
 
-func (d *messageServant) GetMessages(conditions *model.ConditionsT, offset, limit int) ([]*model.MessageFormated, error) {
+func (d *messageServant) GetMessages(conditions *core.ConditionsT, offset, limit int) ([]*core.MessageFormated, error) {
-	messages, err := (&model.Message{}).List(d.db, conditions, offset, limit)
+	messages, err := (&dbr.Message{}).List(d.db, conditions, offset, limit)
 	if err != nil {
 		return nil, err
 	}
 
-	mfs := []*model.MessageFormated{}
+	mfs := []*dbr.MessageFormated{}
 	for _, message := range messages {
 		mf := message.Format()
 		mfs = append(mfs, mf)
@@ -59,6 +63,6 @@ func (d *messageServant) GetMessages(conditions *model.ConditionsT, offset, limi
 	return mfs, nil
 }
 
-func (d *messageServant) GetMessageCount(conditions *model.ConditionsT) (int64, error) {
+func (d *messageServant) GetMessageCount(conditions *core.ConditionsT) (int64, error) {
-	return (&model.Message{}).Count(d.db, conditions)
+	return (&dbr.Message{}).Count(d.db, conditions)
 }

internal/dao/jinzhu/security.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
@@ -10,7 +14,7 @@ import (
 
 	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"github.com/rocboss/paopao-ce/pkg/json"
 	"gopkg.in/resty.v1"
 	"gorm.io/gorm"
@@ -36,14 +40,14 @@ type juhePhoneCaptchaRsp struct {
 }
 
 // 获取最新短信验证码
-func (s *securityServant) GetLatestPhoneCaptcha(phone string) (*model.Captcha, error) {
+func (s *securityServant) GetLatestPhoneCaptcha(phone string) (*core.Captcha, error) {
-	return (&model.Captcha{
+	return (&dbr.Captcha{
 		Phone: phone,
 	}).Get(s.db)
 }
 
 // 更新短信验证码
-func (s *securityServant) UsePhoneCaptcha(captcha *model.Captcha) error {
+func (s *securityServant) UsePhoneCaptcha(captcha *core.Captcha) error {
 	captcha.UseTimes++
 	return captcha.Update(s.db)
 }
@@ -82,7 +86,7 @@ func (s *securityServant) SendPhoneCaptcha(phone string) error {
 	}
 
 	// 写入表
-	captchaModel := &model.Captcha{
+	captchaModel := &dbr.Captcha{
 		Phone:     phone,
 		Captcha:   strconv.Itoa(captcha),
 		ExpiredOn: time.Now().Add(time.Minute * time.Duration(m)).Unix(),

internal/dao/jinzhu/topics.go

@@ -1,10 +1,14 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
 	"strings"
 
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"gorm.io/gorm"
 )
 
@@ -22,28 +26,28 @@ func newTopicService(db *gorm.DB) core.TopicService {
 	}
 }
 
-func (s *topicServant) CreateTag(tag *model.Tag) (*model.Tag, error) {
+func (s *topicServant) CreateTag(tag *core.Tag) (*core.Tag, error) {
 	return createTag(s.db, tag)
 }
 
-func (s *topicServant) DeleteTag(tag *model.Tag) error {
+func (s *topicServant) DeleteTag(tag *core.Tag) error {
 	return deleteTag(s.db, tag)
 }
 
-func (s *topicServant) GetTags(conditions *model.ConditionsT, offset, limit int) ([]*model.Tag, error) {
+func (s *topicServant) GetTags(conditions *core.ConditionsT, offset, limit int) ([]*core.Tag, error) {
-	return (&model.Tag{}).List(s.db, conditions, offset, limit)
+	return (&dbr.Tag{}).List(s.db, conditions, offset, limit)
 }
 
-func (s *topicServant) GetTagsByKeyword(keyword string) ([]*model.Tag, error) {
+func (s *topicServant) GetTagsByKeyword(keyword string) ([]*core.Tag, error) {
-	tag := &model.Tag{}
+	tag := &dbr.Tag{}
 
 	keyword = "%" + strings.Trim(keyword, " ") + "%"
 	if keyword == "%%" {
-		return tag.List(s.db, &model.ConditionsT{
+		return tag.List(s.db, &dbr.ConditionsT{
 			"ORDER": "quote_num DESC",
 		}, 0, 6)
 	} else {
-		return tag.List(s.db, &model.ConditionsT{
+		return tag.List(s.db, &dbr.ConditionsT{
 			"tag LIKE ?": keyword,
 			"ORDER":      "quote_num DESC",
 		}, 0, 6)

internal/dao/jinzhu/tweets.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
@@ -5,7 +9,7 @@ import (
 	"time"
 
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"gorm.io/gorm"
 )
 
@@ -48,7 +52,7 @@ func newTweetHelpService(db *gorm.DB) core.TweetHelpService {
 }
 
 // MergePosts post数据整合
-func (s *tweetHelpServant) MergePosts(posts []*model.Post) ([]*model.PostFormated, error) {
+func (s *tweetHelpServant) MergePosts(posts []*core.Post) ([]*core.PostFormated, error) {
 	postIds := make([]int64, 0, len(posts))
 	userIds := make([]int64, 0, len(posts))
 	for _, post := range posts {
@@ -66,18 +70,18 @@ func (s *tweetHelpServant) MergePosts(posts []*model.Post) ([]*model.PostFormate
 		return nil, err
 	}
 
-	userMap := make(map[int64]*model.UserFormated, len(users))
+	userMap := make(map[int64]*dbr.UserFormated, len(users))
 	for _, user := range users {
 		userMap[user.ID] = user.Format()
 	}
 
-	contentMap := make(map[int64][]*model.PostContentFormated, len(postContents))
+	contentMap := make(map[int64][]*dbr.PostContentFormated, len(postContents))
 	for _, content := range postContents {
 		contentMap[content.PostID] = append(contentMap[content.PostID], content.Format())
 	}
 
 	// 数据整合
-	postsFormated := make([]*model.PostFormated, 0, len(posts))
+	postsFormated := make([]*dbr.PostFormated, 0, len(posts))
 	for _, post := range posts {
 		postFormated := post.Format()
 		postFormated.User = userMap[post.UserID]
@@ -88,7 +92,7 @@ func (s *tweetHelpServant) MergePosts(posts []*model.Post) ([]*model.PostFormate
 }
 
 // RevampPosts post数据整形修复
-func (s *tweetHelpServant) RevampPosts(posts []*model.PostFormated) ([]*model.PostFormated, error) {
+func (s *tweetHelpServant) RevampPosts(posts []*core.PostFormated) ([]*core.PostFormated, error) {
 	postIds := make([]int64, 0, len(posts))
 	userIds := make([]int64, 0, len(posts))
 	for _, post := range posts {
@@ -106,12 +110,12 @@ func (s *tweetHelpServant) RevampPosts(posts []*model.PostFormated) ([]*model.Po
 		return nil, err
 	}
 
-	userMap := make(map[int64]*model.UserFormated, len(users))
+	userMap := make(map[int64]*dbr.UserFormated, len(users))
 	for _, user := range users {
 		userMap[user.ID] = user.Format()
 	}
 
-	contentMap := make(map[int64][]*model.PostContentFormated, len(postContents))
+	contentMap := make(map[int64][]*dbr.PostContentFormated, len(postContents))
 	for _, content := range postContents {
 		contentMap[content.PostID] = append(contentMap[content.PostID], content.Format())
 	}
@@ -124,23 +128,23 @@ func (s *tweetHelpServant) RevampPosts(posts []*model.PostFormated) ([]*model.Po
 	return posts, nil
 }
 
-func (s *tweetHelpServant) getPostContentsByIDs(ids []int64) ([]*model.PostContent, error) {
+func (s *tweetHelpServant) getPostContentsByIDs(ids []int64) ([]*dbr.PostContent, error) {
-	return (&model.PostContent{}).List(s.db, &model.ConditionsT{
+	return (&dbr.PostContent{}).List(s.db, &dbr.ConditionsT{
 		"post_id IN ?": ids,
 		"ORDER":        "sort ASC",
 	}, 0, 0)
 }
 
-func (s *tweetHelpServant) getUsersByIDs(ids []int64) ([]*model.User, error) {
+func (s *tweetHelpServant) getUsersByIDs(ids []int64) ([]*dbr.User, error) {
-	user := &model.User{}
+	user := &dbr.User{}
 
-	return user.List(s.db, &model.ConditionsT{
+	return user.List(s.db, &dbr.ConditionsT{
 		"id IN ?": ids,
 	}, 0, 0)
 }
 
-func (s *tweetManageServant) CreatePostCollection(postID, userID int64) (*model.PostCollection, error) {
+func (s *tweetManageServant) CreatePostCollection(postID, userID int64) (*core.PostCollection, error) {
-	collection := &model.PostCollection{
+	collection := &dbr.PostCollection{
 		PostID: postID,
 		UserID: userID,
 	}
@@ -148,19 +152,19 @@ func (s *tweetManageServant) CreatePostCollection(postID, userID int64) (*model.
 	return collection.Create(s.db)
 }
 
-func (s *tweetManageServant) DeletePostCollection(p *model.PostCollection) error {
+func (s *tweetManageServant) DeletePostCollection(p *core.PostCollection) error {
 	return p.Delete(s.db)
 }
 
-func (s *tweetManageServant) CreatePostContent(content *model.PostContent) (*model.PostContent, error) {
+func (s *tweetManageServant) CreatePostContent(content *core.PostContent) (*core.PostContent, error) {
 	return content.Create(s.db)
 }
 
-func (s *tweetManageServant) CreateAttachment(attachment *model.Attachment) (*model.Attachment, error) {
+func (s *tweetManageServant) CreateAttachment(attachment *core.Attachment) (*core.Attachment, error) {
 	return attachment.Create(s.db)
 }
 
-func (s *tweetManageServant) CreatePost(post *model.Post) (*model.Post, error) {
+func (s *tweetManageServant) CreatePost(post *core.Post) (*core.Post, error) {
 	post.LatestRepliedOn = time.Now().Unix()
 	p, err := post.Create(s.db)
 	if err != nil {
@@ -170,11 +174,11 @@ func (s *tweetManageServant) CreatePost(post *model.Post) (*model.Post, error) {
 	return p, nil
 }
 
-func (s *tweetManageServant) DeletePost(post *model.Post) ([]string, error) {
+func (s *tweetManageServant) DeletePost(post *core.Post) ([]string, error) {
 	var mediaContents []string
 
 	postId := post.ID
-	postContent := &model.PostContent{}
+	postContent := &dbr.PostContent{}
 	err := s.db.Transaction(
 		func(tx *gorm.DB) error {
 			if contents, err := postContent.MediaContentsByPostId(tx, postId); err == nil {
@@ -218,8 +222,8 @@ func (s *tweetManageServant) DeletePost(post *model.Post) ([]string, error) {
 }
 
 func (s *tweetManageServant) deleteCommentByPostId(db *gorm.DB, postId int64) ([]string, error) {
-	comment := &model.Comment{}
+	comment := &dbr.Comment{}
-	commentContent := &model.CommentContent{}
+	commentContent := &dbr.CommentContent{}
 
 	// 获取推文的所有评论id
 	commentIds, err := comment.CommentIdsByPostId(db, postId)
@@ -244,19 +248,19 @@ func (s *tweetManageServant) deleteCommentByPostId(db *gorm.DB, postId int64) ([
 	}
 
 	// 删评论的评论
-	if err = (&model.CommentReply{}).DeleteByCommentIds(db, commentIds); err != nil {
+	if err = (&dbr.CommentReply{}).DeleteByCommentIds(db, commentIds); err != nil {
 		return nil, err
 	}
 
 	return mediaContents, nil
 }
 
-func (s *tweetManageServant) LockPost(post *model.Post) error {
+func (s *tweetManageServant) LockPost(post *core.Post) error {
 	post.IsLock = 1 - post.IsLock
 	return post.Update(s.db)
 }
 
-func (s *tweetManageServant) StickPost(post *model.Post) error {
+func (s *tweetManageServant) StickPost(post *core.Post) error {
 	post.IsTop = 1 - post.IsTop
 	if err := post.Update(s.db); err != nil {
 		return err
@@ -265,7 +269,7 @@ func (s *tweetManageServant) StickPost(post *model.Post) error {
 	return nil
 }
 
-func (s *tweetManageServant) VisiblePost(post *model.Post, visibility model.PostVisibleT) error {
+func (s *tweetManageServant) VisiblePost(post *core.Post, visibility core.PostVisibleT) error {
 	oldVisibility := post.Visibility
 	post.Visibility = visibility
 	// TODO: 这个判断是否可以不要呢
@@ -273,7 +277,7 @@ func (s *tweetManageServant) VisiblePost(post *model.Post, visibility model.Post
 		return nil
 	}
 	// 私密推文 特殊处理
-	if visibility == model.PostVisitPrivate {
+	if visibility == dbr.PostVisitPrivate {
 		// 强制取消置顶
 		// TODO: 置顶推文用户是否有权设置成私密？ 后续完善
 		post.IsTop = 0
@@ -288,14 +292,14 @@ func (s *tweetManageServant) VisiblePost(post *model.Post, visibility model.Post
 	// tag处理
 	tags := strings.Split(post.Tags, ",")
 	for _, t := range tags {
-		tag := &model.Tag{
+		tag := &dbr.Tag{
 			Tag: t,
 		}
 		// TODO: 暂时宽松不处理错误，这里或许可以有优化，后续完善
-		if oldVisibility == model.PostVisitPrivate {
+		if oldVisibility == dbr.PostVisitPrivate {
 			// 从私密转为非私密才需要重新创建tag
 			createTag(db, tag)
-		} else if visibility == model.PostVisitPrivate {
+		} else if visibility == dbr.PostVisitPrivate {
 			// 从非私密转为私密才需要删除tag
 			deleteTag(db, tag)
 		}
@@ -305,7 +309,7 @@ func (s *tweetManageServant) VisiblePost(post *model.Post, visibility model.Post
 	return nil
 }
 
-func (s *tweetManageServant) UpdatePost(post *model.Post) error {
+func (s *tweetManageServant) UpdatePost(post *core.Post) error {
 	if err := post.Update(s.db); err != nil {
 		return err
 	}
@@ -313,104 +317,104 @@ func (s *tweetManageServant) UpdatePost(post *model.Post) error {
 	return nil
 }
 
-func (s *tweetManageServant) CreatePostStar(postID, userID int64) (*model.PostStar, error) {
+func (s *tweetManageServant) CreatePostStar(postID, userID int64) (*core.PostStar, error) {
-	star := &model.PostStar{
+	star := &dbr.PostStar{
 		PostID: postID,
 		UserID: userID,
 	}
 	return star.Create(s.db)
 }
 
-func (s *tweetManageServant) DeletePostStar(p *model.PostStar) error {
+func (s *tweetManageServant) DeletePostStar(p *core.PostStar) error {
 	return p.Delete(s.db)
 }
 
-func (s *tweetServant) GetPostByID(id int64) (*model.Post, error) {
+func (s *tweetServant) GetPostByID(id int64) (*core.Post, error) {
-	post := &model.Post{
+	post := &dbr.Post{
-		Model: &model.Model{
+		Model: &dbr.Model{
 			ID: id,
 		},
 	}
 	return post.Get(s.db)
 }
 
-func (s *tweetServant) GetPosts(conditions *model.ConditionsT, offset, limit int) ([]*model.Post, error) {
+func (s *tweetServant) GetPosts(conditions *core.ConditionsT, offset, limit int) ([]*core.Post, error) {
-	return (&model.Post{}).List(s.db, conditions, offset, limit)
+	return (&dbr.Post{}).List(s.db, conditions, offset, limit)
 }
 
-func (s *tweetServant) GetPostCount(conditions *model.ConditionsT) (int64, error) {
+func (s *tweetServant) GetPostCount(conditions *core.ConditionsT) (int64, error) {
-	return (&model.Post{}).Count(s.db, conditions)
+	return (&dbr.Post{}).Count(s.db, conditions)
 }
 
-func (s *tweetServant) GetUserPostStar(postID, userID int64) (*model.PostStar, error) {
+func (s *tweetServant) GetUserPostStar(postID, userID int64) (*core.PostStar, error) {
-	star := &model.PostStar{
+	star := &dbr.PostStar{
 		PostID: postID,
 		UserID: userID,
 	}
 	return star.Get(s.db)
 }
 
-func (s *tweetServant) GetUserPostStars(userID int64, offset, limit int) ([]*model.PostStar, error) {
+func (s *tweetServant) GetUserPostStars(userID int64, offset, limit int) ([]*core.PostStar, error) {
-	star := &model.PostStar{
+	star := &dbr.PostStar{
 		UserID: userID,
 	}
 
-	return star.List(s.db, &model.ConditionsT{
+	return star.List(s.db, &dbr.ConditionsT{
 		"ORDER": s.db.NamingStrategy.TableName("PostStar") + ".id DESC",
 	}, offset, limit)
 }
 
 func (s *tweetServant) GetUserPostStarCount(userID int64) (int64, error) {
-	star := &model.PostStar{
+	star := &dbr.PostStar{
 		UserID: userID,
 	}
-	return star.Count(s.db, &model.ConditionsT{})
+	return star.Count(s.db, &dbr.ConditionsT{})
 }
 
-func (s *tweetServant) GetUserPostCollection(postID, userID int64) (*model.PostCollection, error) {
+func (s *tweetServant) GetUserPostCollection(postID, userID int64) (*core.PostCollection, error) {
-	star := &model.PostCollection{
+	star := &dbr.PostCollection{
 		PostID: postID,
 		UserID: userID,
 	}
 	return star.Get(s.db)
 }
 
-func (s *tweetServant) GetUserPostCollections(userID int64, offset, limit int) ([]*model.PostCollection, error) {
+func (s *tweetServant) GetUserPostCollections(userID int64, offset, limit int) ([]*core.PostCollection, error) {
-	collection := &model.PostCollection{
+	collection := &dbr.PostCollection{
 		UserID: userID,
 	}
 
-	return collection.List(s.db, &model.ConditionsT{
+	return collection.List(s.db, &dbr.ConditionsT{
 		"ORDER": s.db.NamingStrategy.TableName("PostCollection") + ".id DESC",
 	}, offset, limit)
 }
 
 func (s *tweetServant) GetUserPostCollectionCount(userID int64) (int64, error) {
-	collection := &model.PostCollection{
+	collection := &dbr.PostCollection{
 		UserID: userID,
 	}
-	return collection.Count(s.db, &model.ConditionsT{})
+	return collection.Count(s.db, &dbr.ConditionsT{})
 }
 
-func (s *tweetServant) GetUserWalletBills(userID int64, offset, limit int) ([]*model.WalletStatement, error) {
+func (s *tweetServant) GetUserWalletBills(userID int64, offset, limit int) ([]*core.WalletStatement, error) {
-	statement := &model.WalletStatement{
+	statement := &dbr.WalletStatement{
 		UserID: userID,
 	}
 
-	return statement.List(s.db, &model.ConditionsT{
+	return statement.List(s.db, &dbr.ConditionsT{
 		"ORDER": "id DESC",
 	}, offset, limit)
 }
 
 func (s *tweetServant) GetUserWalletBillCount(userID int64) (int64, error) {
-	statement := &model.WalletStatement{
+	statement := &dbr.WalletStatement{
 		UserID: userID,
 	}
-	return statement.Count(s.db, &model.ConditionsT{})
+	return statement.Count(s.db, &dbr.ConditionsT{})
 }
 
-func (s *tweetServant) GetPostAttatchmentBill(postID, userID int64) (*model.PostAttachmentBill, error) {
+func (s *tweetServant) GetPostAttatchmentBill(postID, userID int64) (*core.PostAttachmentBill, error) {
-	bill := &model.PostAttachmentBill{
+	bill := &dbr.PostAttachmentBill{
 		PostID: postID,
 		UserID: userID,
 	}
@@ -418,16 +422,16 @@ func (s *tweetServant) GetPostAttatchmentBill(postID, userID int64) (*model.Post
 	return bill.Get(s.db)
 }
 
-func (s *tweetServant) GetPostContentsByIDs(ids []int64) ([]*model.PostContent, error) {
+func (s *tweetServant) GetPostContentsByIDs(ids []int64) ([]*core.PostContent, error) {
-	return (&model.PostContent{}).List(s.db, &model.ConditionsT{
+	return (&dbr.PostContent{}).List(s.db, &dbr.ConditionsT{
 		"post_id IN ?": ids,
 		"ORDER":        "sort ASC",
 	}, 0, 0)
 }
 
-func (s *tweetServant) GetPostContentByID(id int64) (*model.PostContent, error) {
+func (s *tweetServant) GetPostContentByID(id int64) (*core.PostContent, error) {
-	return (&model.PostContent{
+	return (&dbr.PostContent{
-		Model: &model.Model{
+		Model: &dbr.Model{
 			ID: id,
 		},
 	}).Get(s.db)

internal/dao/jinzhu/user.go

@@ -1,10 +1,14 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
 	"strings"
 
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"gorm.io/gorm"
 )
 
@@ -22,69 +26,69 @@ func newUserManageService(db *gorm.DB) core.UserManageService {
 	}
 }
 
-func (s *userManageServant) GetUserByID(id int64) (*model.User, error) {
+func (s *userManageServant) GetUserByID(id int64) (*core.User, error) {
-	user := &model.User{
+	user := &dbr.User{
-		Model: &model.Model{
+		Model: &dbr.Model{
 			ID: id,
 		},
 	}
 	return user.Get(s.db)
 }
 
-func (s *userManageServant) GetUserByUsername(username string) (*model.User, error) {
+func (s *userManageServant) GetUserByUsername(username string) (*core.User, error) {
-	user := &model.User{
+	user := &dbr.User{
 		Username: username,
 	}
 	return user.Get(s.db)
 }
 
-func (s *userManageServant) GetUserByPhone(phone string) (*model.User, error) {
+func (s *userManageServant) GetUserByPhone(phone string) (*core.User, error) {
-	user := &model.User{
+	user := &dbr.User{
 		Phone: phone,
 	}
 	return user.Get(s.db)
 }
 
-func (s *userManageServant) GetUsersByIDs(ids []int64) ([]*model.User, error) {
+func (s *userManageServant) GetUsersByIDs(ids []int64) ([]*core.User, error) {
-	user := &model.User{}
+	user := &dbr.User{}
-	return user.List(s.db, &model.ConditionsT{
+	return user.List(s.db, &dbr.ConditionsT{
 		"id IN ?": ids,
 	}, 0, 0)
 }
 
-func (s *userManageServant) GetUsersByKeyword(keyword string) ([]*model.User, error) {
+func (s *userManageServant) GetUsersByKeyword(keyword string) ([]*core.User, error) {
-	user := &model.User{}
+	user := &dbr.User{}
 	keyword = strings.Trim(keyword, " ") + "%"
 	if keyword == "%" {
-		return user.List(s.db, &model.ConditionsT{
+		return user.List(s.db, &dbr.ConditionsT{
 			"ORDER": "id ASC",
 		}, 0, 6)
 	} else {
-		return user.List(s.db, &model.ConditionsT{
+		return user.List(s.db, &dbr.ConditionsT{
 			"username LIKE ?": keyword,
 		}, 0, 6)
 	}
 }
 
-func (s *userManageServant) GetTagsByKeyword(keyword string) ([]*model.Tag, error) {
+func (s *userManageServant) GetTagsByKeyword(keyword string) ([]*core.Tag, error) {
-	tag := &model.Tag{}
+	tag := &dbr.Tag{}
 	keyword = "%" + strings.Trim(keyword, " ") + "%"
 	if keyword == "%%" {
-		return tag.List(s.db, &model.ConditionsT{
+		return tag.List(s.db, &dbr.ConditionsT{
 			"ORDER": "quote_num DESC",
 		}, 0, 6)
 	} else {
-		return tag.List(s.db, &model.ConditionsT{
+		return tag.List(s.db, &dbr.ConditionsT{
 			"tag LIKE ?": keyword,
 			"ORDER":      "quote_num DESC",
 		}, 0, 6)
 	}
 }
 
-func (s *userManageServant) CreateUser(user *model.User) (*model.User, error) {
+func (s *userManageServant) CreateUser(user *dbr.User) (*core.User, error) {
 	return user.Create(s.db)
 }
 
-func (s *userManageServant) UpdateUser(user *model.User) error {
+func (s *userManageServant) UpdateUser(user *core.User) error {
 	return user.Update(s.db)
 }

internal/dao/jinzhu/utils.go

@@ -1,11 +1,15 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"gorm.io/gorm"
 )
 
-func createTag(db *gorm.DB, tag *model.Tag) (*model.Tag, error) {
+func createTag(db *gorm.DB, tag *dbr.Tag) (*dbr.Tag, error) {
 	t, err := tag.Get(db)
 	if err != nil {
 		tag.QuoteNum = 1
@@ -23,7 +27,7 @@ func createTag(db *gorm.DB, tag *model.Tag) (*model.Tag, error) {
 	return t, nil
 }
 
-func deleteTag(db *gorm.DB, tag *model.Tag) error {
+func deleteTag(db *gorm.DB, tag *dbr.Tag) error {
 	tag, err := tag.Get(db)
 	if err != nil {
 		return err
@@ -33,7 +37,7 @@ func deleteTag(db *gorm.DB, tag *model.Tag) error {
 }
 
 func deleteTags(db *gorm.DB, tags []string) error {
-	allTags, err := (&model.Tag{}).TagsFrom(db, tags)
+	allTags, err := (&dbr.Tag{}).TagsFrom(db, tags)
 	if err != nil {
 		return err
 	}
@@ -51,9 +55,9 @@ func deleteTags(db *gorm.DB, tags []string) error {
 }
 
 // 根据IDs获取用户列表
-func getUsersByIDs(db *gorm.DB, ids []int64) ([]*model.User, error) {
+func getUsersByIDs(db *gorm.DB, ids []int64) ([]*dbr.User, error) {
-	user := &model.User{}
+	user := &dbr.User{}
-	return user.List(db, &model.ConditionsT{
+	return user.List(db, &dbr.ConditionsT{
 		"id IN ?": ids,
 	}, 0, 0)
 }

internal/dao/jinzhu/wallet.go

@@ -1,9 +1,13 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package jinzhu
 
 import (
 	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr"
 	"gorm.io/gorm"
 )
 
@@ -21,17 +25,17 @@ func newWalletService(db *gorm.DB) core.WalletService {
 	}
 }
 
-func (d *walletServant) GetRechargeByID(id int64) (*model.WalletRecharge, error) {
+func (d *walletServant) GetRechargeByID(id int64) (*core.WalletRecharge, error) {
-	recharge := &model.WalletRecharge{
+	recharge := &dbr.WalletRecharge{
-		Model: &model.Model{
+		Model: &dbr.Model{
 			ID: id,
 		},
 	}
 
 	return recharge.Get(d.db)
 }
-func (d *walletServant) CreateRecharge(userId, amount int64) (*model.WalletRecharge, error) {
+func (d *walletServant) CreateRecharge(userId, amount int64) (*core.WalletRecharge, error) {
-	recharge := &model.WalletRecharge{
+	recharge := &dbr.WalletRecharge{
 		UserID: userId,
 		Amount: amount,
 	}
@@ -39,26 +43,26 @@ func (d *walletServant) CreateRecharge(userId, amount int64) (*model.WalletRecha
 	return recharge.Create(d.db)
 }
 
-func (d *walletServant) GetUserWalletBills(userID int64, offset, limit int) ([]*model.WalletStatement, error) {
+func (d *walletServant) GetUserWalletBills(userID int64, offset, limit int) ([]*core.WalletStatement, error) {
-	statement := &model.WalletStatement{
+	statement := &dbr.WalletStatement{
 		UserID: userID,
 	}
 
-	return statement.List(d.db, &model.ConditionsT{
+	return statement.List(d.db, &dbr.ConditionsT{
 		"ORDER": "id DESC",
 	}, offset, limit)
 }
 
 func (d *walletServant) GetUserWalletBillCount(userID int64) (int64, error) {
-	statement := &model.WalletStatement{
+	statement := &dbr.WalletStatement{
 		UserID: userID,
 	}
-	return statement.Count(d.db, &model.ConditionsT{})
+	return statement.Count(d.db, &dbr.ConditionsT{})
 }
 
-func (d *walletServant) HandleRechargeSuccess(recharge *model.WalletRecharge, tradeNo string) error {
+func (d *walletServant) HandleRechargeSuccess(recharge *core.WalletRecharge, tradeNo string) error {
-	user, _ := (&model.User{
+	user, _ := (&dbr.User{
-		Model: &model.Model{
+		Model: &dbr.Model{
 			ID: recharge.UserID,
 		},
 	}).Get(d.db)
@@ -71,7 +75,7 @@ func (d *walletServant) HandleRechargeSuccess(recharge *model.WalletRecharge, tr
 		}
 
 		// 新增账单
-		if err := tx.Create(&model.WalletStatement{
+		if err := tx.Create(&dbr.WalletStatement{
 			UserID:          user.ID,
 			ChangeAmount:    recharge.Amount,
 			BalanceSnapshot: user.Balance + recharge.Amount,
@@ -93,7 +97,7 @@ func (d *walletServant) HandleRechargeSuccess(recharge *model.WalletRecharge, tr
 	})
 }
 
-func (d *walletServant) HandlePostAttachmentBought(post *model.Post, user *model.User) error {
+func (d *walletServant) HandlePostAttachmentBought(post *core.Post, user *core.User) error {
 	return d.db.Transaction(func(tx *gorm.DB) error {
 		// 扣除金额
 		if err := tx.Model(user).Update("balance", gorm.Expr("balance - ?", post.AttachmentPrice)).Error; err != nil {
@@ -102,7 +106,7 @@ func (d *walletServant) HandlePostAttachmentBought(post *model.Post, user *model
 		}
 
 		// 新增账单
-		if err := tx.Create(&model.WalletStatement{
+		if err := tx.Create(&dbr.WalletStatement{
 			PostID:          post.ID,
 			UserID:          user.ID,
 			ChangeAmount:    -post.AttachmentPrice,
@@ -113,7 +117,7 @@ func (d *walletServant) HandlePostAttachmentBought(post *model.Post, user *model
 		}
 
 		// 新增附件购买记录
-		if err := tx.Create(&model.PostAttachmentBill{
+		if err := tx.Create(&dbr.PostAttachmentBill{
 			PostID:     post.ID,
 			UserID:     user.ID,
 			PaidAmount: post.AttachmentPrice,
@@ -124,8 +128,8 @@ func (d *walletServant) HandlePostAttachmentBought(post *model.Post, user *model
 		// 对附件主新增账单
 		income := int64(float64(post.AttachmentPrice) * conf.AppSetting.AttachmentIncomeRate)
 		if income > 0 {
-			master := &model.User{
+			master := &dbr.User{
-				Model: &model.Model{
+				Model: &dbr.Model{
 					ID: post.UserID,
 				},
 			}
@@ -137,7 +141,7 @@ func (d *walletServant) HandlePostAttachmentBought(post *model.Post, user *model
 			}
 
 			// 新增账单
-			if err := tx.Create(&model.WalletStatement{
+			if err := tx.Create(&dbr.WalletStatement{
 				PostID:          post.ID,
 				UserID:          master.ID,
 				ChangeAmount:    income,

internal/dao/sakila/sakila.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 // Core service implement base sqlx+mysql. All sub-service
 // will declare here and provide initial function.
 

internal/dao/search/bridge.go

@@ -1,10 +1,13 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package search
 
 import (
 	"time"
 
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
 	"github.com/sirupsen/logrus"
 )
 
@@ -43,7 +46,7 @@ func (s *bridgeTweetSearchServant) DeleteDocuments(identifiers []string) error {
 	return nil
 }
 
-func (s *bridgeTweetSearchServant) Search(user *model.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
+func (s *bridgeTweetSearchServant) Search(user *core.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
 	return s.ts.Search(user, q, offset, limit)
 }
 

internal/dao/search/filter.go

@@ -1,8 +1,11 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package search
 
 import (
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
 	"github.com/rocboss/paopao-ce/pkg/types"
 )
 
@@ -10,19 +13,19 @@ type tweetSearchFilter struct {
 	ams core.AuthorizationManageService
 }
 
-func (s *tweetSearchFilter) filterResp(user *model.User, resp *core.QueryResp) {
+func (s *tweetSearchFilter) filterResp(user *core.User, resp *core.QueryResp) {
 	// 管理员不过滤
 	if user != nil && user.IsAdmin {
 		return
 	}
 
-	var item *model.PostFormated
+	var item *core.PostFormated
 	items := resp.Items
 	latestIndex := len(items) - 1
 	if user == nil {
 		for i := 0; i <= latestIndex; i++ {
 			item = items[i]
-			if item.Visibility != model.PostVisitPublic {
+			if item.Visibility != core.PostVisitPublic {
 				items[i] = items[latestIndex]
 				items = items[:latestIndex]
 				resp.Total--
@@ -36,8 +39,8 @@ func (s *tweetSearchFilter) filterResp(user *model.User, resp *core.QueryResp) {
 		friendFilter[user.ID] = types.Empty{}
 		for i := 0; i <= latestIndex; i++ {
 			item = items[i]
-			cutFriend = (item.Visibility == model.PostVisitFriend && !friendFilter.IsFriend(item.UserID))
+			cutFriend = (item.Visibility == core.PostVisitFriend && !friendFilter.IsFriend(item.UserID))
-			cutPrivate = (item.Visibility == model.PostVisitPrivate && user.ID != item.UserID)
+			cutPrivate = (item.Visibility == core.PostVisitPrivate && user.ID != item.UserID)
 			if cutFriend || cutPrivate {
 				items[i] = items[latestIndex]
 				items = items[:latestIndex]

internal/dao/search/meili.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package search
 
 import (
@@ -7,7 +11,6 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/meilisearch/meilisearch-go"
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
 	"github.com/rocboss/paopao-ce/pkg/json"
 	"github.com/sirupsen/logrus"
 )
@@ -28,20 +31,20 @@ type meiliTweetSearchServant struct {
 }
 
 type postInfo struct {
-	ID              int64              `json:"id"`
+	ID              int64             `json:"id"`
-	UserID          int64              `json:"user_id"`
+	UserID          int64             `json:"user_id"`
-	CommentCount    int64              `json:"comment_count"`
+	CommentCount    int64             `json:"comment_count"`
-	CollectionCount int64              `json:"collection_count"`
+	CollectionCount int64             `json:"collection_count"`
-	UpvoteCount     int64              `json:"upvote_count"`
+	UpvoteCount     int64             `json:"upvote_count"`
-	Visibility      model.PostVisibleT `json:"visibility"`
+	Visibility      core.PostVisibleT `json:"visibility"`
-	IsTop           int                `json:"is_top"`
+	IsTop           int               `json:"is_top"`
-	IsEssence       int                `json:"is_essence"`
+	IsEssence       int               `json:"is_essence"`
-	IsLock          int                `json:"is_lock"`
+	IsLock          int               `json:"is_lock"`
-	LatestRepliedOn int64              `json:"latest_replied_on"`
+	LatestRepliedOn int64             `json:"latest_replied_on"`
-	CreatedOn       int64              `json:"created_on"`
+	CreatedOn       int64             `json:"created_on"`
-	ModifiedOn      int64              `json:"modified_on"`
+	ModifiedOn      int64             `json:"modified_on"`
-	AttachmentPrice int64              `json:"attachment_price"`
+	AttachmentPrice int64             `json:"attachment_price"`
-	IPLoc           string             `json:"ip_loc"`
+	IPLoc           string            `json:"ip_loc"`
 }
 
 func (s *meiliTweetSearchServant) Name() string {
@@ -78,7 +81,7 @@ func (s *meiliTweetSearchServant) DeleteDocuments(identifiers []string) error {
 	return nil
 }
 
-func (s *meiliTweetSearchServant) Search(user *model.User, q *core.QueryReq, offset, limit int) (resp *core.QueryResp, err error) {
+func (s *meiliTweetSearchServant) Search(user *core.User, q *core.QueryReq, offset, limit int) (resp *core.QueryResp, err error) {
 	if q.Type == core.SearchTypeDefault && q.Query != "" {
 		resp, err = s.queryByContent(user, q, offset, limit)
 	} else if q.Type == core.SearchTypeTag && q.Query != "" {
@@ -96,7 +99,7 @@ func (s *meiliTweetSearchServant) Search(user *model.User, q *core.QueryReq, off
 	return
 }
 
-func (s *meiliTweetSearchServant) queryByContent(user *model.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
+func (s *meiliTweetSearchServant) queryByContent(user *core.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
 	request := &meilisearch.SearchRequest{
 		Offset: int64(offset),
 		Limit:  int64(limit),
@@ -117,7 +120,7 @@ func (s *meiliTweetSearchServant) queryByContent(user *model.User, q *core.Query
 	return s.postsFrom(resp)
 }
 
-func (s *meiliTweetSearchServant) queryByTag(user *model.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
+func (s *meiliTweetSearchServant) queryByTag(user *core.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
 	request := &meilisearch.SearchRequest{
 		Offset: int64(offset),
 		Limit:  int64(limit),
@@ -141,7 +144,7 @@ func (s *meiliTweetSearchServant) queryByTag(user *model.User, q *core.QueryReq,
 	return s.postsFrom(resp)
 }
 
-func (s *meiliTweetSearchServant) queryAny(user *model.User, offset, limit int) (*core.QueryResp, error) {
+func (s *meiliTweetSearchServant) queryAny(user *core.User, offset, limit int) (*core.QueryResp, error) {
 	request := &meilisearch.SearchRequest{
 		Offset: int64(offset),
 		Limit:  int64(limit),
@@ -161,7 +164,7 @@ func (s *meiliTweetSearchServant) queryAny(user *model.User, offset, limit int)
 	return s.postsFrom(resp)
 }
 
-func (s *meiliTweetSearchServant) filterList(user *model.User) string {
+func (s *meiliTweetSearchServant) filterList(user *core.User) string {
 	if user == nil {
 		return s.publicFilter
 	}
@@ -174,7 +177,7 @@ func (s *meiliTweetSearchServant) filterList(user *model.User) string {
 }
 
 func (s *meiliTweetSearchServant) postsFrom(resp *meilisearch.SearchResponse) (*core.QueryResp, error) {
-	posts := make([]*model.PostFormated, 0, len(resp.Hits))
+	posts := make([]*core.PostFormated, 0, len(resp.Hits))
 	for _, hit := range resp.Hits {
 		raw, err := json.Marshal(hit)
 		if err != nil {
@@ -184,7 +187,7 @@ func (s *meiliTweetSearchServant) postsFrom(resp *meilisearch.SearchResponse) (*
 		if err = json.Unmarshal(raw, p); err != nil {
 			return nil, err
 		}
-		posts = append(posts, &model.PostFormated{
+		posts = append(posts, &core.PostFormated{
 			ID:              p.ID,
 			UserID:          p.UserID,
 			CommentCount:    p.CommentCount,

internal/dao/search/search.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package search
 
 import (
@@ -6,7 +10,6 @@ import (
 	"github.com/meilisearch/meilisearch-go"
 	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
 	"github.com/rocboss/paopao-ce/pkg/zinc"
 	"github.com/sirupsen/logrus"
 )
@@ -40,9 +43,9 @@ func NewMeiliTweetSearchService(ams core.AuthorizationManageService) (core.Tweet
 		},
 		client:        client,
 		index:         client.Index(s.Index),
-		publicFilter:  fmt.Sprintf("visibility=%d", model.PostVisitPublic),
+		publicFilter:  fmt.Sprintf("visibility=%d", core.PostVisitPublic),
-		privateFilter: fmt.Sprintf("visibility=%d AND user_id=", model.PostVisitPrivate),
+		privateFilter: fmt.Sprintf("visibility=%d AND user_id=", core.PostVisitPrivate),
-		friendFilter:  fmt.Sprintf("visibility=%d", model.PostVisitFriend),
+		friendFilter:  fmt.Sprintf("visibility=%d", core.PostVisitFriend),
 	}
 	return mts, mts
 }
@@ -55,9 +58,9 @@ func NewZincTweetSearchService(ams core.AuthorizationManageService) (core.TweetS
 		},
 		indexName:     s.Index,
 		client:        zinc.NewClient(s),
-		publicFilter:  fmt.Sprintf("visibility:%d", model.PostVisitPublic),
+		publicFilter:  fmt.Sprintf("visibility:%d", core.PostVisitPublic),
-		privateFilter: fmt.Sprintf("visibility:%d AND user_id:%%d", model.PostVisitPrivate),
+		privateFilter: fmt.Sprintf("visibility:%d AND user_id:%%d", core.PostVisitPrivate),
-		friendFilter:  fmt.Sprintf("visibility:%d", model.PostVisitFriend),
+		friendFilter:  fmt.Sprintf("visibility:%d", core.PostVisitFriend),
 	}
 	zts.createIndex()
 

internal/dao/search/zinc.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package search
 
 import (
@@ -5,7 +9,6 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/rocboss/paopao-ce/internal/core"
-	"github.com/rocboss/paopao-ce/internal/model"
 	"github.com/rocboss/paopao-ce/pkg/json"
 	"github.com/rocboss/paopao-ce/pkg/zinc"
 	"github.com/sirupsen/logrus"
@@ -73,7 +76,7 @@ func (s *zincTweetSearchServant) DeleteDocuments(identifiers []string) error {
 	return nil
 }
 
-func (s *zincTweetSearchServant) Search(user *model.User, q *core.QueryReq, offset, limit int) (resp *core.QueryResp, err error) {
+func (s *zincTweetSearchServant) Search(user *core.User, q *core.QueryReq, offset, limit int) (resp *core.QueryResp, err error) {
 	if q.Type == core.SearchTypeDefault && q.Query != "" {
 		resp, err = s.queryByContent(user, q, offset, limit)
 	} else if q.Type == core.SearchTypeTag && q.Query != "" {
@@ -91,7 +94,7 @@ func (s *zincTweetSearchServant) Search(user *model.User, q *core.QueryReq, offs
 	return
 }
 
-func (s *zincTweetSearchServant) queryByContent(user *model.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
+func (s *zincTweetSearchServant) queryByContent(user *core.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
 	resp, err := s.client.EsQuery(s.indexName, map[string]any{
 		"query": map[string]any{
 			"match_phrase": map[string]any{
@@ -108,7 +111,7 @@ func (s *zincTweetSearchServant) queryByContent(user *model.User, q *core.QueryR
 	return s.postsFrom(resp)
 }
 
-func (s *zincTweetSearchServant) queryByTag(user *model.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
+func (s *zincTweetSearchServant) queryByTag(user *core.User, q *core.QueryReq, offset, limit int) (*core.QueryResp, error) {
 	resp, err := s.client.ApiQuery(s.indexName, map[string]any{
 		"search_type": "querystring",
 		"query": map[string]any{
@@ -124,7 +127,7 @@ func (s *zincTweetSearchServant) queryByTag(user *model.User, q *core.QueryReq,
 	return s.postsFrom(resp)
 }
 
-func (s *zincTweetSearchServant) queryAny(user *model.User, offset, limit int) (*core.QueryResp, error) {
+func (s *zincTweetSearchServant) queryAny(user *core.User, offset, limit int) (*core.QueryResp, error) {
 	queryMap := map[string]any{
 		"query": map[string]any{
 			"match_all": map[string]string{},
@@ -141,9 +144,9 @@ func (s *zincTweetSearchServant) queryAny(user *model.User, offset, limit int) (
 }
 
 func (s *zincTweetSearchServant) postsFrom(resp *zinc.QueryResultT) (*core.QueryResp, error) {
-	posts := make([]*model.PostFormated, 0, len(resp.Hits.Hits))
+	posts := make([]*core.PostFormated, 0, len(resp.Hits.Hits))
 	for _, hit := range resp.Hits.Hits {
-		item := &model.PostFormated{}
+		item := &core.PostFormated{}
 		raw, err := json.Marshal(hit.Source)
 		if err != nil {
 			return nil, err

internal/dao/security/attachment.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package security
 
 import (

internal/dao/slonik/slonik.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 // Core service implement base sqlx+postgresql. All sub-service
 // will declare here and provide initial function.
 

internal/dao/storage/alioss.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package storage
 
 import (

internal/dao/storage/cos.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package storage
 
 import (

internal/dao/storage/huaweiobs.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package storage
 
 import (

internal/dao/storage/localoss.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package storage
 
 import (

internal/dao/storage/minio.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package storage
 
 import (

internal/dao/storage/storage.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package storage
 
 import (

internal/internal.go

@@ -1,9 +1,13 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package internal
 
 import (
-	"github.com/rocboss/paopao-ce/internal/migration"
+	"github.com/rocboss/paopao-ce/internal/broker/migration"
-	"github.com/rocboss/paopao-ce/internal/routers/api"
+	wb "github.com/rocboss/paopao-ce/internal/servants/web/broker"
-	"github.com/rocboss/paopao-ce/internal/service"
+	"github.com/rocboss/paopao-ce/internal/servants/web/routers/api"
 )
 
 func Initialize() {
@@ -11,6 +15,6 @@ func Initialize() {
 	migration.Run()
 
 	// initialize service
-	service.Initialize()
+	wb.Initialize()
 	api.Initialize()
 }

internal/middleware/admin.go

@@ -1,25 +0,0 @@
-package middleware
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/rocboss/paopao-ce/internal/model"
-	"github.com/rocboss/paopao-ce/pkg/app"
-	"github.com/rocboss/paopao-ce/pkg/errcode"
-)
-
-func Admin() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		if user, exist := c.Get("USER"); exist {
-			if userModel, ok := user.(*model.User); ok {
-				if userModel.Status == model.UserStatusNormal && userModel.IsAdmin {
-					c.Next()
-					return
-				}
-			}
-		}
-
-		response := app.NewResponse(c)
-		response.ToErrorResponse(errcode.NoAdminPermission)
-		c.Abort()
-	}
-}

internal/middleware/jwt.go

@@ -1,113 +0,0 @@
-package middleware
-
-import (
-	"strings"
-
-	"github.com/gin-gonic/gin"
-	"github.com/golang-jwt/jwt/v4"
-	"github.com/rocboss/paopao-ce/internal/conf"
-	"github.com/rocboss/paopao-ce/internal/model"
-	"github.com/rocboss/paopao-ce/pkg/app"
-	"github.com/rocboss/paopao-ce/pkg/errcode"
-)
-
-func JWT() gin.HandlerFunc {
-	// TODO: optimize get user from a simple service that provide fetch a user info interface.
-	db := conf.MustGormDB()
-	return func(c *gin.Context) {
-		var (
-			token string
-			ecode = errcode.Success
-		)
-		if s, exist := c.GetQuery("token"); exist {
-			token = s
-		} else {
-			token = c.GetHeader("Authorization")
-
-			// 验证前端传过来的token格式，不为空，开头为Bearer
-			if token == "" || !strings.HasPrefix(token, "Bearer ") {
-				response := app.NewResponse(c)
-				response.ToErrorResponse(errcode.UnauthorizedTokenError)
-				c.Abort()
-				return
-			}
-
-			// 验证通过，提取有效部分（除去Bearer)
-			token = token[7:]
-		}
-		if token == "" {
-			ecode = errcode.InvalidParams
-		} else {
-			claims, err := app.ParseToken(token)
-			if err != nil {
-				switch err.(*jwt.ValidationError).Errors {
-				case jwt.ValidationErrorExpired:
-					ecode = errcode.UnauthorizedTokenTimeout
-				default:
-					ecode = errcode.UnauthorizedTokenError
-				}
-			} else {
-				c.Set("UID", claims.UID)
-				c.Set("USERNAME", claims.Username)
-
-				// 加载用户信息
-				user := &model.User{
-					Model: &model.Model{
-						ID: claims.UID,
-					},
-				}
-				user, _ = user.Get(db)
-				c.Set("USER", user)
-
-				// 强制下线机制
-				if (conf.JWTSetting.Issuer + ":" + user.Salt) != claims.Issuer {
-					ecode = errcode.UnauthorizedTokenTimeout
-				}
-			}
-		}
-
-		if ecode != errcode.Success {
-			response := app.NewResponse(c)
-			response.ToErrorResponse(ecode)
-			c.Abort()
-			return
-		}
-
-		c.Next()
-	}
-}
-
-func JwtLoose() gin.HandlerFunc {
-	// TODO: optimize get user from a simple service that provide fetch a user info interface.
-	db := conf.MustGormDB()
-	return func(c *gin.Context) {
-		token, exist := c.GetQuery("token")
-		if !exist {
-			token = c.GetHeader("Authorization")
-			// 验证前端传过来的token格式，不为空，开头为Bearer
-			if strings.HasPrefix(token, "Bearer ") {
-				// 验证通过，提取有效部分（除去Bearer)
-				token = token[7:]
-			} else {
-				c.Next()
-			}
-		}
-		if len(token) > 0 {
-			if claims, err := app.ParseToken(token); err == nil {
-				c.Set("UID", claims.UID)
-				c.Set("USERNAME", claims.Username)
-				// 加载用户信息
-				user := &model.User{
-					Model: &model.Model{
-						ID: claims.UID,
-					},
-				}
-				user, err := user.Get(db)
-				if err == nil && (conf.JWTSetting.Issuer+":"+user.Salt) == claims.Issuer {
-					c.Set("USER", user)
-				}
-			}
-		}
-		c.Next()
-	}
-}

internal/middleware/priv.go

@@ -1,45 +0,0 @@
-package middleware
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/rocboss/paopao-ce/internal/model"
-	"github.com/rocboss/paopao-ce/pkg/app"
-	"github.com/rocboss/paopao-ce/pkg/cfg"
-	"github.com/rocboss/paopao-ce/pkg/errcode"
-)
-
-func Priv() gin.HandlerFunc {
-	if cfg.If("PhoneBind") {
-		return func(c *gin.Context) {
-			if u, exist := c.Get("USER"); exist {
-				if user, ok := u.(*model.User); ok {
-					if user.Status == model.UserStatusNormal {
-						if user.Phone == "" {
-							response := app.NewResponse(c)
-							response.ToErrorResponse(errcode.AccountNoPhoneBind)
-							c.Abort()
-							return
-						}
-						c.Next()
-						return
-					}
-				}
-			}
-			response := app.NewResponse(c)
-			response.ToErrorResponse(errcode.UserHasBeenBanned)
-			c.Abort()
-		}
-	} else {
-		return func(c *gin.Context) {
-			if u, exist := c.Get("USER"); exist {
-				if user, ok := u.(*model.User); ok && user.Status == model.UserStatusNormal {
-					c.Next()
-					return
-				}
-			}
-			response := app.NewResponse(c)
-			response.ToErrorResponse(errcode.UserHasBeenBanned)
-			c.Abort()
-		}
-	}
-}

internal/mirc/main.go

@@ -1,3 +1,7 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
 package main
 
 import (

internal/model/attachment.go

@@ -1,27 +0,0 @@
-package model
-
-import "gorm.io/gorm"
-
-type AttachmentType int
-
-const (
-	ATTACHMENT_TYPE_IMAGE AttachmentType = iota + 1
-	ATTACHMENT_TYPE_VIDEO
-	ATTACHMENT_TYPE_OTHER
-)
-
-type Attachment struct {
-	*Model
-	UserID    int64          `json:"user_id"`
-	FileSize  int64          `json:"file_size"`
-	ImgWidth  int            `json:"img_width"`
-	ImgHeight int            `json:"img_height"`
-	Type      AttachmentType `json:"type"`
-	Content   string         `json:"content"`
-}
-
-func (a *Attachment) Create(db *gorm.DB) (*Attachment, error) {
-	err := db.Create(&a).Error
-
-	return a, err
-}

internal/model/captcha.go

@@ -1,38 +0,0 @@
-package model
-
-import "gorm.io/gorm"
-
-type Captcha struct {
-	*Model
-	Phone     string `json:"phone"`
-	Captcha   string `json:"captcha"`
-	UseTimes  int    `json:"use_times"`
-	ExpiredOn int64  `json:"expired_on"`
-}
-
-func (c *Captcha) Create(db *gorm.DB) (*Captcha, error) {
-	err := db.Create(&c).Error
-
-	return c, err
-}
-
-func (c *Captcha) Update(db *gorm.DB) error {
-	return db.Model(&Captcha{}).Where("id = ? AND is_del = ?", c.Model.ID, 0).Save(c).Error
-}
-
-func (c *Captcha) Get(db *gorm.DB) (*Captcha, error) {
-	var captcha Captcha
-	if c.Model != nil && c.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", c.ID, 0)
-	}
-	if c.Phone != "" {
-		db = db.Where("phone = ?", c.Phone)
-	}
-
-	err := db.Last(&captcha).Error
-	if err != nil {
-		return &captcha, err
-	}
-
-	return &captcha, nil
-}

internal/model/comment.go

@@ -1,127 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type Comment struct {
-	*Model
-	PostID int64  `json:"post_id"`
-	UserID int64  `json:"user_id"`
-	IP     string `json:"ip"`
-	IPLoc  string `json:"ip_loc"`
-}
-
-type CommentFormated struct {
-	ID         int64                   `json:"id"`
-	PostID     int64                   `json:"post_id"`
-	UserID     int64                   `json:"user_id"`
-	User       *UserFormated           `json:"user"`
-	Contents   []*CommentContent       `json:"contents"`
-	Replies    []*CommentReplyFormated `json:"replies"`
-	IPLoc      string                  `json:"ip_loc"`
-	CreatedOn  int64                   `json:"created_on"`
-	ModifiedOn int64                   `json:"modified_on"`
-}
-
-func (c *Comment) Format() *CommentFormated {
-	if c.Model == nil {
-		return &CommentFormated{}
-	}
-	return &CommentFormated{
-		ID:         c.Model.ID,
-		PostID:     c.PostID,
-		UserID:     c.UserID,
-		User:       &UserFormated{},
-		Contents:   []*CommentContent{},
-		Replies:    []*CommentReplyFormated{},
-		IPLoc:      c.IPLoc,
-		CreatedOn:  c.CreatedOn,
-		ModifiedOn: c.ModifiedOn,
-	}
-}
-
-func (c *Comment) Get(db *gorm.DB) (*Comment, error) {
-	var comment Comment
-	if c.Model != nil && c.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", c.ID, 0)
-	} else {
-		return nil, gorm.ErrRecordNotFound
-	}
-
-	err := db.First(&comment).Error
-	if err != nil {
-		return &comment, err
-	}
-
-	return &comment, nil
-}
-
-func (c *Comment) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*Comment, error) {
-	var comments []*Comment
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if c.PostID > 0 {
-		db = db.Where("id = ?", c.PostID)
-	}
-
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&comments).Error; err != nil {
-		return nil, err
-	}
-
-	return comments, nil
-}
-
-func (c *Comment) Count(db *gorm.DB, conditions *ConditionsT) (int64, error) {
-	var count int64
-	if c.PostID > 0 {
-		db = db.Where("post_id = ?", c.PostID)
-	}
-	for k, v := range *conditions {
-		if k != "ORDER" {
-			db = db.Where(k, v)
-		}
-	}
-	if err := db.Model(c).Count(&count).Error; err != nil {
-		return 0, err
-	}
-
-	return count, nil
-}
-
-func (c *Comment) Create(db *gorm.DB) (*Comment, error) {
-	err := db.Create(&c).Error
-
-	return c, err
-}
-
-func (c *Comment) Delete(db *gorm.DB) error {
-	return db.Model(c).Where("id = ?", c.Model.ID).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}
-
-func (c *Comment) CommentIdsByPostId(db *gorm.DB, postId int64) (ids []int64, err error) {
-	err = db.Model(c).Where("post_id = ?", postId).Select("id").Find(&ids).Error
-	return
-}
-
-func (c *Comment) DeleteByPostId(db *gorm.DB, postId int64) error {
-	return db.Model(c).Where("post_id = ?", postId).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}

internal/model/comment_content.go

@@ -1,59 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type CommentContent struct {
-	*Model
-	CommentID int64        `json:"comment_id"`
-	UserID    int64        `json:"user_id"`
-	Content   string       `json:"content"`
-	Type      PostContentT `json:"type"`
-	Sort      int64        `json:"sort"`
-}
-
-func (c *CommentContent) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*CommentContent, error) {
-	var comments []*CommentContent
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if c.CommentID > 0 {
-		db = db.Where("id = ?", c.CommentID)
-	}
-
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&comments).Error; err != nil {
-		return nil, err
-	}
-
-	return comments, nil
-}
-
-func (c *CommentContent) Create(db *gorm.DB) (*CommentContent, error) {
-	err := db.Create(&c).Error
-
-	return c, err
-}
-
-func (c *CommentContent) MediaContentsByCommentId(db *gorm.DB, commentIds []int64) (contents []string, err error) {
-	err = db.Model(c).Where("comment_id IN ? AND type = ?", commentIds, CONTENT_TYPE_IMAGE).Select("content").Find(&contents).Error
-	return
-}
-
-func (c *CommentContent) DeleteByCommentIds(db *gorm.DB, commentIds []int64) error {
-	return db.Model(c).Where("comment_id IN ?", commentIds).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}

internal/model/comment_reply.go

@@ -1,110 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type CommentReply struct {
-	*Model
-	CommentID int64  `json:"comment_id"`
-	UserID    int64  `json:"user_id"`
-	AtUserID  int64  `json:"at_user_id"`
-	Content   string `json:"content"`
-	IP        string `json:"ip"`
-	IPLoc     string `json:"ip_loc"`
-}
-
-type CommentReplyFormated struct {
-	ID         int64         `json:"id"`
-	CommentID  int64         `json:"comment_id"`
-	UserID     int64         `json:"user_id"`
-	User       *UserFormated `json:"user"`
-	AtUserID   int64         `json:"at_user_id"`
-	AtUser     *UserFormated `json:"at_user"`
-	Content    string        `json:"content"`
-	IPLoc      string        `json:"ip_loc"`
-	CreatedOn  int64         `json:"created_on"`
-	ModifiedOn int64         `json:"modified_on"`
-}
-
-func (c *CommentReply) Format() *CommentReplyFormated {
-	if c.Model == nil {
-		return &CommentReplyFormated{}
-	}
-
-	return &CommentReplyFormated{
-		ID:         c.ID,
-		CommentID:  c.CommentID,
-		UserID:     c.UserID,
-		User:       &UserFormated{},
-		AtUserID:   c.AtUserID,
-		AtUser:     &UserFormated{},
-		Content:    c.Content,
-		IPLoc:      c.IPLoc,
-		CreatedOn:  c.CreatedOn,
-		ModifiedOn: c.ModifiedOn,
-	}
-}
-
-func (c *CommentReply) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*CommentReply, error) {
-	var comments []*CommentReply
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if c.CommentID > 0 {
-		db = db.Where("id = ?", c.CommentID)
-	}
-
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&comments).Error; err != nil {
-		return nil, err
-	}
-
-	return comments, nil
-}
-
-func (c *CommentReply) Create(db *gorm.DB) (*CommentReply, error) {
-	err := db.Create(&c).Error
-
-	return c, err
-}
-
-func (c *CommentReply) Get(db *gorm.DB) (*CommentReply, error) {
-	var reply CommentReply
-	if c.Model != nil && c.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", c.ID, 0)
-	} else {
-		return nil, gorm.ErrRecordNotFound
-	}
-
-	err := db.First(&reply).Error
-	if err != nil {
-		return &reply, err
-	}
-
-	return &reply, nil
-}
-
-func (c *CommentReply) Delete(db *gorm.DB) error {
-	return db.Model(&CommentReply{}).Where("id = ? AND is_del = ?", c.Model.ID, 0).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}
-
-func (c *CommentReply) DeleteByCommentIds(db *gorm.DB, commentIds []int64) error {
-	return db.Model(c).Where("comment_id IN ?", commentIds).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}

internal/model/contact.go

@@ -1,119 +0,0 @@
-package model
-
-import (
-	"github.com/sirupsen/logrus"
-	"gorm.io/gorm"
-)
-
-const (
-	ContactStatusRequesting int8 = iota + 1
-	ContactStatusAgree
-	ContactStatusReject
-	ContactStatusDeleted
-)
-
-type Contact struct {
-	*Model
-	User         *User  `json:"-" gorm:"foreignKey:ID;references:FriendId"`
-	UserId       int64  `json:"user_id"`
-	FriendId     int64  `json:"friend_id"`
-	GroupId      int64  `json:"group_id"`
-	Remark       string `json:"remark"`
-	Status       int8   `json:"status"` // 1请求好友, 2已同意好友, 3已拒绝好友, 4已删除好友
-	IsTop        int8   `json:"is_top"`
-	IsBlack      int8   `json:"is_black"`
-	NoticeEnable int8   `json:"notice_enable"`
-}
-
-func (c *Contact) FetchUser(db *gorm.DB) (*Contact, error) {
-	var contact Contact
-	err := db.Omit("User").Unscoped().Where("user_id = ? AND friend_id = ?", c.UserId, c.FriendId).First(&contact).Error
-	if err != nil {
-		logrus.Debugf("Contact.FetchUser fetch user error:%s", err)
-		return nil, err
-	}
-	return &contact, nil
-}
-
-func (c *Contact) GetByUserFriend(db *gorm.DB) (*Contact, error) {
-	var contact Contact
-	err := db.Omit("User").Where("user_id = ? AND friend_id = ?", c.UserId, c.FriendId).First(&contact).Error
-	if err != nil {
-		return nil, err
-	}
-	return &contact, nil
-}
-
-func (c *Contact) FetchByUserFriendAll(db *gorm.DB) ([]*Contact, error) {
-	var contacts []*Contact
-	if err := db.Omit("User").
-		Where("(user_id = ? AND friend_id = ?) OR (user_id = ? AND friend_id = ?)",
-			c.UserId, c.FriendId, c.FriendId, c.UserId).
-		Find(&contacts).Error; err != nil {
-		return nil, err
-	}
-	return contacts, nil
-}
-
-func (c *Contact) List(db *gorm.DB, conditions ConditionsT, offset, limit int) ([]*Contact, error) {
-	var contacts []*Contact
-	var err error
-	tn := db.NamingStrategy.TableName("Contact") + "."
-
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	for k, v := range conditions {
-		if k != "ORDER" {
-			db = db.Where(tn+k, v)
-		}
-	}
-
-	db.Joins("User").Order("`User`.`nickname` ASC")
-	if err = db.Find(&contacts).Error; err != nil {
-		return nil, err
-	}
-	return contacts, nil
-}
-
-func (c *Contact) BeFriendIds(db *gorm.DB) (ids []int64, err error) {
-	if err = db.Model(c).Omit("User").Select("user_id").Where("friend_id = ? AND status = ?", c.FriendId, ContactStatusAgree).Find(&ids).Error; err != nil {
-		return nil, err
-	}
-	return
-}
-
-func (c *Contact) MyFriendIds(db *gorm.DB) (ids []string, err error) {
-	if err = db.Model(c).Omit("User").Select("friend_id").Where("user_id = ? AND status = ?", c.UserId, ContactStatusAgree).Find(&ids).Error; err != nil {
-		return nil, err
-	}
-	return
-}
-
-func (m *Contact) Count(db *gorm.DB, conditions ConditionsT) (int64, error) {
-	var count int64
-
-	for k, v := range conditions {
-		if k != "ORDER" {
-			db = db.Where(k, v)
-		}
-	}
-	if err := db.Model(m).Omit("User").Count(&count).Error; err != nil {
-		return 0, err
-	}
-
-	return count, nil
-}
-
-func (c *Contact) Create(db *gorm.DB) (*Contact, error) {
-	err := db.Omit("User").Create(&c).Error
-	return c, err
-}
-
-func (c *Contact) Update(db *gorm.DB) error {
-	return db.Model(&Contact{}).Omit("User").Where("id = ?", c.Model.ID).Save(c).Error
-}
-
-func (c *Contact) UpdateInUnscoped(db *gorm.DB) error {
-	return db.Unscoped().Omit("User").Save(c).Error
-}

internal/model/message.go

@@ -1,148 +0,0 @@
-package model
-
-import "gorm.io/gorm"
-
-type MessageT int8
-
-const (
-	MsgTypePost MessageT = iota + 1
-	MsgtypeComment
-	MsgTypeReply
-	MsgTypeWhisper
-	MsgTypeRequestingFriend
-	MsgTypeSystem MessageT = 99
-
-	MsgStatusUnread = 0
-	MsgStatusReaded = 1
-)
-
-type Message struct {
-	*Model
-	SenderUserID   int64    `json:"sender_user_id"`
-	ReceiverUserID int64    `json:"receiver_user_id"`
-	Type           MessageT `json:"type"`
-	Brief          string   `json:"brief"`
-	Content        string   `json:"content"`
-	PostID         int64    `json:"post_id"`
-	CommentID      int64    `json:"comment_id"`
-	ReplyID        int64    `json:"reply_id"`
-	IsRead         int8     `json:"is_read"`
-}
-
-type MessageFormated struct {
-	ID             int64         `json:"id"`
-	SenderUserID   int64         `json:"sender_user_id"`
-	SenderUser     *UserFormated `json:"sender_user"`
-	ReceiverUserID int64         `json:"receiver_user_id"`
-	Type           MessageT      `json:"type"`
-	Brief          string        `json:"brief"`
-	Content        string        `json:"content"`
-	PostID         int64         `json:"post_id"`
-	Post           *PostFormated `json:"post"`
-	CommentID      int64         `json:"comment_id"`
-	Comment        *Comment      `json:"comment"`
-	ReplyID        int64         `json:"reply_id"`
-	Reply          *CommentReply `json:"reply"`
-	IsRead         int8          `json:"is_read"`
-	CreatedOn      int64         `json:"created_on"`
-	ModifiedOn     int64         `json:"modified_on"`
-}
-
-func (m *Message) Format() *MessageFormated {
-	if m.Model == nil || m.Model.ID == 0 {
-		return nil
-	}
-	mf := &MessageFormated{
-		ID:             m.ID,
-		SenderUserID:   m.SenderUserID,
-		SenderUser:     &UserFormated{},
-		ReceiverUserID: m.ReceiverUserID,
-		Type:           m.Type,
-		Brief:          m.Brief,
-		Content:        m.Content,
-		PostID:         m.PostID,
-		Post:           &PostFormated{},
-		CommentID:      m.CommentID,
-		Comment:        &Comment{},
-		ReplyID:        m.ReplyID,
-		Reply:          &CommentReply{},
-		IsRead:         m.IsRead,
-		CreatedOn:      m.CreatedOn,
-		ModifiedOn:     m.ModifiedOn,
-	}
-
-	return mf
-}
-
-func (m *Message) Create(db *gorm.DB) (*Message, error) {
-	err := db.Create(&m).Error
-
-	return m, err
-}
-
-func (m *Message) Update(db *gorm.DB) error {
-	return db.Model(&Message{}).Where("id = ? AND is_del = ?", m.Model.ID, 0).Save(m).Error
-}
-
-func (m *Message) Get(db *gorm.DB) (*Message, error) {
-	var message Message
-	if m.Model != nil && m.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", m.ID, 0)
-	}
-	if m.ReceiverUserID > 0 {
-		db = db.Where("receiver_user_id = ?", m.ReceiverUserID)
-	}
-	if err := db.First(&message).Error; err != nil {
-		return nil, err
-	}
-	return &message, nil
-}
-
-func (m *Message) FetchBy(db *gorm.DB, predicates Predicates) ([]*Message, error) {
-	var messages []*Message
-	for k, v := range predicates {
-		db = db.Where(k, v...)
-	}
-	db = db.Where("is_del = 0")
-	if err := db.Find(&messages).Error; err != nil {
-		return nil, err
-	}
-	return messages, nil
-}
-
-func (c *Message) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*Message, error) {
-	var messages []*Message
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&messages).Error; err != nil {
-		return nil, err
-	}
-
-	return messages, nil
-}
-
-func (m *Message) Count(db *gorm.DB, conditions *ConditionsT) (int64, error) {
-	var count int64
-
-	for k, v := range *conditions {
-		if k != "ORDER" {
-			db = db.Where(k, v)
-		}
-	}
-	if err := db.Model(m).Count(&count).Error; err != nil {
-		return 0, err
-	}
-
-	return count, nil
-}

internal/model/post.go

@@ -1,208 +0,0 @@
-package model
-
-import (
-	"strings"
-	"time"
-
-	"gorm.io/gorm"
-)
-
-// PostVisibleT 可访问类型，0公开，1私密，2好友
-type PostVisibleT uint8
-
-const (
-	PostVisitPublic PostVisibleT = iota
-	PostVisitPrivate
-	PostVisitFriend
-	PostVisitInvalid
-)
-
-type Post struct {
-	*Model
-	UserID          int64        `json:"user_id"`
-	CommentCount    int64        `json:"comment_count"`
-	CollectionCount int64        `json:"collection_count"`
-	UpvoteCount     int64        `json:"upvote_count"`
-	Visibility      PostVisibleT `json:"visibility"`
-	IsTop           int          `json:"is_top"`
-	IsEssence       int          `json:"is_essence"`
-	IsLock          int          `json:"is_lock"`
-	LatestRepliedOn int64        `json:"latest_replied_on"`
-	Tags            string       `json:"tags"`
-	AttachmentPrice int64        `json:"attachment_price"`
-	IP              string       `json:"ip"`
-	IPLoc           string       `json:"ip_loc"`
-}
-
-type PostFormated struct {
-	ID              int64                  `json:"id"`
-	UserID          int64                  `json:"user_id"`
-	User            *UserFormated          `json:"user"`
-	Contents        []*PostContentFormated `json:"contents"`
-	CommentCount    int64                  `json:"comment_count"`
-	CollectionCount int64                  `json:"collection_count"`
-	UpvoteCount     int64                  `json:"upvote_count"`
-	Visibility      PostVisibleT           `json:"visibility"`
-	IsTop           int                    `json:"is_top"`
-	IsEssence       int                    `json:"is_essence"`
-	IsLock          int                    `json:"is_lock"`
-	LatestRepliedOn int64                  `json:"latest_replied_on"`
-	CreatedOn       int64                  `json:"created_on"`
-	ModifiedOn      int64                  `json:"modified_on"`
-	Tags            map[string]int8        `json:"tags"`
-	AttachmentPrice int64                  `json:"attachment_price"`
-	IPLoc           string                 `json:"ip_loc"`
-}
-
-func (p *Post) Format() *PostFormated {
-	if p.Model != nil {
-		tagsMap := map[string]int8{}
-		for _, tag := range strings.Split(p.Tags, ",") {
-			tagsMap[tag] = 1
-		}
-		return &PostFormated{
-			ID:              p.ID,
-			UserID:          p.UserID,
-			User:            &UserFormated{},
-			Contents:        []*PostContentFormated{},
-			CommentCount:    p.CommentCount,
-			CollectionCount: p.CollectionCount,
-			UpvoteCount:     p.UpvoteCount,
-			Visibility:      p.Visibility,
-			IsTop:           p.IsTop,
-			IsEssence:       p.IsEssence,
-			IsLock:          p.IsLock,
-			LatestRepliedOn: p.LatestRepliedOn,
-			CreatedOn:       p.CreatedOn,
-			ModifiedOn:      p.ModifiedOn,
-			AttachmentPrice: p.AttachmentPrice,
-			Tags:            tagsMap,
-			IPLoc:           p.IPLoc,
-		}
-	}
-
-	return nil
-}
-
-func (p *Post) Create(db *gorm.DB) (*Post, error) {
-	err := db.Create(&p).Error
-
-	return p, err
-}
-
-func (s *Post) Delete(db *gorm.DB) error {
-	return db.Model(s).Where("id = ?", s.Model.ID).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}
-
-func (p *Post) Get(db *gorm.DB) (*Post, error) {
-	var post Post
-	if p.Model != nil && p.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", p.ID, 0)
-	} else {
-		return nil, gorm.ErrRecordNotFound
-	}
-
-	err := db.First(&post).Error
-	if err != nil {
-		return &post, err
-	}
-
-	return &post, nil
-}
-
-func (p *Post) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*Post, error) {
-	var posts []*Post
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if p.UserID > 0 {
-		db = db.Where("user_id = ?", p.UserID)
-	}
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&posts).Error; err != nil {
-		return nil, err
-	}
-
-	return posts, nil
-}
-
-func (p *Post) Fetch(db *gorm.DB, predicates Predicates, offset, limit int) ([]*Post, error) {
-	var posts []*Post
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if p.UserID > 0 {
-		db = db.Where("user_id = ?", p.UserID)
-	}
-	for query, args := range predicates {
-		if query == "ORDER" {
-			db = db.Order(args[0])
-		} else {
-			db = db.Where(query, args...)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&posts).Error; err != nil {
-		return nil, err
-	}
-
-	return posts, nil
-}
-
-func (p *Post) CountBy(db *gorm.DB, predicates Predicates) (count int64, err error) {
-	for query, args := range predicates {
-		if query != "ORDER" {
-			db = db.Where(query, args...)
-		}
-	}
-	err = db.Model(p).Count(&count).Error
-	return
-}
-
-func (p *Post) Count(db *gorm.DB, conditions *ConditionsT) (int64, error) {
-	var count int64
-	if p.UserID > 0 {
-		db = db.Where("user_id = ?", p.UserID)
-	}
-	for k, v := range *conditions {
-		if k != "ORDER" {
-			db = db.Where(k, v)
-		}
-	}
-	if err := db.Model(p).Count(&count).Error; err != nil {
-		return 0, err
-	}
-
-	return count, nil
-}
-
-func (p *Post) Update(db *gorm.DB) error {
-	return db.Model(&Post{}).Where("id = ? AND is_del = ?", p.Model.ID, 0).Save(p).Error
-}
-
-func (p PostVisibleT) String() string {
-	switch p {
-	case PostVisitPublic:
-		return "public"
-	case PostVisitPrivate:
-		return "private"
-	case PostVisitFriend:
-		return "friend"
-	case PostVisitInvalid:
-		return "invalid"
-	default:
-		return "unknow"
-	}
-}

internal/model/post_attachment_bill.go

@@ -1,36 +0,0 @@
-package model
-
-import "gorm.io/gorm"
-
-type PostAttachmentBill struct {
-	*Model
-	PostID     int64 `json:"post_id"`
-	UserID     int64 `json:"user_id"`
-	PaidAmount int64 `json:"paid_amount"`
-}
-
-func (p *PostAttachmentBill) Get(db *gorm.DB) (*PostAttachmentBill, error) {
-	var pas PostAttachmentBill
-	if p.Model != nil && p.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", p.ID, 0)
-	}
-	if p.PostID > 0 {
-		db = db.Where("post_id = ?", p.PostID)
-	}
-	if p.UserID > 0 {
-		db = db.Where("user_id = ?", p.UserID)
-	}
-
-	err := db.First(&pas).Error
-	if err != nil {
-		return &pas, err
-	}
-
-	return &pas, nil
-}
-
-func (p *PostAttachmentBill) Create(db *gorm.DB) (*PostAttachmentBill, error) {
-	err := db.Create(&p).Error
-
-	return p, err
-}

internal/model/post_collection.go

@@ -1,102 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type PostCollection struct {
-	*Model
-	Post   *Post `json:"-"`
-	PostID int64 `json:"post_id"`
-	UserID int64 `json:"user_id"`
-}
-
-func (p *PostCollection) Get(db *gorm.DB) (*PostCollection, error) {
-	var star PostCollection
-	tn := db.NamingStrategy.TableName("PostCollection") + "."
-
-	if p.Model != nil && p.ID > 0 {
-		db = db.Where(tn+"id = ? AND "+tn+"is_del = ?", p.ID, 0)
-	}
-	if p.PostID > 0 {
-		db = db.Where(tn+"post_id = ?", p.PostID)
-	}
-	if p.UserID > 0 {
-		db = db.Where(tn+"user_id = ?", p.UserID)
-	}
-
-	db = db.Joins("Post").Where("Post.visibility <> ?", PostVisitPrivate).Order("Post.id DESC")
-	err := db.First(&star).Error
-	if err != nil {
-		return &star, err
-	}
-
-	return &star, nil
-}
-
-func (p *PostCollection) Create(db *gorm.DB) (*PostCollection, error) {
-	err := db.Omit("Post").Create(&p).Error
-
-	return p, err
-}
-
-func (p *PostCollection) Delete(db *gorm.DB) error {
-	return db.Model(&PostCollection{}).Omit("Post").Where("id = ? AND is_del = ?", p.Model.ID, 0).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}
-
-func (p *PostCollection) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*PostCollection, error) {
-	var collections []*PostCollection
-	var err error
-	tn := db.NamingStrategy.TableName("PostCollection") + "."
-
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if p.UserID > 0 {
-		db = db.Where(tn+"user_id = ?", p.UserID)
-	}
-
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(tn+k, v)
-		}
-	}
-
-	db = db.Joins("Post").Where("Post.visibility <> ?", PostVisitPrivate).Order("Post.id DESC")
-	if err = db.Where(tn+"is_del = ?", 0).Find(&collections).Error; err != nil {
-		return nil, err
-	}
-
-	return collections, nil
-}
-
-func (p *PostCollection) Count(db *gorm.DB, conditions *ConditionsT) (int64, error) {
-	var count int64
-	tn := db.NamingStrategy.TableName("PostCollection") + "."
-
-	if p.PostID > 0 {
-		db = db.Where(tn+"post_id = ?", p.PostID)
-	}
-	if p.UserID > 0 {
-		db = db.Where(tn+"user_id = ?", p.UserID)
-	}
-	for k, v := range *conditions {
-		if k != "ORDER" {
-			db = db.Where(tn+k, v)
-		}
-	}
-
-	db = db.Joins("Post").Where("Post.visibility <> ?", PostVisitPrivate)
-	if err := db.Model(p).Count(&count).Error; err != nil {
-		return 0, err
-	}
-
-	return count, nil
-}

internal/model/post_content.go

@@ -1,121 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-// 类型，1标题，2文字段落，3图片地址，4视频地址，5语音地址，6链接地址，7附件资源
-
-type PostContentT int
-
-const (
-	CONTENT_TYPE_TITLE PostContentT = iota + 1
-	CONTENT_TYPE_TEXT
-	CONTENT_TYPE_IMAGE
-	CONTENT_TYPE_VIDEO
-	CONTENT_TYPE_AUDIO
-	CONTENT_TYPE_LINK
-	CONTENT_TYPE_ATTACHMENT
-	CONTENT_TYPE_CHARGE_ATTACHMENT
-)
-
-var (
-	mediaContentType = []PostContentT{
-		CONTENT_TYPE_IMAGE,
-		CONTENT_TYPE_VIDEO,
-		CONTENT_TYPE_AUDIO,
-		CONTENT_TYPE_ATTACHMENT,
-		CONTENT_TYPE_CHARGE_ATTACHMENT,
-	}
-)
-
-type PostContent struct {
-	*Model
-	PostID  int64        `json:"post_id"`
-	UserID  int64        `json:"user_id"`
-	Content string       `json:"content"`
-	Type    PostContentT `json:"type"`
-	Sort    int64        `json:"sort"`
-}
-
-type PostContentFormated struct {
-	ID      int64        `json:"id"`
-	PostID  int64        `json:"post_id"`
-	Content string       `json:"content"`
-	Type    PostContentT `json:"type"`
-	Sort    int64        `json:"sort"`
-}
-
-func (p *PostContent) DeleteByPostId(db *gorm.DB, postId int64) error {
-	return db.Model(p).Where("post_id = ?", postId).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}
-
-func (p *PostContent) MediaContentsByPostId(db *gorm.DB, postId int64) (contents []string, err error) {
-	err = db.Model(p).Where("post_id = ? AND type IN ?", postId, mediaContentType).Select("content").Find(&contents).Error
-	return
-}
-
-func (p *PostContent) Create(db *gorm.DB) (*PostContent, error) {
-	err := db.Create(&p).Error
-
-	return p, err
-}
-
-func (p *PostContent) Format() *PostContentFormated {
-	if p.Model == nil {
-		return nil
-	}
-	return &PostContentFormated{
-		ID:      p.ID,
-		PostID:  p.PostID,
-		Content: p.Content,
-		Type:    p.Type,
-		Sort:    p.Sort,
-	}
-}
-
-func (p *PostContent) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*PostContent, error) {
-	var contents []*PostContent
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if p.PostID > 0 {
-		db = db.Where("id = ?", p.PostID)
-	}
-
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&contents).Error; err != nil {
-		return nil, err
-	}
-
-	return contents, nil
-}
-
-func (p *PostContent) Get(db *gorm.DB) (*PostContent, error) {
-	var content PostContent
-	if p.Model != nil && p.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", p.ID, 0)
-	} else {
-		return nil, gorm.ErrRecordNotFound
-	}
-
-	err := db.First(&content).Error
-	if err != nil {
-		return &content, err
-	}
-
-	return &content, nil
-}

internal/model/post_star.go

@@ -1,98 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type PostStar struct {
-	*Model
-	Post   *Post `json:"-"`
-	PostID int64 `json:"post_id"`
-	UserID int64 `json:"user_id"`
-}
-
-func (p *PostStar) Get(db *gorm.DB) (*PostStar, error) {
-	var star PostStar
-	tn := db.NamingStrategy.TableName("PostStar") + "."
-
-	if p.Model != nil && p.ID > 0 {
-		db = db.Where(tn+"id = ? AND "+tn+"is_del = ?", p.ID, 0)
-	}
-	if p.PostID > 0 {
-		db = db.Where(tn+"post_id = ?", p.PostID)
-	}
-	if p.UserID > 0 {
-		db = db.Where(tn+"user_id = ?", p.UserID)
-	}
-
-	db = db.Joins("Post").Where("Post.visibility <> ?", PostVisitPrivate).Order("Post.id DESC")
-	if err := db.First(&star).Error; err != nil {
-		return nil, err
-	}
-	return &star, nil
-}
-
-func (p *PostStar) Create(db *gorm.DB) (*PostStar, error) {
-	err := db.Omit("Post").Create(&p).Error
-
-	return p, err
-}
-
-func (p *PostStar) Delete(db *gorm.DB) error {
-	return db.Model(&PostStar{}).Omit("Post").Where("id = ? AND is_del = ?", p.Model.ID, 0).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}
-
-func (p *PostStar) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*PostStar, error) {
-	var stars []*PostStar
-	var err error
-	tn := db.NamingStrategy.TableName("PostStar") + "."
-
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if p.UserID > 0 {
-		db = db.Where(tn+"user_id = ?", p.UserID)
-	}
-
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(tn+k, v)
-		}
-	}
-
-	db = db.Joins("Post").Where("Post.visibility <> ?", PostVisitPrivate).Order("Post.id DESC")
-	if err = db.Find(&stars).Error; err != nil {
-		return nil, err
-	}
-	return stars, nil
-}
-
-func (p *PostStar) Count(db *gorm.DB, conditions *ConditionsT) (int64, error) {
-	var count int64
-	tn := db.NamingStrategy.TableName("PostStar") + "."
-
-	if p.PostID > 0 {
-		db = db.Where(tn+"post_id = ?", p.PostID)
-	}
-	if p.UserID > 0 {
-		db = db.Where(tn+"user_id = ?", p.UserID)
-	}
-	for k, v := range *conditions {
-		if k != "ORDER" {
-			db = db.Where(tn+k, v)
-		}
-	}
-
-	db = db.Joins("Post").Where("Post.visibility <> ?", PostVisitPrivate)
-	if err := db.Model(p).Count(&count).Error; err != nil {
-		return 0, err
-	}
-	return count, nil
-}

internal/model/rest/contacts.go

@@ -1,31 +0,0 @@
-package rest
-
-type RequestingFriendReq struct {
-	UserId    int64  `json:"user_id" binding:"required"`
-	Greetings string `json:"greetings" binding:"required"`
-}
-
-type AddFriendReq struct {
-	UserId int64 `json:"user_id" binding:"required"`
-}
-
-type RejectFriendReq struct {
-	UserId int64 `json:"user_id" binding:"required"`
-}
-
-type DeleteFriendReq struct {
-	UserId int64 `json:"user_id"`
-}
-
-type ContactItem struct {
-	UserId   int64  `json:"user_id"`
-	UserName string `json:"username"`
-	Nickname string `json:"nickname"`
-	Avatar   string `json:"avatar"`
-	Phone    string `json:"phone"`
-}
-
-type ContactsResp struct {
-	Contacts []ContactItem `json:"contacts"`
-	Total    int64         `json:"total"`
-}

internal/model/rest/tweets.go

@@ -1,8 +0,0 @@
-package rest
-
-import "github.com/rocboss/paopao-ce/internal/model"
-
-type IndexTweetsResp struct {
-	Tweets []*model.PostFormated
-	Total  int64
-}

internal/model/rest/user.go

@@ -1,11 +0,0 @@
-package rest
-
-type UserProfileResp struct {
-	ID       int64  `json:"id"`
-	Nickname string `json:"nickname"`
-	Username string `json:"username"`
-	Status   int    `json:"status"`
-	Avatar   string `json:"avatar"`
-	IsAdmin  bool   `json:"is_admin"`
-	IsFriend bool   `json:"is_friend"`
-}

internal/model/tag.go

@@ -1,97 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type Tag struct {
-	*Model
-	UserID   int64  `json:"user_id"`
-	Tag      string `json:"tag"`
-	QuoteNum int64  `json:"quote_num"`
-}
-type TagFormated struct {
-	ID       int64         `json:"id"`
-	UserID   int64         `json:"user_id"`
-	User     *UserFormated `json:"user"`
-	Tag      string        `json:"tag"`
-	QuoteNum int64         `json:"quote_num"`
-}
-
-func (t *Tag) Format() *TagFormated {
-	if t.Model == nil {
-		return &TagFormated{}
-	}
-
-	return &TagFormated{
-		ID:       t.ID,
-		UserID:   t.UserID,
-		User:     &UserFormated{},
-		Tag:      t.Tag,
-		QuoteNum: t.QuoteNum,
-	}
-}
-
-func (t *Tag) Get(db *gorm.DB) (*Tag, error) {
-	var tag Tag
-	if t.Model != nil && t.Model.ID > 0 {
-		db = db.Where("id= ? AND is_del = ?", t.Model.ID, 0)
-	} else {
-		db = db.Where("tag = ? AND is_del = ?", t.Tag, 0)
-	}
-
-	err := db.First(&tag).Error
-	if err != nil {
-		return &tag, err
-	}
-
-	return &tag, nil
-}
-
-func (t *Tag) Create(db *gorm.DB) (*Tag, error) {
-	err := db.Create(&t).Error
-
-	return t, err
-}
-
-func (t *Tag) Update(db *gorm.DB) error {
-	return db.Model(&Tag{}).Where("id = ? AND is_del = ?", t.Model.ID, 0).Save(t).Error
-}
-
-func (t *Tag) Delete(db *gorm.DB) error {
-	return db.Model(t).Where("id = ?", t.Model.ID).Updates(map[string]any{
-		"deleted_on": time.Now().Unix(),
-		"is_del":     1,
-	}).Error
-}
-
-func (t *Tag) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*Tag, error) {
-	var tags []*Tag
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if t.UserID > 0 {
-		db = db.Where("user_id = ?", t.UserID)
-	}
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&tags).Error; err != nil {
-		return nil, err
-	}
-
-	return tags, nil
-}
-
-func (t *Tag) TagsFrom(db *gorm.DB, tags []string) (res []*Tag, err error) {
-	err = db.Where("tag IN ?", tags).Find(&res).Error
-	return
-}

internal/model/user.go

@@ -1,94 +0,0 @@
-package model
-
-import "gorm.io/gorm"
-
-const (
-	UserStatusNormal int = iota + 1
-	UserStatusClosed
-)
-
-type User struct {
-	*Model
-	Nickname string `json:"nickname"`
-	Username string `json:"username"`
-	Phone    string `json:"phone"`
-	Password string `json:"password"`
-	Salt     string `json:"salt"`
-	Status   int    `json:"status"`
-	Avatar   string `json:"avatar"`
-	Balance  int64  `json:"balance"`
-	IsAdmin  bool   `json:"is_admin"`
-}
-
-type UserFormated struct {
-	ID       int64  `json:"id"`
-	Nickname string `json:"nickname"`
-	Username string `json:"username"`
-	Status   int    `json:"status"`
-	Avatar   string `json:"avatar"`
-	IsAdmin  bool   `json:"is_admin"`
-}
-
-func (u *User) Format() *UserFormated {
-	if u.Model != nil {
-		return &UserFormated{
-			ID:       u.ID,
-			Nickname: u.Nickname,
-			Username: u.Username,
-			Status:   u.Status,
-			Avatar:   u.Avatar,
-			IsAdmin:  u.IsAdmin,
-		}
-	}
-
-	return nil
-}
-
-func (u *User) Get(db *gorm.DB) (*User, error) {
-	var user User
-	if u.Model != nil && u.Model.ID > 0 {
-		db = db.Where("id= ? AND is_del = ?", u.Model.ID, 0)
-	} else if u.Phone != "" {
-		db = db.Where("phone = ? AND is_del = ?", u.Phone, 0)
-	} else {
-		db = db.Where("username = ? AND is_del = ?", u.Username, 0)
-	}
-
-	err := db.First(&user).Error
-	if err != nil {
-		return &user, err
-	}
-
-	return &user, nil
-}
-
-func (u *User) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*User, error) {
-	var users []*User
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&users).Error; err != nil {
-		return nil, err
-	}
-
-	return users, nil
-}
-
-func (u *User) Create(db *gorm.DB) (*User, error) {
-	err := db.Create(&u).Error
-
-	return u, err
-}
-
-func (u *User) Update(db *gorm.DB) error {
-	return db.Model(&User{}).Where("id = ? AND is_del = ?", u.Model.ID, 0).Save(u).Error
-}

internal/model/wallet_recharge.go

@@ -1,34 +0,0 @@
-package model
-
-import "gorm.io/gorm"
-
-type WalletRecharge struct {
-	*Model
-	UserID      int64  `json:"user_id"`
-	Amount      int64  `json:"amount"`
-	TradeNo     string `json:"trade_no"`
-	TradeStatus string `json:"trade_status"`
-}
-
-func (p *WalletRecharge) Get(db *gorm.DB) (*WalletRecharge, error) {
-	var pas WalletRecharge
-	if p.Model != nil && p.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", p.ID, 0)
-	}
-	if p.UserID > 0 {
-		db = db.Where("user_id = ?", p.UserID)
-	}
-
-	err := db.First(&pas).Error
-	if err != nil {
-		return &pas, err
-	}
-
-	return &pas, nil
-}
-
-func (p *WalletRecharge) Create(db *gorm.DB) (*WalletRecharge, error) {
-	err := db.Create(&p).Error
-
-	return p, err
-}

internal/model/wallet_statement.go

@@ -1,83 +0,0 @@
-package model
-
-import "gorm.io/gorm"
-
-type WalletStatement struct {
-	*Model
-	UserID          int64  `json:"user_id"`
-	ChangeAmount    int64  `json:"change_amount"`
-	BalanceSnapshot int64  `json:"balance_snapshot"`
-	Reason          string `json:"reason"`
-	PostID          int64  `json:"post_id"`
-}
-
-func (w *WalletStatement) Get(db *gorm.DB) (*WalletStatement, error) {
-	var ws WalletStatement
-	if w.Model != nil && w.ID > 0 {
-		db = db.Where("id = ? AND is_del = ?", w.ID, 0)
-	}
-	if w.PostID > 0 {
-		db = db.Where("post_id = ?", w.PostID)
-	}
-	if w.UserID > 0 {
-		db = db.Where("user_id = ?", w.UserID)
-	}
-
-	err := db.First(&ws).Error
-	if err != nil {
-		return &ws, err
-	}
-
-	return &ws, nil
-}
-
-func (w *WalletStatement) Create(db *gorm.DB) (*WalletStatement, error) {
-	err := db.Create(&w).Error
-
-	return w, err
-}
-
-func (w *WalletStatement) List(db *gorm.DB, conditions *ConditionsT, offset, limit int) ([]*WalletStatement, error) {
-	var records []*WalletStatement
-	var err error
-	if offset >= 0 && limit > 0 {
-		db = db.Offset(offset).Limit(limit)
-	}
-	if w.UserID > 0 {
-		db = db.Where("user_id = ?", w.UserID)
-	}
-
-	for k, v := range *conditions {
-		if k == "ORDER" {
-			db = db.Order(v)
-		} else {
-			db = db.Where(k, v)
-		}
-	}
-
-	if err = db.Where("is_del = ?", 0).Find(&records).Error; err != nil {
-		return nil, err
-	}
-
-	return records, nil
-}
-
-func (w *WalletStatement) Count(db *gorm.DB, conditions *ConditionsT) (int64, error) {
-	var count int64
-	if w.PostID > 0 {
-		db = db.Where("post_id = ?", w.PostID)
-	}
-	if w.UserID > 0 {
-		db = db.Where("user_id = ?", w.UserID)
-	}
-	for k, v := range *conditions {
-		if k != "ORDER" {
-			db = db.Where(k, v)
-		}
-	}
-	if err := db.Model(w).Count(&count).Error; err != nil {
-		return 0, err
-	}
-
-	return count, nil
-}

internal/proto/gen.go

@@ -0,0 +1,5 @@
+// Copyright 2022 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package proto