分离ip库的下载时机

cmd/make.go

@@ -26,7 +26,8 @@ var (
 		},
 		Examples: "make -m act -i 1:    创建活动1的接口与服务文件 \n" +
 			"make -m logic -n test: 	创建test的服务文件 \n" +
-			"make -m config -n test:    创建配置文件",
+			"make -m config -n test:    创建配置文件 \n" +
+			"make -m socket -n test:    创建socket文件 \n",
 		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
 
 			//g.Dump(parser.GetOptAll(), parser.GetArgAll())
@@ -53,6 +54,12 @@ var (
 					return
 				}
 				err = this.Config(name)
+			case "socket":
+				var name = parser.GetOpt("name").String()
+				if name == "" {
+					return
+				}
+				err = this.Socket(name)
 			}
 
 			return
@@ -116,3 +123,25 @@ func (c *cMake) Config(name string) (err error) {
 
 	return
 }
+
+func (c *cMake) Socket(name string) (err error) {
+	var filePath = fmt.Sprintf("internal/socket/%s/%s_new.go", name, gstr.CaseSnake(name))
+	//生成文件不覆盖
+	if !gfile.Exists(filePath) {
+		// 生成目录文件
+		get, _ := fs.ReadFile(ConfigFiles, "make/socket")
+		fileStr := string(get)
+		fileStr = gstr.Replace(fileStr, "{name}", name)
+		err = gfile.PutContents(filePath, fileStr)
+
+		//生成方法文件
+		var filePath2 = fmt.Sprintf("internal/socket/%s/%s.go", name, gstr.CaseSnake(name))
+		get, _ = fs.ReadFile(ConfigFiles, "make/socket2")
+		fileStr = string(get)
+		fileStr = gstr.Replace(fileStr, "{name}", name)
+		fileStr = gstr.Replace(fileStr, "{func}", gstr.CaseCamel(name))
+		err = gfile.PutContents(filePath2, fileStr)
+	}
+
+	return
+}

cmd/make/socket

@@ -0,0 +1,10 @@
+package {name}
+
+type {name} struct {
+}
+
+func New() *{name} {
+	return &{name}{}
+}
+
+func init() {}

cmd/make/socket2

@@ -0,0 +1,19 @@
+package {name}
+
+import (
+	"github.com/ayflying/utility_go/pkg"
+	"github.com/ayflying/utility_go/pkg/websocket"
+	"google.golang.org/protobuf/proto"
+)
+
+func (s *{name}) {func}Handler(conn *websocket.WebsocketData, req any) (err error) {
+	var data = &v1.{func}2S{}
+	err = proto.Unmarshal(req.([]byte), data)
+
+	var res = &v1.{func}2C{}
+
+	resp, err := proto.Marshal(res)
+	pkg.Websocket().Send(000000, conn.Uid, resp)
+
+	return
+}

cmd/update.go

@@ -2,13 +2,14 @@ package cmd
 
 import (
 	"context"
-	"github.com/ayflying/utility_go/package/s3"
+	"github.com/ayflying/utility_go/pkg"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gctx"
 	"os"
+	"path"
 	"time"
 )
 
