mirror of
https://github.com/luscis/openlan.git
synced 2025-11-01 21:12:34 +08:00
fix: user: default lease is 1 year
Signed-off-by: zhihui.ding <danieldin186@gmail.com>
This commit is contained in:
7
pkg/cache/user.go
vendored
7
pkg/cache/user.go
vendored
@@ -4,12 +4,13 @@ import (
|
||||
"bufio"
|
||||
"crypto/x509"
|
||||
"encoding/pem"
|
||||
"github.com/luscis/openlan/pkg/libol"
|
||||
"github.com/luscis/openlan/pkg/models"
|
||||
"io/ioutil"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/luscis/openlan/pkg/libol"
|
||||
"github.com/luscis/openlan/pkg/models"
|
||||
)
|
||||
|
||||
type user struct {
|
||||
@@ -45,7 +46,7 @@ func (w *user) Load() {
|
||||
if len(columns) > 3 {
|
||||
leStr = columns[3]
|
||||
}
|
||||
lease, _ := libol.GetLocalTime(libol.LeaseTime, leStr)
|
||||
lease, _ := libol.GetLeaseTime(leStr)
|
||||
obj := &models.User{
|
||||
Name: user,
|
||||
Password: pass,
|
||||
|
||||
@@ -306,6 +306,10 @@ func GetLocalTime(layout, value string) (time.Time, error) {
|
||||
return time.ParseInLocation(layout, value, time.Local)
|
||||
}
|
||||
|
||||
func GetLeaseTime(value string) (time.Time, error) {
|
||||
return time.ParseInLocation(LeaseTime, value, time.Local)
|
||||
}
|
||||
|
||||
func Base64Decode(value string) ([]byte, error) {
|
||||
return base64.StdEncoding.DecodeString(value)
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ func NewUserSchema(u *User) schema.User {
|
||||
}
|
||||
|
||||
func SchemaToUserModel(user *schema.User) *User {
|
||||
lease, _ := libol.GetLocalTime(libol.LeaseTime, user.Lease)
|
||||
lease, _ := libol.GetLeaseTime(user.Lease)
|
||||
obj := &User{
|
||||
Alias: user.Alias,
|
||||
Password: user.Password,
|
||||
|
||||
Reference in New Issue
Block a user