更新包

config/config.go

@@ -2,73 +2,45 @@ package config
 
 import (
 	"log"
-	"os"
 
-	"github.com/rotisserie/eris"
+	"code.sikey.com.cn/serverbackend/Serverx/confx"
 	"github.com/spf13/viper"
-	"sikey.com/websocket/utils/configx"
-	"sikey.com/websocket/utils/keys"
-	"sikey.com/websocket/utils/zlog"
 )
 
-var (
-	Config    configx.Config
-	Kafka     kafka
-	Redis     redis
-	Websocket websocket
-	SLS       slsCfg
+const (
+	envNodeId = "NODE_ID"
 )
 
-func init() {
-	viper.SetDefault(keys.WebsocketEnvironment, os.Getenv(keys.WebsocketEnvironment))
-}
-
-func loadRestfulConfig() error {
-	return viper.Unmarshal(&Config)
-}
-
-func loadKafkaConfig() error {
-	return viper.UnmarshalKey("kafka", &Kafka)
-}
-
-func loadRedisConfig() error {
-	return viper.UnmarshalKey("redis", &Redis)
-}
+var Websocket websocket
 
 func loadWebsocketConfig() error {
 	return viper.UnmarshalKey("websocket", &Websocket)
 }
 
-func loadSLSConfig() error {
-	return viper.UnmarshalKey("sls", &SLS)
-}
-
 // MustLoadConfig 加载配置
 func MustLoadConfig(file string) {
-	err := configx.LoadConfig(file,
-		loadRestfulConfig,
-		loadKafkaConfig,
-		loadRedisConfig,
-		loadWebsocketConfig,
-		loadSLSConfig,
-	)
-	if err != nil {
-		log.Fatalln(eris.Wrap(err, "无法映射配置"))
+	confx.SetEnvConfig(envNodeId)
+	if err := confx.LoadConfig(file, loadWebsocketConfig); err != nil {
+		log.Fatalln(err)
 	}
 	log.Printf("Load configs [ toml ] from path [%s] \n", file)
 }
 
-// MustLoadLogger 初始化日志
-func MustLoadLogger() zlog.Writer {
-	var (
-		name = Config.Name
-		env  = Config.Environment
-		path = viper.GetString("log.path")
-	)
-
-	writer, err := zlog.NewZeroWriter(name, path, env)
-	if err != nil {
-		panic(err)
-	}
-	return writer
+func GetServerPort() int {
+	return viper.GetInt("port")
 }
+
+// // MustLoadLogger 初始化日志
+// func MustLoadLogger() zlog.Writer {
+// 	var (
+// 		name = Config.Name
+// 		env  = Config.Environment
+// 		path = viper.GetString("log.path")
+// 	)
+
+// 	writer, err := zlog.NewZeroWriter(name, path, env)
+// 	if err != nil {
+// 		panic(err)
+// 	}
+// 	return writer
+// }

etc/websocket.toml

@@ -6,11 +6,11 @@ port = 10082
 connectSize = 1024 # 控制消息 Channel 大小
 heartbeatWait = 120 # 心跳超时
 messageSize = 256 # 消息 channel 大小
+natsUrl = "nats://106.75.230.4:4333" 
 readBufferSize = 1024 # 读消息体最大的 buffersize
 readWait = 20 # 读超时
 writeBufferSize = 1024 # 写消息体最大的 buffersize
 writeWait = 10 # 写超时
-natsUrl = "nats://106.75.230.4:4333" 
 
 [mysql]
 # dsn = "root:qq123123@tcp(127.0.0.1:3306)/sikey?charset=utf8mb4&parseTime=true&loc=Local"
@@ -45,17 +45,16 @@ partition = 0
 timeout = 10
 topic = "messaging-channel"
 
-[log]
-path = "/Users/luoyangwei/logs/sikey/websocket"
+[logger]
+encoder = "console"
+# [logger.sls]
+# accessKeyId = "LTAI5tMWjYSHsq3S57pyu2JX"
+# accessKeySecret = "08aBmJYTtW1VJX1sffUmFwSNvJnN58"
+# endpoint = "cn-shanghai.log.aliyuncs.com"
+# logStoreName = "w303b"
+# projectName = "w303b-test"
+# sourceIp = "106.75.230.4"
+# topic = "test"
 
 [auth]
 secret = "992443c835c347d6a8b7d046d0261671"
-
-[sls]
-accessKeyId = "LTAI5tMWjYSHsq3S57pyu2JX"
-accessKeySecret = "08aBmJYTtW1VJX1sffUmFwSNvJnN58"
-endpoint = "cn-shanghai.log.aliyuncs.com"
-logStoreName = "w303b"
-projectName = "w303b-test"
-sourceIp = "106.75.230.4"
-topic = "test"

go.mod

@@ -3,26 +3,22 @@ module sikey.com/websocket
 go 1.21.4
 
 require (
+	code.sikey.com.cn/serverbackend/Serverx v1.0.2
 	firebase.google.com/go v3.13.0+incompatible
 	github.com/DeanThompson/ginpprof v0.0.0-20201112072838-007b1e56b2e1
-	github.com/aliyun/aliyun-log-go-sdk v0.1.70
 	github.com/bwmarrin/snowflake v0.3.0
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-sql-driver/mysql v1.7.0
 	github.com/golang-jwt/jwt/v5 v5.2.0
+	github.com/google/martian/v3 v3.3.2
 	github.com/google/uuid v1.4.0
 	github.com/gorilla/websocket v1.5.1
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/nats-io/nats.go v1.32.0
-	github.com/redis/go-redis/v9 v9.4.0
+	github.com/redis/go-redis/v9 v9.5.1
 	github.com/rotisserie/eris v0.5.4
 	github.com/spf13/viper v1.18.2
-	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.18.0
-	google.golang.org/protobuf v1.32.0
-	gorm.io/driver/mysql v1.5.2
-	gorm.io/gorm v1.25.5
+	gorm.io/gorm v1.25.7
 )
 
 require (
@@ -33,6 +29,7 @@ require (
 	cloud.google.com/go/iam v1.1.5 // indirect
 	cloud.google.com/go/longrunning v0.5.4 // indirect
 	cloud.google.com/go/storage v1.35.1 // indirect
+	github.com/aliyun/aliyun-log-go-sdk v0.1.70 // indirect
 	github.com/bytedance/sonic v1.10.2 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -47,6 +44,7 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.17.0 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -82,7 +80,9 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/oauth2 v0.15.0 // indirect
@@ -97,7 +97,9 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gorm.io/driver/mysql v1.5.4 // indirect
 )

go.sum

@@ -2,129 +2,20 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y=
 cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic=
-cloud.google.com/go/accessapproval v1.7.4/go.mod h1:/aTEh45LzplQgFYdQdwPMR9YdX0UlhBmvB84uAmQKUc=
-cloud.google.com/go/accesscontextmanager v1.8.4/go.mod h1:ParU+WbMpD34s5JFEnGAnPBYAgUHozaTmDJU7aCU9+M=
-cloud.google.com/go/aiplatform v1.52.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU=
-cloud.google.com/go/analytics v0.21.6/go.mod h1:eiROFQKosh4hMaNhF85Oc9WO97Cpa7RggD40e/RBy8w=
-cloud.google.com/go/apigateway v1.6.4/go.mod h1:0EpJlVGH5HwAN4VF4Iec8TAzGN1aQgbxAWGJsnPCGGY=
-cloud.google.com/go/apigeeconnect v1.6.4/go.mod h1:CapQCWZ8TCjnU0d7PobxhpOdVz/OVJ2Hr/Zcuu1xFx0=
-cloud.google.com/go/apigeeregistry v0.8.2/go.mod h1:h4v11TDGdeXJDJvImtgK2AFVvMIgGWjSb0HRnBSjcX8=
-cloud.google.com/go/appengine v1.8.4/go.mod h1:TZ24v+wXBujtkK77CXCpjZbnuTvsFNT41MUaZ28D6vg=
-cloud.google.com/go/area120 v0.8.4/go.mod h1:jfawXjxf29wyBXr48+W+GyX/f8fflxp642D/bb9v68M=
-cloud.google.com/go/artifactregistry v1.14.6/go.mod h1:np9LSFotNWHcjnOgh8UVK0RFPCTUGbO0ve3384xyHfE=
-cloud.google.com/go/asset v1.15.3/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU=
-cloud.google.com/go/assuredworkloads v1.11.4/go.mod h1:4pwwGNwy1RP0m+y12ef3Q/8PaiWrIDQ6nD2E8kvWI9U=
-cloud.google.com/go/automl v1.13.4/go.mod h1:ULqwX/OLZ4hBVfKQaMtxMSTlPx0GqGbWN8uA/1EqCP8=
-cloud.google.com/go/baremetalsolution v1.2.3/go.mod h1:/UAQ5xG3faDdy180rCUv47e0jvpp3BFxT+Cl0PFjw5g=
-cloud.google.com/go/batch v1.6.3/go.mod h1:J64gD4vsNSA2O5TtDB5AAux3nJ9iV8U3ilg3JDBYejU=
-cloud.google.com/go/beyondcorp v1.0.3/go.mod h1:HcBvnEd7eYr+HGDd5ZbuVmBYX019C6CEXBonXbCVwJo=
-cloud.google.com/go/bigquery v1.57.1/go.mod h1:iYzC0tGVWt1jqSzBHqCr3lrRn0u13E8e+AqowBsDgug=
-cloud.google.com/go/billing v1.17.4/go.mod h1:5DOYQStCxquGprqfuid/7haD7th74kyMBHkjO/OvDtk=
-cloud.google.com/go/binaryauthorization v1.7.3/go.mod h1:VQ/nUGRKhrStlGr+8GMS8f6/vznYLkdK5vaKfdCIpvU=
-cloud.google.com/go/certificatemanager v1.7.4/go.mod h1:FHAylPe/6IIKuaRmHbjbdLhGhVQ+CWHSD5Jq0k4+cCE=
-cloud.google.com/go/channel v1.17.3/go.mod h1:QcEBuZLGGrUMm7kNj9IbU1ZfmJq2apotsV83hbxX7eE=
-cloud.google.com/go/cloudbuild v1.14.3/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM=
-cloud.google.com/go/clouddms v1.7.3/go.mod h1:fkN2HQQNUYInAU3NQ3vRLkV2iWs8lIdmBKOx4nrL6Hc=
-cloud.google.com/go/cloudtasks v1.12.4/go.mod h1:BEPu0Gtt2dU6FxZHNqqNdGqIG86qyWKBPGnsb7udGY0=
 cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
 cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/contactcenterinsights v1.11.3/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis=
-cloud.google.com/go/container v1.27.1/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4=
-cloud.google.com/go/containeranalysis v0.11.3/go.mod h1:kMeST7yWFQMGjiG9K7Eov+fPNQcGhb8mXj/UcTiWw9U=
-cloud.google.com/go/datacatalog v1.18.3/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM=
-cloud.google.com/go/dataflow v0.9.4/go.mod h1:4G8vAkHYCSzU8b/kmsoR2lWyHJD85oMJPHMtan40K8w=
-cloud.google.com/go/dataform v0.9.1/go.mod h1:pWTg+zGQ7i16pyn0bS1ruqIE91SdL2FDMvEYu/8oQxs=
-cloud.google.com/go/datafusion v1.7.4/go.mod h1:BBs78WTOLYkT4GVZIXQCZT3GFpkpDN4aBY4NDX/jVlM=
-cloud.google.com/go/datalabeling v0.8.4/go.mod h1:Z1z3E6LHtffBGrNUkKwbwbDxTiXEApLzIgmymj8A3S8=
-cloud.google.com/go/dataplex v1.11.1/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c=
-cloud.google.com/go/dataproc/v2 v2.2.3/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY=
-cloud.google.com/go/dataqna v0.8.4/go.mod h1:mySRKjKg5Lz784P6sCov3p1QD+RZQONRMRjzGNcFd0c=
-cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8=
-cloud.google.com/go/datastream v1.10.3/go.mod h1:YR0USzgjhqA/Id0Ycu1VvZe8hEWwrkjuXrGbzeDOSEA=
-cloud.google.com/go/deploy v1.14.2/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g=
-cloud.google.com/go/dialogflow v1.44.3/go.mod h1:mHly4vU7cPXVweuB5R0zsYKPMzy240aQdAu06SqBbAQ=
-cloud.google.com/go/dlp v1.11.1/go.mod h1:/PA2EnioBeXTL/0hInwgj0rfsQb3lpE3R8XUJxqUNKI=
-cloud.google.com/go/documentai v1.23.5/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g=
-cloud.google.com/go/domains v0.9.4/go.mod h1:27jmJGShuXYdUNjyDG0SodTfT5RwLi7xmH334Gvi3fY=
-cloud.google.com/go/edgecontainer v1.1.4/go.mod h1:AvFdVuZuVGdgaE5YvlL1faAoa1ndRR/5XhXZvPBHbsE=
-cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU=
-cloud.google.com/go/essentialcontacts v1.6.5/go.mod h1:jjYbPzw0x+yglXC890l6ECJWdYeZ5dlYACTFL0U/VuM=
-cloud.google.com/go/eventarc v1.13.3/go.mod h1:RWH10IAZIRcj1s/vClXkBgMHwh59ts7hSWcqD3kaclg=
-cloud.google.com/go/filestore v1.7.4/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI=
 cloud.google.com/go/firestore v1.14.0 h1:8aLcKnMPoldYU3YHgu4t2exrKhLQkqaXAGqT0ljrFVw=
 cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ=
-cloud.google.com/go/functions v1.15.4/go.mod h1:CAsTc3VlRMVvx+XqXxKqVevguqJpnVip4DdonFsX28I=
-cloud.google.com/go/gkebackup v1.3.4/go.mod h1:gLVlbM8h/nHIs09ns1qx3q3eaXcGSELgNu1DWXYz1HI=
-cloud.google.com/go/gkeconnect v0.8.4/go.mod h1:84hZz4UMlDCKl8ifVW8layK4WHlMAFeq8vbzjU0yJkw=
-cloud.google.com/go/gkehub v0.14.4/go.mod h1:Xispfu2MqnnFt8rV/2/3o73SK1snL8s9dYJ9G2oQMfc=
-cloud.google.com/go/gkemulticloud v1.0.3/go.mod h1:7NpJBN94U6DY1xHIbsDqB2+TFZUfjLUKLjUX8NGLor0=
-cloud.google.com/go/gsuiteaddons v1.6.4/go.mod h1:rxtstw7Fx22uLOXBpsvb9DUbC+fiXs7rF4U29KHM/pE=
 cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=
 cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
-cloud.google.com/go/iap v1.9.3/go.mod h1:DTdutSZBqkkOm2HEOTBzhZxh2mwwxshfD/h3yofAiCw=
-cloud.google.com/go/ids v1.4.4/go.mod h1:z+WUc2eEl6S/1aZWzwtVNWoSZslgzPxAboS0lZX0HjI=
-cloud.google.com/go/iot v1.7.4/go.mod h1:3TWqDVvsddYBG++nHSZmluoCAVGr1hAcabbWZNKEZLk=
-cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI=
-cloud.google.com/go/language v1.12.2/go.mod h1:9idWapzr/JKXBBQ4lWqVX/hcadxB194ry20m/bTrhWc=
-cloud.google.com/go/lifesciences v0.9.4/go.mod h1:bhm64duKhMi7s9jR9WYJYvjAFJwRqNj+Nia7hF0Z7JA=
-cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI=
 cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
 cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
-cloud.google.com/go/managedidentities v1.6.4/go.mod h1:WgyaECfHmF00t/1Uk8Oun3CQ2PGUtjc3e9Alh79wyiM=
-cloud.google.com/go/maps v1.6.1/go.mod h1:4+buOHhYXFBp58Zj/K+Lc1rCmJssxxF4pJ5CJnhdz18=
-cloud.google.com/go/mediatranslation v0.8.4/go.mod h1:9WstgtNVAdN53m6TQa5GjIjLqKQPXe74hwSCxUP6nj4=
-cloud.google.com/go/memcache v1.10.4/go.mod h1:v/d8PuC8d1gD6Yn5+I3INzLR01IDn0N4Ym56RgikSI0=
-cloud.google.com/go/metastore v1.13.3/go.mod h1:K+wdjXdtkdk7AQg4+sXS8bRrQa9gcOr+foOMF2tqINE=
-cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw=
-cloud.google.com/go/networkconnectivity v1.14.3/go.mod h1:4aoeFdrJpYEXNvrnfyD5kIzs8YtHg945Og4koAjHQek=
-cloud.google.com/go/networkmanagement v1.9.3/go.mod h1:y7WMO1bRLaP5h3Obm4tey+NquUvB93Co1oh4wpL+XcU=
-cloud.google.com/go/networksecurity v0.9.4/go.mod h1:E9CeMZ2zDsNBkr8axKSYm8XyTqNhiCHf1JO/Vb8mD1w=
-cloud.google.com/go/notebooks v1.11.2/go.mod h1:z0tlHI/lREXC8BS2mIsUeR3agM1AkgLiS+Isov3SS70=
-cloud.google.com/go/optimization v1.6.2/go.mod h1:mWNZ7B9/EyMCcwNl1frUGEuY6CPijSkz88Fz2vwKPOY=
-cloud.google.com/go/orchestration v1.8.4/go.mod h1:d0lywZSVYtIoSZXb0iFjv9SaL13PGyVOKDxqGxEf/qI=
-cloud.google.com/go/orgpolicy v1.11.4/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI=
-cloud.google.com/go/osconfig v1.12.4/go.mod h1:B1qEwJ/jzqSRslvdOCI8Kdnp0gSng0xW4LOnIebQomA=
-cloud.google.com/go/oslogin v1.12.2/go.mod h1:CQ3V8Jvw4Qo4WRhNPF0o+HAM4DiLuE27Ul9CX9g2QdY=
-cloud.google.com/go/phishingprotection v0.8.4/go.mod h1:6b3kNPAc2AQ6jZfFHioZKg9MQNybDg4ixFd4RPZZ2nE=
-cloud.google.com/go/policytroubleshooter v1.10.2/go.mod h1:m4uF3f6LseVEnMV6nknlN2vYGRb+75ylQwJdnOXfnv0=
-cloud.google.com/go/privatecatalog v0.9.4/go.mod h1:SOjm93f+5hp/U3PqMZAHTtBtluqLygrDrVO8X8tYtG0=
-cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc=
-cloud.google.com/go/pubsublite v1.8.1/go.mod h1:fOLdU4f5xldK4RGJrBMm+J7zMWNj/k4PxwEZXy39QS0=
-cloud.google.com/go/recaptchaenterprise/v2 v2.8.3/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w=
-cloud.google.com/go/recommendationengine v0.8.4/go.mod h1:GEteCf1PATl5v5ZsQ60sTClUE0phbWmo3rQ1Js8louU=
-cloud.google.com/go/recommender v1.11.3/go.mod h1:+FJosKKJSId1MBFeJ/TTyoGQZiEelQQIZMKYYD8ruK4=
-cloud.google.com/go/redis v1.14.1/go.mod h1:MbmBxN8bEnQI4doZPC1BzADU4HGocHBk2de3SbgOkqs=
-cloud.google.com/go/resourcemanager v1.9.4/go.mod h1:N1dhP9RFvo3lUfwtfLWVxfUWq8+KUQ+XLlHLH3BoFJ0=
-cloud.google.com/go/resourcesettings v1.6.4/go.mod h1:pYTTkWdv2lmQcjsthbZLNBP4QW140cs7wqA3DuqErVI=
-cloud.google.com/go/retail v1.14.4/go.mod h1:l/N7cMtY78yRnJqp5JW8emy7MB1nz8E4t2yfOmklYfg=
-cloud.google.com/go/run v1.3.3/go.mod h1:WSM5pGyJ7cfYyYbONVQBN4buz42zFqwG67Q3ch07iK4=
-cloud.google.com/go/scheduler v1.10.4/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI=
-cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w=
-cloud.google.com/go/security v1.15.4/go.mod h1:oN7C2uIZKhxCLiAAijKUCuHLZbIt/ghYEo8MqwD/Ty4=
-cloud.google.com/go/securitycenter v1.24.2/go.mod h1:l1XejOngggzqwr4Fa2Cn+iWZGf+aBLTXtB/vXjy5vXM=
-cloud.google.com/go/servicedirectory v1.11.3/go.mod h1:LV+cHkomRLr67YoQy3Xq2tUXBGOs5z5bPofdq7qtiAw=
-cloud.google.com/go/shell v1.7.4/go.mod h1:yLeXB8eKLxw0dpEmXQ/FjriYrBijNsONpwnWsdPqlKM=
-cloud.google.com/go/spanner v1.51.0/go.mod h1:c5KNo5LQ1X5tJwma9rSQZsXNBDNvj4/n8BVc3LNahq0=
-cloud.google.com/go/speech v1.20.1/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY=
 cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w=
 cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
-cloud.google.com/go/storagetransfer v1.10.3/go.mod h1:Up8LY2p6X68SZ+WToswpQbQHnJpOty/ACcMafuey8gc=
-cloud.google.com/go/talent v1.6.5/go.mod h1:Mf5cma696HmE+P2BWJ/ZwYqeJXEeU0UqjHFXVLadEDI=
-cloud.google.com/go/texttospeech v1.7.4/go.mod h1:vgv0002WvR4liGuSd5BJbWy4nDn5Ozco0uJymY5+U74=
-cloud.google.com/go/tpu v1.6.4/go.mod h1:NAm9q3Rq2wIlGnOhpYICNI7+bpBebMJbh0yyp3aNw1Y=
-cloud.google.com/go/trace v1.10.4/go.mod h1:Nso99EDIK8Mj5/zmB+iGr9dosS/bzWCJ8wGmE6TXNWY=
-cloud.google.com/go/translate v1.9.3/go.mod h1:Kbq9RggWsbqZ9W5YpM94Q1Xv4dshw/gr/SHfsl5yCZ0=
-cloud.google.com/go/video v1.20.3/go.mod h1:TnH/mNZKVHeNtpamsSPygSR0iHtvrR/cW1/GDjN5+GU=
-cloud.google.com/go/videointelligence v1.11.4/go.mod h1:kPBMAYsTPFiQxMLmmjpcZUMklJp3nC9+ipJJtprccD8=
-cloud.google.com/go/vision/v2 v2.7.5/go.mod h1:GcviprJLFfK9OLf0z8Gm6lQb6ZFUulvpZws+mm6yPLM=
-cloud.google.com/go/vmmigration v1.7.4/go.mod h1:yBXCmiLaB99hEl/G9ZooNx2GyzgsjKnw5fWcINRgD70=
-cloud.google.com/go/vmwareengine v1.0.3/go.mod h1:QSpdZ1stlbfKtyt6Iu19M6XRxjmXO+vb5a/R6Fvy2y4=
-cloud.google.com/go/vpcaccess v1.7.4/go.mod h1:lA0KTvhtEOb/VOdnH/gwPuOzGgM+CWsmGu6bb4IoMKk=
-cloud.google.com/go/webrisk v1.9.4/go.mod h1:w7m4Ib4C+OseSr2GL66m0zMBywdrVNTDKsdEsfMl7X0=
-cloud.google.com/go/websecurityscanner v1.6.4/go.mod h1:mUiyMQ+dGpPPRkHgknIZeCzSHJ45+fY4F52nZFDHm2o=
-cloud.google.com/go/workflows v1.12.3/go.mod h1:fmOUeeqEwPzIU81foMjTRQIdwQHADi/vEr1cx9R1m5g=
+code.sikey.com.cn/serverbackend/Serverx v1.0.2 h1:wywUepF3S9rR+7ATtZdWCkw7l/pZXV8bYHKoUJ9oQ7s=
+code.sikey.com.cn/serverbackend/Serverx v1.0.2/go.mod h1:riR9NxjPh/8SQtYNtnXASO74g4RNKzGGiIOeOA1Zj2A=
 firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4=
 firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
@@ -177,7 +68,6 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
@@ -201,7 +91,6 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -219,14 +108,11 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
@@ -248,11 +134,9 @@ github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4s
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s=
@@ -285,8 +169,9 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91
 github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74=
 github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
+github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
@@ -300,7 +185,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
 github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -319,10 +203,11 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -335,7 +220,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
 github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
@@ -350,7 +234,6 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF
 github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
 github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
@@ -363,18 +246,13 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
-github.com/hashicorp/consul/api v1.25.1/go.mod h1:iiLVwR/htV7mas/sy0O+XSuEnrdBUUydemjxcUrAt4g=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -383,14 +261,12 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
-github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -419,7 +295,6 @@ github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/4
 github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -437,7 +312,6 @@ github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0Q
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -447,7 +321,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
@@ -507,7 +380,6 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
-github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -529,8 +401,8 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk=
-github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8=
+github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
@@ -539,7 +411,6 @@ github.com/rotisserie/eris v0.5.4 h1:Il6IvLdAapsMhvuOahHWiBnl1G++Q0/L5UIkI5mARSk
 github.com/rotisserie/eris v0.5.4/go.mod h1:Z/kgYTJiJtocxCbFfvRmO+QejApzG6zpyky9G1A4g9s=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sagikazarmark/crypt v0.17.0/go.mod h1:SMtHTvdmsZMuY/bpZoqokSoChIrcJ/epOxZN58PbZDg=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
@@ -602,10 +473,6 @@ github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
-go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U=
-go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA=
-go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -652,7 +519,6 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -668,6 +534,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
@@ -739,7 +606,6 @@ golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -764,7 +630,6 @@ google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2Ky
 google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
 google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo=
 google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
-google.golang.org/genproto/googleapis/bytestream v0.0.0-20231120223509-83a465c0220f/go.mod h1:iIgEblxoG4klcXsG0d9cpoxJ4xndv6+1FkDROCHhPRI=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
@@ -779,8 +644,10 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
 google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -819,11 +686,11 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.5.2 h1:QC2HRskSE75wBuOxe0+iCkyJZ+RqpudsQtqkp+IMuXs=
-gorm.io/driver/mysql v1.5.2/go.mod h1:pQLhh1Ut/WUAySdTHwBpBv6+JKcj+ua4ZFx1QQTBzb8=
-gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
-gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/driver/mysql v1.5.4 h1:igQmHfKcbaTVyAIHNhhB888vvxh8EdQ2uSUT0LPcBso=
+gorm.io/driver/mysql v1.5.4/go.mod h1:9rYxJph/u9SWkWc9yY4XJ1F/+xO0S/ChOmbk3+Z5Tvs=
+gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

repositories/online_repostiroy_test.go

@@ -4,18 +4,15 @@ import (
 	"context"
 	"testing"
 
+	"code.sikey.com.cn/serverbackend/Serverx/dbx"
+	"code.sikey.com.cn/serverbackend/Serverx/rdbx"
+	"code.sikey.com.cn/serverbackend/Serverx/zlog"
 	"sikey.com/websocket/config"
-	"sikey.com/websocket/utils/mysqlx"
-	"sikey.com/websocket/utils/redisx"
-	"sikey.com/websocket/utils/zlog"
 )
 
 func TestOnlineRepository_Is(t *testing.T) {
 	config.MustLoadConfig("../etc/websocket.toml")
-	zlog.WithZapLogger(zlog.NewLogger(config.MustLoadLogger()))
-	db := mysqlx.Connect()
-	rdb := redisx.RedisConnect()
-	repos := NewRepositories(db, rdb)
+	repos := NewRepositories(dbx.GetConnect(), rdbx.GetConnect())
 	var err error
 	var online bool
 	if online, err = repos.OnlineRepository.Is(context.TODO(), "2d2e78e8-eb61-47c5-8ebc-8e4d7313f577"); err != nil {

repositories/session_repositroy_test.go

@@ -6,13 +6,13 @@ import (
 	"log"
 	"testing"
 
+	"code.sikey.com.cn/serverbackend/Serverx/dbx"
 	"sikey.com/websocket/config"
-	"sikey.com/websocket/utils/mysqlx"
 )
 
 func getSessionRepository() SessionRepository {
 	config.MustLoadConfig("../etc/websocket.toml")
-	source := mysqlx.Connect()
+	source := dbx.GetConnect()
 	return NewSessionRepository(source)
 }
 

server/client.go

@@ -5,16 +5,15 @@ import (
 	"regexp"
 	"time"
 
+	"code.sikey.com.cn/serverbackend/Serverx/zlog"
 	"github.com/gin-gonic/gin"
+	"github.com/google/martian/v3/log"
 	"github.com/gorilla/websocket"
 	"github.com/mitchellh/mapstructure"
 	"github.com/rotisserie/eris"
-	"gorm.io/gorm"
 	"sikey.com/websocket/models"
 	"sikey.com/websocket/repositories"
 	"sikey.com/websocket/utils/gid"
-	"sikey.com/websocket/utils/keys"
-	"sikey.com/websocket/utils/zlog"
 )
 
 type Client struct {
@@ -23,7 +22,7 @@ type Client struct {
 	hub            *Hub
 	UnderlyingConn *websocket.Conn
 	online         *models.Online
-	logger         *zlog.Logger
+	// logger         *zlog.Logger
 
 	isSimpleMsg   bool   // isSimpleMsg 是否是简单消息
 	localization  string // localization 国际码
@@ -44,7 +43,7 @@ func (c *Client) reader() {
 	defer func() {
 		c.hub.Disconnect <- c
 		c.Close()
-		c.logger.Info("client Offline")
+		// c.logger.Info("client Offline")
 	}()
 
 	c.UnderlyingConn.SetReadDeadline(time.Now().Add(c.readWait))
@@ -52,9 +51,9 @@ func (c *Client) reader() {
 		_, bytes, err := c.UnderlyingConn.ReadMessage()
 		if err != nil {
 			if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
-				c.logger.Errorf("error: %v", eris.Wrap(err, c.UserId))
+				// c.logger.Errorf("error: %v", eris.Wrap(err, c.UserId))
 			} else {
-				c.logger.Errorf("error: %v", eris.Wrap(err, c.UserId))
+				// c.logger.Errorf("error: %v", eris.Wrap(err, c.UserId))
 			}
 			// Close connect
 			// _ = c.repos.OnlineRepository.Offline(c.ctx, c.online)
@@ -62,7 +61,7 @@ func (c *Client) reader() {
 		}
 
 		var message = deserializeMessage(bytes)
-		var log = c.logger.WithField(keys.HeaderRequestId, message.RequestId)
+		// var log = c.logger.WithField(keys.HeaderRequestId, message.RequestId)
 
 		switch message.Type {
 		case MessageTypePingPong:
@@ -83,9 +82,9 @@ func (c *Client) reader() {
 			}
 
 			// Receiver ID format determines whether the receiver is an account or a session
-			log.Infof("message receiver: %s", chatingContent.Receiver)
+			// log.Infof("message receiver: %s", chatingContent.Receiver)
 			users := c.getReceiverUserIds(chatingContent.Receiver)
-			log.Infof("message to users: %v", users)
+			// log.Infof("message to users: %v", users)
 			for _, id := range users {
 				var messaging = *message
 				messaging.Receiver = id
@@ -96,19 +95,19 @@ func (c *Client) reader() {
 				if c.firebaseToken != "" {
 					online, err := c.repos.OnlineRepository.Is(c.ctx, id)
 					if err != nil {
-						log.Error(eris.Wrap(err, "unable to find online user"))
+						// log.Error(eris.Wrap(err, "unable to find online user"))
 						continue
 					}
 					if !online {
 						// Send FCM message
-						token, err := c.repos.FirebaseMessageRepository.GetFirebaseToken(c.ctx, id)
-						if err != nil {
-							if eris.Is(err, models.ErrRecordNotFound) {
-								log.Debugf("user %s not found firebase token", id)
-							}
-						} else {
-							c.hub.FirebaseMessage <- &FirebaseMessage{token: token.Token, message: &messaging, clt: c}
-						}
+						// token, err := c.repos.FirebaseMessageRepository.GetFirebaseToken(c.ctx, id)
+						// if err != nil {
+						// 	if eris.Is(err, models.ErrRecordNotFound) {
+						// 		// log.Debugf("user %s not found firebase token", id)
+						// 	}
+						// } else {
+						// c.hub.FirebaseMessage <- &FirebaseMessage{token: token.Token, message: &messaging, clt: c}
+						// }
 					}
 				}
 				c.hub.Message <- &messaging
@@ -140,9 +139,9 @@ func (c *Client) writer() {
 	for {
 		select {
 		case message, ok := <-c.Send:
-			var log = c.logger
+			// var log = c.logger
 			if message != nil {
-				log = log.WithField(keys.HeaderRequestId, message.RequestId)
+				// log = log.WithField(keys.HeaderRequestId, message.RequestId)
 			}
 
 			c.UnderlyingConn.SetWriteDeadline(time.Now().Add(c.writeWait))
@@ -167,10 +166,10 @@ func (c *Client) writer() {
 						msg.Received = true
 						c.repos.SessionRepository.UpdateMessage(c.ctx, msg)
 					} else {
-						if eris.Is(err, gorm.ErrRecordNotFound) {
+						if eris.Is(err, models.ErrRecordNotFound) {
 							break
 						}
-						log.Error(err)
+						// log.Error(err)
 					}
 				}
 			}

server/fcm.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"log"
 
+	"code.sikey.com.cn/serverbackend/Serverx/zlog"
 	firebase "firebase.google.com/go"
 	"firebase.google.com/go/messaging"
 	"github.com/rotisserie/eris"
-	"sikey.com/websocket/utils/zlog"
 )
 
 type FirebaseMessageServer struct {

server/hub.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"sync"
 
+	"code.sikey.com.cn/serverbackend/Serverx/zlog"
 	"sikey.com/websocket/config"
-	"sikey.com/websocket/utils/zlog"
 )
 
 type Hub struct {

server/hub_test.go

@@ -1,43 +1,20 @@
 package server
 
 import (
-	"context"
 	"fmt"
-	"log"
 	"testing"
 
+	"code.sikey.com.cn/serverbackend/Serverx/dbx"
 	"github.com/gin-gonic/gin"
-	"github.com/redis/go-redis/v9"
 	"sikey.com/websocket/config"
 	"sikey.com/websocket/repositories"
-	"sikey.com/websocket/utils/mysqlx"
 )
 
 var userId = "d6faa0af-b863-48bb-b658-d961a9381585"
 
-func TestHub_ConnectMessage(t *testing.T) {
-	config.MustLoadConfig("../etc/websocket.toml")
-	rdb := redis.NewUniversalClient(&redis.UniversalOptions{
-		Addrs:    []string{config.Redis.Addr},
-		Password: config.Redis.Password,
-		DB:       config.Redis.Db,
-	})
-
-	var err error
-	ctx := context.Background()
-	err = rdb.Publish(ctx, "client.event.connect", userId).Err()
-	if err != nil {
-		log.Fatalln(err)
-	}
-	err = rdb.Publish(ctx, "client.event.disconnect", userId).Err()
-	if err != nil {
-		log.Fatalln(err)
-	}
-}
-
 func TestHub_getReceiverUserIds(t *testing.T) {
 	config.MustLoadConfig("../etc/websocket.toml")
-	repos := repositories.NewRepositories(mysqlx.Connect(), nil)
+	repos := repositories.NewRepositories(dbx.Connect(), nil)
 	c := &Client{
 		ctx:    &gin.Context{},
 		UserId: "beaf8878-03d8-4bf6-a783-22a0d4881265",

server/message.go

@@ -38,7 +38,7 @@ type Message struct {
 type FirebaseMessage struct {
 	token   string
 	message *Message
-	clt     *Client
+	// clt     *Client
 }
 
 type (

server/nats.go

@@ -4,9 +4,9 @@ import (
 	"log"
 	"sync"
 
+	"code.sikey.com.cn/serverbackend/Serverx/zlog"
 	"github.com/nats-io/nats.go"
 	"github.com/rotisserie/eris"
-	"sikey.com/websocket/utils/zlog"
 )
 
 const (

server/server.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"time"
 
+	"code.sikey.com.cn/serverbackend/Serverx/zlog"
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/gorilla/websocket"
@@ -14,7 +15,6 @@ import (
 	"sikey.com/websocket/models"
 	"sikey.com/websocket/repositories"
 	"sikey.com/websocket/utils/keys"
-	"sikey.com/websocket/utils/zlog"
 )
 
 type Server struct {
@@ -40,7 +40,7 @@ func (srv *Server) WebsocketHandler(ctx *gin.Context) {
 		return
 	}
 
-	log := zlog.WithContext(ctx).WithField("ClientId", id)
+	log := zlog.With("ClientId", id)
 	log.Info("client online")
 	conn, err := srv.Upgrader.Upgrade(ctx.Writer, ctx.Request, nil)
 	if err != nil {
@@ -61,7 +61,6 @@ func (srv *Server) WebsocketHandler(ctx *gin.Context) {
 	// Create client
 	client = &Client{
 		ctx:            ctx.Copy(),
-		logger:         log,
 		UserId:         id,
 		hub:            srv.Hub,
 		UnderlyingConn: conn,

utils/mysqlx/mysql.go

@@ -1,149 +0,0 @@
-package mysqlx
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/go-sql-driver/mysql"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/spf13/viper"
-	"golang.org/x/crypto/ssh"
-	sql "gorm.io/driver/mysql"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-)
-
-type mysqlConfig struct {
-	SSH                       bool          `toml:"ssh"` // SSH 是否开启SSH
-	Dsn                       string        // Dsn 数据源地址
-	SkipDefaultTransaction    bool          // SkipDefaultTransaction 跳过默认事务
-	SlowThreshold             time.Duration // SlowThreshold 慢 SQL 阈值
-	IgnoreRecordNotFoundError bool          // IgnoreRecordNotFoundError 忽略记录未找到的错误
-	MaxLifetime               time.Duration // MaxLifetime 连接的有效时长
-	MaxOpenConns              int           // MaxOpenConns 打开数据库连接的最大数量。
-	MaxIdleConns              int           // MaxIdleConns 空闲连接池中连接的最大数量
-}
-
-type driverConfig struct {
-	username string
-	password string
-	protocol string
-	address  string
-	port     int
-	db       string
-	params   string
-}
-
-func (vc *driverConfig) formatDSN() string {
-	return vc.username + ":" + vc.password + "@" +
-		vc.protocol + "(" + vc.address + ":" + strconv.Itoa(vc.port) + ")/" + vc.db + "?" + vc.params
-}
-
-type Dialer struct {
-	client *ssh.Client
-}
-
-func (v *Dialer) Dial(ctx context.Context, address string) (net.Conn, error) {
-	return v.client.Dial("tcp", address)
-}
-
-// Connect 初始化 mysql 连接
-func Connect() *gorm.DB {
-	cfg := readMysqlConfig()
-	conn, err := gorm.Open(sql.New(sql.Config{
-		DSN:                       cfg.Dsn,
-		DefaultStringSize:         255,
-		SkipInitializeWithVersion: false,
-	}), getGormConfig(cfg))
-	if err != nil {
-		log.Panicln(err)
-	}
-
-	sqlDB, _ := conn.DB()
-	// SetMaxIdleConns 设置空闲连接池中连接的最大数量
-	sqlDB.SetMaxIdleConns(cfg.MaxIdleConns)
-	// SetMaxOpenConns 设置打开数据库连接的最大数量。
-	sqlDB.SetMaxOpenConns(cfg.MaxOpenConns)
-	// SetConnMaxLifetime 设置了连接可复用的最大时间。
-	sqlDB.SetConnMaxLifetime(cfg.MaxLifetime)
-
-	log.Printf("Mysql connected to %s \n", cfg.Dsn)
-	return conn
-}
-
-func withDsn(dsn string) *driverConfig {
-	// root:qq123123@tcp(127.0.0.1:3306)/sikey?charset=utf8mb4&parseTime=true&loc=Local
-	var user = strings.Split(dsn, "@")
-	var ua = strings.Split(user[0], ":")
-	var protocol = strings.Split(user[1], "(")
-	var address = strings.Split(protocol[1], ")")
-	var addr = strings.Split(address[0], ":")
-	var port, err = strconv.ParseInt(addr[1], 10, 64)
-	if err != nil {
-		port = 3306
-	}
-	return &driverConfig{
-		username: ua[0],
-		password: ua[1],
-		protocol: protocol[0],
-		address:  addr[0],
-		port:     int(port),
-		db:       strings.Split(address[1], "?")[0][1:],
-		params:   strings.Split(address[1], "?")[1],
-	}
-}
-
-// readMysqlConfig 加载配置
-func readMysqlConfig() mysqlConfig {
-	var cfg mysqlConfig
-	if err := viper.UnmarshalKey("mysql", &cfg); err != nil {
-		log.Fatalln(err)
-	}
-
-	if cfg.SSH {
-		config := &ssh.ClientConfig{
-			User: "root",
-			Auth: []ssh.AuthMethod{
-				ssh.Password("RHTUH2z49aEXnsgz"),
-			},
-			HostKeyCallback: ssh.InsecureIgnoreHostKey(),
-		}
-		var err error
-		var clt *ssh.Client
-		if clt, err = ssh.Dial("tcp", "106.75.230.4:22", config); err != nil {
-			log.Fatalln(err)
-		}
-
-		var protocol = "ssh"
-		vc := withDsn(cfg.Dsn)
-		vc.protocol = protocol
-		cfg.Dsn = vc.formatDSN()
-		fmt.Println(cfg.Dsn)
-		mysql.RegisterDialContext(protocol, (&Dialer{client: clt}).Dial)
-	}
-	return cfg
-}
-
-// getGormConfig 获取 gorm 配置
-func getGormConfig(cfg mysqlConfig) *gorm.Config {
-	return &gorm.Config{
-		DisableForeignKeyConstraintWhenMigrating: true,
-		SkipDefaultTransaction:                   cfg.SkipDefaultTransaction,
-		Logger:                                   defaultLogger(cfg),
-	}
-}
-
-// defaultLogger 默认的日志打印
-func defaultLogger(cfg mysqlConfig) logger.Interface {
-	return logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
-		SlowThreshold:             cfg.SlowThreshold * time.Millisecond, // Slow SQL threshold
-		LogLevel:                  logger.Silent,                        // Log level
-		IgnoreRecordNotFoundError: cfg.IgnoreRecordNotFoundError,        // Ignore ErrRecordNotFound error for logger
-	})
-}

utils/mysqlx/mysql_test.go

@@ -1,12 +0,0 @@
-package mysqlx
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestGetDsn(t *testing.T) {
-	var str = `root:qq123123@tcp(127.0.0.1:3306)/sikey?charset=utf8mb4&parseTime=true&loc=Local`
-	dsn := withDsn(str)
-	fmt.Println(dsn)
-}

utils/redisx/redis.go

@@ -1,48 +0,0 @@
-package redisx
-
-import (
-	"context"
-	"log"
-
-	"github.com/redis/go-redis/v9"
-	"github.com/spf13/viper"
-)
-
-type redisConfig struct {
-	Addr     string // Addr 链接地址
-	DB       int    // DB 数据库, 一般默认是0
-	Password string // Password 密码
-
-	// Channel 来控制订阅频道, 连接发送消息会发送到频道
-	Channel string // Channel 订阅频道
-	// ConnectKey 连接 key, websocket connect 创建时会在 redis 里保存信息,
-	// 这里的 ConnectKey 相当于前缀保存在 redis 里的 key
-	ConnectKey string
-}
-
-func RedisConnect() *redis.Client {
-	cfg := readRedisConfig()
-	addr := cfg.Addr
-	rdb := redis.NewClient(&redis.Options{
-		Addr:     addr,
-		Password: cfg.Password,
-		DB:       cfg.DB,
-	})
-	if err := rdb.Ping(context.Background()).Err(); err != nil {
-		log.Fatalln(err)
-	}
-	log.Printf("Redis connected %s \n", addr)
-	return rdb
-}
-
-func GetRedisConfig() redisConfig {
-	return readRedisConfig()
-}
-
-func readRedisConfig() redisConfig {
-	var cfg redisConfig
-	if err := viper.UnmarshalKey("redis", &cfg); err != nil {
-		log.Fatalln(err)
-	}
-	return cfg
-}

utils/zlog/write.go

@@ -1,68 +0,0 @@
-package zlog
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"time"
-
-	"sikey.com/websocket/utils/format"
-)
-
-const (
-
-	// 控制环境不写入到 es 数据库里
-	notPushEnvironment = "env"
-)
-
-type Writer interface {
-	io.Writer
-
-	GetEnv() string
-}
-
-type ZeroWriter struct {
-	name string
-	path string
-
-	env string
-}
-
-func NewZeroWriter(name, path, env string) (*ZeroWriter, error) {
-	return &ZeroWriter{name: name, path: path, env: env}, nil
-}
-
-func (w *ZeroWriter) GetEnv() string {
-	return w.env
-}
-
-func (w *ZeroWriter) Write(p []byte) (int, error) {
-
-	// date
-	date := time.Now().Format(format.DateParseLeftFormat)
-	filename := fmt.Sprintf("%s/%s-%s.log", w.path, w.name, date)
-
-	var err error
-	var file *os.File
-	if fileStat(filename) {
-		file, err = os.OpenFile(filename, os.O_RDWR|os.O_APPEND, os.ModeAppend)
-	} else {
-		file, err = os.Create(filename)
-	}
-	if err != nil {
-		log.Println("open file error: ", err)
-	}
-
-	return file.Write(p)
-}
-
-// fileStat 检查文件是否存在
-func fileStat(path string) bool {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true
-	}
-
-	return os.IsExist(err)
-}

utils/zlog/write_sls.go

@@ -1,80 +0,0 @@
-package zlog
-
-import (
-	"encoding/json"
-	"log"
-	"time"
-
-	sls "github.com/aliyun/aliyun-log-go-sdk"
-	"google.golang.org/protobuf/proto"
-)
-
-type SLSWriter struct {
-	cfg      SLSWriterConfig
-	client   sls.ClientInterface
-	project  *sls.LogProject
-	logStore *sls.LogStore
-}
-
-type SLSWriterConfig struct {
-	Endpoint        string
-	AccessKeyId     string
-	AccessKeySecret string
-
-	ProjectName  string
-	LogStoreName string
-	Topic        string
-	SourceIP     string
-	Environment  string
-}
-
-func NewSLSWriter(cfg SLSWriterConfig) *SLSWriter {
-	// Create a logging service client.
-	provider := sls.NewStaticCredentialsProvider(cfg.AccessKeyId, cfg.AccessKeySecret, "")
-	client := sls.CreateNormalInterfaceV2(cfg.Endpoint, provider)
-
-	project, err := client.GetProject(cfg.ProjectName)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	logStore, err := client.GetLogStore(project.Name, cfg.LogStoreName)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	return &SLSWriter{
-		cfg:      cfg,
-		client:   client,
-		project:  project,
-		logStore: logStore,
-	}
-}
-func (w *SLSWriter) GetEnv() string {
-	return w.cfg.Environment
-}
-
-func (w *SLSWriter) Write(p []byte) (int, error) {
-	var err error
-	var attributes map[string]string
-	if err = json.Unmarshal(p, &attributes); err != nil {
-		return 0, err
-	}
-
-	contents := make([]*sls.LogContent, 0)
-	for k, v := range attributes {
-		contents = append(contents, &sls.LogContent{Key: proto.String(k), Value: proto.String(v)})
-	}
-
-	unix := uint32(time.Now().UTC().Unix())
-	logs := []*sls.Log{
-		{
-			Time:     proto.Uint32(unix),
-			Contents: contents,
-		},
-	}
-	lg := &sls.LogGroup{
-		Topic:  proto.String(w.cfg.Topic),
-		Source: proto.String(w.cfg.SourceIP),
-		Logs:   logs,
-	}
-	return 1, w.client.PutLogs(w.project.Name, w.logStore.Name, lg)
-}

utils/zlog/write_sls_test.go

@@ -1,51 +0,0 @@
-package zlog
-
-import (
-	"log"
-	"testing"
-	"time"
-
-	sls "github.com/aliyun/aliyun-log-go-sdk"
-	"google.golang.org/protobuf/proto"
-)
-
-func New() {
-	// 日志服务的服务入口。此处以杭州为例，其它地域请根据实际情况填写。
-	Endpoint := "cn-shanghai.log.aliyuncs.com"
-
-	// 本示例从环境变量中获取AccessKey ID和AccessKey Secret。
-	AccessKeyId := "LTAI5tMWjYSHsq3S57pyu2JX"
-	AccessKeySecret := "08aBmJYTtW1VJX1sffUmFwSNvJnN58"
-	// RAM用户角色的临时安全令牌。此处取值为空，表示不使用临时安全令牌。
-	SecurityToken := ""
-	// 创建日志服务Client。
-	provider := sls.NewStaticCredentialsProvider(AccessKeyId, AccessKeySecret, SecurityToken)
-	client := sls.CreateNormalInterfaceV2(Endpoint, provider)
-
-	project, err := client.GetProject("w303b-test")
-	logStore, err := client.GetLogStore("w303b-test", "user")
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	logs := []*sls.Log{
-		{
-			Time: proto.Uint32(uint32(time.Now().Unix())),
-			Contents: []*sls.LogContent{
-				{Key: proto.String("level"), Value: proto.String("info")},
-				{Key: proto.String("msg"), Value: proto.String("hello aliyun log service.")},
-			},
-		},
-	}
-
-	lg := &sls.LogGroup{
-		Topic:  proto.String("test"),
-		Source: proto.String("203.0.113.10"),
-		Logs:   logs,
-	}
-	client.PutLogs(project.Name, logStore.Name, lg)
-}
-
-func TestNew(t *testing.T) {
-	New()
-}

utils/zlog/zlog.go

@@ -1,259 +0,0 @@
-package zlog
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"os"
-	"sync"
-
-	"github.com/rotisserie/eris"
-	"github.com/spf13/viper"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"sikey.com/websocket/utils/keys"
-)
-
-var (
-	l    *Logger
-	once = sync.Once{}
-)
-
-type Logger struct {
-	log *zap.Logger
-	ctx context.Context
-}
-
-func NewZapLogger() *Logger {
-	var name = viper.GetString("name")
-	var env = viper.GetString("environment")
-	var path = viper.GetString("logPath")
-
-	var err error
-	var writer Writer
-	writer, err = NewZeroWriter(name, path, env)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	return NewLogger(writer)
-}
-
-func NewSLSLogger(cfg SLSWriterConfig) *Logger {
-	var writer Writer
-	writer = NewSLSWriter(cfg)
-	return NewLogger(writer)
-}
-
-func NewLogger(writer Writer) *Logger {
-	// 限制日志输出级别, >= DebugLevel 会打印所有级别的日志
-	// 生产环境中一般使用 >= ErrorLevel
-	lowPriority := zap.LevelEnablerFunc(func(lv zapcore.Level) bool {
-		return lv >= zapcore.DebugLevel
-	})
-
-	// 控制台展示方便调试，使用 TEXT 的方式
-	consoleEncoderConfig := zap.NewDevelopmentEncoderConfig()
-	consoleEncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	consoleEncoderConfig.EncodeTime = zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05")
-	consoleEncoder := zapcore.NewConsoleEncoder(consoleEncoderConfig)
-	stdCore := zapcore.NewCore(consoleEncoder, zapcore.Lock(os.Stdout), lowPriority)
-
-	// 日志格式化
-	productionEncoderConfig := zap.NewProductionEncoderConfig()
-	productionEncoderConfig.EncodeTime = zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05")
-	jsonEnc := zapcore.NewJSONEncoder(productionEncoderConfig)
-
-	// 使用 JSON 格式日志
-	var core zapcore.Core
-	if writer.GetEnv() != notPushEnvironment {
-		syncer := zapcore.AddSync(writer)
-		esCore := zapcore.NewCore(jsonEnc, syncer, lowPriority).With([]zap.Field{zap.String("env", writer.GetEnv())})
-		core = zapcore.NewTee(stdCore, esCore)
-	} else {
-		core = stdCore
-	}
-
-	// logger 输出到 console 且标识调用代码行
-	l := zap.New(core).WithOptions(zap.AddCallerSkip(1), zap.AddCaller())
-	return &Logger{log: l}
-}
-
-func NewLoggerWithZapCode(l *zap.Logger) *Logger {
-	return &Logger{log: l}
-}
-
-func WithContext(ctx context.Context) *Logger {
-	requestId := ctx.Value(keys.HeaderRequestId)
-	l := NewLoggerWithZapCode(l.log)
-	if requestId != nil {
-		if id, ok := requestId.(string); ok {
-			l.log = l.log.With(zap.String(keys.HeaderRequestId, id))
-		}
-	}
-	return l
-}
-func WithZapLogger(log *Logger) {
-	once.Do(func() {
-		l = log
-	})
-}
-
-func (l *Logger) WithField(key, value string) *Logger {
-	return NewLoggerWithZapCode(
-		l.log.With(zap.String(key, value)),
-	)
-}
-
-// Debug logs a message at info level.
-func (l *Logger) Debug(args ...any) {
-	l.log.Debug(fmt.Sprint(args...))
-}
-
-// Debugf logs a message at info level.
-func (l *Logger) Debugf(msg string, args ...any) {
-	l.log.Debug(fmt.Sprintf(msg, args...))
-}
-
-// Debugv logs a message at info level.
-func (l *Logger) Debugv(arg any) {
-	l.log.Debug(fmt.Sprint(arg))
-}
-
-// Debugw logs a message at info level.
-func (l *Logger) Debugw(msg string, fields ...zap.Field) {
-	l.log.Debug(fmt.Sprintf(msg, toValues(fields)...))
-}
-
-// Error logs a message at error level.
-func (l *Logger) Error(args ...any) {
-	l.log.Error(fmt.Sprint(args...))
-}
-
-func (l *Logger) ErrorStack(err error) {
-	format := eris.NewDefaultStringFormat(eris.FormatOptions{
-		InvertOutput: true,
-		WithTrace:    true,
-		InvertTrace:  true,
-	})
-
-	formattedStr := eris.ToCustomString(err, format)
-	l.log.Error(formattedStr)
-}
-
-// Errorf logs a message at error level.
-func (l *Logger) Errorf(msg string, args ...any) {
-	l.log.Error(fmt.Sprintf(msg, args...))
-}
-
-// Errorv logs a message at error level.
-func (l *Logger) Errorv(arg any) {
-	l.log.Error(fmt.Sprint(arg))
-}
-
-// Errorw logs a message at error level.
-func (l *Logger) Errorw(msg string, fields ...zap.Field) {
-	l.log.Error(fmt.Sprintf(msg, toValues(fields)...))
-}
-
-// Info logs a message at info level.
-func (l *Logger) Info(args ...any) {
-	l.log.Info(fmt.Sprint(args...))
-}
-
-// Infof logs a message at info level.
-func (l *Logger) Infof(msg string, args ...any) {
-	l.log.Info(fmt.Sprintf(msg, args...))
-}
-
-// Infov logs a message at info level.
-func (l *Logger) Infov(arg any) {
-	l.log.Info(fmt.Sprint(arg))
-}
-
-// Infow logs a message at info level.
-func (l *Logger) Infow(msg string, fields ...zap.Field) {
-	l.log.Info(fmt.Sprintf(msg, toValues(fields)...))
-}
-
-// Debug logs a message at info level.
-func Debug(args ...any) {
-	l.log.Debug(fmt.Sprint(args...))
-}
-
-// Debugf logs a message at info level.
-func Debugf(msg string, args ...any) {
-	l.log.Debug(fmt.Sprintf(msg, args...))
-}
-
-// Debugv logs a message at info level.
-func Debugv(arg any) {
-	l.log.Debug(fmt.Sprint(arg))
-}
-
-// Debugw logs a message at info level.
-func Debugw(msg string, fields ...zap.Field) {
-	l.log.Debug(fmt.Sprintf(msg, toValues(fields)...))
-}
-
-// Error logs a message at error level.
-func Error(args ...any) {
-	l.log.Error(fmt.Sprint(args...))
-}
-
-func ErrorStack(err error) {
-	format := eris.NewDefaultStringFormat(eris.FormatOptions{
-		InvertOutput: true,
-		WithTrace:    true,
-		InvertTrace:  true,
-	})
-
-	formattedStr := eris.ToCustomString(err, format)
-	l.log.Error(formattedStr)
-}
-
-// Errorf logs a message at error level.
-func Errorf(msg string, args ...any) {
-	l.log.Error(fmt.Sprintf(msg, args...))
-}
-
-// Errorv logs a message at error level.
-func Errorv(arg any) {
-	l.log.Error(fmt.Sprint(arg))
-}
-
-// Errorw logs a message at error level.
-func Errorw(msg string, fields ...zap.Field) {
-	l.log.Error(fmt.Sprintf(msg, toValues(fields)...))
-}
-
-// Info logs a message at info level.
-func Info(args ...any) {
-	l.log.Info(fmt.Sprint(args...))
-}
-
-// Infof logs a message at info level.
-func Infof(msg string, args ...any) {
-	l.log.Info(fmt.Sprintf(msg, args...))
-}
-
-// Infov logs a message at info level.
-func Infov(arg any) {
-	l.log.Info(fmt.Sprint(arg))
-}
-
-// Infow logs a message at info level.
-func Infow(msg string, fields ...zap.Field) {
-	l.log.Info(fmt.Sprintf(msg, toValues(fields)...))
-}
-
-func addLineBreakSymbol(msg string) string {
-	return fmt.Sprintln(msg)
-}
-
-func toValues(fields []zap.Field) []any {
-	var str []any = make([]any, len(fields))
-	for i, field := range fields {
-		str[i] = field.String
-	}
-	return str
-}

utils/zlog/zlog_grpc.go

@@ -1,74 +0,0 @@
-package zlog
-
-type GrpcLogger struct {
-	logger *Logger
-}
-
-func NewGrpcLogger(logger *Logger) *GrpcLogger {
-	return &GrpcLogger{logger: logger}
-}
-
-// Info returns
-func (zl *GrpcLogger) Info(args ...interface{}) {
-	Info(args...)
-}
-
-// Infoln returns
-func (zl *GrpcLogger) Infoln(args ...interface{}) {
-	Info(args...)
-}
-
-// Infof returns
-func (zl *GrpcLogger) Infof(format string, args ...interface{}) {
-	Infof(format, args...)
-}
-
-// Warning returns
-func (zl *GrpcLogger) Warning(args ...interface{}) {
-	Debug(args...)
-}
-
-// Warningln returns
-func (zl *GrpcLogger) Warningln(args ...interface{}) {
-	Debug(args...)
-}
-
-// Warningf returns
-func (zl *GrpcLogger) Warningf(format string, args ...interface{}) {
-	Debugf(format, args...)
-}
-
-// Error returns
-func (zl *GrpcLogger) Error(args ...interface{}) {
-	Error(args...)
-}
-
-// Errorln returns
-func (zl *GrpcLogger) Errorln(args ...interface{}) {
-	Error(args...)
-}
-
-// Errorf returns
-func (zl *GrpcLogger) Errorf(format string, args ...interface{}) {
-	Errorf(format, args...)
-}
-
-// Fatal returns
-func (zl *GrpcLogger) Fatal(args ...interface{}) {
-	Error(args...)
-}
-
-// Fatalln returns
-func (zl *GrpcLogger) Fatalln(args ...interface{}) {
-	Error(args...)
-}
-
-// Fatalf logs to fatal level
-func (zl *GrpcLogger) Fatalf(format string, args ...interface{}) {
-	Errorf(format, args...)
-}
-
-// V reports whether verbosity level l is at least the requested verbose level.
-func (zl *GrpcLogger) V(v int) bool {
-	return false
-}

utils/zlog/zlog_test.go

@@ -1 +0,0 @@
-package zlog

websocket.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"code.sikey.com.cn/serverbackend/Serverx/dbx"
+	"code.sikey.com.cn/serverbackend/Serverx/rdbx"
 	"github.com/DeanThompson/ginpprof"
 	"github.com/denisbrodbeck/machineid"
 	"github.com/gin-gonic/gin"
@@ -15,41 +17,18 @@ import (
 	"sikey.com/websocket/config"
 	"sikey.com/websocket/repositories"
 	"sikey.com/websocket/server"
-	"sikey.com/websocket/utils/gid"
-	"sikey.com/websocket/utils/mysqlx"
-	"sikey.com/websocket/utils/redisx"
-	"sikey.com/websocket/utils/zlog"
 )
 
 var configFile = flag.String("f", "./etc/websocket.toml", "the config file")
-var nodeId = flag.Int64("n", 1, "the node id")
 
 func main() {
 	time.Local = time.UTC
 
 	flag.Parse()
 	config.MustLoadConfig(*configFile)
-	gid.SetNodeId(*nodeId)
-
-	// Zaplog init
-	if config.Config.Environment == "release" {
-		gin.SetMode(gin.ReleaseMode)
-		zlog.WithZapLogger(zlog.NewSLSLogger(zlog.SLSWriterConfig{
-			Endpoint:        config.SLS.Endpoint,
-			AccessKeyId:     config.SLS.AccessKeyId,
-			AccessKeySecret: config.SLS.AccessKeySecret,
-			ProjectName:     config.SLS.ProjectName,
-			LogStoreName:    config.SLS.LogStoreName,
-			Topic:           config.SLS.Topic,
-			SourceIP:        config.SLS.SourceIP,
-			Environment:     config.Config.Environment,
-		}))
-	} else {
-		zlog.WithZapLogger(zlog.NewLogger(config.MustLoadLogger()))
-	}
 
 	app := newApp()
-	app.Run(fmt.Sprintf(":%d", config.Config.Port))
+	app.Run(fmt.Sprintf(":%d", config.GetServerPort()))
 }
 
 func newApp() *gin.Engine {
@@ -67,7 +46,7 @@ func newApp() *gin.Engine {
 			},
 		},
 		Hub:          server.NewHub(id),
-		Repositories: repositories.NewRepositories(mysqlx.Connect(), redisx.RedisConnect()),
+		Repositories: repositories.NewRepositories(dbx.GetConnect(), rdbx.GetConnect()),
 	}
 
 	app.GET("/websocket/endpoint", func(ctx *gin.Context) { srv.WebsocketHandler(ctx) })