Feature: add log support for developer (#1101)

* fix: to start im or chat, ZooKeeper must be started first. * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: go mod update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: get all userID Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: msggateway add online status call Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * chore: network mode change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * feat: add api of get server time Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * feat: remove go work sum Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: pull message add isRead field Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: check msg-transfer script Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: start don't kill old process Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: check component Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: pull message set isRead only message come from single. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: add ex field to update group info. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change * cicd: robot automated Change * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change * test: for pressure test. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * test: for pressure test. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * test: for pressure test. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: to start im or chat, ZooKeeper must be started first. --------- Signed-off-by: Gordon <1432970085@qq.com> Signed-off-by: withchao <993506633@qq.com> Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: withchao <993506633@qq.com> Co-authored-by: Xinwei Xiong <3293172751NSS@gmail.com> Co-authored-by: FGadvancer <FGadvancer@users.noreply.github.com>
2026-05-10 03:56:00 +08:00 · 2023-09-19 15:08:05 +08:00
parent 7a3c3d7939
commit bba662f404
13 changed files with 304 additions and 25 deletions
@@ -59,11 +59,8 @@ type ConversationCache interface {
 	DelConversations(ownerUserID string, conversationIDs ...string) ConversationCache
 	DelUsersConversation(conversationID string, ownerUserIDs ...string) ConversationCache
 	// get one conversation from msgCache
-	GetConversations(
-		ctx context.Context,
-		ownerUserID string,
-		conversationIDs []string,
-	) ([]*relationtb.ConversationModel, error)
+	GetConversations(ctx context.Context, ownerUserID string,
+		conversationIDs []string) ([]*relationtb.ConversationModel, error)
 	// get one user's all conversations from msgCache
 	GetUserAllConversations(ctx context.Context, ownerUserID string) ([]*relationtb.ConversationModel, error)
 	// get user conversation recv msg from msgCache
@@ -79,10 +76,8 @@ type ConversationCache interface {
 	GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
 	DelUserAllHasReadSeqs(ownerUserID string, conversationIDs ...string) ConversationCache

-	GetConversationsByConversationID(
-		ctx context.Context,
-		conversationIDs []string,
-	) ([]*relationtb.ConversationModel, error)
+	GetConversationsByConversationID(ctx context.Context,
+		conversationIDs []string) ([]*relationtb.ConversationModel, error)
 	DelConversationByConversationID(conversationIDs ...string) ConversationCache
 	GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error)
 	DelConversationNotReceiveMessageUserIDs(conversationIDs ...string) ConversationCache
@@ -418,10 +413,8 @@ func (c *ConversationRedisCache) GetUserAllHasReadSeqs(
 	)
 }

-func (c *ConversationRedisCache) DelUserAllHasReadSeqs(
-	ownerUserID string,
-	conversationIDs ...string,
-) ConversationCache {
+func (c *ConversationRedisCache) DelUserAllHasReadSeqs(ownerUserID string,
+	conversationIDs ...string) ConversationCache {
 	cache := c.NewCache()
 	for _, conversationID := range conversationIDs {
 		cache.AddKeys(c.getConversationHasReadSeqKey(ownerUserID, conversationID))
@@ -16,21 +16,59 @@ package controller

 import (
 	"context"
+	"time"

 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
+	dbimpl "github.com/openimsdk/open-im-server/v3/pkg/common/db/relation"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
+	"gorm.io/gorm"
 )

 type ThirdDatabase interface {
 	FcmUpdateToken(ctx context.Context, account string, platformID int, fcmToken string, expireTime int64) error
 	SetAppBadge(ctx context.Context, userID string, value int) error
+	//about log for debug
+	UploadLogs(ctx context.Context, logs []*relation.Log) error
+	DeleteLogs(ctx context.Context, logID []string, userID string) error
+	SearchLogs(ctx context.Context, keyword string, start time.Time, end time.Time, pageNumber int32, showNumber int32) (uint32, []*relation.Log, error)
+	GetLogs(ctx context.Context, LogIDs []string, userID string) ([]*relation.Log, error)
+	FindUsers(ctx context.Context, userIDs []string) ([]*relation.UserModel, error)
 }

 type thirdDatabase struct {
-	cache cache.MsgModel
+	cache  cache.MsgModel
+	logdb  relation.LogInterface
+	userdb relation.UserModelInterface
 }

-func NewThirdDatabase(cache cache.MsgModel) ThirdDatabase {
-	return &thirdDatabase{cache: cache}
+// FindUsers implements ThirdDatabase.
+func (t *thirdDatabase) FindUsers(ctx context.Context, userIDs []string) ([]*relation.UserModel, error) {
+	return t.userdb.Find(ctx, userIDs)
+}
+
+// DeleteLogs implements ThirdDatabase.
+func (t *thirdDatabase) DeleteLogs(ctx context.Context, logID []string, userID string) error {
+	return t.logdb.Delete(ctx, logID, userID)
+}
+
+// GetLogs implements ThirdDatabase.
+func (t *thirdDatabase) GetLogs(ctx context.Context, LogIDs []string, userID string) ([]*relation.Log, error) {
+	return t.logdb.Get(ctx, LogIDs, userID)
+}
+
+// SearchLogs implements ThirdDatabase.
+func (t *thirdDatabase) SearchLogs(ctx context.Context, keyword string, start time.Time, end time.Time, pageNumber int32, showNumber int32) (uint32, []*relation.Log, error) {
+	return t.logdb.Search(ctx, keyword, start, end, pageNumber, showNumber)
+
+}
+
+// UploadLogs implements ThirdDatabase.
+func (t *thirdDatabase) UploadLogs(ctx context.Context, logs []*relation.Log) error {
+	return t.logdb.Create(ctx, logs)
+}
+
+func NewThirdDatabase(cache cache.MsgModel, db *gorm.DB) ThirdDatabase {
+	return &thirdDatabase{cache: cache, logdb: dbimpl.NewLogGorm(db), userdb: dbimpl.NewUserGorm(db)}
 }

 func (t *thirdDatabase) FcmUpdateToken(
@@ -0,0 +1,46 @@
+package relation
+
+import (
+	"context"
+	"time"
+
+	"github.com/OpenIMSDK/tools/errs"
+	"github.com/OpenIMSDK/tools/ormutil"
+	relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
+	"gorm.io/gorm"
+)
+
+type LogGorm struct {
+	db *gorm.DB
+}
+
+func (l *LogGorm) Create(ctx context.Context, log []*relationtb.Log) error {
+	return errs.Wrap(l.db.WithContext(ctx).Create(log).Error)
+}
+
+func (l *LogGorm) Search(ctx context.Context, keyword string, start time.Time, end time.Time, pageNumber int32, showNumber int32) (uint32, []*relationtb.Log, error) {
+	db := l.db.WithContext(ctx).Where("create_time >= ?", start)
+	if end.UnixMilli() != 0 {
+		db = l.db.WithContext(ctx).Where("create_time <= ?", end)
+	}
+	return ormutil.GormSearch[relationtb.Log](db, []string{"user_id"}, keyword, pageNumber, showNumber)
+}
+
+func (l *LogGorm) Delete(ctx context.Context, logIDs []string, userID string) error {
+	if userID == "" {
+		return errs.Wrap(l.db.WithContext(ctx).Where("log_id in ?", logIDs).Delete(&relationtb.Log{}).Error)
+	}
+	return errs.Wrap(l.db.WithContext(ctx).Where("log_id in ? and user_id=?", logIDs, userID).Delete(&relationtb.Log{}).Error)
+}
+
+func (l *LogGorm) Get(ctx context.Context, logIDs []string, userID string) ([]*relationtb.Log, error) {
+	var logs []*relationtb.Log
+	if userID == "" {
+		return logs, errs.Wrap(l.db.WithContext(ctx).Where("log_id in ?", logIDs).Find(&logs).Error)
+	}
+	return logs, errs.Wrap(l.db.WithContext(ctx).Where("log_id in ? and user_id=?", logIDs, userID).Find(&logs).Error)
+}
+func NewLogGorm(db *gorm.DB) relationtb.LogInterface {
+	db.AutoMigrate(&relationtb.Log{})
+	return &LogGorm{db: db}
+}
@@ -0,0 +1,25 @@
+package relation
+
+import (
+	"context"
+	"time"
+)
+
+type Log struct {
+	LogID      string    `gorm:"column:log_id;primary_key;type:char(64)"`
+	Platform   string    `gorm:"column:platform;type:varchar(32)"`
+	UserID     string    `gorm:"column:user_id;type:char(64)"`
+	CreateTime time.Time `gorm:"index:,sort:desc"`
+	Url        string    `gorm:"column:url;type varchar(255)"`
+	FileName   string    `gorm:"column:filename;type varchar(255)"`
+	SystemType string    `gorm:"column:system_type;type varchar(255)"`
+	Version    string    `gorm:"column:version;type varchar(255)"`
+	Ex         string    `gorm:"column:ex;type varchar(255)"`
+}
+
+type LogInterface interface {
+	Create(ctx context.Context, log []*Log) error
+	Search(ctx context.Context, keyword string, start time.Time, end time.Time, pageNumber int32, showNumber int32) (uint32, []*Log, error)
+	Delete(ctx context.Context, logID []string, userID string) error
+	Get(ctx context.Context, logIDs []string, userID string) ([]*Log, error)
+}