|
@@ -85,14 +85,14 @@ var privateRoutes = []string{
|
|
|
"/user/order/*",
|
|
|
}
|
|
|
|
|
|
-func encoding(data interface{}) interface{} {
|
|
|
+func encoding(data interface{}) []byte {
|
|
|
content, err := json.Marshal(data)
|
|
|
if err != nil {
|
|
|
logger.Error("json 序列化失败", err)
|
|
|
- return data
|
|
|
+ return []byte{}
|
|
|
}
|
|
|
if !htConfig.NeedEncode() {
|
|
|
- return data
|
|
|
+ return content
|
|
|
}
|
|
|
content = authUtils.DesBase64Encrypt(content, htConfig.GetDesCode())
|
|
|
content = []byte(`"` + string(content) + `"`)
|
|
@@ -109,19 +109,19 @@ func AuthMiddleware() web.FilterFunc {
|
|
|
auth := ctx.Input.Header(authorization)
|
|
|
if auth == "" {
|
|
|
logger.Error("token信息不存在")
|
|
|
- _ = ctx.JSONResp(encoding(rep))
|
|
|
+ _ = ctx.Output.Body(encoding(rep))
|
|
|
return
|
|
|
}
|
|
|
parts := strings.Split(auth, " ")
|
|
|
if len(parts) != 2 || parts[0] != Bearer {
|
|
|
logger.Error("token参数不符合格式" + auth)
|
|
|
- _ = ctx.JSONResp(encoding(rep))
|
|
|
+ _ = ctx.Output.Body(encoding(rep))
|
|
|
return
|
|
|
}
|
|
|
info, err := jwt.CheckToken(parts[1])
|
|
|
if err != nil {
|
|
|
logger.Error("token无效:%v", err)
|
|
|
- _ = ctx.JSONResp(encoding(rep))
|
|
|
+ _ = ctx.Output.Body(encoding(rep))
|
|
|
return
|
|
|
}
|
|
|
//组装用户信息
|
|
@@ -129,7 +129,7 @@ func AuthMiddleware() web.FilterFunc {
|
|
|
userInfo, err = user.GetUserByOpenId(info.OpenId)
|
|
|
if err != nil {
|
|
|
logger.Error("获取用户信息失败:%v", err)
|
|
|
- _ = ctx.JSONResp(encoding(illegalUser()))
|
|
|
+ _ = ctx.Output.Body(encoding(illegalUser()))
|
|
|
return
|
|
|
}
|
|
|
//校验redis中是否合法
|
|
@@ -141,18 +141,18 @@ func AuthMiddleware() web.FilterFunc {
|
|
|
//if err != nil {
|
|
|
// logger.Error("重置用户状态失败:%v", err)
|
|
|
//}
|
|
|
- _ = ctx.JSONResp(encoding(tokenExpired()))
|
|
|
+ _ = ctx.Output.Body(encoding(tokenExpired()))
|
|
|
return
|
|
|
}
|
|
|
if redisToken != parts[1] {
|
|
|
logger.Error("token无效:用户token已刷新")
|
|
|
- _ = ctx.JSONResp(encoding(tokenExpired()))
|
|
|
+ _ = ctx.Output.Body(encoding(tokenExpired()))
|
|
|
return
|
|
|
}
|
|
|
if needCheckLoginStatus(path) {
|
|
|
if info.TokenType != jwt.AccessToken || info.Mobile == "-" || info.Mobile == "" {
|
|
|
logger.Error("token信息异常,当前token类型为:%v", jwt.GuestToken)
|
|
|
- _ = ctx.JSONResp(encoding(LoginRequired()))
|
|
|
+ _ = ctx.Output.Body(encoding(LoginRequired()))
|
|
|
return
|
|
|
}
|
|
|
}
|