测试环境

config/config.go

@@ -7,10 +7,6 @@ import (
 	"x.sikey.com.cn/serverx/confx"
 )
 
-const (
-	envNodeId = "NODE_ID"
-)
-
 var Websocket websocket
 
 func loadWebsocketConfig() error {
@@ -19,7 +15,7 @@ func loadWebsocketConfig() error {
 
 // MustLoadConfig 加载配置
 func MustLoadConfig(file string) {
-	confx.SetEnvConfig(envNodeId)
+	confx.SetEnvConfig("NODE_ID", "ENVIRONMENT")
 	if err := confx.LoadConfig(file, loadWebsocketConfig); err != nil {
 		log.Fatalln(err)
 	}

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/rotisserie/eris v0.5.4
 	github.com/spf13/viper v1.18.2
 	gorm.io/gorm v1.25.7
-	x.sikey.com.cn/serverx v1.2.2
+	x.sikey.com.cn/serverx v1.2.3
 )
 
 require (

go.sum

@@ -703,3 +703,4 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
 x.sikey.com.cn/serverx v1.2.2 h1:UOIATxuuqfQGWeEESWUK83eBRKYJsQRnld4YZWbmEX0=
 x.sikey.com.cn/serverx v1.2.2/go.mod h1:BgkpsIbivTnhap0bDn7pxJxk7hkO5XUV78NixrNGZsw=
+x.sikey.com.cn/serverx v1.2.3/go.mod h1:BgkpsIbivTnhap0bDn7pxJxk7hkO5XUV78NixrNGZsw=

server/client.go

@@ -2,17 +2,16 @@ package server
 
 import (
 	"encoding/json"
-	"regexp"
-	"time"
-
 	"github.com/gin-gonic/gin"
 	"github.com/google/martian/v3/log"
 	"github.com/gorilla/websocket"
 	"github.com/mitchellh/mapstructure"
 	"github.com/rotisserie/eris"
+	"regexp"
 	"sikey.com/websocket/models"
 	"sikey.com/websocket/repositories"
-	"sikey.com/websocket/utils/gid"
+	"time"
+	"x.sikey.com.cn/serverx/gid"
 	"x.sikey.com.cn/serverx/zlog"
 )
 
@@ -72,7 +71,7 @@ func (c *Client) reader() {
 			chatingContent := message.Content.(ChatingContent)
 
 			// Save message to database
-			messageId := gid.GetMessageId()
+			messageId := gid.GetSnowflakeId()
 			chatingContent.MessageId = messageId
 			chatingContent.SessionId = chatingContent.Receiver
 			err = c.saveMessage(messageId, message.Type, &chatingContent)

utils/gid/gid.go

@@ -1,24 +0,0 @@
-package gid
-
-import (
-	"log"
-
-	"github.com/bwmarrin/snowflake"
-)
-
-var node *snowflake.Node
-
-func SetNodeId(n int64) {
-	var err error
-	node, err = snowflake.NewNode(n)
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	// First test generation
-	log.Printf("Node: %d, First test generation %s.\n", n, node.Generate().String())
-}
-
-func GetMessageId() string {
-	return node.Generate().String()
-}