refactor: 3.7.0 code conventions. (#2148)

* Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * feat: add code lint * feat: add code lint * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * feat: code format * Script Refactoring * Script Refactoring * Script Refactoring * Adjust MinIO configuration settings * Adjust configuration settings * Adjust configuration settings * refactor: config change. * refactor: webhooks update. * Adjust configuration settings * refactor: webhooks update. * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * feat: s3 api addr * refactor: webhooks update. * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * refactor: webhooks update. * refactor: kafka update. * Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service. * refactor: kafka update. * refactor: kafka update. * Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service. * Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service. * Windows can compile and run. * Windows can compile and run. * refactor: kafka update. * feat: msg cache split * refactor: webhooks update * refactor: webhooks update * refactor: friends update * refactor: group update * refactor: third update * refactor: api update * refactor: crontab update * refactor: msggateway update * mage * mage * refactor: all module update. * check * refactor: all module update. * load config * load config * load config * load config * refactor: all module update. * refactor: all module update. * refactor: all module update. * refactor: all module update. * refactor: all module update. * Optimize Docker configuration and script. * refactor: all module update. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * refactor: all module update. * Optimize Docker configuration and script. * refactor: all module update. * refactor: all module update. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * update tools * update tools * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * update protocol * Optimize Docker configuration and script. * Optimize Docker configuration and script. * refactor: all module update. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * refactor: api remove token auth by redis directly. * Code Refactoring * refactor: websocket auth change to call rpc of auth. * refactor: kick online user and remove token change to call auth rpc. * refactor: kick online user and remove token change to call auth rpc. * refactor: remove msggateway redis. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor webhook * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor webhook * refactor: cmd update. * refactor: cmd update. * fix: runtime: goroutine stack exceeds * refactor: cmd update. * refactor notification * refactor notification * refactor * refactor: cmd update. * refactor: cmd update. * refactor * refactor * refactor * protojson * protojson * protojson * go mod * wrapperspb * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: context update. * refactor: websocket update info. * refactor: websocket update info. * refactor: websocket update info. * refactor: websocket update info. * refactor: api name change. * refactor: debug info. * refactor: debug info. * refactor: debug info. * fix: update file * refactor * refactor * refactor: debug info. * refactor: debug info. * refactor: debug info. * refactor: debug info. * refactor: debug info. * refactor: debug info. * fix: callback update. * fix: callback update. * refactor * fix: update message. * fix: msg cache timeout. * refactor * refactor * fix: push update. * fix: push update. * fix: push update. * fix: push update. * fix: push update. * fix: push update. * fix: push update. * fix: websocket handle error remove when upgrade error. --------- Co-authored-by: skiffer-git <44203734@qq.com> Co-authored-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> Co-authored-by: withchao <993506633@qq.com>
2026-05-11 12:36:00 +08:00 · 2024-04-19 22:23:08 +08:00
parent cca5336a8a
commit b76816bc14
438 changed files with 11525 additions and 15033 deletions
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/tools/db/pagination"
 )

 type BlackModel struct {
@@ -33,8 +33,8 @@ type BlackModel struct {
 type BlackModelInterface interface {
 	Create(ctx context.Context, blacks []*BlackModel) (err error)
 	Delete(ctx context.Context, blacks []*BlackModel) (err error)
-	//UpdateByMap(ctx context.Context, ownerUserID, blockUserID string, args map[string]any) (err error)
-	//Update(ctx context.Context, blacks []*BlackModel) (err error)
+	// UpdateByMap(ctx context.Context, ownerUserID, blockUserID string, args map[string]any) (err error)
+	// Update(ctx context.Context, blacks []*BlackModel) (err error)
 	Find(ctx context.Context, blacks []*BlackModel) (blackList []*BlackModel, err error)
 	Take(ctx context.Context, ownerUserID, blockUserID string) (black *BlackModel, err error)
 	FindOwnerBlacks(ctx context.Context, ownerUserID string, pagination pagination.Pagination) (total int64, blacks []*BlackModel, err error)
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/tools/db/pagination"
 )

 type ConversationModel struct {
@@ -1,4 +1,4 @@
-// Copyright © 2023 OpenIM. All rights reserved.
+// Copyright © 2024 OpenIM. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package unrelation // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation"
+package relation // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/tools/db/pagination"
 )

 // FriendModel represents the data structure for a friend relationship in MongoDB.
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/tools/db/pagination"
 )

 type FriendRequestModel struct {
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/tools/db/pagination"
 )

 type GroupModel struct {
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/tools/db/pagination"
 )

 type GroupMemberModel struct {
@@ -36,10 +36,10 @@ type GroupMemberModel struct {
 }

 type GroupMemberModelInterface interface {
-	//NewTx(tx any) GroupMemberModelInterface
+	// NewTx(tx any) GroupMemberModelInterface
 	Create(ctx context.Context, groupMembers []*GroupMemberModel) (err error)
 	Delete(ctx context.Context, groupID string, userIDs []string) (err error)
-	//DeleteGroup(ctx context.Context, groupIDs []string) (err error)
+	// DeleteGroup(ctx context.Context, groupIDs []string) (err error)
 	Update(ctx context.Context, groupID string, userID string, data map[string]any) (err error)
 	UpdateRoleLevel(ctx context.Context, groupID string, userID string, roleLevel int32) error
 	FindMemberUserID(ctx context.Context, groupID string) (userIDs []string, err error)
@@ -47,11 +47,11 @@ type GroupMemberModelInterface interface {
 	TakeOwner(ctx context.Context, groupID string) (groupMember *GroupMemberModel, err error)
 	SearchMember(ctx context.Context, keyword string, groupID string, pagination pagination.Pagination) (total int64, groupList []*GroupMemberModel, err error)
 	FindRoleLevelUserIDs(ctx context.Context, groupID string, roleLevel int32) ([]string, error)
-	//MapGroupMemberNum(ctx context.Context, groupIDs []string) (count map[string]uint32, err error)
-	//FindJoinUserID(ctx context.Context, groupIDs []string) (groupUsers map[string][]string, err error)
+	// MapGroupMemberNum(ctx context.Context, groupIDs []string) (count map[string]uint32, err error)
+	// FindJoinUserID(ctx context.Context, groupIDs []string) (groupUsers map[string][]string, err error)
 	FindUserJoinedGroupID(ctx context.Context, userID string) (groupIDs []string, err error)
 	TakeGroupMemberNum(ctx context.Context, groupID string) (count int64, err error)
-	//FindUsersJoinedGroupID(ctx context.Context, userIDs []string) (map[string][]string, error)
+	// FindUsersJoinedGroupID(ctx context.Context, userIDs []string) (map[string][]string, error)
 	FindUserManagedGroupID(ctx context.Context, userID string) (groupIDs []string, err error)
 	IsUpdateRoleLevel(data map[string]any) bool
 }
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/tools/db/pagination"
 )

 type GroupRequestModel struct {
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/tools/db/pagination"
 )

 type LogModel struct {
@@ -12,15 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package unrelation
+package relation

 import (
 	"context"
 	"strconv"
 	"time"

-	"github.com/OpenIMSDK/protocol/msg"
-	"github.com/OpenIMSDK/protocol/sdkws"
+	"github.com/openimsdk/protocol/msg"
+	"github.com/openimsdk/protocol/sdkws"
+	"github.com/openimsdk/tools/errs"
 	"go.mongodb.org/mongo-driver/mongo"
 )

@@ -32,6 +33,8 @@ const (
 	NewestList          = -1
 )

+var ErrMsgListNotExist = errs.New("user not have msg in mongoDB")
+
 type MsgDocModel struct {
 	DocID string          `bson:"doc_id"`
 	Msg   []*MsgInfoModel `bson:"msgs"`
@@ -110,23 +113,8 @@ type MsgDocModelInterface interface {
 	DeleteMsgsInOneDocByIndex(ctx context.Context, docID string, indexes []int) error
 	MarkSingleChatMsgsAsRead(ctx context.Context, userID string, docID string, indexes []int64) error
 	SearchMessage(ctx context.Context, req *msg.SearchMessageReq) (int32, []*MsgInfoModel, error)
-	RangeUserSendCount(
-		ctx context.Context,
-		start time.Time,
-		end time.Time,
-		group bool,
-		ase bool,
-		pageNumber int32,
-		showNumber int32,
-	) (msgCount int64, userCount int64, users []*UserCount, dateCount map[string]int64, err error)
-	RangeGroupSendCount(
-		ctx context.Context,
-		start time.Time,
-		end time.Time,
-		ase bool,
-		pageNumber int32,
-		showNumber int32,
-	) (msgCount int64, userCount int64, groups []*GroupCount, dateCount map[string]int64, err error)
+	RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*UserCount, dateCount map[string]int64, err error)
+	RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*GroupCount, dateCount map[string]int64, err error)
 	ConvertMsgsDocLen(ctx context.Context, conversationIDs []string)
 }

@@ -165,11 +153,11 @@ func (m MsgDocModel) GetDocIDSeqsMap(conversationID string, seqs []int64) map[st
 	return t
 }

-func (m MsgDocModel) GetMsgIndex(seq int64) int64 {
+func (MsgDocModel) GetMsgIndex(seq int64) int64 {
 	return (seq - 1) % singleGocMsgNum
 }

-func (m MsgDocModel) indexGen(conversationID string, seqSuffix int64) string {
+func (MsgDocModel) indexGen(conversationID string, seqSuffix int64) string {
 	return conversationID + ":" + strconv.FormatInt(seqSuffix, 10)
 }

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package unrelation
+package relation

 import "context"

@@ -21,18 +21,18 @@ const (
 	SubscribeUser = "subscribe_user"
 )

-// UserModel collection structure.
-type UserModel struct {
+// SubscribeUserModel collection structure.
+type SubscribeUserModel struct {
 	UserID     string   `bson:"user_id"      json:"userID"`
 	UserIDList []string `bson:"user_id_list" json:"userIDList"`
 }

-func (UserModel) TableName() string {
+func (SubscribeUserModel) TableName() string {
 	return SubscribeUser
 }

-// UserModelInterface Operation interface of user mongodb.
-type UserModelInterface interface {
+// SubscribeUserModelInterface Operation interface of user mongodb.
+type SubscribeUserModelInterface interface {
 	// AddSubscriptionList Subscriber's handling of thresholds.
 	AddSubscriptionList(ctx context.Context, userID string, userIDList []string) error
 	// UnsubscriptionList Handling of unsubscribe.
@@ -18,8 +18,8 @@ import (
 	"context"
 	"time"

-	"github.com/OpenIMSDK/protocol/user"
-	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/protocol/user"
+	"github.com/openimsdk/tools/db/pagination"
 )

 type UserModel struct {
@@ -65,7 +65,7 @@ type UserModelInterface interface {
 	CountTotal(ctx context.Context, before *time.Time) (count int64, err error)
 	// Get user total quantity every day
 	CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error)
-	//CRUD user command
+	// CRUD user command
 	AddUserCommand(ctx context.Context, userID string, Type int32, UUID string, value string, ex string) error
 	DeleteUserCommand(ctx context.Context, userID string, Type int32, UUID string) error
 	UpdateUserCommand(ctx context.Context, userID string, Type int32, UUID string, val map[string]any) error
@@ -15,7 +15,7 @@
 package relation

 import (
-	"github.com/OpenIMSDK/tools/utils"
+	"github.com/openimsdk/tools/errs"
 	"go.mongodb.org/mongo-driver/mongo"
 )

@@ -31,5 +31,5 @@ type GroupSimpleUserID struct {
 }

 func IsNotFound(err error) bool {
-	return utils.Unwrap(err) == mongo.ErrNoDocuments
+	return errs.Unwrap(err) == mongo.ErrNoDocuments
 }
@@ -1,20 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unrelation
-
-type CommonUserModel struct {
-	UserID   string `bson:"user_id"`
-	UserName string `bson:"user_name"`
-}
@@ -1,53 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unrelation
-
-//import (
-//	"context"
-//)
-//
-//const (
-//	CSuperGroup       = "super_group"
-//	CUserToSuperGroup = "user_to_super_group"
-//)
-//
-//type SuperGroupModel struct {
-//	GroupID   string   `bson:"group_id"       json:"groupID"`
-//	MemberIDs []string `bson:"member_id_list" json:"memberIDList"`
-//}
-//
-//func (SuperGroupModel) TableName() string {
-//	return CSuperGroup
-//}
-//
-//type UserToSuperGroupModel struct {
-//	UserID   string   `bson:"user_id"       json:"userID"`
-//	GroupIDs []string `bson:"group_id_list" json:"groupIDList"`
-//}
-//
-//func (UserToSuperGroupModel) TableName() string {
-//	return CUserToSuperGroup
-//}
-//
-//type SuperGroupModelInterface interface {
-//	CreateSuperGroup(ctx context.Context, groupID string, initMemberIDs []string) error
-//	TakeSuperGroup(ctx context.Context, groupID string) (group *SuperGroupModel, err error)
-//	FindSuperGroup(ctx context.Context, groupIDs []string) (groups []*SuperGroupModel, err error)
-//	AddUserToSuperGroup(ctx context.Context, groupID string, userIDs []string) error
-//	RemoverUserFromSuperGroup(ctx context.Context, groupID string, userIDs []string) error
-//	GetSuperGroupByUserID(ctx context.Context, userID string) (*UserToSuperGroupModel, error)
-//	DeleteSuperGroup(ctx context.Context, groupID string) error
-//	RemoveGroupFromUser(ctx context.Context, groupID string, userIDs []string) error
-//}