Skip to content

Commit 3a93d82

Browse files
committed
♻️ refactor: updated codebase and upgraded deps #16 #2
1 parent e993a9b commit 3a93d82

File tree

5 files changed

+27
-39
lines changed

5 files changed

+27
-39
lines changed

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require (
88
github.com/go-playground/universal-translator v0.18.1
99
github.com/go-playground/validator/v10 v10.16.0
1010
github.com/sivaosorg/govm v1.2.8
11-
github.com/sivaosorg/mysqlconn v1.0.4
12-
github.com/sivaosorg/postgresconn v1.0.6
13-
github.com/sivaosorg/rabbitmqconn v1.0.6
14-
github.com/sivaosorg/redisconn v1.0.3
15-
github.com/sivaosorg/wsconn v1.0.4
11+
github.com/sivaosorg/mysqlconn v1.0.5
12+
github.com/sivaosorg/postgresconn v1.0.7
13+
github.com/sivaosorg/rabbitmqconn v1.0.8
14+
github.com/sivaosorg/redisconn v1.0.4
15+
github.com/sivaosorg/wsconn v1.0.5
1616
github.com/swaggo/swag v1.16.2
1717
golang.org/x/time v0.5.0
1818
)
@@ -35,7 +35,7 @@ require (
3535
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
3636
github.com/rabbitmq/amqp091-go v1.9.0 // indirect
3737
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
38-
github.com/ugorji/go/codec v1.2.11 // indirect
38+
github.com/ugorji/go/codec v1.2.12 // indirect
3939
golang.org/x/arch v0.6.0 // indirect
4040
golang.org/x/crypto v0.16.0 // indirect
4141
google.golang.org/protobuf v1.31.0 // indirect
@@ -49,7 +49,7 @@ require (
4949
github.com/gin-gonic/gin v1.9.1
5050
github.com/go-openapi/jsonpointer v0.20.0 // indirect
5151
github.com/go-openapi/jsonreference v0.20.2 // indirect
52-
github.com/go-openapi/spec v0.20.9 // indirect
52+
github.com/go-openapi/spec v0.20.11 // indirect
5353
github.com/go-openapi/swag v0.22.4 // indirect
5454
github.com/josharian/intern v1.0.0 // indirect
5555
github.com/json-iterator/go v1.1.12 // indirect

go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwn
3737
github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
3838
github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
3939
github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
40-
github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8=
41-
github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
40+
github.com/go-openapi/spec v0.20.11 h1:J/TzFDLTt4Rcl/l1PmyErvkqlJDncGvPTMnCI39I4gY=
41+
github.com/go-openapi/spec v0.20.11/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
4242
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
4343
github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
4444
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
@@ -121,16 +121,16 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
121121
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
122122
github.com/sivaosorg/govm v1.2.8 h1:SyVwq7PNUKQQNqI9PbjZ6zY9b33lks75y/qzAzxDNyI=
123123
github.com/sivaosorg/govm v1.2.8/go.mod h1:rXfPCNGc4ddPf1+VRX8Ytw/5xqehfPRrCr53Oi+cwpw=
124-
github.com/sivaosorg/mysqlconn v1.0.4 h1:sv/+zVIkzd4VskCsLHj+noSumH/yGUnORCBInfW7OWY=
125-
github.com/sivaosorg/mysqlconn v1.0.4/go.mod h1:oohoHcVTYlLw/ABOYgLRF/f4F2sQjbEOLPooxGyT9O8=
126-
github.com/sivaosorg/postgresconn v1.0.6 h1:XGrhCaQ4OxO26kHfNoj1QuKpBvBplM/JVwjatbaz+LA=
127-
github.com/sivaosorg/postgresconn v1.0.6/go.mod h1:jJDTBrIkD+w1t5zbQt+dMcYmSVwN/2SsEV05p8iVSdY=
128-
github.com/sivaosorg/rabbitmqconn v1.0.6 h1:ha+oudQEsrp69h4TNQ1qV8n4T6PDcyAMFwWNSoWT4x0=
129-
github.com/sivaosorg/rabbitmqconn v1.0.6/go.mod h1:NngaDnW1eA9r4wm9/ULqQzdexNT8d/CD/JxSi4Ejv6Y=
130-
github.com/sivaosorg/redisconn v1.0.3 h1:UFD+/LjXQPvflVL99X4EeteqExbX3j9AmuXL6g31kOQ=
131-
github.com/sivaosorg/redisconn v1.0.3/go.mod h1:RYp4AP3HK8MtjqoF1jZleXqrgkAqJdRsHQsvV/d57NA=
132-
github.com/sivaosorg/wsconn v1.0.4 h1:zPjDgMNuFOWbgTEeUGVRyJYpLsSfNXVc4qX0yX4Z8GI=
133-
github.com/sivaosorg/wsconn v1.0.4/go.mod h1:CXQtv27NLZbsSZUEVulSxTC4rESrfkyKWVDmVU/DtQU=
124+
github.com/sivaosorg/mysqlconn v1.0.5 h1:VHVfk6d6NQaMNsaLhojyzxF3PV+TA0I4wekIF5fU9QI=
125+
github.com/sivaosorg/mysqlconn v1.0.5/go.mod h1:oohoHcVTYlLw/ABOYgLRF/f4F2sQjbEOLPooxGyT9O8=
126+
github.com/sivaosorg/postgresconn v1.0.7 h1:36O2bVZdFzOqFPboyDZSp7BpZODrCRjj88KELG50ehQ=
127+
github.com/sivaosorg/postgresconn v1.0.7/go.mod h1:FfrmwVY0FjdFzU/fZJn5dvGyNBwa4l5HrIMQxIhDrgE=
128+
github.com/sivaosorg/rabbitmqconn v1.0.8 h1:hRKcMxTb/R6TFH2rn7C6oqIctpxWug2cgI/P2aTK0Vw=
129+
github.com/sivaosorg/rabbitmqconn v1.0.8/go.mod h1:75GqfgtKmdjLXmxHN0aCn2rLBOnY7eiKjgX1ncTjMZc=
130+
github.com/sivaosorg/redisconn v1.0.4 h1:uZnGIJU4K6IuELymABb4BMS6KrS9ldyOLh8jpO5Se98=
131+
github.com/sivaosorg/redisconn v1.0.4/go.mod h1:RYp4AP3HK8MtjqoF1jZleXqrgkAqJdRsHQsvV/d57NA=
132+
github.com/sivaosorg/wsconn v1.0.5 h1:pVJYhdGfczQV1jrBnonOPVKZUF6QFFjJPB+xELzN/Q4=
133+
github.com/sivaosorg/wsconn v1.0.5/go.mod h1:qQNaHywcMexY0F2KFIlqGix14E5EloaIN9AJDGi2GRA=
134134
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
135135
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
136136
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -151,8 +151,8 @@ github.com/swaggo/swag v1.16.2 h1:28Pp+8DkQoV+HLzLx8RGJZXNGKbFqnuvSbAAtoxiY04=
151151
github.com/swaggo/swag v1.16.2/go.mod h1:6YzXnDcpr0767iOejs318CwYkCQqyGer6BizOg03f+E=
152152
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
153153
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
154-
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
155-
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
154+
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
155+
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
156156
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
157157
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
158158
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=

internal/core/core.go

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
"github.com/sivaosorg/govm/server"
1717
"github.com/sivaosorg/govm/timex"
1818
"github.com/sivaosorg/govm/utils"
19-
"github.com/sivaosorg/mysqlconn/mysqlconn"
20-
"github.com/sivaosorg/postgresconn/postgresconn"
21-
"github.com/sivaosorg/rabbitmqconn/rabbitmqconn"
22-
"github.com/sivaosorg/redisconn/redisconn"
19+
"github.com/sivaosorg/mysqlconn"
20+
"github.com/sivaosorg/postgresconn"
21+
"github.com/sivaosorg/rabbitmqconn"
22+
"github.com/sivaosorg/redisconn"
2323
)
2424

2525
type CoreCommand struct {
@@ -72,39 +72,27 @@ func (c *CoreCommand) conn() {
7272
go func() {
7373
defer wg.Done()
7474
psql, s := postgresconn.NewClient(syncconf.Conf.Postgres)
75-
if s.IsConnected {
76-
// defer psql.Close()
77-
}
7875
c.psql = psql
7976
c.psqlStatus = s
8077
}()
8178
wg.Add(1)
8279
go func() {
8380
defer wg.Done()
8481
msql, s := mysqlconn.NewClient(syncconf.Conf.MySql)
85-
if s.IsConnected {
86-
// defer msql.Close()
87-
}
8882
c.msql = msql
8983
c.msqlStatus = s
9084
}()
9185
wg.Add(1)
9286
go func() {
9387
defer wg.Done()
9488
redis, s := redisconn.NewClient(syncconf.Conf.Redis)
95-
if s.IsConnected {
96-
// defer redis.Close()
97-
}
9889
c.redis = redis
9990
c.redisStatus = s
10091
}()
10192
wg.Add(1)
10293
go func() {
10394
defer wg.Done()
10495
rabbitmq, s := rabbitmqconn.NewClient(syncconf.Conf.RabbitMq)
105-
if s.IsConnected {
106-
// defer rabbitmq.Close()
107-
}
10896
c.rabbitmq = rabbitmq
10997
c.rabbitmqStatus = s
11098
}()

internal/handlers/common_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/sivaosorg/govm/entity"
1010
"github.com/sivaosorg/govm/wsconnx"
1111

12-
"github.com/sivaosorg/wsconn/wsconn"
12+
"github.com/sivaosorg/wsconn"
1313
)
1414

1515
type CommonHandler struct {

internal/repository/common_repository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package repository
22

33
import (
44
"github.com/sivaosorg/govm/dbx"
5-
"github.com/sivaosorg/postgresconn/postgresconn"
5+
"github.com/sivaosorg/postgresconn"
66
)
77

88
type CommonRepository interface {

0 commit comments

Comments
 (0)