luoyangwei 1 سال پیش
والد
کامیت
a0c7c76299
3فایلهای تغییر یافته به همراه6 افزوده شده و 8 حذف شده
  1. 3 2
      go.mod
  2. 2 5
      go.sum
  3. 1 1
      websocket.go

+ 3 - 2
go.mod

@@ -17,9 +17,11 @@ require (
 	github.com/spf13/viper v1.18.2
 	go.uber.org/zap v1.27.0
 	gorm.io/gorm v1.25.7
-	x.sikey.com.cn/serverx v1.2.26
+	x.sikey.com.cn/serverx v1.2.27
 )
 
+// replace x.sikey.com.cn/serverx v1.2.26 => ../serverx
+
 require (
 	cloud.google.com/go v0.110.10 // indirect
 	cloud.google.com/go/compute v1.23.3 // indirect
@@ -89,7 +91,6 @@ require (
 	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/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

+ 2 - 5
go.sum

@@ -132,11 +132,8 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
 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/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
@@ -318,5 +315,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
-x.sikey.com.cn/serverx v1.2.26 h1:z71S7Iph+hoPgyPSIkCQt+dTGTOOya5IsD1az70RNGk=
-x.sikey.com.cn/serverx v1.2.26/go.mod h1:l2Wkh1NZGcze44BnojMi7kYGR80Lv15FmpHg9qA6KBc=
+x.sikey.com.cn/serverx v1.2.27 h1:UiaFbmNr4KB0I9DQyIjtMhw5mZPYXiZ8A4GQWEfxM8A=
+x.sikey.com.cn/serverx v1.2.27/go.mod h1:bGIrQlWuSkrXrmD6Sszf0pj1SzFi+NP7ohf6sGnloCY=

+ 1 - 1
websocket.go

@@ -24,7 +24,7 @@ import (
 var name = flag.String("n", "w303", "the name of the server")
 var port = flag.Int64("p", 8080, "the port of the server")
 var nodeId = flag.Int64("i", 1, "the node id of the server")
-var configFile = flag.String("f", "./etc/websocket.toml", "the config file")
+var configFile = flag.String("f", "./etc/websocket.local.yaml", "the config file")
 
 func main() {
 	time.Local = time.UTC