|
@@ -3,7 +3,6 @@ package controller
|
|
import (
|
|
import (
|
|
"errors"
|
|
"errors"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/gin-gonic/gin"
|
|
- "strconv"
|
|
|
|
"trading-go/model"
|
|
"trading-go/model"
|
|
"trading-go/response"
|
|
"trading-go/response"
|
|
"trading-go/util"
|
|
"trading-go/util"
|
|
@@ -12,18 +11,31 @@ import (
|
|
// Register
|
|
// Register
|
|
// @Tags 用户模块
|
|
// @Tags 用户模块
|
|
// @Summary 创建用户
|
|
// @Summary 创建用户
|
|
-// @param vid formData string false "微信ID"
|
|
|
|
-// @param name formData string false "用户名"
|
|
|
|
-// @param avatar formData string false "头像"
|
|
|
|
-// @Success 200 {string} json{"code","data","message"}
|
|
|
|
|
|
+// @Accept application/json
|
|
|
|
+// @Produce application/json
|
|
|
|
+// @param json body model.UserJson true "用户信息"
|
|
|
|
+// @Success 200 object response.Response
|
|
// @Router /user/register [post]
|
|
// @Router /user/register [post]
|
|
func Register(c *gin.Context) {
|
|
func Register(c *gin.Context) {
|
|
- var user model.User
|
|
|
|
- user.Vid = c.PostForm("vid")
|
|
|
|
- user.Name = c.PostForm("name")
|
|
|
|
- user.Avatar = c.PostForm("avatar")
|
|
|
|
- user.Uid = util.GenID()
|
|
|
|
- err := user.Register()
|
|
|
|
|
|
+ var userJ model.UserJson
|
|
|
|
+ err := c.ShouldBindJSON(&userJ)
|
|
|
|
+ if err != nil {
|
|
|
|
+ msg := err.Error()
|
|
|
|
+ response.Fail(c.Writer, msg, 500)
|
|
|
|
+ }
|
|
|
|
+ id := util.GenID()
|
|
|
|
+ if !util.CheckMobile(userJ.Phone) {
|
|
|
|
+ msg := util.PhoneFormatError.Error()
|
|
|
|
+ response.Fail(c.Writer, msg, 400)
|
|
|
|
+ }
|
|
|
|
+ user := model.User{
|
|
|
|
+ Uid: id,
|
|
|
|
+ Vid: userJ.Vid,
|
|
|
|
+ Name: userJ.Name,
|
|
|
|
+ Avatar: userJ.Avatar,
|
|
|
|
+ Phone: userJ.Phone,
|
|
|
|
+ }
|
|
|
|
+ err = user.Register()
|
|
if err != nil {
|
|
if err != nil {
|
|
msg := err.Error()
|
|
msg := err.Error()
|
|
response.Fail(c.Writer, msg, 500)
|
|
response.Fail(c.Writer, msg, 500)
|
|
@@ -36,8 +48,9 @@ func Register(c *gin.Context) {
|
|
// Login
|
|
// Login
|
|
// @Tags 用户模块
|
|
// @Tags 用户模块
|
|
// @Summary 登录
|
|
// @Summary 登录
|
|
|
|
+// @Produce application/json
|
|
// @param vid formData string false "微信ID"
|
|
// @param vid formData string false "微信ID"
|
|
-// @Success 200 {string} json{"code","data","token"}
|
|
|
|
|
|
+// @Success 200 {object} response.Response
|
|
// @Router /user/login [post]
|
|
// @Router /user/login [post]
|
|
func Login(c *gin.Context) {
|
|
func Login(c *gin.Context) {
|
|
var user model.User
|
|
var user model.User
|
|
@@ -67,23 +80,22 @@ func Login(c *gin.Context) {
|
|
response.Success(c.Writer, "success", data)
|
|
response.Success(c.Writer, "success", data)
|
|
}
|
|
}
|
|
|
|
|
|
-// Modify
|
|
|
|
|
|
+// ModifyUser
|
|
// @Tags 用户模块
|
|
// @Tags 用户模块
|
|
// @Summary 修改用户信息
|
|
// @Summary 修改用户信息
|
|
-// @param uid formData string false "用户ID"
|
|
|
|
-// @param avatar formData string false "头像"
|
|
|
|
-// @param name formData string false "用户名"
|
|
|
|
-// @param phone formData string false "电话"
|
|
|
|
-// @Success 200 {string} json{"code","data","token"}
|
|
|
|
|
|
+// @Accept application/json
|
|
|
|
+// @Produce application/json
|
|
|
|
+// @param json body model.User true "用户信息"
|
|
|
|
+// @Success 200 {object} response.Response
|
|
// @Router /user/modify [post]
|
|
// @Router /user/modify [post]
|
|
-func Modify(c *gin.Context) {
|
|
|
|
|
|
+func ModifyUser(c *gin.Context) {
|
|
var user model.User
|
|
var user model.User
|
|
- 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")
|
|
|
|
|
|
+ err := c.ShouldBindJSON(&user)
|
|
|
|
+ if err != nil {
|
|
|
|
+ msg := err.Error()
|
|
|
|
+ response.Fail(c.Writer, msg, 500)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
//fmt.Printf("%#v", user)
|
|
//fmt.Printf("%#v", user)
|
|
if err := user.SPhone(); err != nil {
|
|
if err := user.SPhone(); err != nil {
|
|
if errors.Is(err, util.PhoneBeUsed) {
|
|
if errors.Is(err, util.PhoneBeUsed) {
|
|
@@ -106,7 +118,8 @@ func Modify(c *gin.Context) {
|
|
// UserInfo
|
|
// UserInfo
|
|
// @Tags 用户模块
|
|
// @Tags 用户模块
|
|
// @Summary 获取用户信息
|
|
// @Summary 获取用户信息
|
|
-// @Success 200 {string} json{"code","data"}
|
|
|
|
|
|
+// @Produce application/json
|
|
|
|
+// @Success 200 {object} response.Response
|
|
// @Router /user/info [get]
|
|
// @Router /user/info [get]
|
|
func UserInfo(c *gin.Context) {
|
|
func UserInfo(c *gin.Context) {
|
|
var u model.User
|
|
var u model.User
|