@@ -17,6 +18,8 @@ type serverCfg struct {
 	Address string `json:"address" dc:"服务地址"`
 	Prod    bool   `json:"prod" dc:"是否生产环境"`
 	S3      string `json:"s3" dc:"使用哪个对象储存中转"`
+	Arch    string `json:"arch" dc:"架构"`
+	System  string `json:"system" dc:"系统"`
 }
 
 type UpdateReq struct {
@@ -24,8 +27,6 @@ type UpdateReq struct {
 	FileUrl string            `json:"file_url" dc:"文件地址"`
 }
 
-var s3Mod *s3.Mod
-
 var (
 	Update = gcmd.Command{
 		Name:  "update",
@@ -36,9 +37,30 @@ var (
 			g.Log().Info(ctx, "准备上传更新文件")
 			//加载编辑配置文件
 			g.Cfg("hack").GetAdapter().(*gcfg.AdapterFile).SetFileName("hack/config.yaml")
+			//获取文件名
 			getFileName, err := g.Cfg("hack").Get(ctx, "gfcli.build.name")
 			Filename := getFileName.String()
 
+			////获取架构
+			//getArch, err := g.Cfg("hack").Get(ctx, "gfcli.build.arch")
+			//Arch := getArch.String()
+			//if Arch == "" {
+			//	Arch = "amd64"
+			//}
+			//
+			////获取操作系统
+			//getSystem, err := g.Cfg("hack").Get(ctx, "gfcli.build.system")
+			//System := getSystem.String()
+			//
+			//if System == "" {
+			//	System = "linux"
+			//}
+			//var systemName = System + "_" + Arch
+
+			//获取版本号
+			getVersion, err := g.Cfg("hack").Get(ctx, "gfcli.build.version")
+			Version := getVersion.String()
+
 			var list []*serverCfg
 			serverList := g.Cfg().MustGet(ctx, "server_list")
 			serverList.Scan(&list)
@@ -59,7 +81,9 @@ var (
 			g.Dump("需要更新的服务器", list)
 			//获取上传链接
 			var url = make(map[string]string)
-			filename := "linux_amd64/" + Filename
+			var system = make(map[string]string)
+			//filename := "linux_amd64/" + Filename
+			//filename := path.Join(Version, "linux_amd64", Filename)
 
 			client := g.Client()
 			client.SetTimeout(time.Minute)
@@ -73,14 +97,28 @@ var (
 				}
 
 				//查询当前上传地址是否存在
-				if _, ok := url[v.S3]; !ok {
+				_, ok2 := system[v.System+v.Arch]
+				if _, ok := url[v.S3]; !ok || !ok2 {
+
+					var systemName = "linux_amd64"
+					if v.Arch != "" && v.System != "" {
+						systemName = v.System + "_" + v.Arch
+					}
+					var filename = path.Join(Version, systemName, Filename)
+					g.Log().Debugf(ctx, "当前上传文件："+filename)
+
 					url[v.S3], err = UploadS3(v.S3, filename)
 					if err != nil {
 						g.Log().Error(ctx, err)
 						return
 					}
-				}
+					system[v.System+v.Arch] = filename
 
+					if err != nil {
+						g.Log().Error(ctx, err)
+						return
+					}
+				}
 				g.Log().Debugf(ctx, "准备同步服务器:%v,url=%v", v.Name, address+"/callback/update")
 				get, err := client.Post(ctx, address+"/callback/update", &UpdateReq{
 					FileUrl: url[v.S3],
@@ -107,9 +145,13 @@ var (
 func UploadS3(typ string, filename string) (res string, err error) {
 	//updateServerS3Name, _ := g.Config().Get(ctx, "update_server_s3_name")
 
-	s3Mod = s3.New(typ)
+	var s3Mod = pkg.S3(typ)
 	bucketName := s3Mod.GetCfg().BucketName
 	obj, err := os.Open(filename)
+	if err != nil {
+		return
+	}
+	defer obj.Close()
 	ff, err := obj.Stat()
 	_, err = s3Mod.PutObject(obj, filename, bucketName, ff.Size())
 	if err != nil {

drivers/db/elasticsearch/load.go

@@ -1,6 +1,7 @@
 package elasticsearch
 
 import (
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 )
@@ -14,17 +15,20 @@ const (
 	quoteChar = "`"
 )
 
-func Init() {
-	var (
-		err         error
-		driverObj   = New()
-		driverNames = g.SliceStr{"es", "elasticsearch"}
-	)
-	for _, driverName := range driverNames {
-		if err = gdb.Register(driverName, driverObj); err != nil {
-			panic(err)
+func init() {
+	boot.AddFunc(func() {
+		var (
+			err         error
+			driverObj   = New()
+			driverNames = g.SliceStr{"es", "elasticsearch"}
+		)
+		for _, driverName := range driverNames {
+			if err = gdb.Register(driverName, driverObj); err != nil {
+				panic(err)
+			}
 		}
-	}
+	})
+
 }
 
 // New create and returns a driver that implements gdb.Driver, which supports operations for MySQL.

go.mod

@@ -12,12 +12,10 @@ require (
 	github.com/goccy/go-json v0.10.4
 	github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0
 	github.com/gogf/gf/v2 v2.9.0
-	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230
 	github.com/minio/minio-go/v7 v7.0.85
 	github.com/prometheus/client_golang v1.21.1
-	github.com/stretchr/testify v1.10.0
 	github.com/xuri/excelize/v2 v2.9.0
 	golang.org/x/oauth2 v0.24.0
 	google.golang.org/api v0.44.0
@@ -32,7 +30,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
@@ -47,6 +44,7 @@ require (
 	github.com/go-pay/xtime v0.0.2 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -62,7 +60,6 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pelletier/go-toml v1.9.3 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect

internal/boot/boot.go

@@ -2,11 +2,8 @@ package boot
 
 import (
 	v1 "github.com/ayflying/utility_go/api/system/v1"
-	"github.com/ayflying/utility_go/drivers/db/elasticsearch"
-	"github.com/ayflying/utility_go/pkg/aycache"
 	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/os/gctx"
-	"math"
 )
 
 var (
@@ -22,16 +19,6 @@ func Boot() (err error) {
 		return service.GameAct().Saves()
 	})
 
-	//初始化ES
-	elasticsearch.Init()
-
-	//初始化指标
-	service.SystemCron().AddCron(v1.CronType_MINUTE, func() error {
-		aycache.QPS.Set(math.Round(float64(aycache.QPSCount) / 60))
-		aycache.QPSCount = 0
-		return nil
-	})
-
 	//初始化自启动方法
 	for _, v := range _func {
 		v()

internal/logic/ip2region/ip2region.go

@@ -11,7 +11,8 @@ import (
 )
 
 var (
-	ctx = gctx.New()
+	ctx  = gctx.New()
+	wait = false
 )
 
 type sIp2region struct {
@@ -19,13 +20,16 @@ type sIp2region struct {
 }
 
 func New() *sIp2region {
-	s := &sIp2region{}
-	s.Load()
-	return s
+
+	return &sIp2region{}
 }
 
 func init() {
 	service.RegisterIp2Region(New())
+
+	//boot.AddFunc(func() {
+	//	service.Ip2Region().Load()
+	//})
 }
 
 // Load 加载到内存中
@@ -34,12 +38,20 @@ func init() {
 //	@receiver s *sIp2region: sIp2region的实例。
 func (s *sIp2region) Load() {
 	var err error
-	var dbPath = "/runtime/library/ip2region.xdb"
 
+	var dbPath = "runtime/library/ip2region.xdb"
+	var url = "https://github.com/ayflying/resource/raw/refs/heads/main/attachment/ip2region.xdb"
+	if wait {
+		return
+	}
 	if gfile.IsEmpty(dbPath) {
+		wait = true
+		defer func() {
+			wait = false
+		}()
+		g.Log().Debug(ctx, "等待下载ip库文件")
 		//下载文件
-		putData, err2 := g.Client().Discovery(nil).
-			Get(ctx, "https://resource.luoe.cn/attachment/ip2region.xdb")
+		putData, err2 := g.Client().Discovery(nil).Get(ctx, url)
 		if err2 != nil {
 			return
 		}
@@ -65,6 +77,9 @@ func (s *sIp2region) Load() {
 }
 
 func (s *sIp2region) GetIp(ip string) (res []string) {
+	//初始化加载
+	s.Load()
+
 	res = make([]string, 5)
 	if s.searcher == nil {
 		return

package/excel/excel.go

@@ -111,8 +111,12 @@ func (s *Excel) RemoveComments(list []interface{}, json []string) []interface{}
 		// 遍历当前元素的每个键值对
 		for _, v3 := range v2.(g.Map) {
 			// 如果字符串中存在//则跳过不写入temp
-			if gstr.Contains(gconv.String(v3), "//") {
-				//delKey = append(delKey, k2)
+			//if gstr.Contains(gconv.String(v3), "//") {
+			//	//delKey = append(delKey, k2)
+			//	add = false
+			//	break
+			//}
+			if strings.HasPrefix(gconv.String(v3), "//") {
 				add = false
 				break
 			}

pkg/aycache/cache.go

@@ -1,11 +1,15 @@
 package aycache
 
 import (
+	v1 "github.com/ayflying/utility_go/api/system/v1"
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/ayflying/utility_go/pkg/aycache/drive"
 	drive2 "github.com/ayflying/utility_go/pkg/aycache/drive"
+	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/os/gcache"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+	"math"
 )
 
 type Mod struct {
@@ -22,6 +26,18 @@ var (
 	)
 )
 
+func init() {
+	boot.AddFunc(func() {
+		//初始化指标
+		service.SystemCron().AddCron(v1.CronType_MINUTE, func() error {
+			QPS.Set(math.Round(float64(QPSCount) / 60))
+			QPSCount = 0
+			return nil
+		})
+	})
+
+}
+
 func New(_name ...string) gcache.Adapter {
 
 	var cacheAdapterObj gcache.Adapter

pkg/websocket/registerer.go

@@ -1,16 +1,49 @@
 package websocket
 
-import "context"
+import "google.golang.org/protobuf/proto"
 
 // 定义一个处理方法的类型
-type Handler func(ctx context.Context, req any) (err error)
+type Handler func(conn *WebsocketData, req any) (err error)
+type Handler2 func(conn *WebsocketData)
+
+type HandlerMessage func(conn *WebsocketData, req any)
+
+type PbType func(cmd int32, data []byte, code int32, msg string) proto.Message
+type PbType2 func(data []byte) (int, []byte)
 
 // 路由器的处理映射
 var (
-	handlers = make(map[int]Handler)
+	handlers          = make(map[int]Handler)
+	OnConnectHandlers = make([]Handler2, 0)
+	OnCloseHandlers   = make([]Handler2, 0)
+	onMessageHandlers = make([]HandlerMessage, 0)
+	Byte2Pb           = make([]PbType, 0)
+	Pb2Bytes          = make([]PbType2, 0)
 )
 
 // 注册方法，将某个消息路由器ID和对应的处理方法关联起来
 func (s *SocketV1) RegisterRouter(cmd int, handler Handler) {
 	handlers[cmd] = handler
 }
+
+//注册方法，讲长连接登陆方法进行注册
+func (s *SocketV1) RegisterOnConnect(_func Handler2) {
+	OnConnectHandlers = append(OnConnectHandlers, _func)
+}
+
+func (s *SocketV1) RegisterOnClose(_func Handler2) {
+	OnCloseHandlers = append(OnCloseHandlers, _func)
+}
+
+//注册方法长连接消息体
+func (s *SocketV1) RegisterMessage(_func HandlerMessage) {
+	onMessageHandlers = append(onMessageHandlers, _func)
+}
+
+func (s *SocketV1) RegisterByte2Pb(_func PbType) {
+	Byte2Pb = append(Byte2Pb, _func)
+}
+
+func (s *SocketV1) RegisterPb2Byte(_func PbType2) {
+	Pb2Bytes = append(Pb2Bytes, _func)
+}

pkg/websocket/socket_new.go

@@ -2,44 +2,56 @@ package websocket
 
 import (
 	"context"
+	"fmt"
+	"github.com/ayflying/utility_go/pkg/aycache"
+	"github.com/ayflying/utility_go/tools"
 	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/glog"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/google/uuid"
+	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gorilla/websocket"
+	"google.golang.org/protobuf/proto"
 	"sync"
-	"github.com/gogf/gf/v2/net/ghttp"
+	"time"
 )
 
-type SocketV1 struct{}
+type SocketV1 struct {
+	Type int `json:"type"`
+}
 
 var (
 	//ctx = gctx.New()
 	//Conn map[uuid.UUID]*WebsocketData
-	lock sync.Mutex
-
-	m = gmap.New(true)
+	lock  sync.Mutex
+	cache = aycache.New("redis")
+	m     = gmap.NewHashMap(true)
 )
 
 type WebsocketData struct {
-	Ws   *websocket.Conn
-	Uuid uuid.UUID
-	Uid  int64
-	Ctx  context.Context
+	Ws     *websocket.Conn `json:"ws" dc:"websocket连接池"`
+	Uuid   string          `json:"uuid" dc:"用户唯一标识"`
+	Uid    int64           `json:"uid" dc:"用户编号"`
+	Groups []string        `json:"groups" dc:"群组"`
+	Ctx    context.Context `json:"ctx" dc:""`
+	RoomId int             `json:"roomId" dc:"房间编号"`
 }
 
 func NewV1() *SocketV1 {
-	return &SocketV1{}
+	return &SocketV1{
+		Type: 2,
+	}
 }
 
 type SocketInterface interface {
-	OnConnect(*websocket.Conn)
-	OnMessage(*WebsocketData, []byte, int)
-	Send(uuid.UUID, []byte) (err error)
-	SendAll(data []byte)
-	OnClose(conn *websocket.Conn)
+	Load(serv *ghttp.Server, prefix string)
+	OnConnect(ctx context.Context, conn *websocket.Conn)
+	OnMessage(conn *WebsocketData, req []byte, msgType int)
+	Send(cmd int32, uid int64, req proto.Message)
+	SendAll(cmd int32, req proto.Message)
+	OnClose(conn *WebsocketData)
 }
 
 func (s *SocketV1) Load(serv *ghttp.Server, prefix string) {
@@ -72,37 +84,43 @@ func (s *SocketV1) Load(serv *ghttp.Server, prefix string) {
 //	@Description:
 //	@receiver s
 //	@param conn
-func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
-	//lock.Lock()
-	//defer lock.Unlock()
-
-	defer conn.Close()
-	id, _ := uuid.NewUUID()
-	ip := conn.RemoteAddr().String()
-
-	data := &WebsocketData{
-		Uuid: id,
-		Ws:   conn,
-		Ctx:  ctx,
+func (s *SocketV1) OnConnect(ctx context.Context, ws *websocket.Conn) {
+	id := guid.S()
+	ip := ws.RemoteAddr().String()
+	conn := &WebsocketData{
+		Uuid:   id,
+		Ws:     ws,
+		Ctx:    ctx,
+		Groups: make([]string, 0),
+		RoomId: -1,
 	}
-	m.Set(id, data)
+	m.Set(id, conn)
 
 	//defer delete(Conn, id)
 
-	//to := fmt.Sprintf("创建连接：%v,ip=%v", id, ip)
+	to := fmt.Sprintf("创建连接：%v,ip=%v", id, ip)
+	g.Log().Debugf(ctx, to)
 	//s.Send(id, []byte(to))
 
+	//用户登录钩子执行
+	for _, connect := range OnConnectHandlers {
+		connect(conn)
+	}
+
 	for {
 		//进入当前连接线程拥堵
-		msgType, msg, err := conn.ReadMessage()
+		msgType, msg, err := ws.ReadMessage()
+		s.Type = msgType
 		if err != nil {
 			//客户端断开返回错误，断开当前连接
+			//g.Log().Error(ctx, err)
 			break
 		}
-		s.OnMessage(m.Get(id).(*WebsocketData), msg, msgType)
+		s.OnMessage(conn, msg, msgType)
 	}
 	//关闭连接触发
-	s.OnClose(id, conn)
+
+	s.OnClose(conn)
 	g.Log().Debugf(ctx, "断开连接:uuid=%v,ip=%v", id, ip)
 }
 
@@ -113,67 +131,221 @@ func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
 //	@param msg
 //	@param msgType
 func (s *SocketV1) OnMessage(conn *WebsocketData, req []byte, msgType int) {
-	//g.Log().Debugf(ctx, "收到消息：%v,type=%v,conn=%v", string(req), msgType, conn)
-	//s.Send(conn.Uuid, msg)
-	//s.SendAll(msg)
-	msgStr := string(req)
-	msg := msgStr[8:]
-	cmd := gconv.Int(msgStr[:8])
-	//GetRouter(cmd, conn.Uid, msg)
+	s.Type = 2
+	var cmd int
+	var msg []byte
+	//uid := conn.Uid
+	for _, v := range Pb2Bytes {
+		cmd, msg = v(req)
+	}
+	g.Log("cmd").Debugf(gctx.New(), fmt.Sprintf("from|%d|%d|%v", cmd, conn.Uid, gjson.MustEncodeString(req)))
+
+	//msgStr := string(req)
+	//cmd = gconv.Int(msgStr[:8])
+	//msg = []byte(msgStr[8:])
+
 	handler, exist := handlers[cmd]
 	if exist {
 		//匹配上路由器
-		handler(conn.Ctx, msg)
+		err := handler(conn, msg)
+		if err != nil {
+			g.Log().Error(conn.Ctx, err)
+		}
 	} else {
 		//fmt.Println("未注册的路由器ID:", cmd)
-		s.Send(conn.Uuid, []byte("未注册的协议号:"+msgStr[:8]))
-		s.OnClose(conn.Uuid, conn.Ws)
+		//s.Send(20000000, conn.Uid, []byte("未注册的协议号:"+strconv.Itoa(cmd)))
+		s.OnClose(conn)
 		return
 	}
 
 }
 
+//绑定用户编号
+func (s *SocketV1) BindUid(conn *WebsocketData, uid int64) {
+	lock.Lock()
+	defer lock.Unlock()
+
+	cacheKey := fmt.Sprintf("socket:uid:%d", uid)
+	g.Redis().Set(nil, cacheKey, conn.Uuid)
+
+	if conn.Uid == 0 {
+		conn.Uid = uid
+	}
+
+}
+
+//解绑用户
+func (s *SocketV1) UnBindUid(uid int64) {
+	lock.Lock()
+	defer lock.Unlock()
+
+	cacheKey := fmt.Sprintf("socket:uid:%d", uid)
+	g.Redis().Del(nil, cacheKey)
+}
+
+// Uid2Uuid 用户编号转uuid唯一标识
+func (s *SocketV1) Uid2Uuid(uid int64) (uuid string) {
+	cacheKey := fmt.Sprintf("socket:uid:%d", uid)
+	get, _ := g.Redis().Get(nil, cacheKey)
+	if get.IsNil() {
+		return
+	}
+
+	uuid = get.String()
+
+	//如果不在线了
+	if !m.Contains(uuid) {
+		// 解绑用户编号
+		s.UnBindUid(uid)
+		return
+	}
+
+	return
+}
+
+// SendUuid
+//
+//	@Description:
+//	@receiver s
+//	@param uid
+//	@param data
+func (s *SocketV1) SendUuid(cmd int32, uuidStr string, req proto.Message) {
+	if !m.Contains(uuidStr) {
+		return
+	}
+	//格式化数据
+	var data, err = proto.Marshal(req)
+	if err != nil {
+		g.Log().Error(gctx.New(), err)
+		return
+	}
+
+	conn := m.Get(uuidStr).(*WebsocketData)
+
+	//前置方法
+
+	for _, v := range Byte2Pb {
+		temp := v(cmd, data, 0, "")
+		data, _ = proto.Marshal(temp)
+	}
+	conn.Ws.WriteMessage(s.Type, data)
+	return
+}
+
 // Send
 //
 //	@Description:
 //	@receiver s
 //	@param uid
 //	@param data
-//	@return err
-func (s *SocketV1) Send(id uuid.UUID, data []byte) (err error) {
-	if !m.Contains(id) {
+func (s *SocketV1) Send(cmd int32, uid int64, req proto.Message) {
+	g.Log("cmd").Debugf(gctx.New(), fmt.Sprintf("to|%d|%d|%v", cmd, uid, gjson.MustEncodeString(req)))
+
+	uuid := s.Uid2Uuid(uid)
+	if uuid == "" {
 		return
 	}
-
-	conn := m.Get(id).(*WebsocketData)
-	conn.Ws.WriteMessage(1, data)
-
+	s.SendUuid(cmd, uuid, req)
 	return
 }
 
 // 批量发送
-func (s *SocketV1) SendAll(data []byte) {
+func (s *SocketV1) SendAll(cmd int32, req proto.Message) {
+	g.Log("cmd").Debugf(gctx.New(), fmt.Sprintf("all:%d|-1|%v", cmd, gjson.MustEncodeString(req)))
+
+	//格式化数据
+	var data, err = proto.Marshal(req)
+	if err != nil {
+		g.Log().Error(gctx.New(), err)
+		return
+	}
+
+	for _, v := range Byte2Pb {
+		temp := v(cmd, data, 0, "")
+		data, _ = proto.Marshal(temp)
+	}
 	m.Iterator(func(k interface{}, v interface{}) bool {
-		//fmt.Printf("%v:%v ", k, v)
 		conn := v.(*WebsocketData)
-		conn.Ws.WriteMessage(1, data)
+		conn.Ws.WriteMessage(s.Type, data)
 		return true
 	})
 }
 
+//加入群组
+func (s *SocketV1) JoinGroup(conn *WebsocketData, group string) {
+	conn.Groups = append(conn.Groups, group)
+	cacheKey := "websocket:group:" + group
+	get, _ := aycache.New("redis").Get(conn.Ctx, cacheKey)
+	var list = make(map[int64]string)
+	if !get.IsNil() {
+		get.Scan(&list)
+	}
+	list[conn.Uid] = conn.Uuid
+	cache.Set(conn.Ctx, cacheKey, list, time.Hour*24*7)
+}
+
+// 退出群组
+func (s *SocketV1) LeaveGroup(conn *WebsocketData, group string) {
+	conn.Groups = tools.RemoveSlice[string](conn.Groups, group)
+	cacheKey := "websocket:group:" + group
+	get, _ := cache.Get(conn.Ctx, cacheKey)
+	var list = make(map[int64]string)
+	if !get.IsNil() {
+		get.Scan(&list)
+	}
+	delete(list, conn.Uid)
+	cache.Set(conn.Ctx, cacheKey, list, time.Hour*24*7)
+}
+
+//群组广播
+func (s *SocketV1) SendGroup(cmd int32, group string, req proto.Message) {
+	cacheKey := "websocket:group:" + group
+	get, _ := cache.Get(gctx.New(), cacheKey)
+	var list = make(map[int64]string)
+	if !get.IsNil() {
+		get.Scan(&list)
+	}
+	for uid, v := range list {
+		if m.Contains(v) {
+			s.Send(cmd, uid, req)
+		}
+	}
+}
+
 // OnClose
 //
 //	@Description:
 //	@receiver s
 //	@param conn
-func (s *SocketV1) OnClose(id uuid.UUID, conn *websocket.Conn) {
+func (s *SocketV1) OnClose(conn *WebsocketData) {
 	// 在此处编写断开连接后的处理逻辑
-	g.Log().Debugf(gctx.New(), "WebSocket connection from %s has been closed.", conn.RemoteAddr())
+	//g.Log().Debugf(gctx.New(), "WebSocket connection from %s has been closed.", conn.RemoteAddr())
+
+	//用户登录钩子执行
+	for _, connect := range OnCloseHandlers {
+		connect(conn)
+	}
+	uid := conn.Uid
+	if uid > 0 {
+		s.UnBindUid(uid)
+		for _, v := range conn.Groups {
+			s.LeaveGroup(conn, v)
+		}
+	}
 
 	// 可能的后续操作：
 	// 1. 更新连接状态或从连接池移除
 	// 2. 发送通知或清理关联资源
 	// 3. 执行特定于业务的断开处理
-	m.Remove(id)
-	conn.Close()
+	conn.Ws.Close()
+	m.Remove(conn.Uuid)
+}
+
+// 是否在线
+func (s *SocketV1) IsOnline(uid int64) bool {
+	uuid := s.Uid2Uuid(uid)
+	if m.Contains(uuid) {
+		return true
+	}
+	return false
 }

tools/random.go

@@ -53,12 +53,52 @@ func (m *randMod) RandomAll(data map[int]int, n int) []int {
 	return result
 }
 
+func RandomAll[t Any](data map[t]int, n int) []t {
+	if n > len(data) {
+		n = len(data)
+	}
+	rand.Seed(time.Now().UnixNano())
+	// 复制权重映射，避免修改原始数据
+	remainingWeights := make(map[t]int)
+	for k, v := range data {
+		remainingWeights[k] = v
+	}
+	result := make([]t, 0, n)
+
+	for i := 0; i < n; i++ {
+		totalWeight := 0
+		// 计算剩余元素的总权重
+		for _, weight := range remainingWeights {
+			totalWeight += weight
+		}
+		if totalWeight == 0 {
+			break
+		}
+		// 生成一个 0 到总权重之间的随机数
+		randomNum := rand.Intn(totalWeight)
+		currentWeight := 0
+		for key, weight := range remainingWeights {
+			currentWeight += weight
+			if randomNum < currentWeight {
+				// 将选中的元素添加到结果切片中
+				result = append(result, key)
+				// 从剩余权重映射中移除选中的元素
+				delete(remainingWeights, key)
+				break
+			}
+		}
+	}
+	return result
+}
+
 // RandByArrInt 根据传入的 interface 切片中的整数值按权重随机返回一个索引
 // 参数 s: 一个包含整数的 interface 切片，切片中的每个元素代表一个权重
 // 返回值: 随机选中的元素的索引
-func RandByArrInt(s []interface{}) int {
+func (m *randMod) RandByArrInt(_s interface{}) int {
 	// 初始化总权重为 0
 	sv := 0
+	s := gconv.Ints(_s)
+
 	// 遍历切片，累加每个元素的权重
 	for i := range s {
 		sv += gconv.Int(s[i])
@@ -73,7 +113,7 @@ func RandByArrInt(s []interface{}) int {
 	var all int
 	// 再次遍历切片，累加权重
 	for i := range s {
-		all += gconv.Int(s[i])
+		all += s[i]
 		// 如果当前累加的权重大于随机数，则返回当前索引
 		if all > r {
 			return i

tools/time.go

@@ -124,7 +124,7 @@ func (m *timeMod) GetDailyTimeList(time1 time.Time, time2 time.Time) (timeList [
 
 // ExcelTime2Time excel时间转时间 (12/10/24 02:03转为时间)
 func (m *timeMod) ExcelTime2Time(excelTime string) time.Time {
-	layout := "01/02/06 15:04" // 月/日/年(最后两位) 小时:分钟 (24小时制)
+	layout := "1/2/06 15:04" // 月/日/年(最后两位) 小时:分钟 (24小时制)
 	timeNew, _ := time.ParseInLocation(layout, excelTime, time.Local)
 	return timeNew
 }

tools/tools.go

@@ -20,9 +20,9 @@ type Number interface {
 	int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
 }
 
-//type Any interface {
-//	interface{} | string | int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
-//}
+type Any interface {
+	string | int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
+}
 
 type toolsInterface interface {
 	Load()
@@ -128,11 +128,11 @@ func (m *tools) Items2Map(items [][]int64) (list map[int64]int64) {
 // 该函数通过遍历切片，从后向前检查每个元素，如果找到与指定值相等的元素，则将其从切片中移除。
 // 这种从后向前的遍历方法可以避免因移除元素而导致的数组重新排列带来的额外计算。
 // RemoveSlice 删除切片中的某个值
-func RemoveSlice[t Number](slice []t, value ...t) []t {
+func RemoveSlice[t Any](slice []t, value ...t) []t {
 	// 从后向前遍历切片
 	for i := len(slice) - 1; i >= 0; i-- {
 		// 检查当前元素是否等于需要移除的值
-		if InArray(slice[i], value) {
+		if InArray[t](value, slice[i]) {
 			// 如果相等，移除该元素
 			// 使用append和切片操作符来实现移除操作，将i之前和i之后的元素合并到一起
 			slice = append(slice[:i], slice[i+1:]...)
@@ -149,7 +149,7 @@ func RemoveSlice[t Number](slice []t, value ...t) []t {
 //	@param value 需要查找的值
 //	@param array 进行查找的切片
 //	@return bool 返回是否存在
-func InArray[t Number](value t, array []t) bool {
+func InArray[t Any](array []t, value t) bool {
 	for _, v := range array {
 		if v == value {
 			return true

utility.go

@@ -4,6 +4,7 @@ import (
 	"github.com/ayflying/utility_go/config"
 	"github.com/ayflying/utility_go/internal/boot"
 	_ "github.com/ayflying/utility_go/internal/logic"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 )
 
@@ -13,12 +14,11 @@ var (
 )
 
 func init() {
-	go func() {
-		// 初始化配置
-		var err = boot.Boot()
-		if err != nil {
-			panic(err)
-		}
-	}()
+	g.Log().Debug(ctx, "utility_go init启动完成")
+	// 初始化配置
+	var err = boot.Boot()
+	if err != nil {
+		panic(err)
+	}
 
 }

utility_test.go

@@ -1,9 +1,9 @@
 package utility_go_test
 
 import (
-	"github.com/ayflying/utility_go/internal/boot"
-	_ "github.com/ayflying/utility_go/internal/logic"
+	//_ "github.com/ayflying/utility_go/internal/logic"
 
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"testing"