From e4bccf96b4392f08cbc9d8e508d2accd877d7313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=AC=91?= Date: Tue, 15 Jun 2021 15:05:04 +0800 Subject: [PATCH 1/9] exa_excel_parse.go: fix return err --- server/service/exa_excel_parse.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/service/exa_excel_parse.go b/server/service/exa_excel_parse.go index 19ec3e51..f8a5a356 100644 --- a/server/service/exa_excel_parse.go +++ b/server/service/exa_excel_parse.go @@ -24,8 +24,8 @@ func ParseInfoList2Excel(infoList []model.SysBaseMenu, filePath string) error { menu.Component, }) } - excel.SaveAs(filePath) - return nil + err := excel.SaveAs(filePath) + return err } func ParseExcel2InfoList() ([]model.SysBaseMenu, error) { From ff67f0553fd90cf0018f29e2bbf777c94f525bc1 Mon Sep 17 00:00:00 2001 From: songzhibin97 <718428482@qq.com> Date: Thu, 17 Jun 2021 09:03:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?perf:=E4=BC=98=E5=8C=96=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 创建失败不更改config文件保持,前端保持在init界面 修改文件 - server/api/sys_initdb.go - server/service/sys_initdb.go --- server/api/v1/sys_initdb.go | 3 ++- server/service/sys_initdb.go | 33 +++++++++++---------------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/server/api/v1/sys_initdb.go b/server/api/v1/sys_initdb.go index 7a35819b..ef3b1d4f 100644 --- a/server/api/v1/sys_initdb.go +++ b/server/api/v1/sys_initdb.go @@ -5,6 +5,7 @@ import ( "gin-vue-admin/model/request" "gin-vue-admin/model/response" "gin-vue-admin/service" + "go.uber.org/zap" "github.com/gin-gonic/gin" @@ -30,7 +31,7 @@ func InitDB(c *gin.Context) { } if err := service.InitDB(dbInfo); err != nil { global.GVA_LOG.Error("自动创建数据库失败!", zap.Any("err", err)) - response.FailWithMessage("自动创建数据库失败，请查看后台日志", c) + response.FailWithMessage("自动创建数据库失败，请查看后台日志，检查后在进行初始化", c) return } response.OkWithData("自动创建数据库成功", c) diff --git a/server/service/sys_initdb.go b/server/service/sys_initdb.go index 3880cb05..44e4ec70 100644 --- a/server/service/sys_initdb.go +++ b/server/service/sys_initdb.go @@ -9,10 +9,11 @@ import ( "gin-vue-admin/model/request" "gin-vue-admin/source" "gin-vue-admin/utils" + "path/filepath" + "github.com/spf13/viper" "gorm.io/driver/mysql" "gorm.io/gorm" - "path/filepath" ) //@author: [songzhibin97](https://github.com/songzhibin97) @@ -71,13 +72,6 @@ func initDB(InitDBFunctions ...model.InitDBFunc) (err error) { //@return: error func InitDB(conf request.InitDB) error { - BaseMysql := config.Mysql{ - Path: "", - Dbname: "", - Username: "", - Password: "", - Config: "charset=utf8mb4&parseTime=True&loc=Local", - } if conf.Host == "" { conf.Host = "127.0.0.1" @@ -100,15 +94,11 @@ func InitDB(conf request.InitDB) error { Config: "charset=utf8mb4&parseTime=True&loc=Local", } - if err := writeConfig(global.GVA_VP, MysqlConfig); err != nil { - return err - } - m := global.GVA_CONFIG.Mysql - if m.Dbname == "" { + if MysqlConfig.Dbname == "" { return nil } - linkDns := m.Username + ":" + m.Password + "@tcp(" + m.Path + ")/" + m.Dbname + "?" + m.Config + linkDns := MysqlConfig.Username + ":" + MysqlConfig.Password + "@tcp(" + MysqlConfig.Path + ")/" + MysqlConfig.Dbname + "?" + MysqlConfig.Config mysqlConfig := mysql.Config{ DSN: linkDns, // DSN data source name DefaultStringSize: 191, // string 类型字段的默认长度 @@ -118,15 +108,11 @@ func InitDB(conf request.InitDB) error { SkipInitializeWithVersion: false, // 根据版本自动配置 } if db, err := gorm.Open(mysql.New(mysqlConfig), &gorm.Config{DisableForeignKeyConstraintWhenMigrating: true}); err != nil { - //global.GVA_LOG.Error("MySQL启动异常!", zap.Any("err", err)) - //os.Exit(0) - //return nil - _ = writeConfig(global.GVA_VP, BaseMysql) return nil } else { sqlDB, _ := db.DB() - sqlDB.SetMaxIdleConns(m.MaxIdleConns) - sqlDB.SetMaxOpenConns(m.MaxOpenConns) + sqlDB.SetMaxIdleConns(MysqlConfig.MaxIdleConns) + sqlDB.SetMaxOpenConns(MysqlConfig.MaxOpenConns) global.GVA_DB = db } @@ -147,7 +133,7 @@ func InitDB(conf request.InitDB) error { model.SysOperationRecord{}, ) if err != nil { - _ = writeConfig(global.GVA_VP, BaseMysql) + global.GVA_DB = nil return err } err = initDB( @@ -163,7 +149,10 @@ func InitDB(conf request.InitDB) error { source.File, source.BaseMenu) if err != nil { - _ = writeConfig(global.GVA_VP, BaseMysql) + global.GVA_DB = nil + return err + } + if err = writeConfig(global.GVA_VP, MysqlConfig); err != nil { return err } global.GVA_CONFIG.AutoCode.Root, _ = filepath.Abs("..") From 1faf5d072d9ae079c6207e65914e9ba72624d682 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Thu, 17 Jun 2021 12:12:31 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=20=E5=89=8D=E7=AB=AF=E4=B8=BA=E5=B0=8F=E9=A9=BC=E5=B3=B0=20?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=B8=BA=E4=B8=8B=E5=88=92=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/sys_user.go | 24 +++++++++---------- server/model/sys_auto_code.go | 1 + server/service/sys_auto_code.go | 9 ++++++- web/src/view/layout/bottomInfo/bottomInfo.vue | 2 +- web/src/view/login/index.vue | 2 +- web/src/view/systemTools/autoCode/index.vue | 4 +++- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/server/api/v1/sys_user.go b/server/api/v1/sys_user.go index a3d738d7..1d29ff40 100644 --- a/server/api/v1/sys_user.go +++ b/server/api/v1/sys_user.go @@ -23,15 +23,15 @@ import ( // @Success 200 {string} string "{"success":true,"data":{},"msg":"登陆成功"}" // @Router /base/login [post] func Login(c *gin.Context) { - var L request.Login - _ = c.ShouldBindJSON(&L) - if err := utils.Verify(L, utils.LoginVerify); err != nil { + var l request.Login + _ = c.ShouldBindJSON(&l) + if err := utils.Verify(l, utils.LoginVerify); err != nil { response.FailWithMessage(err.Error(), c) return } - if store.Verify(L.CaptchaId, L.Captcha, true) { - U := &model.SysUser{Username: L.Username, Password: L.Password} - if err, user := service.Login(U); err != nil { + if store.Verify(l.CaptchaId, l.Captcha, true) { + u := &model.SysUser{Username: l.Username, Password: l.Password} + if err, user := service.Login(u); err != nil { global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Any("err", err)) response.FailWithMessage("用户名不存在或者密码错误", c) } else { @@ -112,13 +112,13 @@ func tokenNext(c *gin.Context, user model.SysUser) { // @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}" // @Router /user/register [post] func Register(c *gin.Context) { - var R request.Register - _ = c.ShouldBindJSON(&R) - if err := utils.Verify(R, utils.RegisterVerify); err != nil { + var r request.Register + _ = c.ShouldBindJSON(&r) + if err := utils.Verify(r, utils.RegisterVerify); err != nil { response.FailWithMessage(err.Error(), c) return } - user := &model.SysUser{Username: R.Username, NickName: R.NickName, Password: R.Password, HeaderImg: R.HeaderImg, AuthorityId: R.AuthorityId} + user := &model.SysUser{Username: r.Username, NickName: r.NickName, Password: r.Password, HeaderImg: r.HeaderImg, AuthorityId: r.AuthorityId} err, userReturn := service.Register(*user) if err != nil { global.GVA_LOG.Error("注册失败!", zap.Any("err", err)) @@ -142,8 +142,8 @@ func ChangePassword(c *gin.Context) { response.FailWithMessage(err.Error(), c) return } - U := &model.SysUser{Username: user.Username, Password: user.Password} - if err, _ := service.ChangePassword(U, user.NewPassword); err != nil { + u := &model.SysUser{Username: user.Username, Password: user.Password} + if err, _ := service.ChangePassword(u, user.NewPassword); err != nil { global.GVA_LOG.Error("修改失败!", zap.Any("err", err)) response.FailWithMessage("修改失败，原密码与当前账户不符", c) } else { diff --git a/server/model/sys_auto_code.go b/server/model/sys_auto_code.go index 6e9e0bde..9e030f5d 100644 --- a/server/model/sys_auto_code.go +++ b/server/model/sys_auto_code.go @@ -7,6 +7,7 @@ type AutoCodeStruct struct { StructName string `json:"structName"` // Struct名称 TableName string `json:"tableName"` // 表名 PackageName string `json:"packageName"` // 文件名称 + HumpPackageName string `json:"humpPackageName"` // go文件名称 Abbreviation string `json:"abbreviation"` // Struct简称 Description string `json:"description"` // Struct中文名称 AutoCreateApiToSql bool `json:"autoCreateApiToSql"` // 是否自动创建api diff --git a/server/service/sys_auto_code.go b/server/service/sys_auto_code.go index eda86476..679120af 100644 --- a/server/service/sys_auto_code.go +++ b/server/service/sys_auto_code.go @@ -360,8 +360,15 @@ func getNeedList(autoCode *model.AutoCodeStruct) (dataList []tplData, fileList [ origFileName := strings.TrimSuffix(trimBase[lastSeparator+1:], ".tpl") firstDot := strings.Index(origFileName, ".") if firstDot != -1 { + var fileName string + if origFileName[firstDot:] !=".go"{ + fileName = autoCode.PackageName+origFileName[firstDot:] + }else{ + fileName = autoCode.HumpPackageName+origFileName[firstDot:] + } + dataList[index].autoCodePath = filepath.Join(autoPath, trimBase[:lastSeparator], autoCode.PackageName, - origFileName[:firstDot], autoCode.PackageName+origFileName[firstDot:]) + origFileName[:firstDot], fileName) } } diff --git a/web/src/view/layout/bottomInfo/bottomInfo.vue b/web/src/view/layout/bottomInfo/bottomInfo.vue index 9be35600..98b3e2b3 100644 --- a/web/src/view/layout/bottomInfo/bottomInfo.vue +++ b/web/src/view/layout/bottomInfo/bottomInfo.vue @@ -3,7 +3,7 @@
Powered by - {{$GIN_VUE_ADMIN.appName}} + {{ $GIN_VUE_ADMIN.appName }} Copyright diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue index bf0f810d..eac9a163 100644 --- a/web/src/view/login/index.vue +++ b/web/src/view/login/index.vue @@ -3,7 +3,7 @@