From 661fba3e6fa4edfbd7d3a554a355ed030d94fe59 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Mon, 7 Sep 2020 13:10:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=BB=BA=E5=8C=85=20=E4=B8=BA=20=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=A1=8C=E5=81=9A=E5=9F=BA=E7=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/go.mod | 3 --- server/gva/init_data/init_data.go | 5 ++++- server/initialize/data.go | 0 server/main.go | 4 ++-- server/service/sys_db_initialize.go | 0 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 server/initialize/data.go delete mode 100644 server/service/sys_db_initialize.go diff --git a/server/go.mod b/server/go.mod index 7686a496..6ac4777f 100644 --- a/server/go.mod +++ b/server/go.mod @@ -22,8 +22,6 @@ require ( github.com/json-iterator/go v1.1.10 // indirect github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible github.com/lestrrat-go/strftime v1.0.3 // indirect - github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect - github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect github.com/mailru/easyjson v0.7.1 // indirect github.com/mitchellh/mapstructure v1.2.2 // indirect github.com/mojocn/base64Captcha v1.3.1 @@ -42,7 +40,6 @@ require ( github.com/swaggo/swag v1.6.7 github.com/tebeka/strftime v0.1.3 // indirect github.com/unrolled/secure v1.0.7 - github.com/urfave/cli v1.22.2 // indirect go.uber.org/zap v1.10.0 golang.org/x/net v0.0.0-20200320220750-118fecf932d8 // indirect golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect diff --git a/server/gva/init_data/init_data.go b/server/gva/init_data/init_data.go index 4610370b..5aff1dd4 100644 --- a/server/gva/init_data/init_data.go +++ b/server/gva/init_data/init_data.go @@ -5,6 +5,7 @@ import ( "gin-vue-admin/model" gormadapter "github.com/casbin/gorm-adapter/v3" "github.com/satori/go.uuid" + "go.uber.org/zap" "gorm.io/gorm" "time" ) @@ -309,6 +310,7 @@ func InitSysBaseMenus() (err error) { {Model: gorm.Model{ID: 23, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: true, ParentId: "3", Path: "dictionaryDetail/:id", Name: "dictionaryDetail", Component: "view/superAdmin/dictionary/sysDictionaryDetail.vue", Sort: 1, Meta: model.Meta{Title: "字典详情", Icon: "s-order"}}, {Model: gorm.Model{ID: 24, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "operation", Name: "operation", Component: "view/superAdmin/operation/sysOperationRecord.vue", Sort: 6, Meta: model.Meta{Title: "操作历史", Icon: "time"}}, {Model: gorm.Model{ID: 25, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "simpleUploader", Name: "simpleUploader", Component: "view/example/simpleUploader/simpleUploader", Sort: 6, Meta: model.Meta{Title: "断点续传（插件版）", Icon: "upload"}}, + {Model: gorm.Model{ID: 26, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, ParentId: "0", Path: "https://www.gin-vue-admin.com", Name: "https://www.gin-vue-admin.com", Hidden: false, Component: "/", Sort: 0, Meta: model.Meta{Title: "官方网站", Icon: "s-home"}}, } if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务 tx.Rollback() @@ -366,6 +368,7 @@ func InitSysAuthorityMenus() (err error) { {"888", 23}, {"888", 24}, {"888", 25}, + {"888", 26}, {"8881", 1}, {"8881", 2}, {"8881", 8}, @@ -476,7 +479,7 @@ func InitData() { err = InitSysDictionaryDetail() err = InitExaFileUploadAndDownload() if err != nil { - global.GVA_LOG.Error("initialize data failed", err) + global.GVA_LOG.Error("initialize data failed", zap.Any("err", err)) } global.GVA_LOG.Debug("initialize data success") } diff --git a/server/initialize/data.go b/server/initialize/data.go deleted file mode 100644 index e69de29b..00000000 diff --git a/server/main.go b/server/main.go index 3429c443..e0ad59e1 100644 --- a/server/main.go +++ b/server/main.go @@ -3,7 +3,7 @@ package main import ( "gin-vue-admin/core" "gin-vue-admin/global" - "gin-vue-admin/gva/init_data" + //"gin-vue-admin/gva/init_data" "gin-vue-admin/initialize" //"runtime" ) @@ -25,7 +25,7 @@ func main() { initialize.Mysql() } initialize.DBTables() - init_data.InitData() // 打开注释即可初始化数据 + //init_data.InitData() // 打开注释即可初始化数据 使用过后一定要再次注释或删除 // 程序结束前关闭数据库链接 db, _ := global.GVA_DB.DB() defer db.Close() diff --git a/server/service/sys_db_initialize.go b/server/service/sys_db_initialize.go deleted file mode 100644 index e69de29b..00000000 -- GitLab