ljw 1 год назад
Родитель
Сommit
989990c869
3 измененных файлов с 8 добавлено и 5 удалено
  1. 1 0
      Dockerfile
  2. 6 4
      README.md
  3. 1 1
      go.mod

+ 1 - 0
Dockerfile

@@ -32,6 +32,7 @@ RUN set -eux; \
32 32
 VOLUME /app/data
33 33
 FROM alpine
34 34
 WORKDIR /app
35
+RUN apk add --no-cache tzdata
35 36
 COPY --from=builder /go/rustdesk-api/release /app/
36 37
 
37 38
 EXPOSE 21114

+ 6 - 4
README.md

@@ -17,14 +17,14 @@
17 17
 
18 18
 1. PC客户端使用的是 ***1.3.0***,经测试 ***1.2.6+*** 都可以
19 19
 2. server端必须指定key,不能用自带的生成的key,否则可能链接不上或者超时
20
-   
20
+
21 21
    ```bash
22 22
    hbbs -r <relay-server-ip[:port]> -k <key>
23 23
    hbbr -k <key>
24 24
    ```
25
-   
25
+
26 26
    比如
27
-   
27
+
28 28
    ```bash
29 29
    hbbs -r <relay-server-ip[:port]> -k abc1234567
30 30
    hbbr -k abc1234567
@@ -70,7 +70,8 @@
70 70
    ![web_admin_oauth](docs/web_admin_oauth.png)
71 71
     - `github oauth app`在`Settings`->`Developer settings`->`OAuth Apps`->`New OAuth App`
72 72
       中创建,地址 [https://github.com/settings/developers](https://github.com/settings/developers)
73
-    - `Authorization callback URL`填写`http://<your server[:port]>/api/oauth/callback`,比如`http://127.0.0.1:21114/api/oauth/callback`
73
+    - `Authorization callback URL`填写`http://<your server[:port]>/api/oauth/callback`
74
+      ,比如`http://127.0.0.1:21114/api/oauth/callback`
74 75
 
75 76
 ### **Web Client**:
76 77
 
@@ -118,6 +119,7 @@ rustdesk:
118 119
 
119 120
 | 变量名                                 | 说明                                   | 示例                          |
120 121
 |:------------------------------------|:-------------------------------------|-----------------------------|
122
+| TZ                                  | 时区                                   | Asia/Shanghai               |
121 123
 | -----GIN配置-----                     | ----------                           | ----------                  |
122 124
 | RUSTDESK_API_GIN_TRUST_PROXY        | 信任的代理IP列表,以`,`分割,默认信任所有              | 192.168.1.2,192.168.1.3     |
123 125
 | -----------GORM配置------------------ | ------------------------------------ | --------------------------- |

+ 1 - 1
go.mod

@@ -17,6 +17,7 @@ require (
17 17
 	github.com/swaggo/files v1.0.1
18 18
 	github.com/swaggo/gin-swagger v1.6.0
19 19
 	github.com/swaggo/swag v1.16.3
20
+	golang.org/x/oauth2 v0.23.0
20 21
 	gorm.io/driver/mysql v1.5.7
21 22
 	gorm.io/driver/sqlite v1.5.6
22 23
 	gorm.io/gorm v1.25.7
@@ -64,7 +65,6 @@ require (
64 65
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
65 66
 	golang.org/x/crypto v0.23.0 // indirect
66 67
 	golang.org/x/net v0.21.0 // indirect
67
-	golang.org/x/oauth2 v0.23.0 // indirect
68 68
 	golang.org/x/sys v0.25.0 // indirect
69 69
 	golang.org/x/text v0.15.0 // indirect
70 70
 	golang.org/x/tools v0.7.0 // indirect