mirror of
https://github.com/lejianwen/rustdesk-api.git
synced 2026-05-02 04:26:45 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a771b1e9b0 | ||
|
|
7750f9c54d | ||
|
|
b2d24ee67b | ||
|
|
589a2a5123 | ||
|
|
184d3d357d | ||
|
|
50b3d85270 |
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@@ -55,6 +55,8 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up Go environment
|
- name: Set up Go environment
|
||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v4
|
||||||
@@ -121,6 +123,12 @@ jobs:
|
|||||||
name: rustdesk-api-${{ matrix.job.goos }}-${{ matrix.job.platform }}
|
name: rustdesk-api-${{ matrix.job.goos }}-${{ matrix.job.platform }}
|
||||||
path: |
|
path: |
|
||||||
${{ matrix.job.goos}}-${{ matrix.job.platform }}.${{matrix.job.file_ext}}
|
${{ matrix.job.goos}}-${{ matrix.job.platform }}.${{matrix.job.file_ext}}
|
||||||
|
|
||||||
|
- name: Generate Changelog
|
||||||
|
run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||||
|
|
||||||
- name: Upload to GitHub Release
|
- name: Upload to GitHub Release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
|
|||||||
74
README.md
74
README.md
@@ -140,15 +140,12 @@
|
|||||||
|
|
||||||
1. 如果已经登录了后台，web client将自动直接登录
|
1. 如果已经登录了后台，web client将自动直接登录
|
||||||
2. 如果没登录后台，点击右上角登录即可，api server已经自动配置好了
|
2. 如果没登录后台，点击右上角登录即可，api server已经自动配置好了
|
||||||
|
|
||||||
3. 登录后，会自动同步ID服务器和KEY
|
3. 登录后，会自动同步ID服务器和KEY
|
||||||
4. 登录后，会将地址簿自动保存到web client中，方便使用
|
4. 登录后，会将地址簿自动保存到web client中，方便使用
|
||||||
5. 现已支持`v2 Preview`，访问路径是`/webclient2`
|
5. 现已支持`v2 Preview`，访问路径是`/webclient2`
|
||||||
|
|
||||||
6. `v2 preview` 部署
|
6. `v2 preview` 部署，参考[WIKI](https://github.com/lejianwen/rustdesk-api/wiki)
|
||||||
- 如果是通过`443`端口的`https`部署，必须配置反向代理，可以参考[官方文档](https://rustdesk.com/docs/en/self-host/rustdesk-server-pro/faq/#8-add-websocket-secure-wss-support-for-the-id-server-and-relay-server-to-enable-secure-communication-for-the-web-client)
|
|
||||||
- 如果是`http`或者其他的`https`端口部署，则和`v1`一样，配置好`21118`,`21119`即可
|
|
||||||
- 更多参考[Web-Client-V2-Preview-Document](https://github.com/lejianwen/rustdesk-api/wiki/Web-Client-V2-Preview-Document)
|
|
||||||
|
|
||||||
### 自动化文档: 使用 Swag 生成 API 文档，方便开发者理解和使用 API。
|
### 自动化文档: 使用 Swag 生成 API 文档，方便开发者理解和使用 API。
|
||||||
|
|
||||||
@@ -180,6 +177,7 @@ lang: "en"
|
|||||||
app:
|
app:
|
||||||
web-client: 1 # 1:启用 0:禁用
|
web-client: 1 # 1:启用 0:禁用
|
||||||
register: false #是否开启注册
|
register: false #是否开启注册
|
||||||
|
show-swagger: 0 #是否显示swagger文档
|
||||||
gin:
|
gin:
|
||||||
api-addr: "0.0.0.0:21114"
|
api-addr: "0.0.0.0:21114"
|
||||||
mode: "release"
|
mode: "release"
|
||||||
@@ -212,37 +210,39 @@ proxy:
|
|||||||
### 环境变量
|
### 环境变量
|
||||||
变量名前缀是`RUSTDESK_API`，环境变量如果存在将覆盖配置文件中的配置
|
变量名前缀是`RUSTDESK_API`，环境变量如果存在将覆盖配置文件中的配置
|
||||||
|
|
||||||
| 变量名 | 说明 | 示例 |
|
| 变量名 | 说明 | 示例 |
|
||||||
|------------------------------------|---------------------------------------------------------|------------------------------|
|
|---------------------------------------------------|---------------------------------------------------------|------------------------------|
|
||||||
| TZ | 时区 | Asia/Shanghai |
|
| TZ | 时区 | Asia/Shanghai |
|
||||||
| RUSTDESK_API_LANG | 语言 | `en`,`zh-CN` |
|
| RUSTDESK_API_LANG | 语言 | `en`,`zh-CN` |
|
||||||
| RUSTDESK_API_APP_WEB_CLIENT | 是否启用web-client; 1:启用,0:不启用; 默认启用 | 1 |
|
| RUSTDESK_API_APP_WEB_CLIENT | 是否启用web-client; 1:启用,0:不启用; 默认启用 | 1 |
|
||||||
| RUSTDESK_API_APP_REGISTER | 是否开启注册; `true`, `false` 默认`false` | `false` |
|
| RUSTDESK_API_APP_REGISTER | 是否开启注册; `true`, `false` 默认`false` | `false` |
|
||||||
| -----ADMIN配置----- | ---------- | ---------- |
|
| RUSTDESK_API_APP_SHOW_SWAGGER | 是否可见swagger文档;`1`显示，`0`不显示，默认`0`不显示 | `1` |
|
||||||
| RUSTDESK_API_ADMIN_TITLE | 后台标题 | `RustDesk Api Admin` |
|
| -----ADMIN配置----- | ---------- | ---------- |
|
||||||
| RUSTDESK_API_ADMIN_HELLO | 后台欢迎语，可以使用`html` | |
|
| RUSTDESK_API_ADMIN_TITLE | 后台标题 | `RustDesk Api Admin` |
|
||||||
| RUSTDESK_API_ADMIN_HELLO_FILE | 后台欢迎语文件，如果内容多，使用文件更方便。<br>会覆盖`RUSTDESK_API_ADMIN_HELLO` | `./conf/admin/hello.html` |
|
| RUSTDESK_API_ADMIN_HELLO | 后台欢迎语，可以使用`html` | |
|
||||||
| -----GIN配置----- | ---------- | ---------- |
|
| RUSTDESK_API_ADMIN_HELLO_FILE | 后台欢迎语文件，如果内容多，使用文件更方便。<br>会覆盖`RUSTDESK_API_ADMIN_HELLO` | `./conf/admin/hello.html` |
|
||||||
| RUSTDESK_API_GIN_TRUST_PROXY | 信任的代理IP列表，以`,`分割，默认信任所有 | 192.168.1.2,192.168.1.3 |
|
| -----GIN配置----- | ---------- | ---------- |
|
||||||
| -----------GORM配置---------------- | ------------------------------------ | --------------------------- |
|
| RUSTDESK_API_GIN_TRUST_PROXY | 信任的代理IP列表，以`,`分割，默认信任所有 | 192.168.1.2,192.168.1.3 |
|
||||||
| RUSTDESK_API_GORM_TYPE | 数据库类型sqlite或者mysql，默认sqlite | sqlite |
|
| -----------GORM配置---------------- | ------------------------------------ | --------------------------- |
|
||||||
| RUSTDESK_API_GORM_MAX_IDLE_CONNS | 数据库最大空闲连接数 | 10 |
|
| RUSTDESK_API_GORM_TYPE | 数据库类型sqlite或者mysql，默认sqlite | sqlite |
|
||||||
| RUSTDESK_API_GORM_MAX_OPEN_CONNS | 数据库最大打开连接数 | 100 |
|
| RUSTDESK_API_GORM_MAX_IDLE_CONNS | 数据库最大空闲连接数 | 10 |
|
||||||
| RUSTDESK_API_RUSTDESK_PERSONAL | 是否启用个人版API， 1:启用,0:不启用； 默认启用 | 1 |
|
| RUSTDESK_API_GORM_MAX_OPEN_CONNS | 数据库最大打开连接数 | 100 |
|
||||||
| -----MYSQL配置----- | ---------- | ---------- |
|
| RUSTDESK_API_RUSTDESK_PERSONAL | 是否启用个人版API， 1:启用,0:不启用； 默认启用 | 1 |
|
||||||
| RUSTDESK_API_MYSQL_USERNAME | mysql用户名 | root |
|
| -----MYSQL配置----- | ---------- | ---------- |
|
||||||
| RUSTDESK_API_MYSQL_PASSWORD | mysql密码 | 111111 |
|
| RUSTDESK_API_MYSQL_USERNAME | mysql用户名 | root |
|
||||||
| RUSTDESK_API_MYSQL_ADDR | mysql地址 | 192.168.1.66:3306 |
|
| RUSTDESK_API_MYSQL_PASSWORD | mysql密码 | 111111 |
|
||||||
| RUSTDESK_API_MYSQL_DBNAME | mysql数据库名 | rustdesk |
|
| RUSTDESK_API_MYSQL_ADDR | mysql地址 | 192.168.1.66:3306 |
|
||||||
| -----RUSTDESK配置----- | --------------- | ---------- |
|
| RUSTDESK_API_MYSQL_DBNAME | mysql数据库名 | rustdesk |
|
||||||
| RUSTDESK_API_RUSTDESK_ID_SERVER | Rustdesk的id服务器地址 | 192.168.1.66:21116 |
|
| -----RUSTDESK配置----- | --------------- | ---------- |
|
||||||
| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk的relay服务器地址 | 192.168.1.66:21117 |
|
| RUSTDESK_API_RUSTDESK_ID_SERVER | Rustdesk的id服务器地址 | 192.168.1.66:21116 |
|
||||||
| RUSTDESK_API_RUSTDESK_API_SERVER | Rustdesk的api服务器地址 | http://192.168.1.66:21114 |
|
| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk的relay服务器地址 | 192.168.1.66:21117 |
|
||||||
| RUSTDESK_API_RUSTDESK_KEY | Rustdesk的key | 123456789 |
|
| RUSTDESK_API_RUSTDESK_API_SERVER | Rustdesk的api服务器地址 | http://192.168.1.66:21114 |
|
||||||
| RUSTDESK_API_RUSTDESK_KEY_FILE | Rustdesk存放key的文件 | `./conf/data/id_ed25519.pub` |
|
| RUSTDESK_API_RUSTDESK_KEY | Rustdesk的key | 123456789 |
|
||||||
| ----PROXY配置----- | --------------- | ---------- |
|
| RUSTDESK_API_RUSTDESK_KEY_FILE | Rustdesk存放key的文件 | `./conf/data/id_ed25519.pub` |
|
||||||
| RUSTDESK_API_PROXY_ENABLE | 是否启用代理:`false`, `true` | `false` |
|
| RUSTDESK_API_RUSTDESK_WEBCLIENT_MAGIC_QUERYONLINE | Web client v2 中是否启用新的在线状态查询方法; `1`:启用,`0`:不启用,默认不启用 | `0` |
|
||||||
| RUSTDESK_API_PROXY_HOST | 代理地址 | `http://127.0.0.1:1080` |
|
| ----PROXY配置----- | --------------- | ---------- |
|
||||||
|
| RUSTDESK_API_PROXY_ENABLE | 是否启用代理:`false`, `true` | `false` |
|
||||||
|
| RUSTDESK_API_PROXY_HOST | 代理地址 | `http://127.0.0.1:1080` |
|
||||||
|
|
||||||
|
|
||||||
### 运行
|
### 运行
|
||||||
@@ -263,7 +263,7 @@ proxy:
|
|||||||
lejianwen/rustdesk-api
|
lejianwen/rustdesk-api
|
||||||
```
|
```
|
||||||
|
|
||||||
2. 使用`docker compose`，参考[wiki](https://github.com/lejianwen/rustdesk-api/wiki)
|
2. 使用`docker compose`，参考[WIKI](https://github.com/lejianwen/rustdesk-api/wiki)
|
||||||
|
|
||||||
#### 下载release直接运行
|
#### 下载release直接运行
|
||||||
|
|
||||||
|
|||||||
74
README_EN.md
74
README_EN.md
@@ -144,16 +144,11 @@ installation are `admin` `admin`, please change the password immediately.
|
|||||||
1. If you're already logged into the admin panel, the web client will log in automatically.
|
1. If you're already logged into the admin panel, the web client will log in automatically.
|
||||||
2. If you're not logged in, simply click the login button in the top right corner, and the API server will be
|
2. If you're not logged in, simply click the login button in the top right corner, and the API server will be
|
||||||
pre-configured.
|
pre-configured.
|
||||||
|
|
||||||
3. After logging in, the ID server and key will be automatically synced.
|
3. After logging in, the ID server and key will be automatically synced.
|
||||||
4. The address book will also be automatically saved to the web client for convenient use.
|
4. The address book will also be automatically saved to the web client for convenient use.
|
||||||
5. Now supports `v2 Preview`, accessible at `/webclient2`
|
5. Now supports `v2 Preview`, accessible at `/webclient2`
|
||||||
|
|
||||||
6. `v2 preview` deployment
|
6. `v2 preview` deployment, [WIKI](https://github.com/lejianwen/rustdesk-api/wiki)
|
||||||
- If deploying via `https` on port `443`, you must configure a reverse proxy. Refer to the [official documentation](https://rustdesk.com/docs/en/self-host/rustdesk-server-pro/faq/#8-add-websocket-secure-wss-support-for-the-id-server-and-relay-server-to-enable-secure-communication-for-the-web-client)
|
|
||||||
- If deploying via `http` or other `https` ports, configure `21118` and `21119` as with `v1`
|
|
||||||
- More [Web-Client-V2-Preview-Document](https://github.com/lejianwen/rustdesk-api/wiki/Web-Client-V2-Preview-Document)
|
|
||||||
|
|
||||||
|
|
||||||
### Automated Documentation : API documentation is generated using Swag, making it easier for developers to understand and use the API.
|
### Automated Documentation : API documentation is generated using Swag, making it easier for developers to understand and use the API.
|
||||||
|
|
||||||
@@ -185,6 +180,7 @@ lang: "en"
|
|||||||
app:
|
app:
|
||||||
web-client: 1 # web client route 1:open 0:close
|
web-client: 1 # web client route 1:open 0:close
|
||||||
register: false #register enable
|
register: false #register enable
|
||||||
|
show-swagger: 0 #show swagger 1:open 0:close
|
||||||
gin:
|
gin:
|
||||||
api-addr: "0.0.0.0:21114"
|
api-addr: "0.0.0.0:21114"
|
||||||
mode: "release"
|
mode: "release"
|
||||||
@@ -217,37 +213,39 @@ proxy:
|
|||||||
### Environment Variables
|
### Environment Variables
|
||||||
The prefix for variable names is `RUSTDESK_API`. If environment variables exist, they will override the configurations in the configuration file.
|
The prefix for variable names is `RUSTDESK_API`. If environment variables exist, they will override the configurations in the configuration file.
|
||||||
|
|
||||||
| Variable Name | Description | Example |
|
| Variable Name | Description | Example |
|
||||||
|------------------------------------|-------------------------------------------------------------------------|-------------------------------|
|
|-----------------------------------------------------|--------------------------------------------------------------------------------------------------------------|-------------------------------|
|
||||||
| TZ | timezone | Asia/Shanghai |
|
| TZ | timezone | Asia/Shanghai |
|
||||||
| RUSTDESK_API_LANG | Language | `en`,`zh-CN` |
|
| RUSTDESK_API_LANG | Language | `en`,`zh-CN` |
|
||||||
| RUSTDESK_API_APP_WEB_CLIENT | web client on/off; 1: on, 0 off, deault 1 | 1 |
|
| 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_REGISTER | register enable; `true`, `false`; default:`false` | `false` |
|
||||||
| ----- ADMIN Configuration----- | ---------- | ---------- |
|
| RUSTDESK_API_APP_SHOW_SWAGGER | swagger visible; 1: yes, 0: no; default: 0 | `0` |
|
||||||
| RUSTDESK_API_ADMIN_TITLE | Admin Title | `RustDesk Api Admin` |
|
| ----- ADMIN Configuration----- | ---------- | ---------- |
|
||||||
| RUSTDESK_API_ADMIN_HELLO | Admin welcome message, you can use `html` | |
|
| RUSTDESK_API_ADMIN_TITLE | Admin Title | `RustDesk Api Admin` |
|
||||||
| RUSTDESK_API_ADMIN_HELLO_FILE | Admin welcome message file,<br>will override `RUSTDESK_API_ADMIN_HELLO` | `./conf/admin/hello.html` |
|
| RUSTDESK_API_ADMIN_HELLO | Admin welcome message, you can use `html` | |
|
||||||
| ----- GIN Configuration ----- | --------------------------------------- | ----------------------------- |
|
| RUSTDESK_API_ADMIN_HELLO_FILE | Admin welcome message file,<br>will override `RUSTDESK_API_ADMIN_HELLO` | `./conf/admin/hello.html` |
|
||||||
| RUSTDESK_API_GIN_TRUST_PROXY | Trusted proxy IPs, separated by commas. | 192.168.1.2,192.168.1.3 |
|
| ----- GIN Configuration ----- | --------------------------------------- | ----------------------------- |
|
||||||
| ----- GORM Configuration ----- | --------------------------------------- | ----------------------------- |
|
| RUSTDESK_API_GIN_TRUST_PROXY | Trusted proxy IPs, separated by commas. | 192.168.1.2,192.168.1.3 |
|
||||||
| RUSTDESK_API_GORM_TYPE | Database type (`sqlite` or `mysql`). Default is `sqlite`. | sqlite |
|
| ----- GORM Configuration ----- | --------------------------------------- | ----------------------------- |
|
||||||
| RUSTDESK_API_GORM_MAX_IDLE_CONNS | Maximum idle connections | 10 |
|
| RUSTDESK_API_GORM_TYPE | Database type (`sqlite` or `mysql`). Default is `sqlite`. | sqlite |
|
||||||
| RUSTDESK_API_GORM_MAX_OPEN_CONNS | Maximum open connections | 100 |
|
| RUSTDESK_API_GORM_MAX_IDLE_CONNS | Maximum idle connections | 10 |
|
||||||
| RUSTDESK_API_RUSTDESK_PERSONAL | Open Personal Api 1:Enable,0:Disable | 1 |
|
| RUSTDESK_API_GORM_MAX_OPEN_CONNS | Maximum open connections | 100 |
|
||||||
| ----- MYSQL Configuration ----- | --------------------------------------- | ----------------------------- |
|
| RUSTDESK_API_RUSTDESK_PERSONAL | Open Personal Api 1:Enable,0:Disable | 1 |
|
||||||
| RUSTDESK_API_MYSQL_USERNAME | MySQL username | root |
|
| ----- MYSQL Configuration ----- | --------------------------------------- | ----------------------------- |
|
||||||
| RUSTDESK_API_MYSQL_PASSWORD | MySQL password | 111111 |
|
| RUSTDESK_API_MYSQL_USERNAME | MySQL username | root |
|
||||||
| RUSTDESK_API_MYSQL_ADDR | MySQL address | 192.168.1.66:3306 |
|
| RUSTDESK_API_MYSQL_PASSWORD | MySQL password | 111111 |
|
||||||
| RUSTDESK_API_MYSQL_DBNAME | MySQL database name | rustdesk |
|
| RUSTDESK_API_MYSQL_ADDR | MySQL address | 192.168.1.66:3306 |
|
||||||
| ----- RUSTDESK Configuration ----- | --------------------------------------- | ----------------------------- |
|
| RUSTDESK_API_MYSQL_DBNAME | MySQL database name | rustdesk |
|
||||||
| RUSTDESK_API_RUSTDESK_ID_SERVER | Rustdesk ID server address | 192.168.1.66:21116 |
|
| ----- RUSTDESK Configuration ----- | --------------------------------------- | ----------------------------- |
|
||||||
| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk relay server address | 192.168.1.66:21117 |
|
| RUSTDESK_API_RUSTDESK_ID_SERVER | Rustdesk ID server address | 192.168.1.66:21116 |
|
||||||
| RUSTDESK_API_RUSTDESK_API_SERVER | Rustdesk API server address | http://192.168.1.66:21114 |
|
| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk relay server address | 192.168.1.66:21117 |
|
||||||
| RUSTDESK_API_RUSTDESK_KEY | Rustdesk key | 123456789 |
|
| RUSTDESK_API_RUSTDESK_API_SERVER | Rustdesk API server address | http://192.168.1.66:21114 |
|
||||||
| RUSTDESK_API_RUSTDESK_KEY_FILE | Rustdesk存放key的文件 | `./conf/data/id_ed25519.pub` |
|
| RUSTDESK_API_RUSTDESK_KEY | Rustdesk key | 123456789 |
|
||||||
| ---- PROXY ----- | --------------- | ---------- |
|
| RUSTDESK_API_RUSTDESK_KEY_FILE | Rustdesk key file | `./conf/data/id_ed25519.pub` |
|
||||||
| RUSTDESK_API_PROXY_ENABLE | proxy_enable :`false`, `true` | `false` |
|
| RUSTDESK_API_RUSTDESK_WEBCLIENT_MAGIC_QUERYONLINE | New online query method is enabled in the web client v2; '1': Enabled, '0': Disabled, not enabled by default | `0` |
|
||||||
| RUSTDESK_API_PROXY_HOST | proxy_host | `http://127.0.0.1:1080` |
|
| ---- PROXY ----- | --------------- | ---------- |
|
||||||
|
| RUSTDESK_API_PROXY_ENABLE | proxy_enable :`false`, `true` | `false` |
|
||||||
|
| RUSTDESK_API_PROXY_HOST | proxy_host | `http://127.0.0.1:1080` |
|
||||||
|
|
||||||
### Installation Steps
|
### Installation Steps
|
||||||
|
|
||||||
@@ -267,7 +265,7 @@ The prefix for variable names is `RUSTDESK_API`. If environment variables exist,
|
|||||||
lejianwen/rustdesk-api
|
lejianwen/rustdesk-api
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Using `docker-compose`,look [wiki](https://github.com/lejianwen/rustdesk-api/wiki)
|
2. Using `docker-compose`,look [WIKI](https://github.com/lejianwen/rustdesk-api/wiki)
|
||||||
|
|
||||||
#### Running from Release
|
#### Running from Release
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ rustdesk:
|
|||||||
key: ""
|
key: ""
|
||||||
key-file: "./conf/data/id_ed25519.pub"
|
key-file: "./conf/data/id_ed25519.pub"
|
||||||
personal: 1
|
personal: 1
|
||||||
|
webclient-magic-queryonline: 0
|
||||||
logger:
|
logger:
|
||||||
path: "./runtime/log.txt"
|
path: "./runtime/log.txt"
|
||||||
level: "warn" #trace,debug,info,warn,error,fatal
|
level: "warn" #trace,debug,info,warn,error,fatal
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ type Rustdesk struct {
|
|||||||
Key string `mapstructure:"key"`
|
Key string `mapstructure:"key"`
|
||||||
KeyFile string `mapstructure:"key-file"`
|
KeyFile string `mapstructure:"key-file"`
|
||||||
Personal int `mapstructure:"personal"`
|
Personal int `mapstructure:"personal"`
|
||||||
|
//webclient-magic-queryonline
|
||||||
|
WebclientMagicQueryonline int `mapstructure:"webclient-magic-queryonline"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func LoadKeyFile(rustdesk *Rustdesk) {
|
func LoadKeyFile(rustdesk *Rustdesk) {
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 97 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 97 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 44 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 44 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 29 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
@@ -4,7 +4,6 @@ import (
|
|||||||
"Gwen/global"
|
"Gwen/global"
|
||||||
"Gwen/http/request/admin"
|
"Gwen/http/request/admin"
|
||||||
"Gwen/http/response"
|
"Gwen/http/response"
|
||||||
"Gwen/model"
|
|
||||||
"Gwen/service"
|
"Gwen/service"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
_ "encoding/json"
|
_ "encoding/json"
|
||||||
@@ -107,9 +106,21 @@ func (ct *AddressBook) BatchCreate(c *gin.Context) {
|
|||||||
response.Fail(c, 101, errList[0])
|
response.Fail(c, 101, errList[0])
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
ul := len(f.UserIds)
|
||||||
|
|
||||||
|
if ul == 0 {
|
||||||
|
response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ul > 1 {
|
||||||
|
//多用户置空标签
|
||||||
|
f.Tags = []string{}
|
||||||
|
//多用户只能创建到默认地址簿
|
||||||
|
f.CollectionId = 0
|
||||||
|
}
|
||||||
|
|
||||||
//创建标签
|
//创建标签
|
||||||
for _, fu := range f.UserIds {
|
/*for _, fu := range f.UserIds {
|
||||||
if fu == 0 {
|
if fu == 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -122,13 +133,13 @@ func (ct *AddressBook) BatchCreate(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
ts := f.ToAddressBooks()
|
ts := f.ToAddressBooks()
|
||||||
for _, t := range ts {
|
for _, t := range ts {
|
||||||
if t.UserId == 0 {
|
if t.UserId == 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
ex := service.AllService.AddressBookService.InfoByUserIdAndId(t.UserId, t.Id)
|
ex := service.AllService.AddressBookService.InfoByUserIdAndIdAndCid(t.UserId, t.Id, t.CollectionId)
|
||||||
if ex.RowId == 0 {
|
if ex.RowId == 0 {
|
||||||
service.AllService.AddressBookService.Create(t)
|
service.AllService.AddressBookService.Create(t)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package web
|
|||||||
import (
|
import (
|
||||||
"Gwen/global"
|
"Gwen/global"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"strconv"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Index struct {
|
type Index struct {
|
||||||
@@ -14,11 +15,13 @@ func (i *Index) Index(c *gin.Context) {
|
|||||||
|
|
||||||
func (i *Index) ConfigJs(c *gin.Context) {
|
func (i *Index) ConfigJs(c *gin.Context) {
|
||||||
apiServer := global.Config.Rustdesk.ApiServer
|
apiServer := global.Config.Rustdesk.ApiServer
|
||||||
|
magicQueryonline := strconv.Itoa(global.Config.Rustdesk.WebclientMagicQueryonline)
|
||||||
tmp := `
|
tmp := `
|
||||||
localStorage.setItem('api-server', "` + apiServer + `")
|
localStorage.setItem('api-server', "` + apiServer + `")
|
||||||
const ws2_prefix = 'wc-'
|
const ws2_prefix = 'wc-'
|
||||||
localStorage.setItem(ws2_prefix+'api-server', "` + apiServer + `")
|
localStorage.setItem(ws2_prefix+'api-server', "` + apiServer + `")
|
||||||
`
|
|
||||||
|
window.webclient_magic_queryonline = ` + magicQueryonline + ``
|
||||||
|
|
||||||
c.String(200, tmp)
|
c.String(200, tmp)
|
||||||
}
|
}
|
||||||
|
|||||||
122
resources/web2/js/dist/index.js
vendored
122
resources/web2/js/dist/index.js
vendored
@@ -11112,6 +11112,71 @@ function nt(u, e) {
|
|||||||
ye("callback_query_onlines", {onlines: u.join(","), offlines: e.join(",")})
|
ye("callback_query_onlines", {onlines: u.join(","), offlines: e.join(",")})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const onlineCache = {}
|
||||||
|
|
||||||
|
// Query onlines
|
||||||
|
async function myQueryOnline(id) {
|
||||||
|
const last_online = onlineCache[id]
|
||||||
|
if (last_online && new Date().getTime() - last_online < 20 * 1000) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
// 映射 方便后期更新
|
||||||
|
const maps = {
|
||||||
|
uri: P4(),
|
||||||
|
ws: j4,
|
||||||
|
conn_type: ne.DEFAULT_CONN,
|
||||||
|
nat_type: pt.SYMMETRIC,
|
||||||
|
token: Pt(),
|
||||||
|
version: se,
|
||||||
|
licence_key: Io(),
|
||||||
|
rendezvousPunchHoleRequest: Ku,
|
||||||
|
rendezvousPunchHoleResponse_Failure: Z0
|
||||||
|
}
|
||||||
|
|
||||||
|
const s = new maps.ws(maps.uri, !0, "rendezvous");
|
||||||
|
await s.open();
|
||||||
|
const punch_hole_request = maps.rendezvousPunchHoleRequest.fromPartial({
|
||||||
|
id: id,
|
||||||
|
licence_key: maps.licence_key,
|
||||||
|
conn_type: maps.conn_type,
|
||||||
|
nat_type: maps.nat_type,
|
||||||
|
token: maps.token,
|
||||||
|
version: maps.version
|
||||||
|
});
|
||||||
|
s.sendRendezvous({punch_hole_request: punch_hole_request});
|
||||||
|
const msg = await s.next();
|
||||||
|
s.close();
|
||||||
|
let online = false
|
||||||
|
const phr = msg.punch_hole_response, rr = msg.relay_response;
|
||||||
|
if (phr) {
|
||||||
|
online = true
|
||||||
|
if (phr != null && phr.other_failure) {
|
||||||
|
online = false
|
||||||
|
return online
|
||||||
|
}
|
||||||
|
if (phr.failure != maps.rendezvousPunchHoleResponse_Failure.UNRECOGNIZED) switch (phr == null ? void 0 : phr.failure) {
|
||||||
|
case maps.rendezvousPunchHoleResponse_Failure.ID_NOT_EXIST:
|
||||||
|
case maps.rendezvousPunchHoleResponse_Failure.OFFLINE:
|
||||||
|
case maps.rendezvousPunchHoleResponse_Failure.LICENSE_MISMATCH:
|
||||||
|
case maps.rendezvousPunchHoleResponse_Failure.LICENSE_OVERUSE:
|
||||||
|
online = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
} else if (rr) {
|
||||||
|
online = true
|
||||||
|
if (!rr.version) {
|
||||||
|
online = false
|
||||||
|
return online
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (online) {
|
||||||
|
onlineCache[id] = new Date().getTime()
|
||||||
|
} else if (onlineCache[id]) {
|
||||||
|
delete onlineCache[id]
|
||||||
|
}
|
||||||
|
return online
|
||||||
|
}
|
||||||
|
|
||||||
async function wn(u) {
|
async function wn(u) {
|
||||||
let e = [];
|
let e = [];
|
||||||
try {
|
try {
|
||||||
@@ -11121,28 +11186,45 @@ async function wn(u) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (e.length === 0) return;
|
if (e.length === 0) return;
|
||||||
const i = bn(), o = new j4(i, !0, "query onlines");
|
|
||||||
try {
|
if (window.webclient_magic_queryonline) {
|
||||||
await o.open();
|
const onlines = []
|
||||||
const a = Ju.fromPartial({id: N4(), peers: e});
|
const offlines = []
|
||||||
o.sendRendezvous({online_request: a})
|
for (let i = 0; i < e.length; i++) {
|
||||||
} catch (a) {
|
let online = await myQueryOnline(e[i])
|
||||||
console.error("Failed to query onlines, ", a), nt([], e), o.close();
|
if (online) {
|
||||||
return
|
onlines.push(e[i])
|
||||||
}
|
} else {
|
||||||
for (let a = 0; a < 2; a++) {
|
offlines.push(e[i])
|
||||||
const t = await Ro(o, 3e3);
|
}
|
||||||
if (!t || (t == null ? void 0 : t.key_exchange) || (t == null ? void 0 : t.online_response) === void 0) continue;
|
|
||||||
const s = t.online_response.states;
|
|
||||||
let l = [], E = [];
|
|
||||||
for (let c = 0; c < e.length; c++) {
|
|
||||||
const C = 1 << 7 - c % 8;
|
|
||||||
(s[Math.floor(c / 8)] & C) === C ? l.push(e[c]) : E.push(e[c])
|
|
||||||
}
|
}
|
||||||
nt(l, E), o.close();
|
nt(onlines, offlines)
|
||||||
return
|
} else {
|
||||||
|
const i = bn(), o = new j4(i, !0, "query onlines");
|
||||||
|
try {
|
||||||
|
await o.open();
|
||||||
|
const a = Ju.fromPartial({id: N4(), peers: e});
|
||||||
|
o.sendRendezvous({online_request: a})
|
||||||
|
} catch (a) {
|
||||||
|
console.error("Failed to query onlines, ", a), nt([], e), o.close();
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for (let a = 0; a < 2; a++) {
|
||||||
|
const t = await Ro(o, 3e3);
|
||||||
|
if (!t || (t == null ? void 0 : t.key_exchange) || (t == null ? void 0 : t.online_response) === void 0) continue;
|
||||||
|
const s = t.online_response.states;
|
||||||
|
let l = [], E = [];
|
||||||
|
for (let c = 0; c < e.length; c++) {
|
||||||
|
const C = 1 << 7 - c % 8;
|
||||||
|
(s[Math.floor(c / 8)] & C) === C ? l.push(e[c]) : E.push(e[c])
|
||||||
|
}
|
||||||
|
nt(l, E), o.close();
|
||||||
|
return
|
||||||
|
}
|
||||||
|
o.close(), console.error("Failed to query online states, no online response")
|
||||||
}
|
}
|
||||||
o.close(), console.error("Failed to query online states, no online response")
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
window.curConn = void 0;
|
window.curConn = void 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user