diff --git a/README.md b/README.md index 50348a2..32c523f 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,7 @@ jwt: | RUSTDESK_API_APP_WEB_CLIENT | 是否启用web-client; 1:启用,0:不启用; 默认启用 | 1 | | RUSTDESK_API_APP_REGISTER | 是否开启注册; `true`, `false` 默认`false` | `false` | | RUSTDESK_API_APP_SHOW_SWAGGER | 是否可见swagger文档;`1`显示,`0`不显示,默认`0`不显示 | `1` | +| RUSTDESK_API_APP_TOKEN_EXPIRE | token有效时长(秒) | `3600` | | -----ADMIN配置----- | ---------- | ---------- | | RUSTDESK_API_ADMIN_TITLE | 后台标题 | `RustDesk Api Admin` | | RUSTDESK_API_ADMIN_HELLO | 后台欢迎语,可以使用`html` | | diff --git a/README_EN.md b/README_EN.md index ce973bb..0960522 100644 --- a/README_EN.md +++ b/README_EN.md @@ -194,6 +194,7 @@ The prefix for variable names is `RUSTDESK_API`. If environment variables exist, | RUSTDESK_API_APP_WEB_CLIENT | web client on/off; 1: on, 0 off, default: 1 | 1 | | RUSTDESK_API_APP_REGISTER | register enable; `true`, `false`; default:`false` | `false` | | RUSTDESK_API_APP_SHOW_SWAGGER | swagger visible; 1: yes, 0: no; default: 0 | `0` | +| RUSTDESK_API_APP_TOKEN_EXPIRE | token expire duration(second) | `3600` | | ----- ADMIN Configuration----- | ---------- | ---------- | | RUSTDESK_API_ADMIN_TITLE | Admin Title | `RustDesk Api Admin` | | RUSTDESK_API_ADMIN_HELLO | Admin welcome message, you can use `html` | | diff --git a/conf/config.yaml b/conf/config.yaml index 40cfdd6..76cc1f1 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -3,6 +3,7 @@ app: web-client: 1 # 1:启用 0:禁用 register: false #是否开启注册 show-swagger: 0 # 1:启用 0:禁用 + token-expire: 360000 admin: title: "RustDesk Api Admin" hello-file: "./conf/admin/hello.html" #优先使用file diff --git a/config/config.go b/config/config.go index ef2d474..92aa7ec 100644 --- a/config/config.go +++ b/config/config.go @@ -17,6 +17,7 @@ type App struct { WebClient int `mapstructure:"web-client"` Register bool `mapstructure:"register"` ShowSwagger int `mapstructure:"show-swagger"` + TokenExpire int `mapstructure:"token-expire"` } type Admin struct { Title string `mapstructure:"title"` diff --git a/service/user.go b/service/user.go index 63e1564..c1f0d5a 100644 --- a/service/user.go +++ b/service/user.go @@ -82,7 +82,7 @@ func (us *UserService) Login(u *model.User, llog *model.LoginLog) *model.UserTok Token: token, DeviceUuid: llog.Uuid, DeviceId: llog.DeviceId, - ExpiredAt: time.Now().Add(time.Hour * 24 * 7).Unix(), + ExpiredAt: time.Now().Add(time.Second * time.Duration(global.Config.App.TokenExpire)).Unix(), } global.DB.Create(ut) llog.UserTokenId = ut.UserId @@ -452,7 +452,7 @@ func (us *UserService) getAdminUserCount() int64 { } func (us *UserService) RefreshAccessToken(ut *model.UserToken) { - ut.ExpiredAt = time.Now().Add(time.Hour * 24 * 7).Unix() + ut.ExpiredAt = time.Now().Add(time.Second * time.Duration(global.Config.App.TokenExpire)).Unix() global.DB.Model(ut).Update("expired_at", ut.ExpiredAt) } func (us *UserService) AutoRefreshAccessToken(ut *model.UserToken) {