|
|
@@ -4,6 +4,8 @@ import (
|
|
|
"fmt"
|
|
|
"github.com/gin-gonic/gin"
|
|
|
"github.com/golang-jwt/jwt"
|
|
|
+ "github.com/mojocn/base64Captcha"
|
|
|
+ "github.com/satori/go.uuid"
|
|
|
"strconv"
|
|
|
"time"
|
|
|
|
|
|
@@ -18,21 +20,13 @@ var Auth = new(auth)
|
|
|
|
|
|
type auth struct{}
|
|
|
|
|
|
-type JwtToken struct {
|
|
|
- jwt.StandardClaims
|
|
|
- TenantId string `json:"tenant_id"`
|
|
|
- UserId int64 `json:"user_id"`
|
|
|
- TokenType string `json:"token_type"`
|
|
|
- ClientId string `json:"client_id"`
|
|
|
- RoleId string `json:"role_id"`
|
|
|
- RoleName string `json:"role_name"`
|
|
|
- DeptId string `json:"dept_id"`
|
|
|
- PostId string `json:"post_id"`
|
|
|
- OauthId string `json:"oauth_id"`
|
|
|
- Account string `json:"account"`
|
|
|
- UserName string `json:"user_name"`
|
|
|
- NickName string `json:"nick_name"`
|
|
|
- Random string `json:"random"`
|
|
|
+var driver = &base64Captcha.DriverString{
|
|
|
+ Height: 48,
|
|
|
+ Width: 130,
|
|
|
+ NoiseCount: 100,
|
|
|
+ ShowLineOptions: 2,
|
|
|
+ Length: 5,
|
|
|
+ BgColor: nil,
|
|
|
}
|
|
|
|
|
|
func (c *auth) Token(ctx *gin.Context) {
|
|
|
@@ -98,17 +92,40 @@ func (c *auth) Token(ctx *gin.Context) {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
-//checkLock 校验用户登录失败次数
|
|
|
-func checkLock() {
|
|
|
+func (c *auth) Logout(ctx *gin.Context) {
|
|
|
+ emptyKeyFunc := func(t *jwt.Token) (interface{}, error) { return []byte(config.Instance().Server.TokenSign), nil }
|
|
|
+ authorization := ctx.GetHeader("Authorization")
|
|
|
+ token, err := jwt.ParseWithClaims(authorization, &model.JwtToken{}, emptyKeyFunc)
|
|
|
+ if err != nil {
|
|
|
+ ctx.JSON(http.StatusUnauthorized, util.NormalResponse(http.StatusUnauthorized, err.Error(), nil))
|
|
|
+ return
|
|
|
+ }
|
|
|
+ jwtToken := token.Claims.(*model.JwtToken)
|
|
|
+ err = util.Redis.Del(getAccessTokenKey(jwtToken.TenantId, jwtToken.UserId, jwtToken.Random)).Err()
|
|
|
+ //todo 操作记录
|
|
|
+ ctx.JSON(http.StatusOK, util.SuccessResponse("", nil))
|
|
|
+}
|
|
|
|
|
|
+func (c *auth) Captcha(ctx *gin.Context) {
|
|
|
+ id := uuid.NewV1().String()
|
|
|
+ code := util.RandomString2(5)
|
|
|
+ gotItem, _ := driver.DrawCaptcha(code)
|
|
|
+ image := gotItem.EncodeB64string()
|
|
|
+ rsp := model.RspCaptcha{
|
|
|
+ Key: id,
|
|
|
+ Image: image,
|
|
|
+ }
|
|
|
+ util.Redis.Set(getCaptchaKey(id), code, 5*time.Minute)
|
|
|
+ ctx.JSON(http.StatusOK, rsp)
|
|
|
}
|
|
|
|
|
|
-func getAccessTokenKey(tenantId string, uId int64, random string) string {
|
|
|
- return fmt.Sprintf("access_token_%s_%d_%s", tenantId, uId, random)
|
|
|
+//checkLock 校验用户登录失败次数
|
|
|
+func checkLock() {
|
|
|
+
|
|
|
}
|
|
|
|
|
|
func getAccessToken(info model.UserInfo, random string) (string, error) {
|
|
|
- jwtToken := JwtToken{StandardClaims: jwt.StandardClaims{
|
|
|
+ jwtToken := model.JwtToken{StandardClaims: jwt.StandardClaims{
|
|
|
Audience: "audience",
|
|
|
ExpiresAt: time.Now().Add(2 * time.Hour).Unix(),
|
|
|
Issuer: "issuser",
|
|
|
@@ -152,9 +169,13 @@ func grant(token model.Token, ctx *gin.Context) (*model.UserInfo, *util.Errors)
|
|
|
key := ctx.GetHeader(model.CaptchaHeaderKey)
|
|
|
code := ctx.GetHeader(model.CaptchaHeaderCode)
|
|
|
// 获取验证码
|
|
|
- redisCode := util.Redis.Get(model.CaptchaKey + key).String()
|
|
|
+ result, err := util.Redis.Get(getCaptchaKey(key)).Result()
|
|
|
+ if err != nil {
|
|
|
+ return nil, util.NormalResponse(http.StatusBadRequest, model.CaptchaNotCorrect, nil)
|
|
|
+ }
|
|
|
+ redisCode := result
|
|
|
// 判断验证码
|
|
|
- if config.Instance().Server.CodeEnable && (code == "" || !strings.EqualFold(redisCode, code)) {
|
|
|
+ if config.Instance().Server.CodeEnabled && (key == "" || code == "" || !strings.EqualFold(redisCode, code)) {
|
|
|
return nil, util.NormalResponse(http.StatusBadRequest, model.CaptchaNotCorrect, nil)
|
|
|
}
|
|
|
|
|
|
@@ -179,20 +200,10 @@ func grant(token model.Token, ctx *gin.Context) (*model.UserInfo, *util.Errors)
|
|
|
return info, nil
|
|
|
}
|
|
|
|
|
|
-func (c *auth) Logout(ctx *gin.Context) {
|
|
|
- emptyKeyFunc := func(t *jwt.Token) (interface{}, error) { return []byte(config.Instance().Server.TokenSign), nil }
|
|
|
- authorization := ctx.GetHeader("Authorization")
|
|
|
- token, err := jwt.ParseWithClaims(authorization, &JwtToken{}, emptyKeyFunc)
|
|
|
- if err != nil {
|
|
|
- ctx.JSON(http.StatusUnauthorized, util.NormalResponse(http.StatusUnauthorized, err.Error(), nil))
|
|
|
- return
|
|
|
- }
|
|
|
- jwtToken := token.Claims.(*JwtToken)
|
|
|
- err = util.Redis.Del(getAccessTokenKey(jwtToken.TenantId, jwtToken.UserId, jwtToken.Random)).Err()
|
|
|
- //todo 操作记录
|
|
|
- ctx.JSON(http.StatusOK, util.SuccessResponse("", nil))
|
|
|
+func getAccessTokenKey(tenantId string, uId int64, random string) string {
|
|
|
+ return fmt.Sprintf("access_token_%s_%d_%s", tenantId, uId, random)
|
|
|
}
|
|
|
|
|
|
-func (c *auth) Captcha(ctx *gin.Context) {
|
|
|
- ctx.JSON(0, nil)
|
|
|
+func getCaptchaKey(uId string) string {
|
|
|
+ return fmt.Sprintf("auth:captcha:%s", uId)
|
|
|
}
|
