diff --git a/Dockerfile b/Dockerfile index 74850bc..310e0bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,7 @@ RUN set -eux; \ VOLUME /app/data FROM alpine WORKDIR /app +RUN apk add --no-cache tzdata COPY --from=builder /go/rustdesk-api/release /app/ EXPOSE 21114 diff --git a/README.md b/README.md index e962761..9d1f760 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,14 @@ 1. PC客户端使用的是 ***1.3.0***,经测试 ***1.2.6+*** 都可以 2. server端必须指定key,不能用自带的生成的key,否则可能链接不上或者超时 - + ```bash hbbs -r -k hbbr -k ``` - + 比如 - + ```bash hbbs -r -k abc1234567 hbbr -k abc1234567 @@ -70,7 +70,8 @@ ![web_admin_oauth](docs/web_admin_oauth.png) - `github oauth app`在`Settings`->`Developer settings`->`OAuth Apps`->`New OAuth App` 中创建,地址 [https://github.com/settings/developers](https://github.com/settings/developers) - - `Authorization callback URL`填写`http:///api/oauth/callback`,比如`http://127.0.0.1:21114/api/oauth/callback` + - `Authorization callback URL`填写`http:///api/oauth/callback` + ,比如`http://127.0.0.1:21114/api/oauth/callback` ### **Web Client**: @@ -118,6 +119,7 @@ rustdesk: | 变量名 | 说明 | 示例 | |:------------------------------------|:-------------------------------------|-----------------------------| +| TZ | 时区 | Asia/Shanghai | | -----GIN配置----- | ---------- | ---------- | | RUSTDESK_API_GIN_TRUST_PROXY | 信任的代理IP列表,以`,`分割,默认信任所有 | 192.168.1.2,192.168.1.3 | | -----------GORM配置------------------ | ------------------------------------ | --------------------------- | diff --git a/go.mod b/go.mod index 0e074bc..ccde1dd 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( github.com/swaggo/files v1.0.1 github.com/swaggo/gin-swagger v1.6.0 github.com/swaggo/swag v1.16.3 + golang.org/x/oauth2 v0.23.0 gorm.io/driver/mysql v1.5.7 gorm.io/driver/sqlite v1.5.6 gorm.io/gorm v1.25.7 @@ -64,7 +65,6 @@ require ( golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect golang.org/x/crypto v0.23.0 // indirect golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/text v0.15.0 // indirect golang.org/x/tools v0.7.0 // indirect