update db model

src/common/db/redisModel.go

@@ -1,6 +1,7 @@
 package db
 
 import (
+	log2 "Open_IM/src/common/log"
 	"github.com/garyburd/redigo/redis"
 )
 
@@ -10,62 +11,82 @@ const (
 	lastGetSeq       = "LAST_GET_SEQ"
 )
 
+func (d *DataBases) Exec(cmd string, key interface{}, args ...interface{}) (interface{}, error) {
+	con := d.redisPool.Get()
+	if err := con.Err(); err != nil {
+		log2.Error("", "", "redis cmd = %v, err = %v", cmd, err)
+		return nil, err
+	}
+	defer con.Close()
+
+	params := make([]interface{}, 0)
+	params = append(params, key)
+
+	if len(args) > 0 {
+		for _, v := range args {
+			params = append(params, v)
+		}
+	}
+
+	return con.Do(cmd, params...)
+}
+
 //执行用户消息的seq自增操作
 func (d *DataBases) IncrUserSeq(uid string) (int64, error) {
 	key := userIncrSeq + uid
-	return redis.Int64(d.RedisDB.Exec("INCR", key))
+	return redis.Int64(d.Exec("INCR", key))
 }
 
 //获取最新的seq
 func (d *DataBases) GetUserSeq(uid string) (int64, error) {
 	key := userIncrSeq + uid
-	return redis.Int64(d.RedisDB.Exec("GET", key))
+	return redis.Int64(d.Exec("GET", key))
 }
 
 //存储苹果的设备token到redis
 func (d *DataBases) SetAppleDeviceToken(accountAddress, value string) (err error) {
 	key := appleDeviceToken + accountAddress
-	_, err = d.RedisDB.Exec("SET", key, value)
+	_, err = d.Exec("SET", key, value)
 	return err
 }
 
 //删除苹果设备token
 func (d *DataBases) DelAppleDeviceToken(accountAddress string) (err error) {
 	key := appleDeviceToken + accountAddress
-	_, err = d.RedisDB.Exec("DEL", key)
+	_, err = d.Exec("DEL", key)
 	return err
 }
 
 //记录用户上一次主动拉取Seq的值
 func (d *DataBases) SetLastGetSeq(uid string) (err error) {
 	key := lastGetSeq + uid
-	_, err = d.RedisDB.Exec("SET", key)
+	_, err = d.Exec("SET", key)
 	return err
 }
 
 //获取用户上一次主动拉取Seq的值
 func (d *DataBases) GetLastGetSeq(uid string) (int64, error) {
 	key := userIncrSeq + uid
-	return redis.Int64(d.RedisDB.Exec("GET", key))
+	return redis.Int64(d.Exec("GET", key))
 }
 
 //Store userid and platform class to redis
 func (d *DataBases) SetUserIDAndPlatform(userID, platformClass, value string, ttl int64) error {
 	key := userID + platformClass
-	_, err := d.RedisDB.Exec("SET", key, value, "EX", ttl)
+	_, err := d.Exec("SET", key, value, "EX", ttl)
 	return err
 }
 
 //Check exists userid and platform class from redis
 func (d *DataBases) ExistsUserIDAndPlatform(userID, platformClass string) (interface{}, error) {
 	key := userID + platformClass
-	exists, err := d.RedisDB.Exec("EXISTS", key)
+	exists, err := d.Exec("EXISTS", key)
 	return exists, err
 }
 
 //Get platform class Token
 func (d *DataBases) GetPlatformToken(userID, platformClass string) (interface{}, error) {
 	key := userID + platformClass
-	token, err := d.RedisDB.Exec("GET", key)
+	token, err := d.Exec("GET", key)
 	return token, err
 }