Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

 Conflicts:

	internal/api/auth.go

	internal/api/route.go

	internal/api/user.go

	internal/rpc/third/third.go

pkg/common/db/relation/object_hash_model.go

@@ -0,0 +1,40 @@
+package relation
+
+import (
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
+	"context"
+	"gorm.io/gorm"
+)
+
+func NewObjectHash(db *gorm.DB) relation.ObjectHashModelInterface {
+	return &ObjectHashGorm{
+		DB: db,
+	}
+}
+
+type ObjectHashGorm struct {
+	DB *gorm.DB
+}
+
+func (o *ObjectHashGorm) NewTx(tx any) relation.ObjectHashModelInterface {
+	return &ObjectHashGorm{
+		DB: tx.(*gorm.DB),
+	}
+}
+
+func (o *ObjectHashGorm) Take(ctx context.Context, hash string, engine string) (oh *relation.ObjectHashModel, err error) {
+	defer func() {
+		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "hash", hash, "engine", engine, "objectHash", oh)
+	}()
+	oh = &relation.ObjectHashModel{}
+	return oh, utils.Wrap1(o.DB.Where("hash = ? and engine = ?", hash, engine).Take(oh).Error)
+}
+
+func (o *ObjectHashGorm) Create(ctx context.Context, h []*relation.ObjectHashModel) (err error) {
+	defer func() {
+		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "objectHash", h)
+	}()
+	return utils.Wrap1(o.DB.Create(h).Error)
+}

pkg/common/db/relation/object_info_model.go

@@ -0,0 +1,45 @@
+package relation
+
+import (
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
+	"context"
+	"gorm.io/gorm"
+)
+
+func NewObjectInfo(db *gorm.DB) relation.ObjectInfoModelInterface {
+	return &ObjectInfoGorm{
+		DB: db,
+	}
+}
+
+type ObjectInfoGorm struct {
+	DB *gorm.DB
+}
+
+func (o *ObjectInfoGorm) NewTx(tx any) relation.ObjectInfoModelInterface {
+	return &ObjectInfoGorm{
+		DB: tx.(*gorm.DB),
+	}
+}
+
+func (o *ObjectInfoGorm) SetObject(ctx context.Context, obj *relation.ObjectInfoModel) (err error) {
+	defer func() {
+		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "objectInfo", obj)
+	}()
+	return utils.Wrap1(o.DB.Transaction(func(tx *gorm.DB) error {
+		if err := tx.Where("name = ?", obj.Name).Delete(&relation.ObjectInfoModel{}).Error; err != nil {
+			return err
+		}
+		return tx.Create(obj).Error
+	}))
+}
+
+func (o *ObjectInfoGorm) Take(ctx context.Context, name string) (info *relation.ObjectInfoModel, err error) {
+	defer func() {
+		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "name", name, "info", info)
+	}()
+	info = &relation.ObjectInfoModel{}
+	return info, utils.Wrap1(o.DB.Where("name = ?", name).Take(info).Error)
+}

pkg/common/db/relation/object_put_model.go

@@ -0,0 +1,47 @@
+package relation
+
+import (
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
+	"context"
+	"gorm.io/gorm"
+)
+
+func NewObjectPut(db *gorm.DB) relation.ObjectPutModelInterface {
+	return &ObjectPutGorm{
+		DB: db,
+	}
+}
+
+type ObjectPutGorm struct {
+	DB *gorm.DB
+}
+
+func (o *ObjectPutGorm) NewTx(tx any) relation.ObjectPutModelInterface {
+	return &ObjectPutGorm{
+		DB: tx.(*gorm.DB),
+	}
+}
+
+func (o *ObjectPutGorm) Create(ctx context.Context, m []*relation.ObjectPutModel) (err error) {
+	defer func() {
+		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "objectPut", m)
+	}()
+	return utils.Wrap1(o.DB.Create(m).Error)
+}
+
+func (o *ObjectPutGorm) Take(ctx context.Context, putID string) (put *relation.ObjectPutModel, err error) {
+	defer func() {
+		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "putID", putID, "put", put)
+	}()
+	put = &relation.ObjectPutModel{}
+	return put, utils.Wrap1(o.DB.Where("put_id = ?", putID).Take(put).Error)
+}
+
+func (o *ObjectPutGorm) SetCompleted(ctx context.Context, putID string) (err error) {
+	defer func() {
+		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "putID", putID)
+	}()
+	return utils.Wrap1(o.DB.Model(&relation.ObjectPutModel{}).Where("put_id = ?", putID).Update("complete", true).Error)
+}