|
@@ -3,6 +3,7 @@ package controller
|
|
|
import (
|
|
|
"errors"
|
|
|
"github.com/gin-gonic/gin"
|
|
|
+ "strconv"
|
|
|
"trading-go/model"
|
|
|
"trading-go/response"
|
|
|
"trading-go/util"
|
|
@@ -11,16 +12,17 @@ import (
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func Register(c *gin.Context) {
|
|
|
var user model.User
|
|
|
- user.Uid = c.PostForm("uid")
|
|
|
+ user.Vid = c.PostForm("vid")
|
|
|
user.Name = c.PostForm("name")
|
|
|
user.Avatar = c.PostForm("avatar")
|
|
|
+ user.Uid = util.GenID()
|
|
|
err := user.Register()
|
|
|
if err != nil {
|
|
|
msg := err.Error()
|
|
@@ -34,12 +36,12 @@ func Register(c *gin.Context) {
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
func Login(c *gin.Context) {
|
|
|
var user model.User
|
|
|
- user.Uid = c.PostForm("uid")
|
|
|
+ user.Vid = c.PostForm("vid")
|
|
|
err, nu := user.Login()
|
|
|
if err != nil && err.Error() == "sql: no rows in result set" {
|
|
|
err = util.NoSuchUserError
|
|
@@ -76,7 +78,9 @@ func Login(c *gin.Context) {
|
|
|
|
|
|
func Modify(c *gin.Context) {
|
|
|
var user model.User
|
|
|
- user.Uid = c.PostForm("uid")
|
|
|
+ id := c.PostForm("uid")
|
|
|
+ uid, err := strconv.Atoi(id)
|
|
|
+ user.Uid = int64(uid)
|
|
|
user.Phone = c.PostForm("phone")
|
|
|
user.Avatar = c.PostForm("avatar")
|
|
|
user.Name = c.PostForm("name")
|
|
@@ -89,7 +93,7 @@ func Modify(c *gin.Context) {
|
|
|
}
|
|
|
return
|
|
|
}
|
|
|
- err := user.Modify()
|
|
|
+ err = user.Modify()
|
|
|
if err != nil {
|
|
|
msg := err.Error()
|
|
|
response.Fail(c.Writer, msg, 500)
|
|
@@ -98,3 +102,28 @@ func Modify(c *gin.Context) {
|
|
|
response.Success(c.Writer, msg, nil)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+func UserInfo(c *gin.Context) {
|
|
|
+ var u model.User
|
|
|
+ token := c.GetHeader("Authorization")
|
|
|
+ t, claim, err := util.ParseToken(token)
|
|
|
+ if err != nil {
|
|
|
+ response.Fail(c.Writer, "failed to parse token", 500)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if !t.Valid {
|
|
|
+ response.Fail(c.Writer, "failed", 400)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ u.Uid = claim.UserId
|
|
|
+ nu, err := u.Info()
|
|
|
+ if err != nil {
|
|
|
+ response.Fail(c.Writer, "failed", 500)
|
|
|
+ }
|
|
|
+ response.Success(c.Writer, "success", nu)
|
|
|
+}
|