diff --git a/bank_card/go.mod b/bank_card/go.mod index 3111668..2f39219 100644 --- a/bank_card/go.mod +++ b/bank_card/go.mod @@ -12,3 +12,5 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/tx7do/kratos-utils => ../ diff --git a/entgo/go.mod b/entgo/go.mod index 17aac2a..9bca2a3 100644 --- a/entgo/go.mod +++ b/entgo/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-kratos/kratos/v2 v2.7.1 github.com/google/uuid v1.3.1 github.com/stretchr/testify v1.8.4 - github.com/tx7do/kratos-utils v0.0.0-20231025044346-36a096df76d8 + github.com/tx7do/kratos-utils v1.0.0 ) require ( @@ -34,3 +34,5 @@ require ( google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/tx7do/kratos-utils => ../ diff --git a/entgo/go.sum b/entgo/go.sum index 1786344..b76f090 100644 --- a/entgo/go.sum +++ b/entgo/go.sum @@ -44,8 +44,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tx7do/kratos-utils v0.0.0-20231025044346-36a096df76d8 h1:G+s0DQ6zI0dGcvd9tRpXcYzelO0xRnp2jpFtQ+697Ko= -github.com/tx7do/kratos-utils v0.0.0-20231025044346-36a096df76d8/go.mod h1:rTeeqeABjK9HamIwKZ+uLozVIk/hGiEbNsi6rVr4l0w= +github.com/tx7do/kratos-utils v1.0.0 h1:riJckHihwtT52/e7fATQUe5+v1TtxIg5Wm86PxzDAJs= +github.com/tx7do/kratos-utils v1.0.0/go.mod h1:rTeeqeABjK9HamIwKZ+uLozVIk/hGiEbNsi6rVr4l0w= github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/entgo/mixin/time.go b/entgo/mixin/time.go index 2cd5a29..abf3c1a 100644 --- a/entgo/mixin/time.go +++ b/entgo/mixin/time.go @@ -69,11 +69,11 @@ func (TimeAt) Fields() []ent.Field { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -var _ ent.Mixin = (*CreatedTime)(nil) +var _ ent.Mixin = (*CreateTime)(nil) -type CreatedTime struct{ mixin.Schema } +type CreateTime struct{ mixin.Schema } -func (CreatedTime) Fields() []ent.Field { +func (CreateTime) Fields() []ent.Field { return []ent.Field{ // 创建时间 field.Time("create_time"). @@ -86,11 +86,11 @@ func (CreatedTime) Fields() []ent.Field { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -var _ ent.Mixin = (*UpdatedTime)(nil) +var _ ent.Mixin = (*UpdateTime)(nil) -type UpdatedTime struct{ mixin.Schema } +type UpdateTime struct{ mixin.Schema } -func (UpdatedTime) Fields() []ent.Field { +func (UpdateTime) Fields() []ent.Field { return []ent.Field{ // 更新时间 field.Time("update_time"). @@ -102,11 +102,11 @@ func (UpdatedTime) Fields() []ent.Field { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -var _ ent.Mixin = (*DeletedTime)(nil) +var _ ent.Mixin = (*DeleteTime)(nil) -type DeletedTime struct{ mixin.Schema } +type DeleteTime struct{ mixin.Schema } -func (DeletedTime) Fields() []ent.Field { +func (DeleteTime) Fields() []ent.Field { return []ent.Field{ // 删除时间 field.Time("delete_time"). @@ -122,9 +122,9 @@ type Time struct{ mixin.Schema } func (Time) Fields() []ent.Field { var fields []ent.Field - fields = append(fields, CreatedTime{}.Fields()...) - fields = append(fields, UpdatedTime{}.Fields()...) - fields = append(fields, DeletedTime{}.Fields()...) + fields = append(fields, CreateTime{}.Fields()...) + fields = append(fields, UpdateTime{}.Fields()...) + fields = append(fields, DeleteTime{}.Fields()...) return fields } diff --git a/entgo/mixin/timestamp.go b/entgo/mixin/timestamp.go index 7261e07..be1ae0c 100644 --- a/entgo/mixin/timestamp.go +++ b/entgo/mixin/timestamp.go @@ -1,10 +1,11 @@ package mixin import ( + "time" + "entgo.io/ent" "entgo.io/ent/schema/field" "entgo.io/ent/schema/mixin" - "time" ) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -74,3 +75,71 @@ func (Timestamp) Fields() []ent.Field { } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +var _ ent.Mixin = (*CreatedAtTimestamp)(nil) + +type CreatedAtTimestamp struct{ mixin.Schema } + +func (CreatedAtTimestamp) Fields() []ent.Field { + return []ent.Field{ + // 创建时间,毫秒 + field.Int64("created_at"). + Comment("创建时间"). + Immutable(). + Optional(). + Nillable(). + DefaultFunc(time.Now().UnixMilli), + } +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +var _ ent.Mixin = (*UpdatedAtTimestamp)(nil) + +type UpdatedAtTimestamp struct{ mixin.Schema } + +func (UpdatedAtTimestamp) Fields() []ent.Field { + return []ent.Field{ + // 更新时间,毫秒 + // 需要注意的是,如果不是程序自动更新,那么这个字段不会被更新,除非在数据库里面下触发器更新。 + field.Int64("updated_at"). + Comment("更新时间"). + Optional(). + Nillable(). + UpdateDefault(time.Now().UnixMilli), + } +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +var _ ent.Mixin = (*DeletedAtTimestamp)(nil) + +type DeletedAtTimestamp struct{ mixin.Schema } + +func (DeletedAtTimestamp) Fields() []ent.Field { + return []ent.Field{ + // 删除时间,毫秒 + field.Int64("deleted_at"). + Comment("删除时间"). + Optional(). + Nillable(), + } +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +var _ ent.Mixin = (*TimestampAt)(nil) + +type TimestampAt struct{ mixin.Schema } + +func (TimestampAt) Fields() []ent.Field { + var fields []ent.Field + fields = append(fields, CreatedAtTimestamp{}.Fields()...) + fields = append(fields, UpdatedAtTimestamp{}.Fields()...) + fields = append(fields, DeletedAtTimestamp{}.Fields()...) + return fields +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/geoip/go.mod b/geoip/go.mod index ee9a213..71180a0 100644 --- a/geoip/go.mod +++ b/geoip/go.mod @@ -17,3 +17,5 @@ require ( golang.org/x/sys v0.10.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/tx7do/kratos-utils => ../ diff --git a/upgrade.bat b/upgrade.bat index 77bec06..84884bc 100644 --- a/upgrade.bat +++ b/upgrade.bat @@ -3,9 +3,17 @@ echo off ::指定起始文件夹 set DIR="%cd%" -for /R %DIR% /d %%i in (*) do ( - echo %%i - cd %%i - go get all - go mod tidy -) +go get all +go mod tidy + +cd %DIR%/bank_card +go get all +go mod tidy + +cd %DIR%/entgo +go get all +go mod tidy + +cd %DIR%/geoip +go get all +go mod tidy