cms dev

pkg/common/config/config.go

@@ -85,6 +85,7 @@ type config struct {
 		OpenImOnlineMessageRelayName string `yaml:"openImOnlineMessageRelayName"`
 		OpenImGroupName              string `yaml:"openImGroupName"`
 		OpenImAuthName               string `yaml:"openImAuthName"`
+		OpenImMessageCMSName 		 string `yaml:"openImMessageCMSName"`
 	}
 	Etcd struct {
 		EtcdSchema string   `yaml:"etcdSchema"`

pkg/common/db/mysql_model/im_mysql_model/group_model.go

@@ -147,7 +147,7 @@ func GetGroupsCountNum(group db.Group) (int32, error) {
 	return count, nil
 }
 
-func GetGroupsById(groupId string) (db.Group, error) {
+func GetGroupById(groupId string) (db.Group, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	group := db.Group{
 		GroupID: groupId,

pkg/common/db/mysql_model/im_mysql_model/message_cms.go

@@ -0,0 +1,17 @@
+package im_mysql_model
+
+import (
+	"Open_IM/pkg/common/db"
+	"fmt"
+)
+
+func GetChatLog(chatLog db.ChatLog, pageNumber, showNumber int32) ([]db.ChatLog, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	var chatLogs []db.ChatLog
+	if err != nil {
+		return chatLogs, err
+	}
+	dbConn.LogMode(true)
+	err = dbConn.Table("chat_logs").Where(fmt.Sprintf(" content like '%%%s%%' ", chatLog.Content)).Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&chatLogs).Error
+	return chatLogs, err
+}

pkg/common/http/http_resp.go

@@ -2,10 +2,15 @@ package http
 
 import (
 	"Open_IM/pkg/common/constant"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+
 	//"Open_IM/pkg/cms_api_struct"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+
 )
 
 type BaseResp struct {
@@ -27,6 +32,28 @@ func RespHttp200(ctx *gin.Context, err error, data interface{}) {
 	ctx.JSON(http.StatusOK, resp)
 }
 
+// warp error
+func WarpError(err constant.ErrInfo) error {
+	return status.Error(codes.Code(err.ErrCode), err.ErrMsg)
+}
+
+// parse error from server
+func RespHttp200S(ctx *gin.Context, err error, data interface{}) {
+	var resp BaseResp
+	switch e := err.(type) {
+	case constant.ErrInfo:
+		resp.Code = e.ErrCode
+	default:
+		s, ok := status.FromError(err)
+		if !ok {
+			return
+		}
+		resp.Code = int32(s.Code())
+		resp.ErrMsg = s.Message()
+	}
+	resp.Data = data
+	ctx.JSON(http.StatusOK, resp)
+}
 
 //func CheckErr(pb interface{}) constant.ErrInfo{
 //