Commit 329808f9 authored by brent's avatar brent

modify user login

parent 070955e2
......@@ -117,8 +117,9 @@ func (server *UserController) Login() {
server.respond(http.StatusOK, "")
return
}
duration := claims.Exp - claims.Iat
tokenString, err := utils.GenerateToken(checkUser, checkUser.Id, int(duration))
//duration := claims.Exp - claims.Iat
duration := utils.DEFAULT_EXPIRE_SECONDS
tokenString, err := utils.GenerateToken(checkUser, checkUser.Id, duration)
if err != nil {
server.respond(models.LoginFailed, "登录失败")
return
......@@ -253,9 +254,62 @@ func regisgerUser(user models.User) (*models.User, error) {
mysql.GetMysqlInstace().Ormer.Update(checkUser)
createApiKey(checkUser)
createJWTToken(checkUser)
return checkUser, nil
}
func createApiKey(checkUser *models.User) {
data, err := kong.CreateApiKey(checkUser)
if err != nil {
return
}
if data.Id == "" {
return
}
timestamp := time.Now()
app := models.ApiKey{
Name: "test",
ApiKey: data.Key,
UserId: checkUser.Id,
CreatedTime: timestamp,
UpdatedTime: timestamp,
Deleted: 0,
ApiKeyId: data.Id,
}
mysql.GetMysqlInstace().Ormer.Insert(&app)
}
func createJWTToken(checkUser *models.User) {
data, store, err := kong.CreateJwt(checkUser)
if err != nil {
return
}
if data.Id == "" {
return
}
jwtToken, err := utils.GenerateKongToken(data, "")
if err != nil {
jwtToken = ""
}
timestamp := time.Now()
app := models.JwtToken{
Name: "test",
JwtCredential: string(store),
JwtToken: jwtToken,
UserId: checkUser.Id,
CreatedTime: timestamp,
UpdatedTime: timestamp,
Deleted: 0,
JwtId: data.Id,
}
mysql.GetMysqlInstace().Ormer.Insert(&app)
}
func generatorMD5(code string) string {
MD5 := md5.New()
_, _ = io.WriteString(MD5, code)
......
......@@ -15,7 +15,7 @@ import (
const (
SecretKEY string = "JWT-Secret-Key"
DEFAULT_EXPIRE_SECONDS int = 6000 // default expired 10 minutes
DEFAULT_EXPIRE_SECONDS int = 7 * 24 * 60 * 60 // default expired 10 minutes
PasswordHashBytes = 16
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment