From 547a5eb8e4e9df035c74c290a46dfd611b310350 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Thu, 25 Mar 2021 18:35:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B=20=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96Duplicate=20column=20name=20'is=5Ffr?= =?UTF-8?q?ontend'=20(#376)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + app/admin/middleware/init.go | 2 +- app/admin/models/syschinaareadata.go | 9 +++------ app/admin/service/dto/syschinaareadata.go | 5 +---- cmd/migrate/migration/version/1615948084336_migrate.go | 5 +++-- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 1dd3955..ce6fd6b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ cmd/migrate/migration/version-local/* # go sum go.sum +config/settings.deva.yml diff --git a/app/admin/middleware/init.go b/app/admin/middleware/init.go index 08486be..54dfc8a 100644 --- a/app/admin/middleware/init.go +++ b/app/admin/middleware/init.go @@ -21,4 +21,4 @@ func InitMiddleware(r *gin.Engine) { r.Use(Secure) // 链路追踪 //r.Use(middleware.Trace()) -} +} \ No newline at end of file diff --git a/app/admin/models/syschinaareadata.go b/app/admin/models/syschinaareadata.go index 13d7c8b..019b041 100644 --- a/app/admin/models/syschinaareadata.go +++ b/app/admin/models/syschinaareadata.go @@ -2,18 +2,15 @@ package models import ( "go-admin/common/models" - "time" ) type SysChinaAreaData struct { models.Model - models.ControlBy PId string `json:"pId" gorm:"type:int(11);comment:上级编码"` Name string `json:"name" gorm:"type:varchar(128);comment:名称"` - CreateTime time.Time `json:"createTime" gorm:"type:timestamp;comment:CreateTime"` - UpdateTime time.Time `json:"updateTime" gorm:"type:timestamp;comment:UpdateTime"` - DeleteTime time.Time `json:"deleteTime" gorm:"type:timestamp;comment:DeleteTime"` + models.ControlBy + models.ModelTime } func (SysChinaAreaData) TableName() string { @@ -27,4 +24,4 @@ func (e *SysChinaAreaData) Generate() models.ActiveRecord { func (e *SysChinaAreaData) GetId() interface{} { return e.Id -} +} \ No newline at end of file diff --git a/app/admin/service/dto/syschinaareadata.go b/app/admin/service/dto/syschinaareadata.go index e236975..773571e 100644 --- a/app/admin/service/dto/syschinaareadata.go +++ b/app/admin/service/dto/syschinaareadata.go @@ -59,9 +59,6 @@ func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) { Model: common.Model{Id: s.Id}, PId: s.PId, Name: s.Name, - CreateTime: s.CreateTime, - UpdateTime: s.UpdateTime, - DeleteTime: s.DeleteTime, }, nil } @@ -98,4 +95,4 @@ func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error { func (s *SysChinaAreaDataById) SetUpdateBy(id int) { -} +} \ No newline at end of file diff --git a/cmd/migrate/migration/version/1615948084336_migrate.go b/cmd/migrate/migration/version/1615948084336_migrate.go index 5bd4617..72741cc 100644 --- a/cmd/migrate/migration/version/1615948084336_migrate.go +++ b/cmd/migrate/migration/version/1615948084336_migrate.go @@ -3,6 +3,7 @@ package version import ( "gorm.io/gorm" "runtime" + "strings" "go-admin/cmd/migrate/migration" common "go-admin/common/models" @@ -17,7 +18,7 @@ func _1615948084336Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { err := tx.Exec("alter table sys_config add is_frontend int default 1 null comment '是否前台参数' after config_type").Error - if err != nil { + if err != nil && !strings.Contains(err.Error(),"Duplicate column name 'is_frontend'") { return err } @@ -25,4 +26,4 @@ func _1615948084336Test(db *gorm.DB, version string) error { Version: version, }).Error }) -} +} \ No newline at end of file