From 71992c48f39308549f64e0ab93ed71d9f5194c86 Mon Sep 17 00:00:00 2001 From: tiansin Date: Sat, 9 Jan 2021 20:33:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20:memo:=20=E4=BC=98=E5=8C=96=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E5=8A=A0=E8=A7=A3=E5=AF=86=E9=80=BB=E8=BE=91=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/admin/auth_service/auth_rule.go | 5 +-- app/service/admin/user_service/user.go | 5 +-- boot/bootAdmin.go | 3 ++ config/config.toml | 3 +- library/service/adminService.go | 34 +++++++++++++-------- library/utils/tools.go | 7 ++--- 6 files changed, 36 insertions(+), 21 deletions(-) diff --git a/app/service/admin/auth_service/auth_rule.go b/app/service/admin/auth_service/auth_rule.go index 0820bad..e312989 100644 --- a/app/service/admin/auth_service/auth_rule.go +++ b/app/service/admin/auth_service/auth_rule.go @@ -7,7 +7,8 @@ import ( "gfast/app/model/admin/user" "gfast/app/model/admin/user_post" "gfast/app/service/casbin_adapter_service" - "gfast/library/utils" + "gfast/library/service" + "github.com/gogf/gf/database/gdb" "github.com/gogf/gf/errors/gerror" "github.com/gogf/gf/frame/g" @@ -197,7 +198,7 @@ func DeleteRoleRule(roleId int) (err error) { //添加管理员操作 func AddUser(req *user.AddUserReq) (InsertId int64, err error) { //密码加密 - req.Password = utils.EncryptCBC(gconv.String(req.Password), utils.AdminCbcPublicKey) + req.Password = service.EncryptData(req.Password) return user.Add(req) } diff --git a/app/service/admin/user_service/user.go b/app/service/admin/user_service/user.go index c5b02f7..901fd61 100644 --- a/app/service/admin/user_service/user.go +++ b/app/service/admin/user_service/user.go @@ -15,6 +15,7 @@ import ( "gfast/boot" "gfast/library/service" "gfast/library/utils" + "github.com/gogf/gf/errors/gerror" "github.com/gogf/gf/frame/g" "github.com/gogf/gf/net/ghttp" @@ -46,7 +47,7 @@ func UpdatePwd(r *ghttp.Request, data *UpdatePwdReq) error { return err } - OldPassword := utils.EncryptCBC(gconv.String(data.OldPassword), utils.AdminCbcPublicKey) + OldPassword := service.EncryptData(data.OldPassword) if OldPassword != currentUser["user_password"].(string) { return errors.New("原始密码错误!") @@ -284,7 +285,7 @@ func ChangeUserStatus(req *user.StatusReq) error { func ResetUserPwd(req *user.ResetPwdReq) error { //密码加密 - req.Password = utils.EncryptCBC(gconv.String(req.Password), utils.AdminCbcPublicKey) + req.Password = service.EncryptData(req.Password) return user.ResetUserPwd(req) } diff --git a/boot/bootAdmin.go b/boot/bootAdmin.go index 566449c..f4479e0 100644 --- a/boot/bootAdmin.go +++ b/boot/bootAdmin.go @@ -2,6 +2,7 @@ package boot import ( "gfast/library/service" + "github.com/goflyfox/gtoken/gtoken" "github.com/gogf/gf/frame/g" ) @@ -13,6 +14,8 @@ func initAdmin() { service.NotCheckAuthAdminIds = g.Cfg().GetInts("adminInfo.notCheckAuthAdminIds") //后端分页长度配置 service.AdminPageNum = g.Cfg().GetInt("adminInfo.pageNum") + //后端数据加密密钥 + service.AdminEncryptKey = g.Cfg().GetString("server.EncryptKey") // 设置并启动后台gtoken处理 initAdminGfToken() } diff --git a/config/config.toml b/config/config.toml index 9901c9e..461053b 100644 --- a/config/config.toml +++ b/config/config.toml @@ -27,7 +27,8 @@ SessionPath = "./data/session" SessionMaxAge = "24h" DumpRouterMap = true - NameToUriType = 3 + NameToUriType = 3 + EncryptKey = "HqmP1KLMuz09Q0Bu" # Redis数据库配置 diff --git a/library/service/adminService.go b/library/service/adminService.go index e99639b..a2a8c32 100644 --- a/library/service/adminService.go +++ b/library/service/adminService.go @@ -1,20 +1,20 @@ package service import ( - "gfast/library/response" "gfast/library/utils" + + "github.com/goflyfox/gtoken/gtoken" "github.com/gogf/gf/crypto/gmd5" "github.com/gogf/gf/net/ghttp" "github.com/gogf/gf/util/gvalid" ) var ( - AdminMultiLogin bool //是否允许后台管理员多端登陆 - AdminPageNum = 20 //后台分页长度 - NotCheckAuthAdminIds []int //无需验证权限的用户id -) - -//AdminLogin 后台用户登陆验证 + AdminMultiLogin bool //是否允许后台管理员多端登陆 + AdminPageNum = 20 //后台分页长度 + NotCheckAuthAdminIds []int //无需验证权限的用户id + AdminEncryptKey string //后台数据加密密钥 +) //AdminLogin 后台用户登陆验证 func AdminLogin(r *ghttp.Request) (string, interface{}) { data := r.GetFormMapStrStr() @@ -30,13 +30,13 @@ func AdminLogin(r *ghttp.Request) (string, interface{}) { } if e := gvalid.CheckMap(data, rules, msgs); e != nil { - response.JsonExit(r, response.ErrorCode, e.String()) + r.Response.WriteJsonExit(gtoken.Fail(e.String())) } //判断验证码是否正确 if !VerifyString(data["idKeyC"], data["idValueC"]) { - response.JsonExit(r, response.ErrorCode, "验证码输入错误") + r.Response.WriteJsonExit(gtoken.Fail("验证码输入错误")) } - password := utils.EncryptCBC(data["password"], utils.AdminCbcPublicKey) + password := EncryptData(data["password"]) var keys string if AdminMultiLogin { keys = data["username"] + password + gmd5.MustEncryptString(utils.GetClientIp(r)) @@ -47,11 +47,11 @@ func AdminLogin(r *ghttp.Request) (string, interface{}) { userAgent := r.Header.Get("User-Agent") if err, user := signIn(data["username"], password, r); err != nil { go loginLog(0, data["username"], ip, userAgent, err.Error(), "系统后台") - response.JsonExit(r, response.ErrorCode, err.Error()) + r.Response.WriteJsonExit(gtoken.Fail(err.Error())) } else { //判断是否后台用户 if user.IsAdmin != 1 { - response.JsonExit(r, response.ErrorCode, "抱歉!此用户不属于后台管理员!") + r.Response.WriteJsonExit(gtoken.Fail("抱歉!此用户不属于后台管理员!")) } r.SetParam("userInfo", user) go loginLog(1, data["username"], ip, userAgent, "登录成功", "系统后台") @@ -59,3 +59,13 @@ func AdminLogin(r *ghttp.Request) (string, interface{}) { } return keys, nil } + +// EncryptData 数据加密方法 +func EncryptData(plainText string) string { + return utils.EncryptCBC(plainText, AdminEncryptKey) +} + +// DecryptData 数据解密方法 +func DecryptData(plainText string) string { + return utils.DecryptCBC(plainText, AdminEncryptKey) +} diff --git a/library/utils/tools.go b/library/utils/tools.go index dbf9f45..009ec46 100644 --- a/library/utils/tools.go +++ b/library/utils/tools.go @@ -2,6 +2,9 @@ package utils import ( "fmt" + "net" + "time" + "github.com/gogf/gf/crypto/gaes" "github.com/gogf/gf/encoding/gbase64" "github.com/gogf/gf/encoding/gcharset" @@ -12,12 +15,8 @@ import ( "github.com/gogf/gf/net/ghttp" "github.com/gogf/gf/os/gtime" "github.com/gogf/gf/text/gstr" - "net" - "time" ) -const AdminCbcPublicKey = "HqmP1KLMuz09Q0Bu" - //字符串加密 func EncryptCBC(plainText, publicKey string) string { key := []byte(publicKey)