Compare commits

..

No commits in common. "44e9beca709d4e3b6f5f6d5fe5e979aefaae94ec" and "4178bf0622d785dec37c380170abc84bdb7bca29" have entirely different histories.

2 changed files with 6 additions and 8 deletions

View File

@ -77,6 +77,8 @@ else
git pull
fi
` + cid.Script + `
pwd
ls -lh
echo "end"`
//执行脚本
cmd := exec.Command("/bin/bash", "-c", scriptContent)
@ -217,6 +219,8 @@ else
git pull
fi
` + res.Script + `
pwd
ls -lh
echo "end"`
//执行脚本
cmd := exec.Command("/bin/bash", "-c", scriptContent)

View File

@ -253,7 +253,6 @@ func loginHandler(c *gin.Context) {
func registerHandler(c *gin.Context) {
var req_data RLReq
tokenString := ""
var id uint
if err := c.ShouldBindJSON(&req_data); err == nil {
if len(req_data.Password) != 32 {
hasher := md5.New()
@ -264,7 +263,7 @@ func registerHandler(c *gin.Context) {
c.JSON(200, gin.H{"error": "user already exists", "code": proto.UsernameExists, "message": "error"})
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 {
c.JSON(200, gin.H{"error": "create user error", "code": proto.OperationFailed, "message": "error"})
return
@ -291,11 +290,6 @@ func registerHandler(c *gin.Context) {
return
}
// 返回令牌
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})
c.JSON(200, gin.H{"token": tokenString, "username": req_data.User, "code": proto.SuccessCode, "message": "success"})
return
}