From ab13fa582db5556d937fa811a9da39a1b11254b2 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Mon, 20 Oct 2025 01:36:42 +0800 Subject: [PATCH] [chore] update README --- .gitattributes | 3 +++ README.md | 42 +++++++++++++++++++++++------------------- README_EN.md | 26 +++++++++++++++----------- 3 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4047745 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.h linguist-language=C++ +*.cpp linguist-language=C++ +*.lua linguist-language=Xmake \ No newline at end of file diff --git a/README.md b/README.md index 4ed9795..45ef2d0 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ # CrossDesk -#### 跨界连接，高效如一 - ----- [English](README_EN.md) / [中文](README.md) ![sup_example](https://github.com/user-attachments/assets/eeb64fbe-1f07-4626-be1c-b77396beb905) @@ -72,7 +69,7 @@ xmake r crossdesk #### 注意 运行时如果客户端状态栏显示 **未连接服务器**，请先在 [CrossDesk 官方网站](https://www.crossdesk.cn/) 安装客户端，以便在环境中安装所需的证书文件。 -image +image ## 关于 Xmake @@ -239,25 +236,32 @@ chmod +x generate_certs.sh ``` 输出如下： ``` -生成根证书私钥... -生成自签根证书... -生成服务器私钥... -生成服务器证书签名请求（CSR）... -用根证书签发服务器证书... +Generating root private key... +Generating self-signed root certificate... +Generating server private key... +Generating server CSR... +Signing server certificate with root certificate... Certificate request self-signature ok -subject=C = CN, ST = Zhejiang, L = Hangzhou, O = CrossDesk, OU = CrossDesk, CN = CrossDesk -清理中间文件... -生成完成,部署时需要： - 根证书: crossdesk.cn_root.crt - 服务器私钥: crossdesk.cn.key - 服务器证书: crossdesk.cn_bundle.crt +subject=C = CN, ST = Zhejiang, L = Hangzhou, O = CrossDesk, OU = CrossDesk, CN = xxx.xxx.xxx.xxx +cleaning up intermediate files... +Generation complete. Deployment files:: + Client root certificate:: crossdesk.cn_root.crt + Server private key: crossdesk.cn.key + Server certificate: crossdesk.cn_bundle.crt ``` #### 服务端 将 **crossdesk.cn.key** 和 **crossdesk.cn_bundle.crt** 放置到 **/path/to/your/certs** 目录下。 #### 客户端 -1. 点击右上角设置进入设置页面。 -2. 点击点击**自托管服务器配置**。 -3. 在**证书文件路径**选择框中找到 **crossdesk.cn_root.crt** 的存放路径，选中 **crossdesk.cn_root.crt**。 -4. 勾选使用**自托管服务器配置**。 \ No newline at end of file +1. 点击右上角设置进入设置页面。
+image

+ +3. 点击点击**自托管服务器配置**。

+image

+ +5. 在**证书文件路径**选择框中找到 **crossdesk.cn_root.crt** 的存放路径，选中 **crossdesk.cn_root.crt**，点击确认。

+image

+ +7. 勾选使用**自托管服务器配置**，点击确认配置生效。

+image

diff --git a/README_EN.md b/README_EN.md index bf9e076..fc288ca 100644 --- a/README_EN.md +++ b/README_EN.md @@ -1,8 +1,5 @@ # CrossDesk -#### Bridging work, uniting efficiency - ----- [中文](README.md) / [English](README_EN.md) ![sup_example](https://github.com/user-attachments/assets/3f17d8f3-7c4a-4b63-bae4-903363628687) @@ -17,15 +14,15 @@ CrossDesk is an experimental application of [MiniRTC](https://github.com/kunkund Enter the remote desktop ID in the menu bar’s “Remote ID” field and click “→” to initiate a remote connection. -![usage1](https://github.com/user-attachments/assets/bf39f8fa-de77-41a1-8db3-73d6cab9da6a) +![usage1](https://github.com/user-attachments/assets/3a4bb59f-c84c-44d2-9a20-11790aac510e) If the remote desktop requires a connection password, you must enter the correct password on your side to successfully establish the connection. -![password](https://github.com/user-attachments/assets/f6556966-a84f-4301-a79b-2726b389ed71) +![password](https://github.com/user-attachments/assets/1beadcce-640d-4f5c-8e77-51917b5294d5) Before connecting, you can customize configuration options in the settings, such as language and video encoding format. -![settings](https://github.com/user-attachments/assets/12f7e9c3-a472-40c1-8fb9-ae7d1ae3865c) +![settings](https://github.com/user-attachments/assets/8bc5468d-7bbb-4e30-95bd-da1f352ac08c) ## How to build @@ -73,7 +70,7 @@ xmake r crossdesk #### Notice If the client status bar shows **Disconnected** during runtime, please first install the client from the [CrossDesk official website](https://www.crossdesk.cn/) to ensure the required certificate files are available in the environment. -image +image ## About Xmake #### Installing Xmake @@ -261,7 +258,14 @@ Generation complete. Deployment files:: Place **crossdesk.cn.key** and **crossdesk.cn_bundle.crt** into the **/path/to/your/certs** directory. #### Client Side -1. Click the settings icon in the top-right corner to enter the settings page. -2. Click **Self-Hosted Server Configuration**. -3. In the **Certificate File Path** selection, locate and select the **crossdesk.cn_root.crt** file. -4. Check the option to use **Self-Hosted Server Configuration**. \ No newline at end of file +1. Click the settings icon in the top-right corner to enter the settings page.
+image

+ +2. Click **Self-Hosted Server Configuration**.

+image

+ +3. In the **Certificate File Path** selection, locate and select the **crossdesk.cn_root.crt** file.

+image

+ +4. Check the option to use **Self-Hosted Server Configuration**.

+image