|
@@ -7,12 +7,11 @@ import (
|
|
"net/url"
|
|
"net/url"
|
|
"strconv"
|
|
"strconv"
|
|
"strings"
|
|
"strings"
|
|
- "time"
|
|
|
|
|
|
|
|
"github.com/astaxie/beego"
|
|
"github.com/astaxie/beego"
|
|
|
|
|
|
- "hongze/hongze_admin/models"
|
|
|
|
- "hongze/hongze_admin/utils"
|
|
|
|
|
|
+ "hongze/hongze_api/models"
|
|
|
|
+ "hongze/hongze_api/utils"
|
|
|
|
|
|
"rdluck_tools/log"
|
|
"rdluck_tools/log"
|
|
)
|
|
)
|
|
@@ -25,7 +24,7 @@ func init() {
|
|
|
|
|
|
type BaseAuthController struct {
|
|
type BaseAuthController struct {
|
|
beego.Controller
|
|
beego.Controller
|
|
- SysUser *models.Admin
|
|
|
|
|
|
+ User *models.WxUserItem
|
|
}
|
|
}
|
|
|
|
|
|
func (this *BaseAuthController) Prepare() {
|
|
func (this *BaseAuthController) Prepare() {
|
|
@@ -63,7 +62,7 @@ func (this *BaseAuthController) Prepare() {
|
|
}
|
|
}
|
|
|
|
|
|
fmt.Println("GetUserByToken")
|
|
fmt.Println("GetUserByToken")
|
|
- session, err := models.GetSysSessionByToken(token)
|
|
|
|
|
|
+ session, err := models.GetSessionByToken(token)
|
|
if err != nil {
|
|
if err != nil {
|
|
if err.Error() == utils.ErrNoRow() {
|
|
if err.Error() == utils.ErrNoRow() {
|
|
this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "Token 信息已变更:Token: " + token}, false, false)
|
|
this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "Token 信息已变更:Token: " + token}, false, false)
|
|
@@ -79,29 +78,24 @@ func (this *BaseAuthController) Prepare() {
|
|
this.StopRun()
|
|
this.StopRun()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- if time.Now().After(session.ExpiredTime) {
|
|
|
|
- this.JSON(models.BaseResponse{Ret: 408, Msg: "请重新登录!", ErrMsg: "获取用户信息异常,Eerr:" + err.Error()}, false, false)
|
|
|
|
- this.StopRun()
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- admin, err := models.GetSysUserById(session.SysUserId)
|
|
|
|
|
|
+ wxUser, err := models.GetWxUserItemByUserId(session.UserId)
|
|
if err != nil {
|
|
if err != nil {
|
|
if err.Error() == utils.ErrNoRow() {
|
|
if err.Error() == utils.ErrNoRow() {
|
|
- this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.SysUserId)}, false, false)
|
|
|
|
|
|
+ this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.UserId)}, false, false)
|
|
this.StopRun()
|
|
this.StopRun()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- this.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "获取admin信息异常,Eerr:" + err.Error()}, false, false)
|
|
|
|
|
|
+ this.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "获取wx_user信息异常,Eerr:" + err.Error()}, false, false)
|
|
this.StopRun()
|
|
this.StopRun()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- if admin == nil {
|
|
|
|
|
|
+ if wxUser == nil {
|
|
this.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "admin is empty "}, false, false)
|
|
this.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "admin is empty "}, false, false)
|
|
this.StopRun()
|
|
this.StopRun()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
- this.SysUser = admin
|
|
|
|
|
|
+ this.User = wxUser
|
|
} else {
|
|
} else {
|
|
this.JSON(models.BaseResponse{Ret: 408, Msg: "请求异常,请联系客服!", ErrMsg: "POST之外的请求,暂不支持"}, false, false)
|
|
this.JSON(models.BaseResponse{Ret: 408, Msg: "请求异常,请联系客服!", ErrMsg: "POST之外的请求,暂不支持"}, false, false)
|
|
this.StopRun()
|
|
this.StopRun()
|