mirror of https://github.com/zhufuyi/sponge
change name
This commit is contained in:
zhuyasen
parent
90a0fee28a
commit
2a2e1891ce
|
|
@ -83,7 +83,7 @@ func runGenConfigCommand(files map[string]configType, ysArgs jy2struct.Args) err
|
|||
ysArgs.Name = "Config"
|
||||
startCode = configFileCode
|
||||
}
|
||||
structCodes, err := jy2struct.Covert(&ysArgs)
|
||||
structCodes, err := jy2struct.Convert(&ysArgs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -161,7 +161,7 @@ func saveFile(inputFile string, outputFile string, code string) error {
|
|||
|
||||
func convertToGoFile(ysArgs jy2struct.Args, outPath string) error {
|
||||
ysArgs.Name = "Config"
|
||||
data, err := jy2struct.Covert(&ysArgs)
|
||||
data, err := jy2struct.Convert(&ysArgs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,8 +133,8 @@ func addHTTPPbFields(moduleName string, serverName string, projectName string, r
|
|||
fields = append(fields, deleteFieldsMark(r, imageBuildFile, wellOnlyGrpcStartMark, wellOnlyGrpcEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, makeFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, gitIgnoreFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark2, wellEndMark2)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, appConfigFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, replaceFileContentMark(r, readmeFile, "## "+serverName)...)
|
||||
fields = append(fields, []replacer.Field{
|
||||
|
|
|
|||
|
|
@ -134,8 +134,8 @@ func addRPCGwFields(moduleName string, serverName string, projectName string, re
|
|||
fields = append(fields, deleteFieldsMark(r, imageBuildFile, wellOnlyGrpcStartMark, wellOnlyGrpcEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, makeFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, gitIgnoreFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark2, wellEndMark2)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, appConfigFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, replaceFileContentMark(r, readmeFile, "## "+serverName)...)
|
||||
fields = append(fields, []replacer.Field{
|
||||
|
|
|
|||
|
|
@ -129,8 +129,8 @@ func addRPCPbFields(moduleName string, serverName string, projectName string, re
|
|||
fields = append(fields, deleteFieldsMark(r, imageBuildFile, wellOnlyGrpcStartMark, wellOnlyGrpcEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, makeFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, gitIgnoreFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark2, wellEndMark2)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, appConfigFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, replaceFileContentMark(r, readmeFile, "## "+serverName)...)
|
||||
fields = append(fields, []replacer.Field{
|
||||
|
|
|
|||
|
|
@ -149,8 +149,8 @@ func addRPCFields(moduleName string, serverName string, projectName string, repo
|
|||
fields = append(fields, deleteFieldsMark(r, k8sServiceFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, makeFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, gitIgnoreFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark2, wellEndMark2)...)
|
||||
fields = append(fields, deleteFieldsMark(r, protoShellFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, deleteFieldsMark(r, appConfigFile, wellStartMark, wellEndMark)...)
|
||||
fields = append(fields, replaceFileContentMark(r, readmeFile, "## "+serverName)...)
|
||||
fields = append(fields, []replacer.Field{
|
||||
|
|
|
|||
12
go.mod
12
go.mod
|
|
@ -29,13 +29,12 @@ require (
|
|||
github.com/pkg/errors v0.9.1
|
||||
github.com/prometheus/client_golang v1.13.0
|
||||
github.com/shirou/gopsutil/v3 v3.23.3
|
||||
github.com/spf13/cast v1.5.0
|
||||
github.com/spf13/cobra v1.4.0
|
||||
github.com/spf13/viper v1.12.0
|
||||
github.com/stretchr/testify v1.8.2
|
||||
github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a
|
||||
github.com/swaggo/gin-swagger v1.5.2
|
||||
github.com/swaggo/swag v1.8.1
|
||||
github.com/swaggo/swag v1.8.12
|
||||
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.15
|
||||
github.com/vmihailenco/msgpack v4.0.4+incompatible
|
||||
go.etcd.io/etcd/client/v3 v3.5.4
|
||||
|
|
@ -47,7 +46,7 @@ require (
|
|||
go.opentelemetry.io/otel/sdk v1.9.0
|
||||
go.opentelemetry.io/otel/trace v1.9.0
|
||||
go.uber.org/zap v1.21.0
|
||||
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
|
||||
golang.org/x/sync v0.1.0
|
||||
google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a
|
||||
google.golang.org/grpc v1.50.1
|
||||
google.golang.org/protobuf v1.28.1
|
||||
|
|
@ -140,6 +139,7 @@ require (
|
|||
github.com/shoenig/go-m1cpu v0.1.4 // indirect
|
||||
github.com/shopspring/decimal v1.2.0 // indirect
|
||||
github.com/spf13/afero v1.8.2 // indirect
|
||||
github.com/spf13/cast v1.5.0 // indirect
|
||||
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
github.com/subosito/gotenv v1.3.0 // indirect
|
||||
|
|
@ -155,12 +155,12 @@ require (
|
|||
go.uber.org/atomic v1.7.0 // indirect
|
||||
go.uber.org/multierr v1.6.0 // indirect
|
||||
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
|
||||
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
|
||||
golang.org/x/net v0.8.0 // indirect
|
||||
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
|
||||
golang.org/x/sys v0.6.0 // indirect
|
||||
golang.org/x/text v0.3.8 // indirect
|
||||
golang.org/x/text v0.8.0 // indirect
|
||||
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
|
||||
golang.org/x/tools v0.1.12 // indirect
|
||||
golang.org/x/tools v0.7.0 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
gopkg.in/ini.v1 v1.66.4 // indirect
|
||||
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
|
||||
|
|
|
|||
23
go.sum
23
go.sum
|
|
@ -78,7 +78,6 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
|
|||
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
|
||||
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
|
||||
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
|
||||
github.com/agiledragon/gomonkey/v2 v2.3.1 h1:k+UnUY0EMNYUFUAQVETGY9uUTxjMdnUkP0ARyJS1zzs=
|
||||
github.com/agiledragon/gomonkey/v2 v2.3.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
|
||||
|
|
@ -524,7 +523,6 @@ github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDs
|
|||
github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
|
||||
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
|
||||
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
|
||||
github.com/otiai10/copy v1.7.0 h1:hVoPiN+t+7d2nzzwMiDHPSOogsWAStewq3TwU05+clE=
|
||||
github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U=
|
||||
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
|
||||
github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
|
||||
|
|
@ -642,8 +640,9 @@ github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a h1:kAe4YSu0O0UFn1DowN
|
|||
github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w=
|
||||
github.com/swaggo/gin-swagger v1.5.2 h1:dj2es17EaOHoy0Owu4xn3An1mI8/xjdFyIH6KAbOdYo=
|
||||
github.com/swaggo/gin-swagger v1.5.2/go.mod h1:Cbj/MlHApPOjZdf4joWFXLLgmZVPyh54GPvPPyVjVZM=
|
||||
github.com/swaggo/swag v1.8.1 h1:JuARzFX1Z1njbCGz+ZytBR15TFJwF2Q7fu8puJHhQYI=
|
||||
github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ=
|
||||
github.com/swaggo/swag v1.8.12 h1:pctzkNPu0AlQP2royqX3apjKCQonAnf7KGoxeO4y64w=
|
||||
github.com/swaggo/swag v1.8.12/go.mod h1:lNfm6Gg+oAq3zRJQNEMBE66LIJKM44mxFqhEEgy2its=
|
||||
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
|
||||
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
|
||||
github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
|
||||
|
|
@ -770,7 +769,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|||
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
|
||||
golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
|
||||
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=
|
||||
|
|
@ -826,8 +825,8 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su
|
|||
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||
golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
|
||||
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
|
||||
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
|
||||
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
|
|
@ -863,8 +862,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
|
|||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
|
||||
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
|
||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
|
|
@ -974,8 +973,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|||
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
|
||||
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
|
||||
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
|
||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
|
|
@ -1041,8 +1040,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
|||
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
|
||||
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
|
||||
golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
|
||||
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=
|
||||
|
|
|
|||
|
|
@ -81,7 +81,12 @@ func (d *userExampleDao) DeleteByIDs(ctx context.Context, ids []uint64) error {
|
|||
}
|
||||
|
||||
func (d *userExampleDao) UpdateByID(ctx context.Context, table *model.UserExample) error {
|
||||
return d.updateByID(ctx, d.db, table)
|
||||
err := d.updateByID(ctx, d.db, table)
|
||||
|
||||
// delete cache
|
||||
_ = d.cache.Del(ctx, table.ID)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// UpdateByID update records by id
|
||||
|
|
@ -119,15 +124,7 @@ func (d *userExampleDao) updateByID(ctx context.Context, db *gorm.DB, table *mod
|
|||
}
|
||||
// delete the templates code end
|
||||
|
||||
err := db.WithContext(ctx).Model(table).Updates(update).Error
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// delete cache
|
||||
_ = d.cache.Del(ctx, table.ID)
|
||||
|
||||
return nil
|
||||
return db.WithContext(ctx).Model(table).Updates(update).Error
|
||||
}
|
||||
|
||||
// GetByID get a record based on id
|
||||
|
|
@ -227,6 +224,7 @@ func (d *userExampleDao) GetByIDs(ctx context.Context, ids []uint64) (map[uint64
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
return itemMap, nil
|
||||
}
|
||||
|
||||
|
|
@ -313,5 +311,10 @@ func (d *userExampleDao) DeleteByTx(ctx context.Context, tx *gorm.DB, id uint64)
|
|||
|
||||
// UpdateByTx update a record by id in the database using the provided transaction
|
||||
func (d *userExampleDao) UpdateByTx(ctx context.Context, tx *gorm.DB, table *model.UserExample) error {
|
||||
return d.updateByID(ctx, tx, table)
|
||||
err := d.updateByID(ctx, tx, table)
|
||||
|
||||
// delete cache
|
||||
_ = d.cache.Del(ctx, table.ID)
|
||||
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ func Test_userExampleService_List(t *testing.T) {
|
|||
assert.Error(t, err)
|
||||
}
|
||||
|
||||
func Test_covertUserExample(t *testing.T) {
|
||||
func Test_convertUserExample(t *testing.T) {
|
||||
testData := &model.UserExample{}
|
||||
testData.ID = 1
|
||||
testData.CreatedAt = time.Now()
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ func TestRedisCache(t *testing.T) {
|
|||
key := utils.Uint64ToStr(testData.ID)
|
||||
err := iCache.Set(c.Ctx, key, c.TestDataMap[key], time.Minute)
|
||||
assert.NoError(t, err)
|
||||
err = iCache.Set(c.Ctx, key, c.TestDataMap[key], 0)
|
||||
assert.NoError(t, err)
|
||||
//err = iCache.Set(c.Ctx, key, c.TestDataMap[key], 0)
|
||||
//assert.NoError(t, err)
|
||||
|
||||
val := &redisUser{}
|
||||
err = iCache.Get(c.Ctx, key, val)
|
||||
|
|
@ -62,8 +62,8 @@ func TestRedisCache(t *testing.T) {
|
|||
|
||||
err = iCache.MultiSet(c.Ctx, c.TestDataMap, time.Minute)
|
||||
assert.NoError(t, err)
|
||||
err = iCache.MultiSet(c.Ctx, c.TestDataMap, 0)
|
||||
assert.NoError(t, err)
|
||||
//err = iCache.MultiSet(c.Ctx, c.TestDataMap, 0)
|
||||
//assert.NoError(t, err)
|
||||
|
||||
var keys []string
|
||||
for k := range c.TestDataMap {
|
||||
|
|
@ -71,9 +71,9 @@ func TestRedisCache(t *testing.T) {
|
|||
}
|
||||
vals := make(map[string]*redisUser)
|
||||
err = iCache.MultiGet(c.Ctx, keys, vals)
|
||||
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, len(c.TestDataSlice), len(vals))
|
||||
|
||||
err = iCache.SetCacheWithNotFound(c.Ctx, "not_found")
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ func NewError(code int, msg string) *Error {
|
|||
return e
|
||||
}
|
||||
|
||||
// Err covert to standard error
|
||||
// Err convert to standard error
|
||||
func (e *Error) Err() error {
|
||||
if len(e.details) == 0 {
|
||||
return fmt.Errorf("code = %d, msg = %s", e.code, e.msg)
|
||||
|
|
|
|||
|
|
@ -24,15 +24,15 @@ type Args struct {
|
|||
Example of conversion.
|
||||
|
||||
```go
|
||||
// json covert to struct
|
||||
code, err := jy2struct.Covert(&jy2struct.Args{
|
||||
// json convert to struct
|
||||
code, err := jy2struct.Convert(&jy2struct.Args{
|
||||
Format: "json",
|
||||
// InputFile: "user.json", // source from json file
|
||||
SubStruct: true,
|
||||
})
|
||||
|
||||
// yaml covert to struct
|
||||
code, err := jy2struct.Covert(&jy2struct.Args{
|
||||
// yaml convert to struct
|
||||
code, err := jy2struct.Convert(&jy2struct.Args{
|
||||
Format: "yaml",
|
||||
// InputFile: "user.yaml", // Source from yaml file
|
||||
SubStruct: true,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"strings"
|
||||
)
|
||||
|
||||
// Args covert arguments
|
||||
// Args convert arguments
|
||||
type Args struct {
|
||||
Format string // document format, json or yaml
|
||||
Data string // json or yaml content
|
||||
|
|
@ -48,8 +48,8 @@ func (j *Args) checkValid() error {
|
|||
return nil
|
||||
}
|
||||
|
||||
// Covert json or yaml to go struct
|
||||
func Covert(args *Args) (string, error) {
|
||||
// Convert json or yaml to go struct
|
||||
func Convert(args *Args) (string, error) {
|
||||
err := args.checkValid()
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"testing"
|
||||
)
|
||||
|
||||
func TestCovert(t *testing.T) {
|
||||
func TestConvert(t *testing.T) {
|
||||
type args struct {
|
||||
args *Args
|
||||
}
|
||||
|
|
@ -61,20 +61,20 @@ age: 10`,
|
|||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got, err := Covert(tt.args.args)
|
||||
got, err := Convert(tt.args.args)
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("Covert() error = %v, wantErr %v", err, tt.wantErr)
|
||||
t.Errorf("Convert() error = %v, wantErr %v", err, tt.wantErr)
|
||||
return
|
||||
}
|
||||
t.Log(got)
|
||||
})
|
||||
}
|
||||
|
||||
// test Covert error
|
||||
// test Convert error
|
||||
arg := &Args{Format: "unknown"}
|
||||
_, err := Covert(arg)
|
||||
_, err := Convert(arg)
|
||||
assert.Error(t, err)
|
||||
arg = &Args{Format: "yaml", InputFile: "notfound.yaml"}
|
||||
_, err = Covert(arg)
|
||||
_, err = Convert(arg)
|
||||
assert.Error(t, err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,8 +107,8 @@ func (r *replacerInfo) SetSubDirsAndFiles(subDirs []string, subFiles ...string)
|
|||
return
|
||||
}
|
||||
|
||||
subDirs = r.covertPathsDelimiter(subDirs...)
|
||||
subFiles = r.covertPathsDelimiter(subFiles...)
|
||||
subDirs = r.convertPathsDelimiter(subDirs...)
|
||||
subFiles = r.convertPathsDelimiter(subFiles...)
|
||||
|
||||
var files []string
|
||||
isExistFile := make(map[string]struct{}) // use map to avoid duplicate files
|
||||
|
|
@ -148,7 +148,7 @@ func (r *replacerInfo) SetIgnoreSubFiles(filenames ...string) {
|
|||
|
||||
// SetIgnoreSubDirs specify subdirectories to be ignored
|
||||
func (r *replacerInfo) SetIgnoreSubDirs(dirs ...string) {
|
||||
dirs = r.covertPathsDelimiter(dirs...)
|
||||
dirs = r.convertPathsDelimiter(dirs...)
|
||||
r.ignoreDirs = append(r.ignoreDirs, dirs...)
|
||||
}
|
||||
|
||||
|
|
@ -188,7 +188,7 @@ func (r *replacerInfo) GetSourcePath() string {
|
|||
|
||||
// ReadFile read file content
|
||||
func (r *replacerInfo) ReadFile(filename string) ([]byte, error) {
|
||||
filename = r.covertPathDelimiter(filename)
|
||||
filename = r.convertPathDelimiter(filename)
|
||||
|
||||
foundFile := []string{}
|
||||
for _, file := range r.files {
|
||||
|
|
@ -329,7 +329,7 @@ func (r *replacerInfo) getNewFilePath(file string) string {
|
|||
}
|
||||
|
||||
// if windows, convert the path splitter
|
||||
func (r *replacerInfo) covertPathDelimiter(filePath string) string {
|
||||
func (r *replacerInfo) convertPathDelimiter(filePath string) string {
|
||||
if r.isActual && gofile.IsWindows() {
|
||||
filePath = strings.ReplaceAll(filePath, "/", "\\")
|
||||
}
|
||||
|
|
@ -337,7 +337,7 @@ func (r *replacerInfo) covertPathDelimiter(filePath string) string {
|
|||
}
|
||||
|
||||
// if windows, batch convert path splitters
|
||||
func (r *replacerInfo) covertPathsDelimiter(filePaths ...string) []string {
|
||||
func (r *replacerInfo) convertPathsDelimiter(filePaths ...string) []string {
|
||||
if r.isActual && gofile.IsWindows() {
|
||||
filePathsTmp := []string{}
|
||||
for _, dir := range filePaths {
|
||||
|
|
|
|||
Loading…
Reference in New Issue