From 249567d61de296aa3d1b71e92ebb5deb95520aa6 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Tue, 12 Jan 2021 13:21:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat=E2=9C=A8=20:=20=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../version/1599190683670_migrate.go | 2 +- .../version/1610427732413_migrate.go | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 cmd/migrate/migration/version/1610427732413_migrate.go diff --git a/cmd/migrate/migration/version/1599190683670_migrate.go b/cmd/migrate/migration/version/1599190683670_migrate.go index f81afa7..91aa1e6 100644 --- a/cmd/migrate/migration/version/1599190683670_migrate.go +++ b/cmd/migrate/migration/version/1599190683670_migrate.go @@ -58,7 +58,7 @@ func _1599190683670Test(db *gorm.DB, version string) error { } list8 := []models.SysUser{ - {models.SysUserId{1}, models.LoginM{models.UserName{"admin"}, models.PassWord{"$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2"}}, models.SysUserB{"zhangwj", "13818888888", 1, "", "", "0", "1@qq.com", 1, 1, "1", "1", "", "0", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", ""}}, + {models.SysUserId{1}, models.LoginM{models.UserName{"admin"}, models.PassWord{"$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2"}}, models.SysUserB{"zhangwj", "13818888888", 1, "", "", "0", "1@qq.com", 1, 1, "1", "1", "", "2", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", ""}}, } list9 := []models.DictData{ diff --git a/cmd/migrate/migration/version/1610427732413_migrate.go b/cmd/migrate/migration/version/1610427732413_migrate.go new file mode 100644 index 0000000..bf14a18 --- /dev/null +++ b/cmd/migrate/migration/version/1610427732413_migrate.go @@ -0,0 +1,32 @@ +package version + +import ( + "go-admin/app/admin/models" + //"go-admin/app/admin/models" + "gorm.io/gorm" + "runtime" + + "go-admin/cmd/migrate/migration" + common "go-admin/common/models" +) + +func init() { + _, fileName, _, _ := runtime.Caller(0) + migration.Migrate.SetVersion(migration.GetFilename(fileName), _1610427732413Test) +} + +func _1610427732413Test(db *gorm.DB, version string) error { + return db.Transaction(func(tx *gorm.DB) error { + + // TODO: 这里开始写入要变更的内容 + user := models.SysUser{} + err := tx.Model(&user).Where("status = ?", 0).Update("status", 2).Error + if err != nil { + return err + } + + return tx.Create(&common.Migration{ + Version: version, + }).Error + }) +} From 305326d9ea2247f2f4dba66bdc2ab1a1a05eee56 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Tue, 12 Jan 2021 13:21:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat=E2=9C=A8=20:=20=E7=99=BB=E9=99=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=95=B0=E6=8D=AE=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/middleware/handler/auth.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/admin/middleware/handler/auth.go b/app/admin/middleware/handler/auth.go index 3da45c8..741735f 100644 --- a/app/admin/middleware/handler/auth.go +++ b/app/admin/middleware/handler/auth.go @@ -61,7 +61,7 @@ func IdentityHandler(c *gin.Context) interface{} { // @Router /login [post] func Authenticator(c *gin.Context) (interface{}, error) { var loginVals models.Login - var status = "0" + var status = "2" var msg = "登录成功" var username = "" @@ -142,7 +142,7 @@ func LogOut(c *gin.Context) { location := tools.GetLocation(c.ClientIP()) loginLog.LoginLocation = location loginLog.LoginTime = tools.GetCurrentTime() - loginLog.Status = "0" + loginLog.Status = "2" loginLog.Remark = c.Request.UserAgent() browserName, browserVersion := ua.Browser() loginLog.Browser = browserName + " " + browserVersion From f768d69defc7929abd521ea578c52e72e4105b24 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Tue, 12 Jan 2021 13:22:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat=E2=9C=A8=20:=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E6=8E=A5=E5=8F=A3=E4=BD=BF=E7=94=A8?= =?UTF-8?q?log=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/middleware/permission.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/admin/middleware/permission.go b/app/admin/middleware/permission.go index 6d8e303..81d2168 100644 --- a/app/admin/middleware/permission.go +++ b/app/admin/middleware/permission.go @@ -28,14 +28,17 @@ func AuthCheckRole() gin.HandlerFunc { } else { res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method) if err != nil { - log.Errorf("msgID[%s] error:%s method:%s path:%s", msgID, err, c.Request.Method, c.Request.URL.Path) + log.Errorf("msgID[%s] AuthCheckRole error:%s method:%s path:%s", msgID, err, c.Request.Method, c.Request.URL.Path) app.Error(c, 500, err, "") + return } } if res { + log.Infof("msgID[%s] isTrue: %v role: %s method: %s path: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path) c.Next() } else { + log.Warnf("msgID[%s] isTrue: %v role: %s method: %s path: %s message: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path,"当前请求是没有接口权限的,请管理员确认!") c.JSON(http.StatusOK, gin.H{ "code": 403, "msg": "对不起,您没有该接口访问权限,请联系管理员", From c0f6fb6b4108d859b8df4eaf4737fec26f2d60a3 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Thu, 14 Jan 2021 16:03:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat=E2=9C=A8=20:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=A0=E6=9D=83=E9=99=90log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/middleware/permission.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/middleware/permission.go b/app/admin/middleware/permission.go index 81d2168..8a5a138 100644 --- a/app/admin/middleware/permission.go +++ b/app/admin/middleware/permission.go @@ -38,7 +38,7 @@ func AuthCheckRole() gin.HandlerFunc { log.Infof("msgID[%s] isTrue: %v role: %s method: %s path: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path) c.Next() } else { - log.Warnf("msgID[%s] isTrue: %v role: %s method: %s path: %s message: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path,"当前请求是没有接口权限的,请管理员确认!") + log.Warnf("msgID[%s] isTrue: %v role: %s method: %s path: %s message: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path,"当前request无权限,请管理员确认!") c.JSON(http.StatusOK, gin.H{ "code": 403, "msg": "对不起,您没有该接口访问权限,请联系管理员",