diff --git a/go.mod b/go.mod index bddb995a..bff9bcd8 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,6 @@ require ( github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.4+incompatible github.com/jackc/pgx/v5 v5.4.2 github.com/json-iterator/go v1.1.12 - github.com/kyleconroy/sqlc v1.19.1 github.com/meilisearch/meilisearch-go v0.25.0 github.com/minio/minio-go/v7 v7.0.61 github.com/onsi/ginkgo/v2 v2.11.0 @@ -36,6 +35,7 @@ require ( github.com/smartwalle/alipay/v3 v3.2.15 github.com/sourcegraph/conc v0.3.0 github.com/spf13/viper v1.16.0 + github.com/sqlc-dev/sqlc v1.20.0 github.com/tencentyun/cos-go-sdk-v5 v0.7.42 github.com/yinheli/mahonia v0.0.0-20131226213531-0eef680515cc go.uber.org/automaxprocs v1.5.3 @@ -77,7 +77,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/cel-go v0.16.0 // indirect + github.com/google/cel-go v0.17.1 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect @@ -148,6 +148,7 @@ require ( golang.org/x/text v0.11.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.9.3 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index fdb36dc8..86dca78a 100644 --- a/go.sum +++ b/go.sum @@ -636,8 +636,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.16.0 h1:DG9YQ8nFCFXAs/FDDwBxmL1tpKNrdlGUM9U3537bX/Y= -github.com/google/cel-go v0.16.0/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY= +github.com/google/cel-go v0.17.1 h1:s2151PDGy/eqpCI80/8dl4VL3xTkqI/YubXLXCFw0mw= +github.com/google/cel-go v0.17.1/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY= github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -883,8 +883,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4= -github.com/kyleconroy/sqlc v1.19.1 h1:ZO45HSdlGWSselFFAzl2jD5fqvEKT9hEeIFqErMK1Zo= -github.com/kyleconroy/sqlc v1.19.1/go.mod h1:A1OObCUZYaPKKHNc1eywbVySz4cA6Wq/lYVYht9asHE= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= @@ -1231,6 +1229,8 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/sqlc-dev/sqlc v1.20.0 h1:teJJBBN9PTKLhO6IFsyhsP6JD4mD0/Db73eLOyfgrgw= +github.com/sqlc-dev/sqlc v1.20.0/go.mod h1:txy7rfJ+rgUwThYp+d1+/vONbPgR34OgVCRdRYJcoWI= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= @@ -1936,6 +1936,8 @@ google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ= +google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= diff --git a/internal/dao/slonik/authority.go b/internal/dao/slonik/authority.go index 0981489d..f72fdc4d 100644 --- a/internal/dao/slonik/authority.go +++ b/internal/dao/slonik/authority.go @@ -7,6 +7,7 @@ package slonik import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" ) @@ -18,19 +19,19 @@ type authorizationManageSrv struct { *pgxSrv } -func (s *authorizationManageSrv) IsAllow(user *core.User, action *core.Action) bool { +func (s *authorizationManageSrv) IsAllow(user *ms.User, action *ms.Action) bool { // TODO debug.NotImplemented() return false } -func (s *authorizationManageSrv) MyFriendSet(userId int64) core.FriendSet { +func (s *authorizationManageSrv) MyFriendSet(userId int64) ms.FriendSet { // TODO debug.NotImplemented() return nil } -func (s *authorizationManageSrv) BeFriendFilter(userId int64) core.FriendFilter { +func (s *authorizationManageSrv) BeFriendFilter(userId int64) ms.FriendFilter { // TODO debug.NotImplemented() return nil diff --git a/internal/dao/slonik/comments.go b/internal/dao/slonik/comments.go index 8e1d700e..5ce59815 100644 --- a/internal/dao/slonik/comments.go +++ b/internal/dao/slonik/comments.go @@ -8,6 +8,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/core/cs" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" ) @@ -24,37 +25,37 @@ type commentManageSrv struct { *pgxSrv } -func (s *commentSrv) GetComments(conditions *core.ConditionsT, offset, limit int) ([]*core.Comment, error) { +func (s *commentSrv) GetComments(conditions *ms.ConditionsT, offset, limit int) ([]*ms.Comment, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *commentSrv) GetCommentByID(id int64) (*core.Comment, error) { +func (s *commentSrv) GetCommentByID(id int64) (*ms.Comment, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *commentSrv) GetCommentReplyByID(id int64) (*core.CommentReply, error) { +func (s *commentSrv) GetCommentReplyByID(id int64) (*ms.CommentReply, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *commentSrv) GetCommentCount(conditions *core.ConditionsT) (int64, error) { +func (s *commentSrv) GetCommentCount(conditions *ms.ConditionsT) (int64, error) { // TODO debug.NotImplemented() return 0, nil } -func (s *commentSrv) GetCommentContentsByIDs(ids []int64) ([]*core.CommentContent, error) { +func (s *commentSrv) GetCommentContentsByIDs(ids []int64) ([]*ms.CommentContent, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *commentSrv) GetCommentRepliesByID(ids []int64) ([]*core.CommentReplyFormated, error) { +func (s *commentSrv) GetCommentRepliesByID(ids []int64) ([]*ms.CommentReplyFormated, error) { // TODO debug.NotImplemented() return nil, nil @@ -65,31 +66,31 @@ func (s *commentSrv) GetCommentThumbsMap(userId int64, tweetId int64) (cs.Commen return nil, nil, debug.ErrNotImplemented } -func (s *commentManageSrv) DeleteComment(comment *core.Comment) error { +func (s *commentManageSrv) DeleteComment(comment *ms.Comment) error { // TODO debug.NotImplemented() return nil } -func (s *commentManageSrv) CreateComment(comment *core.Comment) (*core.Comment, error) { +func (s *commentManageSrv) CreateComment(comment *ms.Comment) (*ms.Comment, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *commentManageSrv) CreateCommentReply(reply *core.CommentReply) (*core.CommentReply, error) { +func (s *commentManageSrv) CreateCommentReply(reply *ms.CommentReply) (*ms.CommentReply, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *commentManageSrv) DeleteCommentReply(reply *core.CommentReply) error { +func (s *commentManageSrv) DeleteCommentReply(reply *ms.CommentReply) error { // TODO debug.NotImplemented() return nil } -func (s *commentManageSrv) CreateCommentContent(content *core.CommentContent) (*core.CommentContent, error) { +func (s *commentManageSrv) CreateCommentContent(content *ms.CommentContent) (*ms.CommentContent, error) { // TODO debug.NotImplemented() return nil, nil diff --git a/internal/dao/slonik/contacts.go b/internal/dao/slonik/contacts.go index 393c9671..31c50ee2 100644 --- a/internal/dao/slonik/contacts.go +++ b/internal/dao/slonik/contacts.go @@ -7,6 +7,7 @@ package slonik import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" ) @@ -42,7 +43,7 @@ func (s *contactManageSrv) DeleteFriend(userId int64, friendId int64) (err error return nil } -func (s *contactManageSrv) GetContacts(userId int64, offset int, limit int) (*core.ContactList, error) { +func (s *contactManageSrv) GetContacts(userId int64, offset int, limit int) (*ms.ContactList, error) { // TODO debug.NotImplemented() return nil, nil diff --git a/internal/dao/slonik/messages.go b/internal/dao/slonik/messages.go index 1aa2ca19..bc531784 100644 --- a/internal/dao/slonik/messages.go +++ b/internal/dao/slonik/messages.go @@ -7,6 +7,7 @@ package slonik import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" ) @@ -18,7 +19,7 @@ type messageSrv struct { *pgxSrv } -func (s *messageSrv) CreateMessage(msg *core.Message) (*core.Message, error) { +func (s *messageSrv) CreateMessage(msg *ms.Message) (*ms.Message, error) { // TODO debug.NotImplemented() return nil, nil @@ -30,25 +31,25 @@ func (s *messageSrv) GetUnreadCount(userID int64) (int64, error) { return 0, nil } -func (s *messageSrv) GetMessageByID(id int64) (*core.Message, error) { +func (s *messageSrv) GetMessageByID(id int64) (*ms.Message, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *messageSrv) ReadMessage(message *core.Message) error { +func (s *messageSrv) ReadMessage(message *ms.Message) error { // TODO debug.NotImplemented() return nil } -func (s *messageSrv) GetMessages(conditions *core.ConditionsT, offset, limit int) ([]*core.MessageFormated, error) { +func (s *messageSrv) GetMessages(conditions *ms.ConditionsT, offset, limit int) ([]*ms.MessageFormated, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *messageSrv) GetMessageCount(conditions *core.ConditionsT) (int64, error) { +func (s *messageSrv) GetMessageCount(conditions *ms.ConditionsT) (int64, error) { // TODO debug.NotImplemented() return 0, nil diff --git a/internal/dao/slonik/security.go b/internal/dao/slonik/security.go index 8d3aff80..579edd6f 100644 --- a/internal/dao/slonik/security.go +++ b/internal/dao/slonik/security.go @@ -7,6 +7,7 @@ package slonik import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" ) @@ -19,14 +20,14 @@ type securitySrv struct { } // GetLatestPhoneCaptcha 获取最新短信验证码 -func (s *securitySrv) GetLatestPhoneCaptcha(phone string) (*core.Captcha, error) { +func (s *securitySrv) GetLatestPhoneCaptcha(phone string) (*ms.Captcha, error) { // TODO debug.NotImplemented() return nil, nil } // UsePhoneCaptcha 更新短信验证码 -func (s *securitySrv) UsePhoneCaptcha(captcha *core.Captcha) error { +func (s *securitySrv) UsePhoneCaptcha(captcha *ms.Captcha) error { // TODO debug.NotImplemented() return nil diff --git a/internal/dao/slonik/sqlc/gen.go b/internal/dao/slonik/sqlc/gen.go index bcd09185..2143f0a5 100644 --- a/internal/dao/slonik/sqlc/gen.go +++ b/internal/dao/slonik/sqlc/gen.go @@ -6,7 +6,7 @@ package main import ( "os" - sqlc "github.com/kyleconroy/sqlc/pkg/cli" + sqlc "github.com/sqlc-dev/sqlc/pkg/cli" ) //go:generate go run $GOFILE generate -x diff --git a/internal/dao/slonik/sqlc/postgres/db.go b/internal/dao/slonik/sqlc/postgres/db.go index bb4649fa..925d5536 100644 --- a/internal/dao/slonik/sqlc/postgres/db.go +++ b/internal/dao/slonik/sqlc/postgres/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.19.1 +// sqlc v1.20.0 package dbr diff --git a/internal/dao/slonik/sqlc/postgres/models.go b/internal/dao/slonik/sqlc/postgres/models.go index ef23e00e..f1486189 100644 --- a/internal/dao/slonik/sqlc/postgres/models.go +++ b/internal/dao/slonik/sqlc/postgres/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.19.1 +// sqlc v1.20.0 package dbr diff --git a/internal/dao/slonik/sqlc/postgres/querier.go b/internal/dao/slonik/sqlc/postgres/querier.go index 823df0a0..6f2e94a1 100644 --- a/internal/dao/slonik/sqlc/postgres/querier.go +++ b/internal/dao/slonik/sqlc/postgres/querier.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.19.1 +// sqlc v1.20.0 package dbr diff --git a/internal/dao/slonik/sqlc/postgres/topic.sql.go b/internal/dao/slonik/sqlc/postgres/topic.sql.go index 23b5e59c..a26c70dc 100644 --- a/internal/dao/slonik/sqlc/postgres/topic.sql.go +++ b/internal/dao/slonik/sqlc/postgres/topic.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.19.1 +// sqlc v1.20.0 // source: topic.sql package dbr diff --git a/internal/dao/slonik/timeline.go b/internal/dao/slonik/timeline.go index f5c9fb3a..0efe5155 100644 --- a/internal/dao/slonik/timeline.go +++ b/internal/dao/slonik/timeline.go @@ -8,6 +8,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/core/cs" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" ) @@ -40,7 +41,7 @@ type simpleIndexPostsSrv struct { } // IndexPosts 根据userId查询广场推文列表，简单做到不同用户的主页都是不同的； -func (s *friendIndexSrv) IndexPosts(user *core.User, offset int, limit int) (*core.IndexTweetList, error) { +func (s *friendIndexSrv) IndexPosts(user *ms.User, offset int, limit int) (*ms.IndexTweetList, error) { // TODO return nil, debug.ErrNotImplemented } @@ -51,7 +52,7 @@ func (s *friendIndexSrv) TweetTimeline(userId int64, offset int, limit int) (*cs } // IndexPosts 根据userId查询广场推文列表，简单做到不同用户的主页都是不同的； -func (s *followIndexSrv) IndexPosts(user *core.User, offset int, limit int) (*core.IndexTweetList, error) { +func (s *followIndexSrv) IndexPosts(user *ms.User, offset int, limit int) (*ms.IndexTweetList, error) { // TODO return nil, debug.ErrNotImplemented } @@ -62,7 +63,7 @@ func (s *followIndexSrv) TweetTimeline(userId int64, offset int, limit int) (*cs } // IndexPosts 根据userId查询广场推文列表，简单做到不同用户的主页都是不同的； -func (s *lightIndexSrv) IndexPosts(user *core.User, offset int, limit int) (*core.IndexTweetList, error) { +func (s *lightIndexSrv) IndexPosts(user *ms.User, offset int, limit int) (*ms.IndexTweetList, error) { // TODO return nil, debug.ErrNotImplemented } @@ -73,7 +74,7 @@ func (s *lightIndexSrv) TweetTimeline(userId int64, offset int, limit int) (*cs. } // simpleCacheIndexGetPosts simpleCacheIndex 专属获取广场推文列表函数 -func (s *simpleIndexPostsSrv) IndexPosts(_user *core.User, offset int, limit int) (*core.IndexTweetList, error) { +func (s *simpleIndexPostsSrv) IndexPosts(_user *ms.User, offset int, limit int) (*ms.IndexTweetList, error) { // TODO return nil, debug.ErrNotImplemented } diff --git a/internal/dao/slonik/tweets.go b/internal/dao/slonik/tweets.go index fe3a535f..30def2ea 100644 --- a/internal/dao/slonik/tweets.go +++ b/internal/dao/slonik/tweets.go @@ -8,6 +8,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/core/cs" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" "gorm.io/gorm" ) @@ -31,14 +32,14 @@ type tweetHelpSrv struct { } // MergePosts post数据整合 -func (s *tweetHelpSrv) MergePosts(posts []*core.Post) ([]*core.PostFormated, error) { +func (s *tweetHelpSrv) MergePosts(posts []*ms.Post) ([]*ms.PostFormated, error) { // TODO debug.NotImplemented() return nil, nil } // RevampPosts post数据整形修复 -func (s *tweetHelpSrv) RevampPosts(posts []*core.PostFormated) ([]*core.PostFormated, error) { +func (s *tweetHelpSrv) RevampPosts(posts []*ms.PostFormated) ([]*ms.PostFormated, error) { // TODO debug.NotImplemented() return nil, nil @@ -54,43 +55,43 @@ func (s *tweetHelpSrv) MergeTweets(tweets cs.TweetInfo) (cs.TweetList, error) { return nil, debug.ErrNotImplemented } -func (s *tweetHelpSrv) getPostContentsByIDs(ids []int64) ([]*core.PostContent, error) { +func (s *tweetHelpSrv) getPostContentsByIDs(ids []int64) ([]*ms.PostContent, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetHelpSrv) getUsersByIDs(ids []int64) ([]*core.User, error) { +func (s *tweetHelpSrv) getUsersByIDs(ids []int64) ([]*ms.User, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetManageSrv) CreatePostCollection(postID, userID int64) (*core.PostCollection, error) { +func (s *tweetManageSrv) CreatePostCollection(postID, userID int64) (*ms.PostCollection, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetManageSrv) DeletePostCollection(p *core.PostCollection) error { +func (s *tweetManageSrv) DeletePostCollection(p *ms.PostCollection) error { // TODO debug.NotImplemented() return nil } -func (s *tweetManageSrv) CreatePostContent(content *core.PostContent) (*core.PostContent, error) { +func (s *tweetManageSrv) CreatePostContent(content *ms.PostContent) (*ms.PostContent, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetManageSrv) CreatePost(post *core.Post) (*core.Post, error) { +func (s *tweetManageSrv) CreatePost(post *ms.Post) (*ms.Post, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetManageSrv) DeletePost(post *core.Post) ([]string, error) { +func (s *tweetManageSrv) DeletePost(post *ms.Post) ([]string, error) { // TODO debug.NotImplemented() return nil, nil @@ -102,43 +103,43 @@ func (s *tweetManageSrv) deleteCommentByPostId(db *gorm.DB, postId int64) ([]str return nil, nil } -func (s *tweetManageSrv) LockPost(post *core.Post) error { +func (s *tweetManageSrv) LockPost(post *ms.Post) error { // TODO debug.NotImplemented() return nil } -func (s *tweetManageSrv) StickPost(post *core.Post) error { +func (s *tweetManageSrv) StickPost(post *ms.Post) error { // TODO debug.NotImplemented() return nil } -func (s *tweetManageSrv) VisiblePost(post *core.Post, visibility core.PostVisibleT) error { +func (s *tweetManageSrv) VisiblePost(post *ms.Post, visibility core.PostVisibleT) error { // TODO debug.NotImplemented() return nil } -func (s *tweetManageSrv) UpdatePost(post *core.Post) error { +func (s *tweetManageSrv) UpdatePost(post *ms.Post) error { // TODO debug.NotImplemented() return nil } -func (s *tweetManageSrv) CreatePostStar(postID, userID int64) (*core.PostStar, error) { +func (s *tweetManageSrv) CreatePostStar(postID, userID int64) (*ms.PostStar, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetManageSrv) DeletePostStar(p *core.PostStar) error { +func (s *tweetManageSrv) DeletePostStar(p *ms.PostStar) error { // TODO debug.NotImplemented() return nil } -func (s *tweetManageSrv) CreateAttachment(obj *cs.Attachment) (int64, error) { +func (s *tweetManageSrv) CreateAttachment(obj *ms.Attachment) (int64, error) { // TODO return 0, debug.ErrNotImplemented } @@ -188,31 +189,31 @@ func (s *tweetManageSrv) DeleteFavorite(userId int64, favoriteId int64) error { return debug.ErrNotImplemented } -func (s *tweetSrv) GetPostByID(id int64) (*core.Post, error) { +func (s *tweetSrv) GetPostByID(id int64) (*ms.Post, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetSrv) GetPosts(conditions *core.ConditionsT, limit int, offset int) ([]*core.Post, error) { +func (s *tweetSrv) GetPosts(conditions ms.ConditionsT, limit int, offset int) ([]*ms.Post, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetSrv) GetPostCount(conditions *core.ConditionsT) (int64, error) { +func (s *tweetSrv) GetPostCount(conditions ms.ConditionsT) (int64, error) { // TODO debug.NotImplemented() return 0, nil } -func (s *tweetSrv) GetUserPostStar(postID, userID int64) (*core.PostStar, error) { +func (s *tweetSrv) GetUserPostStar(postID, userID int64) (*ms.PostStar, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetSrv) GetUserPostStars(userID int64, limit int, offset int) ([]*core.PostStar, error) { +func (s *tweetSrv) GetUserPostStars(userID int64, limit int, offset int) ([]*ms.PostStar, error) { // TODO debug.NotImplemented() return nil, nil @@ -224,13 +225,13 @@ func (s *tweetSrv) GetUserPostStarCount(userID int64) (int64, error) { return 0, nil } -func (s *tweetSrv) GetUserPostCollection(postID, userID int64) (*core.PostCollection, error) { +func (s *tweetSrv) GetUserPostCollection(postID, userID int64) (*ms.PostCollection, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetSrv) GetUserPostCollections(userID int64, limit int, offset int) ([]*core.PostCollection, error) { +func (s *tweetSrv) GetUserPostCollections(userID int64, limit int, offset int) ([]*ms.PostCollection, error) { // TODO debug.NotImplemented() return nil, nil @@ -242,7 +243,7 @@ func (s *tweetSrv) GetUserPostCollectionCount(userID int64) (int64, error) { return 0, nil } -func (s *tweetSrv) GetUserWalletBills(userID int64, limit int, offset int) ([]*core.WalletStatement, error) { +func (s *tweetSrv) GetUserWalletBills(userID int64, limit int, offset int) ([]*ms.WalletStatement, error) { // TODO debug.NotImplemented() return nil, nil @@ -254,19 +255,19 @@ func (s *tweetSrv) GetUserWalletBillCount(userID int64) (int64, error) { return 0, nil } -func (s *tweetSrv) GetPostAttatchmentBill(postID, userID int64) (*core.PostAttachmentBill, error) { +func (s *tweetSrv) GetPostAttatchmentBill(postID, userID int64) (*ms.PostAttachmentBill, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetSrv) GetPostContentsByIDs(ids []int64) ([]*core.PostContent, error) { +func (s *tweetSrv) GetPostContentsByIDs(ids []int64) ([]*ms.PostContent, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *tweetSrv) GetPostContentByID(id int64) (*core.PostContent, error) { +func (s *tweetSrv) GetPostContentByID(id int64) (*ms.PostContent, error) { // TODO debug.NotImplemented() return nil, nil diff --git a/internal/dao/slonik/user.go b/internal/dao/slonik/user.go index 0e3d0532..172f5cff 100644 --- a/internal/dao/slonik/user.go +++ b/internal/dao/slonik/user.go @@ -7,6 +7,7 @@ package slonik import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" ) @@ -18,43 +19,43 @@ type userManageSrv struct { *pgxSrv } -func (s *userManageSrv) GetUserByID(id int64) (*core.User, error) { +func (s *userManageSrv) GetUserByID(id int64) (*ms.User, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *userManageSrv) GetUserByUsername(username string) (*core.User, error) { +func (s *userManageSrv) GetUserByUsername(username string) (*ms.User, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *userManageSrv) GetUserByPhone(phone string) (*core.User, error) { +func (s *userManageSrv) GetUserByPhone(phone string) (*ms.User, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *userManageSrv) GetUsersByIDs(ids []int64) ([]*core.User, error) { +func (s *userManageSrv) GetUsersByIDs(ids []int64) ([]*ms.User, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *userManageSrv) GetUsersByKeyword(keyword string) ([]*core.User, error) { +func (s *userManageSrv) GetUsersByKeyword(keyword string) ([]*ms.User, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *userManageSrv) CreateUser(user *core.User) (*core.User, error) { +func (s *userManageSrv) CreateUser(user *ms.User) (*ms.User, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *userManageSrv) UpdateUser(user *core.User) error { +func (s *userManageSrv) UpdateUser(user *ms.User) error { // TODO debug.NotImplemented() return nil diff --git a/internal/dao/slonik/wallet.go b/internal/dao/slonik/wallet.go index 8b4f15ca..1c1bd16e 100644 --- a/internal/dao/slonik/wallet.go +++ b/internal/dao/slonik/wallet.go @@ -7,6 +7,7 @@ package slonik import ( "github.com/jackc/pgx/v5" "github.com/rocboss/paopao-ce/internal/core" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/debug" ) @@ -18,18 +19,18 @@ type walletSrv struct { *pgxSrv } -func (s *walletSrv) GetRechargeByID(id int64) (*core.WalletRecharge, error) { +func (s *walletSrv) GetRechargeByID(id int64) (*ms.WalletRecharge, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *walletSrv) CreateRecharge(userId, amount int64) (*core.WalletRecharge, error) { +func (s *walletSrv) CreateRecharge(userId, amount int64) (*ms.WalletRecharge, error) { // TODO debug.NotImplemented() return nil, nil } -func (s *walletSrv) GetUserWalletBills(userID int64, offset, limit int) ([]*core.WalletStatement, error) { +func (s *walletSrv) GetUserWalletBills(userID int64, offset, limit int) ([]*ms.WalletStatement, error) { // TODO debug.NotImplemented() return nil, nil @@ -41,13 +42,13 @@ func (s *walletSrv) GetUserWalletBillCount(userID int64) (int64, error) { return 0, nil } -func (s *walletSrv) HandleRechargeSuccess(recharge *core.WalletRecharge, tradeNo string) error { +func (s *walletSrv) HandleRechargeSuccess(recharge *ms.WalletRecharge, tradeNo string) error { // TODO debug.NotImplemented() return nil } -func (s *walletSrv) HandlePostAttachmentBought(post *core.Post, user *core.User) error { +func (s *walletSrv) HandlePostAttachmentBought(post *ms.Post, user *ms.User) error { // TODO debug.NotImplemented() return nil