diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e2e27e..ea2c9b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,10 @@ jobs: go-version: '1.20' cache: false - uses: actions/checkout@v3 + - name: install deps + run: | + go install golang.org/x/tools/cmd/goimports + - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: diff --git a/core/errcode/errors.pb.go b/core/errcode/errors.pb.go index 0e8f9cb..30eccb3 100644 --- a/core/errcode/errors.pb.go +++ b/core/errcode/errors.pb.go @@ -7,10 +7,11 @@ package errcode import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/core/plugins/logger/zap/zap_test.go b/core/plugins/logger/zap/zap_test.go index c77df75..a7d0634 100644 --- a/core/plugins/logger/zap/zap_test.go +++ b/core/plugins/logger/zap/zap_test.go @@ -2,9 +2,10 @@ package zap import ( "fmt" - "go.uber.org/zap/zapcore" "testing" + "go.uber.org/zap/zapcore" + "github.com/mss-boot-io/mss-boot/core/logger" "github.com/mss-boot-io/mss-boot/core/logger/level" "github.com/mss-boot-io/mss-boot/core/logger/writer" diff --git a/go.mod b/go.mod index d4d5d19..f79111e 100644 --- a/go.mod +++ b/go.mod @@ -43,6 +43,8 @@ require ( github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect golang.org/x/arch v0.3.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/tools v0.13.0 // indirect ) require ( @@ -110,13 +112,13 @@ require ( go.mongodb.org/mongo-driver v1.9.0 go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.9.0 + golang.org/x/crypto v0.13.0 golang.org/x/image v0.5.0 // indirect - golang.org/x/net v0.10.0 // indirect + golang.org/x/net v0.15.0 // indirect golang.org/x/oauth2 v0.4.0 - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/sync v0.3.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect diff --git a/go.sum b/go.sum index 78c1558..4d09da0 100644 --- a/go.sum +++ b/go.sum @@ -564,8 +564,8 @@ golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -600,6 +600,8 @@ 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.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +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-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -639,8 +641,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= 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= @@ -662,8 +664,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/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.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= 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= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -721,8 +724,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -737,8 +740,8 @@ 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.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= 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= @@ -797,6 +800,8 @@ golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/config/gormdb/config_test.go b/pkg/config/gormdb/config_test.go index 8e98562..4c8bb31 100644 --- a/pkg/config/gormdb/config_test.go +++ b/pkg/config/gormdb/config_test.go @@ -1,9 +1,10 @@ package gormdb import ( + "testing" + "gorm.io/driver/mysql" "gorm.io/gorm" - "testing" ) var dsn0 = "dsn0" diff --git a/pkg/config/mongodb/database.go b/pkg/config/mongodb/database.go index fde18b3..ca6d8da 100644 --- a/pkg/config/mongodb/database.go +++ b/pkg/config/mongodb/database.go @@ -19,8 +19,8 @@ import ( // nolint "github.com/casbin/casbin/v2/persist" "github.com/casbin/casbin/v2/persist" // nolint "github.com/casbin/mongodb-adapter/v3" - "github.com/casbin/mongodb-adapter/v3" - "github.com/kamva/mgm/v3" + mongodbadapter "github.com/casbin/mongodb-adapter/v3" + mgm "github.com/kamva/mgm/v3" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/readpref" diff --git a/pkg/config/mongodb/type.go b/pkg/config/mongodb/type.go index 120923e..5fa2504 100644 --- a/pkg/config/mongodb/type.go +++ b/pkg/config/mongodb/type.go @@ -7,7 +7,7 @@ package mongodb * @Last Modified time: 2022/3/14 9:32 */ -import "github.com/kamva/mgm/v3" +import mgm "github.com/kamva/mgm/v3" // Tabler table interface type Tabler interface { diff --git a/pkg/config/source/mgdb/mgdb.go b/pkg/config/source/mgdb/mgdb.go index a09a221..a5c8b87 100644 --- a/pkg/config/source/mgdb/mgdb.go +++ b/pkg/config/source/mgdb/mgdb.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "github.com/mss-boot-io/mss-boot/pkg/config/source" "go.mongodb.org/mongo-driver/bson" mongoOptions "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/config/source/mgdb/type.go b/pkg/config/source/mgdb/type.go index 5061914..e54d7e6 100644 --- a/pkg/config/source/mgdb/type.go +++ b/pkg/config/source/mgdb/type.go @@ -12,7 +12,7 @@ import ( "fmt" "strings" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "gopkg.in/yaml.v3" "github.com/mss-boot-io/mss-boot/pkg" diff --git a/pkg/response/actions/base.go b/pkg/response/actions/base.go index 70070c5..56c1517 100644 --- a/pkg/response/actions/base.go +++ b/pkg/response/actions/base.go @@ -11,7 +11,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "gorm.io/gorm/schema" ) diff --git a/pkg/response/actions/control_mgm.go b/pkg/response/actions/control_mgm.go index b12ec85..146e235 100644 --- a/pkg/response/actions/control_mgm.go +++ b/pkg/response/actions/control_mgm.go @@ -13,7 +13,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "github.com/mss-boot-io/mss-boot/pkg" "github.com/mss-boot-io/mss-boot/pkg/response" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/pkg/response/actions/delete_mgm.go b/pkg/response/actions/delete_mgm.go index e4e00a9..365ff6d 100644 --- a/pkg/response/actions/delete_mgm.go +++ b/pkg/response/actions/delete_mgm.go @@ -13,7 +13,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/response/actions/get_gorm.go b/pkg/response/actions/get_gorm.go index a230df2..1844902 100644 --- a/pkg/response/actions/get_gorm.go +++ b/pkg/response/actions/get_gorm.go @@ -9,9 +9,10 @@ package actions import ( "errors" - "gorm.io/gorm" "net/http" + "gorm.io/gorm" + "github.com/gin-gonic/gin" "gorm.io/gorm/schema" diff --git a/pkg/response/actions/get_mgm.go b/pkg/response/actions/get_mgm.go index 21b2f3f..8e471df 100644 --- a/pkg/response/actions/get_mgm.go +++ b/pkg/response/actions/get_mgm.go @@ -13,7 +13,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/response/actions/search_mgm.go b/pkg/response/actions/search_mgm.go index 30f15c2..e5f80c1 100644 --- a/pkg/response/actions/search_mgm.go +++ b/pkg/response/actions/search_mgm.go @@ -15,7 +15,7 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "github.com/kamva/mgm/v3/builder" "github.com/kamva/mgm/v3/field" "go.mongodb.org/mongo-driver/bson" diff --git a/pkg/response/actions/search_test.go b/pkg/response/actions/search_test.go index 9d979d6..f2debcd 100644 --- a/pkg/response/actions/search_test.go +++ b/pkg/response/actions/search_test.go @@ -10,7 +10,7 @@ package actions import ( "testing" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "go.mongodb.org/mongo-driver/bson/primitive" ) diff --git a/pkg/response/actions/type.go b/pkg/response/actions/type.go index 41bc990..e28cedb 100644 --- a/pkg/response/actions/type.go +++ b/pkg/response/actions/type.go @@ -12,7 +12,7 @@ import ( "time" "github.com/google/uuid" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "github.com/spf13/cast" "gorm.io/gorm" "gorm.io/gorm/schema" diff --git a/pkg/response/controller/simple.go b/pkg/response/controller/simple.go index 73dc942..10aa644 100644 --- a/pkg/response/controller/simple.go +++ b/pkg/response/controller/simple.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/gin-gonic/gin" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "github.com/mss-boot-io/mss-boot/pkg/response" "github.com/mss-boot-io/mss-boot/pkg/response/actions" diff --git a/pkg/utils.go b/pkg/utils.go index d9f23de..8df8339 100644 --- a/pkg/utils.go +++ b/pkg/utils.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/kamva/mgm/v3" + mgm "github.com/kamva/mgm/v3" "golang.org/x/crypto/bcrypt" "gorm.io/gorm/schema" )