优化

app/dao/dao.go

@@ -4,47 +4,49 @@ import (
 	"fmt"
 	"fmt"
 	"github.com/go-redis/redis/v7"
 	"github.com/go-redis/redis/v7"
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
-	"xorm.io/xorm"
 	"github.com/ichunt2019/cfg/lib"
 	"github.com/ichunt2019/cfg/lib"
 	"ichunt_golang/app/common/config"
 	"ichunt_golang/app/common/config"
 	"time"
 	"time"
+	"xorm.io/xorm"
 
 
-	redispool "github.com/ichunt2019/go-redis-pool"
+	redisPool "github.com/ichunt2019/go-redis-pool"
 	"sync"
 	"sync"
 )
 )
+
 var (
 var (
 	once sync.Once
 	once sync.Once
 	Dao  *dao
 	Dao  *dao
 )
 )
+
 type dao struct {
 type dao struct {
 	db         map[string]*xorm.Engine      //非主从mysql数据库
 	db         map[string]*xorm.Engine      //非主从mysql数据库
 	dbGroup    map[string]*xorm.EngineGroup //mysql主从
 	dbGroup    map[string]*xorm.EngineGroup //mysql主从
-	redisGroup map[string]*redispool.Pool
+	redisGroup map[string]*redisPool.Pool
 }
 }
 
 
 //获取db实例
 //获取db实例
-func(self *dao) GetDb(databases string) *xorm.Engine{
+func (self *dao) GetDb(databases string) *xorm.Engine {
 	return self.db[databases]
 	return self.db[databases]
 }
 }
+
 //获取主从db实例
 //获取主从db实例
-func(self *dao) GetDbGroup(databases string) *xorm.EngineGroup{
+func (self *dao) GetDbGroup(databases string) *xorm.EngineGroup {
 	return self.dbGroup[databases]
 	return self.dbGroup[databases]
 }
 }
 
 
 //获取主从db实例
 //获取主从db实例
-func(self *dao) GetRedisDbGroup(databases string) *redispool.Pool{
+func (self *dao) GetRedisDbGroup(databases string) *redisPool.Pool {
 	return self.redisGroup[databases]
 	return self.redisGroup[databases]
 }
 }
 
 
-
-func mysqlSetup(d *dao) *dao{
+func mysqlSetup(d *dao) *dao {
 	var (
 	var (
 		err error
 		err error
 	)
 	)
 	DatabaseList := config.BuildDatabaseList()
 	DatabaseList := config.BuildDatabaseList()
 	GroupDatabaseList := config.BuildGroupDatabaseList()
 	GroupDatabaseList := config.BuildGroupDatabaseList()
 	for conName, db := range DatabaseList {
 	for conName, db := range DatabaseList {
-		d.db[conName],err = xorm.NewEngine("mysql", db.DataSourceName)
+		d.db[conName], err = xorm.NewEngine("mysql", db.DataSourceName)
 		if err != nil {
 		if err != nil {
 			panic(err)
 			panic(err)
 		}
 		}
@@ -58,7 +60,7 @@ func mysqlSetup(d *dao) *dao{
 		d.db[conName].SetMaxOpenConns(db.MaxOpenCons)
 		d.db[conName].SetMaxOpenConns(db.MaxOpenCons)
 	}
 	}
 	for conName, db := range GroupDatabaseList {
 	for conName, db := range GroupDatabaseList {
-		d.dbGroup[conName],err = xorm.NewEngineGroup("mysql", db.DataSourceName)
+		d.dbGroup[conName], err = xorm.NewEngineGroup("mysql", db.DataSourceName)
 		if err != nil {
 		if err != nil {
 			panic(err)
 			panic(err)
 		}
 		}
@@ -72,30 +74,29 @@ func mysqlSetup(d *dao) *dao{
 		d.dbGroup[conName].SetMaxOpenConns(db.MaxOpenCons)
 		d.dbGroup[conName].SetMaxOpenConns(db.MaxOpenCons)
 	}
 	}
 
 
-
 	return d
 	return d
 }
 }
 
 
-func redisSetup(d *dao) *dao{
+func redisSetup(d *dao) *dao {
 	var err error
 	var err error
 	redisGroupList := config.BuildRedisGroupConfigs()
 	redisGroupList := config.BuildRedisGroupConfigs()
 	fmt.Println(redisGroupList)
 	fmt.Println(redisGroupList)
-	for redisServerName,redisInfo:= range redisGroupList{
-		d.redisGroup[redisServerName], err = redispool.NewHA(&redispool.HAConfig{
+	for redisServerName, redisInfo := range redisGroupList {
+		d.redisGroup[redisServerName], err = redisPool.NewHA(&redisPool.HAConfig{
 			Master:           redisInfo.MasterHost,
 			Master:           redisInfo.MasterHost,
 			Slaves:           redisInfo.SlaveHost,
 			Slaves:           redisInfo.SlaveHost,
-			Password:redisInfo.Password,
-			ReadonlyPassword:redisInfo.ReadonlyPassword,
-			Options:&redis.Options{
-				DialTimeout:redisInfo.DialTimeout,//连接超时
-				MinIdleConns:redisInfo.MinIdleConns,//空闲链接数
-				ReadTimeout:redisInfo.ReadTimeout,
+			Password:         redisInfo.Password,
+			ReadonlyPassword: redisInfo.ReadonlyPassword,
+			Options: &redis.Options{
+				DialTimeout:  redisInfo.DialTimeout,  //连接超时
+				MinIdleConns: redisInfo.MinIdleConns, //空闲链接数
+				ReadTimeout:  redisInfo.ReadTimeout,
 				WriteTimeout: redisInfo.WriteTimeout,
 				WriteTimeout: redisInfo.WriteTimeout,
 			},
 			},
-			AutoEjectHost:      true,//是否弹出故障主机
-			ServerFailureLimit: 3,//达到失败次数时弹出
-			ServerRetryTimeout: 5 * time.Second,//在“ServerRetryTimeout”之后重试弹出的主机`
-			MinServerNum:       1,//保留min服务器 针对从服务器
+			AutoEjectHost:      true,            //是否弹出故障主机
+			ServerFailureLimit: 3,               //达到失败次数时弹出
+			ServerRetryTimeout: 5 * time.Second, //在“ServerRetryTimeout”之后重试弹出的主机`
+			MinServerNum:       1,               //保留min服务器 针对从服务器
 		})
 		})
 
 
 		if err != nil {
 		if err != nil {
@@ -109,9 +110,9 @@ func redisSetup(d *dao) *dao{
 func Init() {
 func Init() {
 	Dao = &dao{}
 	Dao = &dao{}
 	once.Do(func() {
 	once.Do(func() {
-		Dao.db = make(map[string]*xorm.Engine,0)
-		Dao.dbGroup = make(map[string]*xorm.EngineGroup,0)
-		Dao.redisGroup = make(map[string]*redispool.Pool,0)
+		Dao.db = make(map[string]*xorm.Engine, 0)
+		Dao.dbGroup = make(map[string]*xorm.EngineGroup, 0)
+		Dao.redisGroup = make(map[string]*redisPool.Pool, 0)
 		Dao = mysqlSetup(Dao)
 		Dao = mysqlSetup(Dao)
 		Dao = redisSetup(Dao)
 		Dao = redisSetup(Dao)
 	})
 	})