refactor:sync.map replace map

Author: gphper

controllers/conn_controller.go

@@ -30,12 +30,14 @@ func (con connController) List(c *gin.Context) {
 	}
 	conns := make([]ConnItem, 0)
 
-	for k, v := range global.GlobalConf.RedisServices {
+	global.GlobalConf.RedisServices.Range(func(k, v interface{}) bool {
 		conns = append(conns, ConnItem{
-			Key:  k,
-			Name: v.RedisService,
+			Key:  k.(string),
+			Name: v.(global.RedisService).RedisService,
 		})
-	}
+		return true
+	})
+
 	con.Success(c, http.StatusOK, conns)
 }
 
@@ -52,7 +54,7 @@ func (con connController) Add(c *gin.Context) {
 	m.Write([]byte(conf.ServiceName))
 	key := hex.EncodeToString(m.Sum(nil))
 
-	global.GlobalConf.RedisServices[key] = global.RedisService{
+	tmp := global.RedisService{
 		RedisService: conf.ServiceName,
 		Config: model.RedisConfig{
 			Addr:     net.JoinHostPort(conf.Host, conf.Port),
@@ -67,6 +69,14 @@ func (con connController) Add(c *gin.Context) {
 			SshPassword: conf.SshPassword,
 		},
 	}
+	global.GlobalConf.RedisServices.Store(key, tmp)
+
+	tmpRedisServicesCp := make(map[string]global.RedisService)
+	global.GlobalConf.RedisServices.Range(func(k, v interface{}) bool {
+		tmpRedisServicesCp[k.(string)] = v.(global.RedisService)
+		return true
+	})
+	global.GlobalConf.RedisServicesCp = tmpRedisServicesCp
 
 	//存储
 	buffer := &bytes.Buffer{}
@@ -94,7 +104,14 @@ func (con connController) Del(c *gin.Context) {
 		return
 	}
 
-	delete(global.GlobalConf.RedisServices, req.ServiceName)
+	global.GlobalConf.RedisServices.Delete(req.ServiceName)
+
+	tmpRedisServicesCp := make(map[string]global.RedisService)
+	global.GlobalConf.RedisServices.Range(func(k, v interface{}) bool {
+		tmpRedisServicesCp[k.(string)] = v.(global.RedisService)
+		return true
+	})
+	global.GlobalConf.RedisServicesCp = tmpRedisServicesCp
 
 	//存储
 	buffer := &bytes.Buffer{}

controllers/index_controller.go

@@ -42,14 +42,14 @@ func (con indexController) Open(c *gin.Context) {
 	}
 
 	keys := strings.Split(req.Index, "_")
-	redisServer := global.GlobalConf.RedisServices[keys[1]]
-	client, err := service.NewRedisClient(redisServer)
+	redisServer, _ := global.GlobalConf.RedisServices.Load(keys[1])
+	client, err := service.NewRedisClient(redisServer.(global.RedisService))
 	if err != nil {
 		con.Error(c, err.Error())
 		return
 	}
 	global.GlobalClients[keys[1]] = client
-	global.GlobalConf.RedisServices[keys[1]] = redisServer
+	global.GlobalConf.RedisServices.Store(keys[1], redisServer)
 
 	val, _ := c.Get("username")
 	ctx := context.WithValue(context.Background(), "username", val)
@@ -298,9 +298,12 @@ func (con indexController) SerInfo(c *gin.Context) {
 		return
 	}
 
-	redisServer := global.GlobalConf.RedisServices[req.Key]
-
-	client, err := service.NewRedisClient(redisServer)
+	redisServer, ok := global.GlobalConf.RedisServices.Load(req.Key)
+	if !ok {
+		fmt.Println(ok)
+	}
+	redisServers := redisServer.(global.RedisService)
+	client, err := service.NewRedisClient(redisServers)
 	if err != nil {
 		con.Error(c, err.Error())
 		return
@@ -319,7 +322,8 @@ func (con indexController) SerInfo(c *gin.Context) {
 
 	con.Success(c, http.StatusOK, gin.H{
 		"info": info,
-		"name": redisServer.RedisService,
+		"time": time.Now().Format("15:04:05"),
+		"name": redisServers.RedisService,
 	})
 }
 

controllers/ws_controller.go

@@ -118,8 +118,8 @@ func (con wsController) Ws(c *gin.Context) {
 		var client *redis.Client
 		client = global.GlobalClients[cmd.Sk]
 		if client == nil {
-			redisServer := global.GlobalConf.RedisServices[cmd.Sk]
-			client, err = service.NewRedisClient(redisServer)
+			redisServer, _ := global.GlobalConf.RedisServices.Load(cmd.Sk)
+			client, err = service.NewRedisClient(redisServer.(global.RedisService))
 			if err != nil {
 				err = ws.WriteMessage(mt, ReturnResp(err.Error(), 0, uint8(cmd.Db)))
 				if err != nil {
@@ -129,7 +129,7 @@ func (con wsController) Ws(c *gin.Context) {
 				goto LOOP
 			}
 			global.GlobalClients[cmd.Sk] = client
-			global.GlobalConf.RedisServices[cmd.Sk] = redisServer
+			global.GlobalConf.RedisServices.Store(cmd.Sk, redisServer)
 		}
 		err = client.Do(ctx, "select", cmd.Db).Err()
 		if err != nil {

global/default.go

@@ -13,17 +13,19 @@ import (
 	"grm/model"
 	"io"
 	"os"
+	"sync"
 
 	"github.com/go-redis/redis"
 )
 
 var GlobalClients map[string]*redis.Client
 
 type GlobalConfig struct {
-	Accounts      map[string]string
-	RedisServices map[string]RedisService
-	Separator     string
-	Tree          bool
+	Accounts        map[string]string
+	RedisServicesCp map[string]RedisService
+	RedisServices   sync.Map
+	Separator       string
+	Tree            bool
 }
 
 type RedisService struct {
@@ -35,7 +37,7 @@ type RedisService struct {
 
 var GlobalConf = GlobalConfig{
 	Accounts:      make(map[string]string),
-	RedisServices: make(map[string]RedisService),
+	RedisServices: sync.Map{},
 	Separator:     ":",
 	Tree:          true,
 }
@@ -52,6 +54,11 @@ func init() {
 
 	decoder := json.NewDecoder(bytes.NewBuffer(data))
 	err = decoder.Decode(&GlobalConf)
+
+	for k, v := range GlobalConf.RedisServicesCp {
+		GlobalConf.RedisServices.Store(k, v)
+	}
+
 	if err != nil && err != io.EOF {
 		fmt.Println(err)
 		os.Exit(0)