|
@@ -80,10 +80,10 @@ func Login(c *gin.Context) {
|
|
|
|
|
|
}
|
|
|
|
|
|
-//登录以后签发jwt
|
|
|
+// 登录以后签发jwt
|
|
|
func tokenNext(c *gin.Context, user model.SysUser) {
|
|
|
j := &middleware.JWT{
|
|
|
- []byte(global.GVA_CONFIG.JWT.SigningKey), // 唯一签名
|
|
|
+ SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey), // 唯一签名
|
|
|
}
|
|
|
clams := request.CustomClaims{
|
|
|
UUID: user.UUID,
|
|
@@ -91,58 +91,55 @@ func tokenNext(c *gin.Context, user model.SysUser) {
|
|
|
NickName: user.NickName,
|
|
|
AuthorityId: user.AuthorityId,
|
|
|
StandardClaims: jwt.StandardClaims{
|
|
|
- NotBefore: int64(time.Now().Unix() - 1000), // 签名生效时间
|
|
|
- ExpiresAt: int64(time.Now().Unix() + 60*60*24*7), // 过期时间 一周
|
|
|
- Issuer: "qmPlus", //签名的发行者
|
|
|
+ NotBefore: time.Now().Unix() - 1000, // 签名生效时间
|
|
|
+ ExpiresAt: time.Now().Unix() + 60*60*24*7, // 过期时间 一周
|
|
|
+ Issuer: "qmPlus", // 签名的发行者
|
|
|
},
|
|
|
}
|
|
|
token, err := j.CreateToken(clams)
|
|
|
if err != nil {
|
|
|
response.FailWithMessage("获取token失败", c)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if !global.GVA_CONFIG.System.UseMultipoint {
|
|
|
+ response.OkWithData(resp.LoginResponse{
|
|
|
+ User: user,
|
|
|
+ Token: token,
|
|
|
+ ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
|
|
|
+ }, c)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var loginJwt model.JwtBlacklist
|
|
|
+ loginJwt.Jwt = token
|
|
|
+ err, jwtStr := service.GetRedisJWT(user.Username)
|
|
|
+ if err == redis.Nil {
|
|
|
+ if err := service.SetRedisJWT(loginJwt, user.Username); err != nil {
|
|
|
+ response.FailWithMessage("设置登录状态失败", c)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ response.OkWithData(resp.LoginResponse{
|
|
|
+ User: user,
|
|
|
+ Token: token,
|
|
|
+ ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
|
|
|
+ }, c)
|
|
|
+ } else if err != nil {
|
|
|
+ response.FailWithMessage(fmt.Sprintf("%v", err), c)
|
|
|
} else {
|
|
|
- if global.GVA_CONFIG.System.UseMultipoint {
|
|
|
- var loginJwt model.JwtBlacklist
|
|
|
- loginJwt.Jwt = token
|
|
|
- err, jwtStr := service.GetRedisJWT(user.Username)
|
|
|
- if err == redis.Nil {
|
|
|
- err2 := service.SetRedisJWT(loginJwt, user.Username)
|
|
|
- if err2 != nil {
|
|
|
- response.FailWithMessage("设置登录状态失败", c)
|
|
|
- } else {
|
|
|
- response.OkWithData(resp.LoginResponse{
|
|
|
- User: user,
|
|
|
- Token: token,
|
|
|
- ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
|
|
|
- }, c)
|
|
|
- }
|
|
|
- } else if err != nil {
|
|
|
- response.FailWithMessage(fmt.Sprintf("%v", err), c)
|
|
|
- } else {
|
|
|
- var blackJWT model.JwtBlacklist
|
|
|
- blackJWT.Jwt = jwtStr
|
|
|
- err3 := service.JsonInBlacklist(blackJWT)
|
|
|
- if err3 != nil {
|
|
|
- response.FailWithMessage("jwt作废失败", c)
|
|
|
- } else {
|
|
|
- err2 := service.SetRedisJWT(loginJwt, user.Username)
|
|
|
- if err2 != nil {
|
|
|
- response.FailWithMessage("设置登录状态失败", c)
|
|
|
- } else {
|
|
|
- response.OkWithData(resp.LoginResponse{
|
|
|
- User: user,
|
|
|
- Token: token,
|
|
|
- ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
|
|
|
- }, c)
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- response.OkWithData(resp.LoginResponse{
|
|
|
- User: user,
|
|
|
- Token: token,
|
|
|
- ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
|
|
|
- }, c)
|
|
|
+ var blackJWT model.JwtBlacklist
|
|
|
+ blackJWT.Jwt = jwtStr
|
|
|
+ if err := service.JsonInBlacklist(blackJWT); err != nil {
|
|
|
+ response.FailWithMessage("jwt作废失败", c)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if err := service.SetRedisJWT(loginJwt, user.Username); err != nil {
|
|
|
+ response.FailWithMessage("设置登录状态失败", c)
|
|
|
+ return
|
|
|
}
|
|
|
+ response.OkWithData(resp.LoginResponse{
|
|
|
+ User: user,
|
|
|
+ Token: token,
|
|
|
+ ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
|
|
|
+ }, c)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -189,21 +186,21 @@ type UserHeaderImg struct {
|
|
|
// @Router /user/uploadHeaderImg [post]
|
|
|
func UploadHeaderImg(c *gin.Context) {
|
|
|
claims, _ := c.Get("claims")
|
|
|
- //获取头像文件
|
|
|
+ // 获取头像文件
|
|
|
// 这里我们通过断言获取 claims内的所有内容
|
|
|
waitUse := claims.(*request.CustomClaims)
|
|
|
uuid := waitUse.UUID
|
|
|
_, header, err := c.Request.FormFile("headerImg")
|
|
|
- //便于找到用户 以后从jwt中取
|
|
|
+ // 便于找到用户 以后从jwt中取
|
|
|
if err != nil {
|
|
|
response.FailWithMessage(fmt.Sprintf("上传文件失败,%v", err), c)
|
|
|
} else {
|
|
|
- //文件上传后拿到文件路径
|
|
|
+ // 文件上传后拿到文件路径
|
|
|
err, filePath, _ := utils.Upload(header)
|
|
|
if err != nil {
|
|
|
response.FailWithMessage(fmt.Sprintf("接收返回值失败,%v", err), c)
|
|
|
} else {
|
|
|
- //修改数据库后得到修改后的user并且返回供前端使用
|
|
|
+ // 修改数据库后得到修改后的user并且返回供前端使用
|
|
|
err, user := service.UploadHeaderImg(uuid, filePath)
|
|
|
if err != nil {
|
|
|
response.FailWithMessage(fmt.Sprintf("修改数据库链接失败,%v", err), c)
|