rdluck 4 سال پیش
والد
کامیت
3b779c8709
4فایلهای تغییر یافته به همراه12 افزوده شده و 39 حذف شده
  1. 0 21
      controllers/base_auth.go
  2. 8 17
      controllers/user.go
  3. 1 1
      models/session.go
  4. 3 0
      routers/router.go

+ 0 - 21
controllers/base_auth.go

@@ -39,27 +39,6 @@ func (this *BaseAuthController) Prepare() {
 				this.StopRun()
 				return
 			}
-			//authorizationArr := strings.Split(authorization, ",")
-			//tokenStr := authorizationArr[0]
-			//tokenArr := strings.Split(tokenStr, "=")
-			//token := tokenArr[1]
-			//
-			//accountStr := authorizationArr[1]
-			//accountArr := strings.Split(accountStr, "=")
-			//account := accountArr[1]
-			//
-			//fmt.Println("token:", token)
-			//fmt.Println("account:", account)
-			////校验token是否合法
-			//// JWT校验Token和Account
-			//if !utils.CheckToken(account, token) {
-			//	fmt.Println("CheckToken Err")
-			//	this.JSON(models.BaseResponse{Ret: 408, Msg: "鉴权失败,请重新登录!", ErrMsg: "登录失效,请重新登陆!,CheckToken Fail"}, false, false)
-			//	this.StopRun()
-			//	return
-			//}
-			//
-			//fmt.Println("GetUserByToken")
 			session, err := models.GetSessionByToken(authorization)
 			if err != nil {
 				if err.Error() == utils.ErrNoRow() {

+ 8 - 17
controllers/user.go

@@ -9,6 +9,11 @@ type UserController struct {
 	BaseAuthController
 }
 
+//用户
+type UserCommonController struct {
+	BaseCommonController
+}
+
 // @Title 获取用户详情
 // @Description 获取用户详情接口
 // @Success 200 {object} models.UserDetail
@@ -39,38 +44,24 @@ func (this *UserController) Detail() {
 	br.Data = item
 }
 
-
 // @Title 获取短信验证码
 // @Description 获取短信验证码接口
+// @Param   Mobile   query   string  true       "手机号码"
+// @Param   AreaNum   query   string  true       "地区编码"
 // @Success 200 {object} models.UserDetail
 // @router /getSmsCode [get]
-func (this *UserController) GetSmsCode() {
+func (this *UserCommonController) GetSmsCode() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,用户信息为空"
-		br.Ret = 408
-		return
-	}
-	item, err := models.GetUserDetailByUserId(user.UserId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
 
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	br.Data = item
 }
 
-
 /*
 $app->get('api/user/getSmsCode',"UserController@getSmsCode");//获取短信验证码
 $app->post('api/user/checkSmsCode',"UserController@checkSmsCode");//校验短信验证码

+ 1 - 1
models/session.go

@@ -16,7 +16,7 @@ type Session struct {
 }
 
 func GetSessionByToken(token string) (item *Session, err error) {
-	sql := `SELECT * FROM session WHERE access_token=? AND expire_time> NOW() ORDER BY session_idd DESC LIMIT 1 `
+	sql := `SELECT * FROM session WHERE access_token=? AND expire_time> NOW() ORDER BY session_id DESC LIMIT 1 `
 	o := orm.NewOrm()
 	o.Using("rddp")
 	err = o.Raw(sql, token).QueryRow(&item)

+ 3 - 0
routers/router.go

@@ -50,6 +50,9 @@ func init() {
 			beego.NSInclude(
 				&controllers.UserController{},
 			),
+			beego.NSInclude(
+				&controllers.UserCommonController{},
+			),
 		),
 	)
 	beego.AddNamespace(ns)