From a68e58f93bade5ea90fd017718525ec8258f9157 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Mon, 26 Oct 2020 15:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/version/1599190683659_tables.go | 2 +- .../version/1599190683670_migrate.go | 8 +- .../version/1602644950000_migrate.go | 7 +- cmd/migrate/server.go | 6 +- cmd/version/server.go | 5 +- go-admin-ui/src/api/syscategory.js | 47 --- go-admin-ui/src/views/syscategory/index.vue | 329 ------------------ 7 files changed, 12 insertions(+), 392 deletions(-) delete mode 100644 go-admin-ui/src/api/syscategory.js delete mode 100644 go-admin-ui/src/views/syscategory/index.vue diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index 42eeda3b..53bc5fda 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -1,9 +1,9 @@ package version import ( - "go-admin/app/admin/models/system" "runtime" + "go-admin/app/admin/models/system" "gorm.io/gorm" "go-admin/app/admin/models" diff --git a/cmd/migrate/migration/version/1599190683670_migrate.go b/cmd/migrate/migration/version/1599190683670_migrate.go index a1756592..7660403f 100644 --- a/cmd/migrate/migration/version/1599190683670_migrate.go +++ b/cmd/migrate/migration/version/1599190683670_migrate.go @@ -1,10 +1,10 @@ package version import ( - "go-admin/app/admin/models/system" "runtime" "time" + "go-admin/app/admin/models/system" "gorm.io/gorm" "go-admin/app/admin/models" @@ -20,10 +20,8 @@ func init() { func _1599190683670Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - list1 := []models.RoleMenu{ - } - list2 := []models.CasbinRule{ - } + list1 := []models.RoleMenu{} + list2 := []models.CasbinRule{} list3 := []models.SysDept{ {DeptId: 1, ParentId: 0, DeptPath: "/0/1", DeptName: "爱拓科技", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "0", CreateBy: "1", UpdateBy: "1", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, diff --git a/cmd/migrate/migration/version/1602644950000_migrate.go b/cmd/migrate/migration/version/1602644950000_migrate.go index a73d1471..c2f87cee 100644 --- a/cmd/migrate/migration/version/1602644950000_migrate.go +++ b/cmd/migrate/migration/version/1602644950000_migrate.go @@ -1,11 +1,12 @@ package version import ( - "go-admin/app/admin/models" - "go-admin/app/admin/models/system" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + + "go-admin/app/admin/models" + "go-admin/app/admin/models/system" "go-admin/cmd/migrate/migration" common "go-admin/common/models" ) diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go index 08850a86..a2c4ae12 100644 --- a/cmd/migrate/server.go +++ b/cmd/migrate/server.go @@ -16,7 +16,7 @@ import ( "go-admin/common/global" "go-admin/common/models" "go-admin/pkg/logger" - tools2 "go-admin/tools" + "go-admin/tools" "go-admin/tools/config" ) @@ -91,9 +91,9 @@ func genFile() error { var b1 bytes.Buffer err = t1.Execute(&b1, m) if goAdmin { - tools2.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go") + tools.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go") } else { - tools2.FileCreate(b1, "./cmd/migrate/migration/version-local/"+m["GenerateTime"]+"_migrate.go") + tools.FileCreate(b1, "./cmd/migrate/migration/version-local/"+m["GenerateTime"]+"_migrate.go") } return nil } diff --git a/cmd/version/server.go b/cmd/version/server.go index cb46e41d..1095bb1f 100644 --- a/cmd/version/server.go +++ b/cmd/version/server.go @@ -9,10 +9,7 @@ import ( ) var ( - configYml string - port string - mode string - StartCmd = &cobra.Command{ + StartCmd = &cobra.Command{ Use: "version", Short: "Get version info", Example: "go-admin version", diff --git a/go-admin-ui/src/api/syscategory.js b/go-admin-ui/src/api/syscategory.js deleted file mode 100644 index cde5aead..00000000 --- a/go-admin-ui/src/api/syscategory.js +++ /dev/null @@ -1,47 +0,0 @@ -import request from '@/utils/request' - -// 查询SysCategory列表 -export function listSysCategory(query) { - return request({ - url: '/api/v1/cms', - method: 'get', - params: query - }) -} - -// 查询SysCategory详细 -export function getSysCategory (ID) { - return request({ - url: '/api/v1/cms/' + ID, - method: 'get' - }) -} - - -// 新增SysCategory -export function addSysCategory(data) { - return request({ - url: '/api/v1/cms', - method: 'post', - data: data - }) -} - -// 修改SysCategory -export function updateSysCategory(data) { - return request({ - url: '/api/v1/cms/'+data.ID, - method: 'put', - data: data - }) -} - -// 删除SysCategory -export function delSysCategory(data) { - return request({ - url: '/api/v1/cms', - method: 'delete', - data: data - }) -} - diff --git a/go-admin-ui/src/views/syscategory/index.vue b/go-admin-ui/src/views/syscategory/index.vue deleted file mode 100644 index 6860b271..00000000 --- a/go-admin-ui/src/views/syscategory/index.vue +++ /dev/null @@ -1,329 +0,0 @@ - - - -