Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
demo-go
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
彭芳
demo-go
Commits
e4755882
Commit
e4755882
authored
Feb 21, 2023
by
彭芳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[refactor]: add database conf
parent
0cac1efc
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
126 additions
and
172 deletions
+126
-172
main.go
cmd/demo/main.go
+2
-3
config.yaml
configs/config.yaml
+4
-0
go.mod
go.mod
+0
-4
go.sum
go.sum
+0
-5
conf.pb.go
internal/conf/conf.pb.go
+89
-152
conf.proto
internal/conf/conf.proto
+3
-6
data.go
internal/data/data.go
+26
-2
http.go
internal/server/http.go
+2
-0
No files found.
cmd/demo/main.go
View file @
e4755882
...
...
@@ -10,7 +10,6 @@ import (
"github.com/go-kratos/kratos/v2/config"
"github.com/go-kratos/kratos/v2/config/file"
"github.com/go-kratos/kratos/v2/log"
"github.com/go-kratos/kratos/v2/middleware/tracing"
"github.com/go-kratos/kratos/v2/transport/http"
_
"go.uber.org/automaxprocs"
...
...
@@ -53,8 +52,8 @@ func main() {
"service.id"
,
id
,
"service.name"
,
Name
,
"service.version"
,
Version
,
"trace.id"
,
tracing
.
TraceID
(),
"span.id"
,
tracing
.
SpanID
(),
//
"trace.id", tracing.TraceID(),
//
"span.id", tracing.SpanID(),
)
c
:=
config
.
New
(
config
.
WithSource
(
...
...
configs/config.yaml
View file @
e4755882
...
...
@@ -6,3 +6,6 @@ data:
database
:
driver
:
mysql
source
:
adstest:Ey5M6GowXu!7@tcp(ads-mysql-test.adsdesk.cn:13316)/adsdesk_test2?charset=utf8&parseTime=True&loc=Local
max_idle
:
50
max_open
:
100
max_lifetime
:
30s
\ No newline at end of file
go.mod
View file @
e4755882
...
...
@@ -23,8 +23,6 @@ require (
require (
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-playground/form/v4 v4.2.0 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
...
...
@@ -45,8 +43,6 @@ require (
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
go.opentelemetry.io/otel v1.7.0 // indirect
go.opentelemetry.io/otel/trace v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.4.0 // indirect
...
...
go.sum
View file @
e4755882
...
...
@@ -36,9 +36,7 @@ github.com/go-kratos/aegis v0.1.2/go.mod h1:jYeSQ3Gesba478zEnujOiG5QdsyF3Xk/8owF
github.com/go-kratos/kratos/v2 v2.4.1 h1:NFQy8Ha4Xu6T3Q40JlKzspvlMa5IGvIHhJw5+sqyV4c=
github.com/go-kratos/kratos/v2 v2.4.1/go.mod h1:5acyLj4EgY428AJnZl2EwCrMV1OVlttQFBum+SghMiA=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
...
...
@@ -154,11 +152,8 @@ github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6
github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM=
go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0=
go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU=
go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o=
go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/automaxprocs v1.5.1 h1:e1YG66Lrk73dn4qhg8WFSvhF0JuFQF0ERIp4rpuV8Qk=
...
...
internal/conf/conf.pb.go
View file @
e4755882
...
...
@@ -82,7 +82,6 @@ type Server struct {
unknownFields
protoimpl
.
UnknownFields
Http
*
Server_HTTP
`protobuf:"bytes,1,opt,name=http,proto3" json:"http,omitempty"`
Grpc
*
Server_GRPC
`protobuf:"bytes,2,opt,name=grpc,proto3" json:"grpc,omitempty"`
}
func
(
x
*
Server
)
Reset
()
{
...
...
@@ -124,13 +123,6 @@ func (x *Server) GetHttp() *Server_HTTP {
return
nil
}
func
(
x
*
Server
)
GetGrpc
()
*
Server_GRPC
{
if
x
!=
nil
{
return
x
.
Grpc
}
return
nil
}
type
Data
struct
{
state
protoimpl
.
MessageState
sizeCache
protoimpl
.
SizeCache
...
...
@@ -249,18 +241,20 @@ func (x *Server_HTTP) GetTimeout() *durationpb.Duration {
return
nil
}
type
Server_GRPC
struct
{
type
Data_Database
struct
{
state
protoimpl
.
MessageState
sizeCache
protoimpl
.
SizeCache
unknownFields
protoimpl
.
UnknownFields
Network
string
`protobuf:"bytes,1,opt,name=network,proto3" json:"network,omitempty"`
Addr
string
`protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
Timeout
*
durationpb
.
Duration
`protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"`
Driver
string
`protobuf:"bytes,1,opt,name=driver,proto3" json:"driver,omitempty"`
Source
string
`protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
MaxIdle
int64
`protobuf:"varint,3,opt,name=max_idle,json=maxIdle,proto3" json:"max_idle,omitempty"`
MaxOpen
int64
`protobuf:"varint,4,opt,name=max_open,json=maxOpen,proto3" json:"max_open,omitempty"`
MaxLifetime
*
durationpb
.
Duration
`protobuf:"bytes,5,opt,name=max_lifetime,json=maxLifetime,proto3" json:"max_lifetime,omitempty"`
}
func
(
x
*
Server_GRPC
)
Reset
()
{
*
x
=
Server_GRPC
{}
func
(
x
*
Data_Database
)
Reset
()
{
*
x
=
Data_Database
{}
if
protoimpl
.
UnsafeEnabled
{
mi
:=
&
file_conf_conf_proto_msgTypes
[
4
]
ms
:=
protoimpl
.
X
.
MessageStateOf
(
protoimpl
.
Pointer
(
x
))
...
...
@@ -268,13 +262,13 @@ func (x *Server_GRPC) Reset() {
}
}
func
(
x
*
Server_GRPC
)
String
()
string
{
func
(
x
*
Data_Database
)
String
()
string
{
return
protoimpl
.
X
.
MessageStringOf
(
x
)
}
func
(
*
Server_GRPC
)
ProtoMessage
()
{}
func
(
*
Data_Database
)
ProtoMessage
()
{}
func
(
x
*
Server_GRPC
)
ProtoReflect
()
protoreflect
.
Message
{
func
(
x
*
Data_Database
)
ProtoReflect
()
protoreflect
.
Message
{
mi
:=
&
file_conf_conf_proto_msgTypes
[
4
]
if
protoimpl
.
UnsafeEnabled
&&
x
!=
nil
{
ms
:=
protoimpl
.
X
.
MessageStateOf
(
protoimpl
.
Pointer
(
x
))
...
...
@@ -286,85 +280,44 @@ func (x *Server_GRPC) ProtoReflect() protoreflect.Message {
return
mi
.
MessageOf
(
x
)
}
// Deprecated: Use
Server_GRPC
.ProtoReflect.Descriptor instead.
func
(
*
Server_GRPC
)
Descriptor
()
([]
byte
,
[]
int
)
{
return
file_conf_conf_proto_rawDescGZIP
(),
[]
int
{
1
,
1
}
// Deprecated: Use
Data_Database
.ProtoReflect.Descriptor instead.
func
(
*
Data_Database
)
Descriptor
()
([]
byte
,
[]
int
)
{
return
file_conf_conf_proto_rawDescGZIP
(),
[]
int
{
2
,
0
}
}
func
(
x
*
Server_GRPC
)
GetNetwork
()
string
{
func
(
x
*
Data_Database
)
GetDriver
()
string
{
if
x
!=
nil
{
return
x
.
Network
return
x
.
Driver
}
return
""
}
func
(
x
*
Server_GRPC
)
GetAddr
()
string
{
func
(
x
*
Data_Database
)
GetSource
()
string
{
if
x
!=
nil
{
return
x
.
Addr
return
x
.
Source
}
return
""
}
func
(
x
*
Server_GRPC
)
GetTimeout
()
*
durationpb
.
Duration
{
func
(
x
*
Data_Database
)
GetMaxIdle
()
int64
{
if
x
!=
nil
{
return
x
.
Timeout
return
x
.
MaxIdle
}
return
nil
return
0
}
type
Data_Database
struct
{
state
protoimpl
.
MessageState
sizeCache
protoimpl
.
SizeCache
unknownFields
protoimpl
.
UnknownFields
Driver
string
`protobuf:"bytes,1,opt,name=driver,proto3" json:"driver,omitempty"`
Source
string
`protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
}
func
(
x
*
Data_Database
)
Reset
()
{
*
x
=
Data_Database
{}
if
protoimpl
.
UnsafeEnabled
{
mi
:=
&
file_conf_conf_proto_msgTypes
[
5
]
ms
:=
protoimpl
.
X
.
MessageStateOf
(
protoimpl
.
Pointer
(
x
))
ms
.
StoreMessageInfo
(
mi
)
}
}
func
(
x
*
Data_Database
)
String
()
string
{
return
protoimpl
.
X
.
MessageStringOf
(
x
)
}
func
(
*
Data_Database
)
ProtoMessage
()
{}
func
(
x
*
Data_Database
)
ProtoReflect
()
protoreflect
.
Message
{
mi
:=
&
file_conf_conf_proto_msgTypes
[
5
]
if
protoimpl
.
UnsafeEnabled
&&
x
!=
nil
{
ms
:=
protoimpl
.
X
.
MessageStateOf
(
protoimpl
.
Pointer
(
x
))
if
ms
.
LoadMessageInfo
()
==
nil
{
ms
.
StoreMessageInfo
(
mi
)
}
return
ms
}
return
mi
.
MessageOf
(
x
)
}
// Deprecated: Use Data_Database.ProtoReflect.Descriptor instead.
func
(
*
Data_Database
)
Descriptor
()
([]
byte
,
[]
int
)
{
return
file_conf_conf_proto_rawDescGZIP
(),
[]
int
{
2
,
0
}
}
func
(
x
*
Data_Database
)
GetDriver
()
string
{
func
(
x
*
Data_Database
)
GetMaxOpen
()
int64
{
if
x
!=
nil
{
return
x
.
Driver
return
x
.
MaxOpen
}
return
""
return
0
}
func
(
x
*
Data_Database
)
Get
Source
()
string
{
func
(
x
*
Data_Database
)
Get
MaxLifetime
()
*
durationpb
.
Duration
{
if
x
!=
nil
{
return
x
.
Sourc
e
return
x
.
MaxLifetim
e
}
return
""
return
nil
}
type
Data_Redis
struct
{
...
...
@@ -381,7 +334,7 @@ type Data_Redis struct {
func
(
x
*
Data_Redis
)
Reset
()
{
*
x
=
Data_Redis
{}
if
protoimpl
.
UnsafeEnabled
{
mi
:=
&
file_conf_conf_proto_msgTypes
[
6
]
mi
:=
&
file_conf_conf_proto_msgTypes
[
5
]
ms
:=
protoimpl
.
X
.
MessageStateOf
(
protoimpl
.
Pointer
(
x
))
ms
.
StoreMessageInfo
(
mi
)
}
...
...
@@ -394,7 +347,7 @@ func (x *Data_Redis) String() string {
func
(
*
Data_Redis
)
ProtoMessage
()
{}
func
(
x
*
Data_Redis
)
ProtoReflect
()
protoreflect
.
Message
{
mi
:=
&
file_conf_conf_proto_msgTypes
[
6
]
mi
:=
&
file_conf_conf_proto_msgTypes
[
5
]
if
protoimpl
.
UnsafeEnabled
&&
x
!=
nil
{
ms
:=
protoimpl
.
X
.
MessageStateOf
(
protoimpl
.
Pointer
(
x
))
if
ms
.
LoadMessageInfo
()
==
nil
{
...
...
@@ -450,51 +403,49 @@ var file_conf_conf_proto_rawDesc = []byte{
0x74
,
0x6f
,
0x73
,
0x2e
,
0x61
,
0x70
,
0x69
,
0x2e
,
0x53
,
0x65
,
0x72
,
0x76
,
0x65
,
0x72
,
0x52
,
0x06
,
0x73
,
0x65
,
0x72
,
0x76
,
0x65
,
0x72
,
0x12
,
0x24
,
0x0a
,
0x04
,
0x64
,
0x61
,
0x74
,
0x61
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x10
,
0x2e
,
0x6b
,
0x72
,
0x61
,
0x74
,
0x6f
,
0x73
,
0x2e
,
0x61
,
0x70
,
0x69
,
0x2e
,
0x44
,
0x61
,
0x74
,
0x61
,
0x52
,
0x04
,
0x64
,
0x61
,
0x74
,
0x61
,
0x22
,
0x
b8
,
0x02
,
0x0a
,
0x69
,
0x2e
,
0x44
,
0x61
,
0x74
,
0x61
,
0x52
,
0x04
,
0x64
,
0x61
,
0x74
,
0x61
,
0x22
,
0x
a0
,
0x01
,
0x0a
,
0x06
,
0x53
,
0x65
,
0x72
,
0x76
,
0x65
,
0x72
,
0x12
,
0x2b
,
0x0a
,
0x04
,
0x68
,
0x74
,
0x74
,
0x70
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x17
,
0x2e
,
0x6b
,
0x72
,
0x61
,
0x74
,
0x6f
,
0x73
,
0x2e
,
0x61
,
0x70
,
0x69
,
0x2e
,
0x53
,
0x65
,
0x72
,
0x76
,
0x65
,
0x72
,
0x2e
,
0x48
,
0x54
,
0x54
,
0x50
,
0x52
,
0x04
,
0x68
,
0x74
,
0x74
,
0x70
,
0x12
,
0x2b
,
0x0a
,
0x04
,
0x67
,
0x72
,
0x70
,
0x63
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x17
,
0x2e
,
0x6b
,
0x72
,
0x61
,
0x74
,
0x6f
,
0x73
,
0x2e
,
0x61
,
0x70
,
0x69
,
0x2e
,
0x53
,
0x65
,
0x72
,
0x76
,
0x65
,
0x72
,
0x2e
,
0x47
,
0x52
,
0x50
,
0x43
,
0x52
,
0x04
,
0x67
,
0x72
,
0x70
,
0x63
,
0x1a
,
0x69
,
0x0a
,
0x04
,
0x48
,
0x54
,
0x54
,
0x50
,
0x12
,
0x18
,
0x0a
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x12
,
0x12
,
0x0a
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x12
,
0x33
,
0x0a
,
0x07
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x18
,
0x03
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x67
,
0x6f
,
0x6f
,
0x67
,
0x6c
,
0x65
,
0x2e
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x62
,
0x75
,
0x66
,
0x2e
,
0x44
,
0x75
,
0x72
,
0x61
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x52
,
0x07
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x1a
,
0x69
,
0x0a
,
0x04
,
0x47
,
0x52
,
0x50
,
0x43
,
0x12
,
0x18
,
0x0a
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x12
,
0x12
,
0x0a
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x12
,
0x33
,
0x0a
,
0x07
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x18
,
0x03
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x67
,
0x6f
,
0x6f
,
0x67
,
0x6c
,
0x65
,
0x2e
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x62
,
0x75
,
0x66
,
0x2e
,
0x44
,
0x75
,
0x72
,
0x61
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x52
,
0x07
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x22
,
0xdd
,
0x02
,
0x0a
,
0x04
,
0x44
,
0x61
,
0x74
,
0x61
,
0x12
,
0x35
,
0x0a
,
0x08
,
0x64
,
0x61
,
0x74
,
0x61
,
0x62
,
0x61
,
0x73
,
0x65
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x6b
,
0x72
,
0x61
,
0x74
,
0x6f
,
0x73
,
0x2e
,
0x61
,
0x70
,
0x69
,
0x2e
,
0x44
,
0x61
,
0x74
,
0x61
,
0x2e
,
0x44
,
0x61
,
0x74
,
0x61
,
0x62
,
0x61
,
0x73
,
0x65
,
0x52
,
0x08
,
0x64
,
0x61
,
0x74
,
0x61
,
0x62
,
0x61
,
0x73
,
0x65
,
0x12
,
0x2c
,
0x0a
,
0x05
,
0x72
,
0x65
,
0x64
,
0x69
,
0x73
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x16
,
0x2e
,
0x6b
,
0x72
,
0x61
,
0x74
,
0x6f
,
0x73
,
0x2e
,
0x61
,
0x70
,
0x69
,
0x2e
,
0x44
,
0x61
,
0x74
,
0x61
,
0x2e
,
0x52
,
0x65
,
0x64
,
0x69
,
0x73
,
0x52
,
0x05
,
0x72
,
0x65
,
0x64
,
0x69
,
0x73
,
0x1a
,
0x3a
,
0x0a
,
0x08
,
0x44
,
0x61
,
0x74
,
0x61
,
0x62
,
0x61
,
0x73
,
0x65
,
0x12
,
0x16
,
0x0a
,
0x06
,
0x64
,
0x72
,
0x69
,
0x76
,
0x65
,
0x72
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x06
,
0x64
,
0x72
,
0x69
,
0x76
,
0x65
,
0x72
,
0x12
,
0x16
,
0x0a
,
0x06
,
0x73
,
0x6f
,
0x75
,
0x72
,
0x63
,
0x65
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x06
,
0x73
,
0x6f
,
0x75
,
0x72
,
0x63
,
0x65
,
0x1a
,
0xb3
,
0x01
,
0x0a
,
0x05
,
0x52
,
0x65
,
0x64
,
0x69
,
0x73
,
0x12
,
0x18
,
0x0a
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x12
,
0x12
,
0x0a
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x12
,
0x3c
,
0x0a
,
0x0c
,
0x72
,
0x65
,
0x61
,
0x64
,
0x5f
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x18
,
0x03
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x67
,
0x6f
,
0x6f
,
0x67
,
0x6c
,
0x65
,
0x2e
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x62
,
0x75
,
0x66
,
0x2e
,
0x44
,
0x75
,
0x72
,
0x61
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x52
,
0x0b
,
0x72
,
0x65
,
0x61
,
0x64
,
0x54
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x12
,
0x3e
,
0x0a
,
0x0d
,
0x77
,
0x72
,
0x69
,
0x74
,
0x65
,
0x5f
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x18
,
0x04
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x67
,
0x6f
,
0x6f
,
0x67
,
0x6c
,
0x65
,
0x2e
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x62
,
0x75
,
0x66
,
0x2e
,
0x44
,
0x75
,
0x72
,
0x61
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x52
,
0x0c
,
0x77
,
0x72
,
0x69
,
0x74
,
0x65
,
0x54
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x42
,
0x19
,
0x5a
,
0x17
,
0x64
,
0x65
,
0x6d
,
0x6f
,
0x2f
,
0x69
,
0x6e
,
0x74
,
0x65
,
0x72
,
0x6e
,
0x61
,
0x6c
,
0x2f
,
0x63
,
0x6f
,
0x6e
,
0x66
,
0x3b
,
0x63
,
0x6f
,
0x6e
,
0x66
,
0x62
,
0x06
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x33
,
0x68
,
0x74
,
0x74
,
0x70
,
0x1a
,
0x69
,
0x0a
,
0x04
,
0x48
,
0x54
,
0x54
,
0x50
,
0x12
,
0x18
,
0x0a
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x12
,
0x12
,
0x0a
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x12
,
0x33
,
0x0a
,
0x07
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x18
,
0x03
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x67
,
0x6f
,
0x6f
,
0x67
,
0x6c
,
0x65
,
0x2e
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x62
,
0x75
,
0x66
,
0x2e
,
0x44
,
0x75
,
0x72
,
0x61
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x52
,
0x07
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x22
,
0xd2
,
0x03
,
0x0a
,
0x04
,
0x44
,
0x61
,
0x74
,
0x61
,
0x12
,
0x35
,
0x0a
,
0x08
,
0x64
,
0x61
,
0x74
,
0x61
,
0x62
,
0x61
,
0x73
,
0x65
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x6b
,
0x72
,
0x61
,
0x74
,
0x6f
,
0x73
,
0x2e
,
0x61
,
0x70
,
0x69
,
0x2e
,
0x44
,
0x61
,
0x74
,
0x61
,
0x2e
,
0x44
,
0x61
,
0x74
,
0x61
,
0x62
,
0x61
,
0x73
,
0x65
,
0x52
,
0x08
,
0x64
,
0x61
,
0x74
,
0x61
,
0x62
,
0x61
,
0x73
,
0x65
,
0x12
,
0x2c
,
0x0a
,
0x05
,
0x72
,
0x65
,
0x64
,
0x69
,
0x73
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x16
,
0x2e
,
0x6b
,
0x72
,
0x61
,
0x74
,
0x6f
,
0x73
,
0x2e
,
0x61
,
0x70
,
0x69
,
0x2e
,
0x44
,
0x61
,
0x74
,
0x61
,
0x2e
,
0x52
,
0x65
,
0x64
,
0x69
,
0x73
,
0x52
,
0x05
,
0x72
,
0x65
,
0x64
,
0x69
,
0x73
,
0x1a
,
0xae
,
0x01
,
0x0a
,
0x08
,
0x44
,
0x61
,
0x74
,
0x61
,
0x62
,
0x61
,
0x73
,
0x65
,
0x12
,
0x16
,
0x0a
,
0x06
,
0x64
,
0x72
,
0x69
,
0x76
,
0x65
,
0x72
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x06
,
0x64
,
0x72
,
0x69
,
0x76
,
0x65
,
0x72
,
0x12
,
0x16
,
0x0a
,
0x06
,
0x73
,
0x6f
,
0x75
,
0x72
,
0x63
,
0x65
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x06
,
0x73
,
0x6f
,
0x75
,
0x72
,
0x63
,
0x65
,
0x12
,
0x19
,
0x0a
,
0x08
,
0x6d
,
0x61
,
0x78
,
0x5f
,
0x69
,
0x64
,
0x6c
,
0x65
,
0x18
,
0x03
,
0x20
,
0x01
,
0x28
,
0x03
,
0x52
,
0x07
,
0x6d
,
0x61
,
0x78
,
0x49
,
0x64
,
0x6c
,
0x65
,
0x12
,
0x19
,
0x0a
,
0x08
,
0x6d
,
0x61
,
0x78
,
0x5f
,
0x6f
,
0x70
,
0x65
,
0x6e
,
0x18
,
0x04
,
0x20
,
0x01
,
0x28
,
0x03
,
0x52
,
0x07
,
0x6d
,
0x61
,
0x78
,
0x4f
,
0x70
,
0x65
,
0x6e
,
0x12
,
0x3c
,
0x0a
,
0x0c
,
0x6d
,
0x61
,
0x78
,
0x5f
,
0x6c
,
0x69
,
0x66
,
0x65
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x18
,
0x05
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x67
,
0x6f
,
0x6f
,
0x67
,
0x6c
,
0x65
,
0x2e
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x62
,
0x75
,
0x66
,
0x2e
,
0x44
,
0x75
,
0x72
,
0x61
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x52
,
0x0b
,
0x6d
,
0x61
,
0x78
,
0x4c
,
0x69
,
0x66
,
0x65
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x1a
,
0xb3
,
0x01
,
0x0a
,
0x05
,
0x52
,
0x65
,
0x64
,
0x69
,
0x73
,
0x12
,
0x18
,
0x0a
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x18
,
0x01
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x07
,
0x6e
,
0x65
,
0x74
,
0x77
,
0x6f
,
0x72
,
0x6b
,
0x12
,
0x12
,
0x0a
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x18
,
0x02
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x04
,
0x61
,
0x64
,
0x64
,
0x72
,
0x12
,
0x3c
,
0x0a
,
0x0c
,
0x72
,
0x65
,
0x61
,
0x64
,
0x5f
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x18
,
0x03
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x67
,
0x6f
,
0x6f
,
0x67
,
0x6c
,
0x65
,
0x2e
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x62
,
0x75
,
0x66
,
0x2e
,
0x44
,
0x75
,
0x72
,
0x61
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x52
,
0x0b
,
0x72
,
0x65
,
0x61
,
0x64
,
0x54
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x12
,
0x3e
,
0x0a
,
0x0d
,
0x77
,
0x72
,
0x69
,
0x74
,
0x65
,
0x5f
,
0x74
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x18
,
0x04
,
0x20
,
0x01
,
0x28
,
0x0b
,
0x32
,
0x19
,
0x2e
,
0x67
,
0x6f
,
0x6f
,
0x67
,
0x6c
,
0x65
,
0x2e
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x62
,
0x75
,
0x66
,
0x2e
,
0x44
,
0x75
,
0x72
,
0x61
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x52
,
0x0c
,
0x77
,
0x72
,
0x69
,
0x74
,
0x65
,
0x54
,
0x69
,
0x6d
,
0x65
,
0x6f
,
0x75
,
0x74
,
0x42
,
0x19
,
0x5a
,
0x17
,
0x64
,
0x65
,
0x6d
,
0x6f
,
0x2f
,
0x69
,
0x6e
,
0x74
,
0x65
,
0x72
,
0x6e
,
0x61
,
0x6c
,
0x2f
,
0x63
,
0x6f
,
0x6e
,
0x66
,
0x3b
,
0x63
,
0x6f
,
0x6e
,
0x66
,
0x62
,
0x06
,
0x70
,
0x72
,
0x6f
,
0x74
,
0x6f
,
0x33
,
}
var
(
...
...
@@ -509,33 +460,31 @@ func file_conf_conf_proto_rawDescGZIP() []byte {
return
file_conf_conf_proto_rawDescData
}
var
file_conf_conf_proto_msgTypes
=
make
([]
protoimpl
.
MessageInfo
,
7
)
var
file_conf_conf_proto_msgTypes
=
make
([]
protoimpl
.
MessageInfo
,
6
)
var
file_conf_conf_proto_goTypes
=
[]
interface
{}{
(
*
Bootstrap
)(
nil
),
// 0: kratos.api.Bootstrap
(
*
Server
)(
nil
),
// 1: kratos.api.Server
(
*
Data
)(
nil
),
// 2: kratos.api.Data
(
*
Server_HTTP
)(
nil
),
// 3: kratos.api.Server.HTTP
(
*
Server_GRPC
)(
nil
),
// 4: kratos.api.Server.GRPC
(
*
Data_Database
)(
nil
),
// 5: kratos.api.Data.Database
(
*
Data_Redis
)(
nil
),
// 6: kratos.api.Data.Redis
(
*
durationpb
.
Duration
)(
nil
),
// 7: google.protobuf.Duration
(
*
Data_Database
)(
nil
),
// 4: kratos.api.Data.Database
(
*
Data_Redis
)(
nil
),
// 5: kratos.api.Data.Redis
(
*
durationpb
.
Duration
)(
nil
),
// 6: google.protobuf.Duration
}
var
file_conf_conf_proto_depIdxs
=
[]
int32
{
1
,
// 0: kratos.api.Bootstrap.server:type_name -> kratos.api.Server
2
,
// 1: kratos.api.Bootstrap.data:type_name -> kratos.api.Data
3
,
// 2: kratos.api.Server.http:type_name -> kratos.api.Server.HTTP
4
,
// 3: kratos.api.Server.grpc:type_name -> kratos.api.Server.GRPC
5
,
// 4: kratos.api.Data.database:type_name -> kratos.api.Data.Database
6
,
// 5: kratos.api.Data.redis:type_name -> kratos.api.Data.Redis
7
,
// 6: kratos.api.Server.HTTP.timeout:type_name -> google.protobuf.Duration
7
,
// 7: kratos.api.Server.GRPC.timeout:type_name -> google.protobuf.Duration
7
,
// 8: kratos.api.Data.Redis.read_timeout:type_name -> google.protobuf.Duration
7
,
// 9: kratos.api.Data.Redis.write_timeout:type_name -> google.protobuf.Duration
10
,
// [10:10] is the sub-list for method output_type
10
,
// [10:10] is the sub-list for method input_type
10
,
// [10:10] is the sub-list for extension type_name
10
,
// [10:10] is the sub-list for extension extendee
0
,
// [0:10] is the sub-list for field type_name
1
,
// 0: kratos.api.Bootstrap.server:type_name -> kratos.api.Server
2
,
// 1: kratos.api.Bootstrap.data:type_name -> kratos.api.Data
3
,
// 2: kratos.api.Server.http:type_name -> kratos.api.Server.HTTP
4
,
// 3: kratos.api.Data.database:type_name -> kratos.api.Data.Database
5
,
// 4: kratos.api.Data.redis:type_name -> kratos.api.Data.Redis
6
,
// 5: kratos.api.Server.HTTP.timeout:type_name -> google.protobuf.Duration
6
,
// 6: kratos.api.Data.Database.max_lifetime:type_name -> google.protobuf.Duration
6
,
// 7: kratos.api.Data.Redis.read_timeout:type_name -> google.protobuf.Duration
6
,
// 8: kratos.api.Data.Redis.write_timeout:type_name -> google.protobuf.Duration
9
,
// [9:9] is the sub-list for method output_type
9
,
// [9:9] is the sub-list for method input_type
9
,
// [9:9] is the sub-list for extension type_name
9
,
// [9:9] is the sub-list for extension extendee
0
,
// [0:9] is the sub-list for field type_name
}
func
init
()
{
file_conf_conf_proto_init
()
}
...
...
@@ -593,18 +542,6 @@ func file_conf_conf_proto_init() {
}
}
file_conf_conf_proto_msgTypes
[
4
]
.
Exporter
=
func
(
v
interface
{},
i
int
)
interface
{}
{
switch
v
:=
v
.
(
*
Server_GRPC
);
i
{
case
0
:
return
&
v
.
state
case
1
:
return
&
v
.
sizeCache
case
2
:
return
&
v
.
unknownFields
default
:
return
nil
}
}
file_conf_conf_proto_msgTypes
[
5
]
.
Exporter
=
func
(
v
interface
{},
i
int
)
interface
{}
{
switch
v
:=
v
.
(
*
Data_Database
);
i
{
case
0
:
return
&
v
.
state
...
...
@@ -616,7 +553,7 @@ func file_conf_conf_proto_init() {
return
nil
}
}
file_conf_conf_proto_msgTypes
[
6
]
.
Exporter
=
func
(
v
interface
{},
i
int
)
interface
{}
{
file_conf_conf_proto_msgTypes
[
5
]
.
Exporter
=
func
(
v
interface
{},
i
int
)
interface
{}
{
switch
v
:=
v
.
(
*
Data_Redis
);
i
{
case
0
:
return
&
v
.
state
...
...
@@ -635,7 +572,7 @@ func file_conf_conf_proto_init() {
GoPackagePath
:
reflect
.
TypeOf
(
x
{})
.
PkgPath
(),
RawDescriptor
:
file_conf_conf_proto_rawDesc
,
NumEnums
:
0
,
NumMessages
:
7
,
NumMessages
:
6
,
NumExtensions
:
0
,
NumServices
:
0
,
},
...
...
internal/conf/conf.proto
View file @
e4755882
...
...
@@ -16,19 +16,16 @@ message Server {
string
addr
=
2
;
google.protobuf.Duration
timeout
=
3
;
}
message
GRPC
{
string
network
=
1
;
string
addr
=
2
;
google.protobuf.Duration
timeout
=
3
;
}
HTTP
http
=
1
;
GRPC
grpc
=
2
;
}
message
Data
{
message
Database
{
string
driver
=
1
;
string
source
=
2
;
int64
max_idle
=
3
;
int64
max_open
=
4
;
google.protobuf.Duration
max_lifetime
=
5
;
}
message
Redis
{
string
network
=
1
;
...
...
internal/data/data.go
View file @
e4755882
...
...
@@ -27,6 +27,14 @@ func NewData(c *conf.Data, logger log.Logger) (*Data, func(), error) {
cleanup
:=
func
()
{
log
.
NewHelper
(
logger
)
.
Info
(
"closing the data resources"
)
}
db
,
err
:=
newDb
(
c
)
if
err
!=
nil
{
return
nil
,
cleanup
,
err
}
return
&
Data
{
db
:
db
},
cleanup
,
nil
}
func
newDb
(
c
*
conf
.
Data
)
(
*
gorm
.
DB
,
error
)
{
db
,
err
:=
gorm
.
Open
(
mysql
.
New
(
mysql
.
Config
{
DriverName
:
c
.
Database
.
Driver
,
DSN
:
c
.
Database
.
Source
,
...
...
@@ -34,9 +42,25 @@ func NewData(c *conf.Data, logger log.Logger) (*Data, func(), error) {
Logger
:
NewGormLogger
(),
})
if
err
!=
nil
{
return
nil
,
cleanup
,
err
return
nil
,
err
}
return
&
Data
{
db
:
db
},
cleanup
,
nil
sqlDb
,
err
:=
db
.
DB
()
if
err
!=
nil
{
return
nil
,
err
}
// the maximum number of connections in the idle connection pool.
if
c
.
Database
.
MaxIdle
>
0
{
sqlDb
.
SetMaxIdleConns
(
int
(
c
.
Database
.
MaxIdle
))
}
// the maximum number of open connections to the database.
if
c
.
Database
.
MaxOpen
>
0
{
sqlDb
.
SetMaxOpenConns
(
int
(
c
.
Database
.
MaxOpen
))
}
// the maximum amount of time a connection may be reused.
if
c
.
Database
.
MaxLifetime
!=
nil
{
sqlDb
.
SetConnMaxLifetime
(
c
.
Database
.
MaxLifetime
.
AsDuration
())
}
return
db
,
nil
}
func
NewGormLogger
()
logger
.
Interface
{
...
...
internal/server/http.go
View file @
e4755882
...
...
@@ -15,6 +15,8 @@ func NewHTTPServer(c *conf.Server, web *router.Web, logger log.Logger) *kratos_h
var
opts
=
[]
kratos_http
.
ServerOption
{
kratos_http
.
Middleware
(
recovery
.
Recovery
(),
// tracing.Server(),
// logging.Server(logger),
),
}
if
c
.
Http
.
Network
!=
""
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment