From 9420b685b2b1cb9666ce1c4d59300061fec37c22 Mon Sep 17 00:00:00 2001 From: boyce Date: Thu, 31 Jan 2019 18:15:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=8E=E6=9C=8D=E5=8A=A1=E9=97=B4=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/main.go | 2 ++ service/Service.go | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Test/main.go b/Test/main.go index 5fe039f..07140a5 100644 --- a/Test/main.go +++ b/Test/main.go @@ -99,6 +99,8 @@ func (ws *CTest) OnRun() error { pTmpModule := ws.GetModuleByType(1) pTmpModuleTest := pTmpModule.(*CTestModule) pTmpModuleTest.DoSomething() + pservice := testModule.GetOwnerService() + fmt.Printf("%T", pservice) return nil } diff --git a/service/Service.go b/service/Service.go index eddb890..2b4f972 100644 --- a/service/Service.go +++ b/service/Service.go @@ -24,10 +24,12 @@ type IBaseModule interface { OnRun() error AddModule(module IBaseModule) bool GetModuleByType(moduleType uint32) IBaseModule + GetOwnerService() IService + SetOwnerService(iservice IService) } type IService interface { - Init(Iservice interface{}, servicetype int) error + Init(Iservice IService, servicetype int) error Run(service IService, exit chan bool, pwaitGroup *sync.WaitGroup) error OnInit() error OnEndInit() error @@ -76,6 +78,8 @@ type BaseService struct { type BaseModule struct { moduleType uint32 mapModule map[uint32]IBaseModule + + ownerService IService } func (slf *BaseService) GetServiceId() int { @@ -115,8 +119,9 @@ func (slf *BaseService) OnRemoveService(iservice IService) { return } -func (slf *BaseService) Init(Iservice interface{}, servicetype int) error { - slf.servicename = fmt.Sprintf("%T", Iservice) +func (slf *BaseService) Init(iservice IService, servicetype int) error { + slf.ownerService = iservice + slf.servicename = fmt.Sprintf("%T", iservice) parts := strings.Split(slf.servicename, ".") if len(parts) != 2 { err := fmt.Errorf("BaseService.Init: service name is error: %q", slf.servicename) @@ -185,6 +190,8 @@ func (slf *BaseModule) AddModule(module IBaseModule) bool { return false } + module.SetOwnerService(slf.ownerService) + if slf.mapModule == nil { slf.mapModule = make(map[uint32]IBaseModule) } @@ -213,3 +220,11 @@ func (slf *BaseModule) OnInit() error { func (slf *BaseModule) OnRun() error { return fmt.Errorf("not implement OnRun moduletype %d ", slf.GetModuleType()) } + +func (slf *BaseModule) GetOwnerService() IService { + return slf.ownerService +} + +func (slf *BaseModule) SetOwnerService(iservice IService) { + slf.ownerService = iservice +} From 20bfffeb3e2a6e42a78cea71e6c1e396c7996c92 Mon Sep 17 00:00:00 2001 From: boyce Date: Fri, 1 Feb 2019 13:50:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4orgin=E7=BB=93=E7=82=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8E=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/main.go | 18 ++++++++++++------ originnode/global.go | 25 +++++++++++++++++++++++++ server/server.go => originnode/node.go | 16 ++++++++-------- service/Service.go | 14 +++++++------- 4 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 originnode/global.go rename server/server.go => originnode/node.go (86%) diff --git a/Test/main.go b/Test/main.go index 07140a5..2796f54 100644 --- a/Test/main.go +++ b/Test/main.go @@ -10,7 +10,7 @@ import ( "github.com/duanhf2012/origin/cluster" "github.com/duanhf2012/origin/network" - "github.com/duanhf2012/origin/server" + "github.com/duanhf2012/origin/originnode" "github.com/duanhf2012/origin/service" "github.com/duanhf2012/origin/sysservice" @@ -123,17 +123,23 @@ func (ws *CTest) OnDestory() error { } func main() { - server := server.NewServer() - if server == nil { + node := originnode.NewOrginNode() + if node == nil { return } + var module CTestModule + module.SetModuleType(1) + originnode.AddModule(&module) + ptest := originnode.GetModuleByType(1) + fmt.Print(ptest) + var receiver CMessageReceiver wsservice := sysservice.NewWSServerService("/ws", 1314, &receiver, false) test := NewCTest(0) httpserver := sysservice.NewHttpServerService(9120) - server.SetupService(test, httpserver, wsservice) + node.SetupService(test, httpserver, wsservice) - server.Init() - server.Start() + node.Init() + node.Start() } diff --git a/originnode/global.go b/originnode/global.go new file mode 100644 index 0000000..5eb19a8 --- /dev/null +++ b/originnode/global.go @@ -0,0 +1,25 @@ +package originnode + +import ( + _ "net/http/pprof" + + "github.com/duanhf2012/origin/service" +) + +type GlobalModule struct { + service.BaseModule +} + +var g_module GlobalModule + +func AddModule(module service.IModule) bool { + if module.GetModuleType() == 0 { + return false + } + + return g_module.AddModule(module) +} + +func GetModuleByType(moduleType uint32) service.IModule { + return g_module.GetModuleByType(moduleType) +} diff --git a/server/server.go b/originnode/node.go similarity index 86% rename from server/server.go rename to originnode/node.go index ef29223..a5e19b4 100644 --- a/server/server.go +++ b/originnode/node.go @@ -1,4 +1,4 @@ -package server +package originnode import ( "fmt" @@ -20,13 +20,13 @@ type CExitCtl struct { waitGroup *sync.WaitGroup } -type cserver struct { +type COriginNode struct { CExitCtl serviceManager service.IServiceManager sigs chan os.Signal } -func (s *cserver) Init() { +func (s *COriginNode) Init() { service.InitLog() service.InstanceServiceMgr().Init() @@ -36,7 +36,7 @@ func (s *cserver) Init() { signal.Notify(s.sigs, syscall.SIGINT, syscall.SIGTERM) } -func (s *cserver) SetupService(services ...service.IService) { +func (s *COriginNode) SetupService(services ...service.IService) { for i := 0; i < len(services); i++ { if cluster.InstanceClusterMgr().HasLocalService(services[i].GetServiceName()) == true { service.InstanceServiceMgr().Setup(services[i]) @@ -61,7 +61,7 @@ func (s *cserver) SetupService(services ...service.IService) { } -func (s *cserver) Start() { +func (s *COriginNode) Start() { go func() { log.Println(http.ListenAndServe("localhost:6060", nil)) @@ -77,19 +77,19 @@ func (s *cserver) Start() { s.Stop() } -func (s *cserver) Stop() { +func (s *COriginNode) Stop() { close(s.exit) s.waitGroup.Wait() } -func NewServer() *cserver { +func NewOrginNode() *COriginNode { err := cluster.InstanceClusterMgr().Init() if err != nil { fmt.Print(err) return nil } - return new(cserver) + return new(COriginNode) } func HasCmdParam(param string) bool { diff --git a/service/Service.go b/service/Service.go index 2b4f972..795440e 100644 --- a/service/Service.go +++ b/service/Service.go @@ -17,13 +17,13 @@ type MethodInfo struct { types reflect.Type } -type IBaseModule interface { +type IModule interface { SetModuleType(moduleType uint32) GetModuleType() uint32 OnInit() error OnRun() error - AddModule(module IBaseModule) bool - GetModuleByType(moduleType uint32) IBaseModule + AddModule(module IModule) bool + GetModuleByType(moduleType uint32) IModule GetOwnerService() IService SetOwnerService(iservice IService) } @@ -77,7 +77,7 @@ type BaseService struct { type BaseModule struct { moduleType uint32 - mapModule map[uint32]IBaseModule + mapModule map[uint32]IModule ownerService IService } @@ -185,7 +185,7 @@ func (slf *BaseModule) GetModuleType() uint32 { //OnInit() error //OnRun() error -func (slf *BaseModule) AddModule(module IBaseModule) bool { +func (slf *BaseModule) AddModule(module IModule) bool { if module.GetModuleType() == 0 { return false } @@ -193,7 +193,7 @@ func (slf *BaseModule) AddModule(module IBaseModule) bool { module.SetOwnerService(slf.ownerService) if slf.mapModule == nil { - slf.mapModule = make(map[uint32]IBaseModule) + slf.mapModule = make(map[uint32]IModule) } _, ok := slf.mapModule[module.GetModuleType()] @@ -205,7 +205,7 @@ func (slf *BaseModule) AddModule(module IBaseModule) bool { return true } -func (slf *BaseModule) GetModuleByType(moduleType uint32) IBaseModule { +func (slf *BaseModule) GetModuleByType(moduleType uint32) IModule { ret, ok := slf.mapModule[moduleType] if ok == false { return nil From 8942ede22aa7e6343f3933b7b5317fc1291e6d49 Mon Sep 17 00:00:00 2001 From: boyce Date: Fri, 1 Feb 2019 13:53:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sysmodule/basemodule.go | 1 - sysmodule/timer.go.mv | 35 ----------------------------------- 2 files changed, 36 deletions(-) delete mode 100644 sysmodule/basemodule.go delete mode 100644 sysmodule/timer.go.mv diff --git a/sysmodule/basemodule.go b/sysmodule/basemodule.go deleted file mode 100644 index d68e6cf..0000000 --- a/sysmodule/basemodule.go +++ /dev/null @@ -1 +0,0 @@ -package sysmodule diff --git a/sysmodule/timer.go.mv b/sysmodule/timer.go.mv deleted file mode 100644 index 675c401..0000000 --- a/sysmodule/timer.go.mv +++ /dev/null @@ -1,35 +0,0 @@ -package wsservice - -import ( - "origin/service" -) - -//声明控制器函数Map类型变量 - -type cWSService struct { - service.BaseService - port int -} - -func (ws *cWSService) OnInit() error { - return nil -} - -func (ws *cWSService) OnRun() error { - - return nil -} - -func (ws *cWSService) OnDestory() error { - return nil -} - -func NewWSService(servicetype int) *cWSService { - wss := new(cWSService) - wss.Init(wss, servicetype) - return wss -} - -func (ws *cWSService) RPC_TestMethod(a string, b int) error { - return nil -} From 02592f49eabb0a149a555d60789286d02070252c Mon Sep 17 00:00:00 2001 From: boyce Date: Fri, 1 Feb 2019 15:25:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9Eredis=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sysmodule/RedisModule.go | 742 ++++++++++++++++++++++++++++++++++ sysmodule/RedisModule_test.go | 24 ++ 2 files changed, 766 insertions(+) create mode 100644 sysmodule/RedisModule.go create mode 100644 sysmodule/RedisModule_test.go diff --git a/sysmodule/RedisModule.go b/sysmodule/RedisModule.go new file mode 100644 index 0000000..07ba4da --- /dev/null +++ b/sysmodule/RedisModule.go @@ -0,0 +1,742 @@ +package sysmodule + +import ( + "encoding/json" + "errors" + "fmt" + "time" + + "github.com/duanhf2012/origin/service" + "github.com/gomodule/redigo/redis" +) + +type RedisModule struct { + service.BaseModule + redispool *redis.Pool +} + +// ConfigRedis 服务器配置 +type ConfigRedis struct { + IP string + Port string + Password string + DbIndex int + MaxIdle int //最大的空闲连接数，表示即使没有redis连接时依然可以保持N个空闲的连接，而不被清除，随时处于待命状态。 + MaxActive int //最大的激活连接数，表示同时最多有N个连接 + IdleTimeout int //最大的空闲连接等待时间，超过此时间后，空闲连接将被关闭 +} + +func (slf *RedisModule) Init(redisCfg *ConfigRedis) { + redisServer := redisCfg.IP + ":" + redisCfg.Port + slf.redispool = &redis.Pool{ + MaxIdle: redisCfg.MaxIdle, + MaxActive: redisCfg.MaxActive, + IdleTimeout: time.Duration(redisCfg.IdleTimeout) * time.Second, + Dial: func() (redis.Conn, error) { + // 连接数据库 + opt := []redis.DialOption{redis.DialDatabase(redisCfg.DbIndex)} + if redisCfg.Password != "" { + opt = append(opt, redis.DialPassword(redisCfg.Password)) + } + c, err := redis.Dial("tcp", redisServer, opt...) + if err != nil { + fmt.Println(err) + return nil, err + } + + return c, err + }, + + TestOnBorrow: func(c redis.Conn, t time.Time) error { + if time.Since(t) < time.Minute { + return nil + } + _, err := c.Do("PING") + return err + }, + } +} + +// GetConn ... +func (slf *RedisModule) GetConn() (redis.Conn, error) { + conn := slf.redispool.Get() + if conn == nil { + return nil, fmt.Errorf("not get connection") + } + + if conn.Err() != nil { + defer conn.Close() + return nil, conn.Err() + } + return conn, nil +} + +//TestPingRedis 测试连接Redis +func (slf *RedisModule) TestPingRedis() error { + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("not get connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + err := slf.redispool.TestOnBorrow(conn, time.Now()) + + if err != nil { + return err + } + + return nil +} + +//SetRedisString redis添加string类型数据 无过期时间 +//示例:SetRedisString("TestKey", "Hell World!") +func (slf *RedisModule) SetRedisString(key, value string) (err error) { + err = slf.setRedisExStringByEx(key, value, "-1") + + return +} + +//SetRedisExString redis添加string类型数据 有过期时间 ex过期时间,单位秒,必须是整数 +//示例:SetRedisExString("TestKey", "Hell World!","60") +func (slf *RedisModule) SetRedisExString(key, value, ex string) (err error) { + err = slf.setRedisExStringByEx(key, value, ex) + + return +} + +//SetRedisStringJSON redis添加JSON数据 无过期时间 +//示例:SetRedisStringJSON("AAAABTEST1", eagleconfig.Cfg) +func (slf *RedisModule) SetRedisStringJSON(key string, val interface{}) (err error) { + err = slf.SetRedisExStringJSON(key, val, "-1") + + return +} + +//SetRedisExStringJSON redis添加JSON数据 有过期时间 ex过期时间,单位秒,必须是整数 +//示例:SetRedisStringJSON("AAAABTEST1", eagleconfig.Cfg,"60") +func (slf *RedisModule) SetRedisExStringJSON(key string, val interface{}, ex string) (err error) { + if temp, err := json.Marshal(val); err == nil { + err = slf.setRedisExStringByEx(key, string(temp), ex) + } + + return +} + +func (slf *RedisModule) setRedisExStringByEx(key, value, ex string) error { + if key == "" { + return errors.New("Key Is Empty") + } + + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + var ret interface{} + var retErr error + if ex == "-1" { + ret, retErr = conn.Do("SET", key, value) + } else { + ret, retErr = conn.Do("SET", key, value, "EX", ex) + } + + if retErr != nil { + return retErr + } + + _, ok := ret.(string) + if !ok { + retErr = errors.New("Func[SetRedisString] Redis Data Error") + return retErr + } + + return nil +} + +//SetMuchRedisString redis添加多条string类型数据 +//示例:SetMuchRedisString(map[string]string{"Test1": "C语言", "Test2": "Go语言", "Test3": "Python", "Test4": "C++"}) +func (slf *RedisModule) SetMuchRedisString(mapInfo map[string]string) (err error) { + err = slf.setMuchRedisStringByEx(mapInfo, "-1") + + return +} + +//SetMuchRedisStringSameEx redis添加多条string类型数据 具有相同的过期时间 ex过期时间 整数 +//示例:SetMuchRedisStringSameEx(map[string]string{"Test1": "C语言", "Test2": "Go语言", "Test3": "Python", "Test4": "C++"},"300") +func (slf *RedisModule) SetMuchRedisStringSameEx(mapInfo map[string]string, ex string) (err error) { + err = slf.setMuchRedisStringByEx(mapInfo, ex) + + return +} + +func (slf *RedisModule) setMuchRedisStringByEx(mapInfo map[string]string, ex string) error { + if len(mapInfo) <= 0 { + return errors.New("Save Info Is Empty") + } + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + // 开始Send数据 + conn.Send("MULTI") + for key, val := range mapInfo { + if ex == "-1" { + conn.Send("SET", key, val) + } else { + conn.Send("SET", key, val, "EX", ex) + } + } + // 执行命令 + _, err := conn.Do("EXEC") + + if err != nil { + return err + } + + return nil +} + +//GetRedisString redis获取string类型数据 +//示例:GetRedisString("TestKey") +func (slf *RedisModule) GetRedisString(key string) (string, error) { + conn := slf.redispool.Get() + if conn == nil { + return "", fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return "", conn.Err() + } + + ret, err := conn.Do("GET", key) + if err != nil { + return "", err + } + + if ret == nil { + err = errors.New("Func[GetRedisString] Key Is Not Exist") + return "", err + } + + str, ok := ret.([]byte) + if !ok { + err = errors.New("Func[GetRedisString] Redis Data Error") + return "", err + } + + return string(str), nil +} + +//GetRedisStringJSON redis获取string类型数据的Json +//示例:GetRedisString("TestKey") +func (slf *RedisModule) GetRedisStringJSON(key string, st interface{}) error { + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + ret, err := conn.Do("GET", key) + if err != nil { + return err + } + + if ret == nil { + err = errors.New("Func[GetRedisString] Key Is Not Exist") + return err + } + + str, ok := ret.([]byte) + if !ok { + err = errors.New("Func[GetRedisString] Redis Data Error") + return err + } + + if err = json.Unmarshal(str, st); err != nil { + return err + } + + return nil +} + +//GetMuchRedisString redis获取string类型数据 +//Pipeline实现的原理是队列，而队列的原理是先进先出 +//示例:GetMuchRedisString(&[]string{"AAAABTEST1", "AAAABTEST2"}) +func (slf *RedisModule) GetMuchRedisString(keys []string) (retMap map[string]string, err error) { + if len(keys) <= 0 { + err = errors.New("Func[GetMuchRedisString] Keys Is Empty") + return + } + conn := slf.redispool.Get() + if conn == nil { + err = fmt.Errorf("Redis Not Get Connection") + return + } + defer conn.Close() + if conn.Err() != nil { + err = conn.Err() + return + } + + // 开始Send数据 + conn.Send("MULTI") + for _, val := range keys { + conn.Send("GET", val) + } + // 执行命令 + ret, err := conn.Do("EXEC") + + if err != nil { + return + } + + retList, ok := ret.([]interface{}) + if !ok { + err = errors.New("Func[GetMuchRedisString] Redis Data Error") + return + } + + retMap = make(map[string]string) + for index, val := range retList { + strVal, ok := val.([]byte) + if !ok { + retMap[keys[index]] = "" + continue + } + retMap[keys[index]] = string(strVal) + } + err = nil + return +} + +//GetMuchRedisStringJSON redis获取string类型数据Json +//Pipeline实现的原理是队列，而队列的原理是先进先出 +//示例:temp := make(map[string]interface{}) +//temp["AAAABTEST1"] = &eagleconfig.ServerConfig{} +//temp["AAAABTEST2"] = &eagleconfig.ServerConfig{} +//GetMuchRedisStringJSON(&temp) +func (slf *RedisModule) GetMuchRedisStringJSON(keys map[string]interface{}) error { + if len(keys) <= 0 { + err := errors.New("Func[GetMuchRedisStringJSON] Keys Is Empty") + return err + } + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + // 开始Send数据 + conn.Send("MULTI") + var tempKeys []string + for key := range keys { + tempKeys = append(tempKeys, key) + conn.Send("GET", key) + } + // 执行命令 + ret, err := conn.Do("EXEC") + + if err != nil { + return err + } + + retList, ok := ret.([]interface{}) + if !ok { + err = errors.New("Func[GetMuchRedisStringJSON] Redis Data Error") + return err + } + + fmt.Println(tempKeys) + for index, val := range retList { + strVal, ok := val.([]byte) + + if !ok { + continue + } + + json.Unmarshal(strVal, keys[tempKeys[index]]) + } + + return nil +} + +//DelRedisString redis删除string类型数据 +//示例:DelRedisString("AAAABTEST1") +func (slf *RedisModule) DelRedisString(key string) error { + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + ret, err := conn.Do("DEL", key) + if err != nil { + return err + } + + retValue, ok := ret.(int64) + if !ok { + err = errors.New("Func[DelRedisString] Redis Data Error") + return err + } + + if retValue == 0 { + err = errors.New("Func[DelRedisString] Delete Key Fail") + return err + } + + return nil +} + +//DelMuchRedisString redis删除string类型数据 +//示例:DelMuchRedisString([]string{"AAAABTEST1",""AAAABTEST2}) +func (slf *RedisModule) DelMuchRedisString(keys []string) (map[string]bool, error) { + if len(keys) <= 0 { + err := errors.New("Func[DelMuchRedisString] Keys Is Empty") + return nil, err + } + + conn := slf.redispool.Get() + if conn == nil { + return nil, fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return nil, conn.Err() + } + + // 开始Send数据 + conn.Send("MULTI") + for _, val := range keys { + conn.Send("DEL", val) + } + // 执行命令 + ret, err := conn.Do("EXEC") + + if err != nil { + return nil, err + } + + retList, ok := ret.([]interface{}) + if !ok { + err = errors.New("Func[DelMuchRedisString] Redis Data Error") + return nil, err + } + + retMap := map[string]bool{} + for index, val := range retList { + iVal, ok := val.(int64) + if !ok || iVal == 0 { + retMap[keys[index]] = false + continue + } + + retMap[keys[index]] = true + } + + return retMap, nil +} + +//SetRedisHash ... +//如果 hsahKey 是哈希表中的一个新建域，并且值设置成功，返回 1 +//如果哈希表中域 hsahKey 已经存在且旧值已被新值覆盖，返回 0 +func (slf *RedisModule) SetRedisHash(redisKey, hashKey, value string) error { + if redisKey == "" || hashKey == "" { + return errors.New("Key Is Empty") + } + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + _, retErr := conn.Do("HSET", redisKey, hashKey, value) + + if retErr != nil { + return retErr + } + + return nil +} + +//GetRedisAllHashJSON ... +func (slf *RedisModule) GetRedisAllHashJSON(redisKey string) (map[string]string, error) { + if redisKey == "" { + return nil, errors.New("Key Is Empty") + } + conn := slf.redispool.Get() + if conn == nil { + return nil, errors.New("Redis Not Get Connection") + } + + defer conn.Close() + if conn.Err() != nil { + return nil, conn.Err() + } + + value, err := redis.Values(conn.Do("HGETALL", redisKey)) + if err != nil { + fmt.Println(err) + return nil, err + } + + return redis.StringMap(value, err) +} + +//GetRedisHashValueByKey ... +func (slf *RedisModule) GetRedisHashValueByKey(redisKey string, fieldKey string) (string, error) { + if redisKey == "" || fieldKey == "" { + return "", errors.New("Key Is Empty") + } + conn := slf.redispool.Get() + if conn == nil { + return "", errors.New("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return "", conn.Err() + } + + value, err := conn.Do("HGET", redisKey, fieldKey) + if err != nil { + fmt.Println(err) + return "", err + } + if value == nil { + return "", errors.New("Reids Get Hash nil") + } + + str, ok := value.([]byte) + if !ok { + err = errors.New("Func[GetRedisHashValueByKey] Redis Data Error") + return "", err + } + + return string(str), nil +} + +//SetRedisHashJSON ... +func (slf *RedisModule) SetRedisHashJSON(redisKey, hsahKey string, value interface{}) error { + temp, err := json.Marshal(value) + if err == nil { + err = slf.SetRedisHash(redisKey, hsahKey, string(temp)) + } + + return err +} + +//SetMuchRedisHashJSON ... value : hashkey -> value +func (slf *RedisModule) SetMuchRedisHashJSON(redisKey string, value map[string][]interface{}) error { + if len(value) <= 0 { + err := errors.New("Func[SetMuchRedisHashJSON] value Is Empty") + return err + } + + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + // 开始Send数据 + conn.Send("MULTI") + for symbol, val := range value { + temp, err := json.Marshal(val) + if err == nil { + conn.Do("HSET", redisKey, symbol, temp) + } + } + // 执行命令 + _, err := conn.Do("EXEC") + + if err != nil { + return err + } + + return nil +} + +//DelRedisHash ... +func (slf *RedisModule) DelRedisHash(redisKey string, hsahKey string) error { + tempHashKey := []string{hsahKey} + + err := slf.DelMuchRedisHash(redisKey, tempHashKey) + + return err +} + +//DelMuchRedisHash ... +func (slf *RedisModule) DelMuchRedisHash(redisKey string, hsahKey []string) error { + if redisKey == "" || len(hsahKey) <= 0 { + return errors.New("Key Is Empty") + } + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + arg := []interface{}{redisKey} + for _, k := range hsahKey { + arg = append(arg, k) + } + + _, retErr := conn.Do("HDEL", arg...) + + if retErr != nil { + return retErr + } + + return nil +} + +//LPUSH和RPUSH +func (slf *RedisModule) setRedisList(key string, value []string, setType string) error { + if key == "" { + return errors.New("Key Is Empty") + } + if setType != "LPUSH" && setType != "RPUSH" { + return errors.New("Redis List Push Type Error,Must Be LPUSH or RPUSH") + } + conn := slf.redispool.Get() + if conn == nil { + return fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return conn.Err() + } + + arg := []interface{}{key} + for _, k := range value { + arg = append(arg, k) + } + _, retErr := conn.Do(setType, arg...) + + if retErr != nil { + return retErr + } + + return nil +} + +//SetRedisListLpush ... +func (slf *RedisModule) SetRedisListLpush(key, value string) error { + tempVal := []string{value} + err := slf.setRedisList(key, tempVal, "LPUSH") + + return err +} + +//SetMuchRedisListLpush ... +func (slf *RedisModule) SetMuchRedisListLpush(key string, value []string) error { + return slf.setRedisList(key, value, "LPUSH") +} + +//SetRedisListJSONLpush ... +func (slf *RedisModule) SetRedisListJSONLpush(key string, value interface{}) error { + temp, err := json.Marshal(value) + if err == nil { + tempVal := []string{string(temp)} + err = slf.setRedisList(key, tempVal, "LPUSH") + } + + return err +} + +//SetMuchRedisListJSONLpush ... +func (slf *RedisModule) SetMuchRedisListJSONLpush(key string, value []interface{}) error { + tempVal := []string{} + for _, val := range value { + if temp, err := json.Marshal(val); err == nil { + tempVal = append(tempVal, string(temp)) + } + } + + return slf.setRedisList(key, tempVal, "LPUSH") +} + +//SetRedisListRpush ... +func (slf *RedisModule) SetRedisListRpush(key, value string) error { + tempVal := []string{value} + err := slf.setRedisList(key, tempVal, "RPUSH") + + return err +} + +//SetMuchRedisListRpush ... +func (slf *RedisModule) SetMuchRedisListRpush(key string, value []string) error { + return slf.setRedisList(key, value, "RPUSH") +} + +//SetRedisListJSONRpush ... +func (slf *RedisModule) SetRedisListJSONRpush(key string, value interface{}) error { + temp, err := json.Marshal(value) + if err == nil { + tempVal := []string{string(temp)} + err = slf.setRedisList(key, tempVal, "RPUSH") + } + + return err +} + +//SetMuchRedisListJSONRpush ... +func (slf *RedisModule) SetMuchRedisListJSONRpush(key string, value []interface{}) error { + tempVal := []string{} + for _, val := range value { + if temp, err := json.Marshal(val); err == nil { + tempVal = append(tempVal, string(temp)) + } + } + + return slf.setRedisList(key, tempVal, "RPUSH") +} + +// Lrange ... +func (slf *RedisModule) Lrange(key string, start, end int) ([]string, error) { + conn := slf.redispool.Get() + if conn == nil { + return nil, fmt.Errorf("Redis Not Get Connection") + } + defer conn.Close() + if conn.Err() != nil { + return nil, conn.Err() + } + + reply, err := conn.Do("lrange", key, start, end) + if err != nil { + return nil, err + } + + return redis.Strings(reply, err) +} diff --git a/sysmodule/RedisModule_test.go b/sysmodule/RedisModule_test.go new file mode 100644 index 0000000..2f98e22 --- /dev/null +++ b/sysmodule/RedisModule_test.go @@ -0,0 +1,24 @@ +package sysmodule + +import ( + "fmt" + "testing" +) + +func TestRedisModule(t *testing.T) { + var cfg ConfigRedis + var module RedisModule + + cfg.IP = "192.168.0.5" + cfg.Password = "" + cfg.Port = "6379" + cfg.IdleTimeout = 2 + cfg.MaxActive = 3 + cfg.MaxIdle = 3 + cfg.DbIndex = 15 + module.Init(&cfg) + + module.SetRedisHash("rediskey", "hashkey", "1111") + ret, err := module.GetRedisHashValueByKey("rediskey", "hashkey") + fmt.Print(ret, err) +}