Compare commits
2 Commits
4178bf0622
...
44e9beca70
| Author | SHA1 | Date |
|---|---|---|
|
|
44e9beca70 | |
|
|
36e0fdb797 |
|
|
@ -77,8 +77,6 @@ else
|
||||||
git pull
|
git pull
|
||||||
fi
|
fi
|
||||||
` + cid.Script + `
|
` + cid.Script + `
|
||||||
pwd
|
|
||||||
ls -lh
|
|
||||||
echo "end"`
|
echo "end"`
|
||||||
//执行脚本
|
//执行脚本
|
||||||
cmd := exec.Command("/bin/bash", "-c", scriptContent)
|
cmd := exec.Command("/bin/bash", "-c", scriptContent)
|
||||||
|
|
@ -219,8 +217,6 @@ else
|
||||||
git pull
|
git pull
|
||||||
fi
|
fi
|
||||||
` + res.Script + `
|
` + res.Script + `
|
||||||
pwd
|
|
||||||
ls -lh
|
|
||||||
echo "end"`
|
echo "end"`
|
||||||
//执行脚本
|
//执行脚本
|
||||||
cmd := exec.Command("/bin/bash", "-c", scriptContent)
|
cmd := exec.Command("/bin/bash", "-c", scriptContent)
|
||||||
|
|
|
||||||
|
|
@ -253,6 +253,7 @@ func loginHandler(c *gin.Context) {
|
||||||
func registerHandler(c *gin.Context) {
|
func registerHandler(c *gin.Context) {
|
||||||
var req_data RLReq
|
var req_data RLReq
|
||||||
tokenString := ""
|
tokenString := ""
|
||||||
|
var id uint
|
||||||
if err := c.ShouldBindJSON(&req_data); err == nil {
|
if err := c.ShouldBindJSON(&req_data); err == nil {
|
||||||
if len(req_data.Password) != 32 {
|
if len(req_data.Password) != 32 {
|
||||||
hasher := md5.New()
|
hasher := md5.New()
|
||||||
|
|
@ -263,7 +264,7 @@ func registerHandler(c *gin.Context) {
|
||||||
c.JSON(200, gin.H{"error": "user already exists", "code": proto.UsernameExists, "message": "error"})
|
c.JSON(200, gin.H{"error": "user already exists", "code": proto.UsernameExists, "message": "error"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
id := service.CreateUser(req_data.User, req_data.Password, req_data.Email, req_data.Gender, req_data.Age)
|
id = service.CreateUser(req_data.User, req_data.Password, req_data.Email, req_data.Gender, req_data.Age)
|
||||||
if id == 0 {
|
if id == 0 {
|
||||||
c.JSON(200, gin.H{"error": "create user error", "code": proto.OperationFailed, "message": "error"})
|
c.JSON(200, gin.H{"error": "create user error", "code": proto.OperationFailed, "message": "error"})
|
||||||
return
|
return
|
||||||
|
|
@ -290,6 +291,11 @@ func registerHandler(c *gin.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// 返回令牌
|
// 返回令牌
|
||||||
c.JSON(200, gin.H{"token": tokenString, "username": req_data.User, "code": proto.SuccessCode, "message": "success"})
|
data := make(map[string]interface{})
|
||||||
|
data["id"] = id
|
||||||
|
data["username"] = req_data.User
|
||||||
|
data["email"] = req_data.Email
|
||||||
|
data["token"] = tokenString
|
||||||
|
c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "date": data})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue