修改克隆项目时的地址
This commit is contained in:
28
README.md
28
README.md
@@ -34,11 +34,11 @@
|
|||||||
|
|
||||||
| 平台 | 下载链接 | 系统要求 |
|
| 平台 | 下载链接 | 系统要求 |
|
||||||
|------|---------|---------|
|
|------|---------|---------|
|
||||||
| Windows | [FunMC-Setup.exe](https://funmc.com/download) | Windows 10+ |
|
| Windows | [FunMC-Setup.exe](https://fc.funmc.cn/download) | Windows 10+ |
|
||||||
| macOS (Apple Silicon) | [FunMC-arm64.dmg](https://funmc.com/download) | macOS 11+ |
|
| macOS (Apple Silicon) | [FunMC-arm64.dmg](https://fc.funmc.cn/download) | macOS 11+ |
|
||||||
| macOS (Intel) | [FunMC-x64.dmg](https://funmc.com/download) | macOS 10.13+ |
|
| macOS (Intel) | [FunMC-x64.dmg](https://fc.funmc.cn/download) | macOS 10.13+ |
|
||||||
| Linux | [FunMC.AppImage](https://funmc.com/download) | Ubuntu 18.04+ |
|
| Linux | [FunMC.AppImage](https://fc.funmc.cn/download) | Ubuntu 18.04+ |
|
||||||
| Android | [FunMC.apk](https://funmc.com/download) | Android 7.0+ |
|
| Android | [FunMC.apk](https://fc.funmc.cn/download) | Android 7.0+ |
|
||||||
| iOS | App Store (即将上线) | iOS 13.0+ |
|
| iOS | App Store (即将上线) | iOS 13.0+ |
|
||||||
|
|
||||||
**私有部署用户**: 请访问你的服务器管理面板下载页面获取客户端
|
**私有部署用户**: 请访问你的服务器管理面板下载页面获取客户端
|
||||||
@@ -120,13 +120,13 @@
|
|||||||
|
|
||||||
**Linux/macOS:**
|
**Linux/macOS:**
|
||||||
```bash
|
```bash
|
||||||
curl -fsSL https://raw.githubusercontent.com/mofangfang/funmc/main/deploy.sh | bash
|
curl -fsSL https://gt.funmc.cn/xiaobai/FunConnect/raw/main/deploy.sh | bash
|
||||||
```
|
```
|
||||||
|
|
||||||
**或者使用 Docker Compose:**
|
**或者使用 Docker Compose:**
|
||||||
```bash
|
```bash
|
||||||
# 克隆仓库
|
# 克隆仓库
|
||||||
git clone https://github.com/mofangfang/funmc.git
|
git clone https://gt.funmc.cn/xiaobai/FunConnect.git
|
||||||
cd funmc
|
cd funmc
|
||||||
|
|
||||||
# 配置环境变量
|
# 配置环境变量
|
||||||
@@ -233,7 +233,7 @@ sudo systemctl status funmc-server funmc-relay
|
|||||||
```nginx
|
```nginx
|
||||||
server {
|
server {
|
||||||
listen 443 ssl http2;
|
listen 443 ssl http2;
|
||||||
server_name funmc.com;
|
server_name fc.funmc.cn;
|
||||||
|
|
||||||
ssl_certificate /path/to/cert.pem;
|
ssl_certificate /path/to/cert.pem;
|
||||||
ssl_certificate_key /path/to/key.pem;
|
ssl_certificate_key /path/to/key.pem;
|
||||||
@@ -314,7 +314,7 @@ funmc/
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 1. 克隆仓库
|
# 1. 克隆仓库
|
||||||
git clone https://github.com/mofangfang/funmc.git
|
git clone https://gt.funmc.cn/xiaobai/FunConnect.git
|
||||||
cd funmc
|
cd funmc
|
||||||
|
|
||||||
# 2. 启动数据库 (Docker)
|
# 2. 启动数据库 (Docker)
|
||||||
@@ -399,7 +399,7 @@ cargo tauri build --target x86_64-unknown-linux-gnu
|
|||||||
|
|
||||||
### WebSocket 信令
|
### WebSocket 信令
|
||||||
|
|
||||||
连接地址: `wss://funmc.com/api/v1/ws?token=<jwt>`
|
连接地址: `wss://fc.funmc.cn/api/v1/ws?token=<jwt>`
|
||||||
|
|
||||||
消息类型:
|
消息类型:
|
||||||
- `offer` / `answer` / `ice_candidate` - P2P 连接协商
|
- `offer` / `answer` / `ice_candidate` - P2P 连接协商
|
||||||
@@ -412,9 +412,9 @@ cargo tauri build --target x86_64-unknown-linux-gnu
|
|||||||
|
|
||||||
| 服务 | 地址 | 端口 |
|
| 服务 | 地址 | 端口 |
|
||||||
|------|------|------|
|
|------|------|------|
|
||||||
| API 服务器 | https://funmc.com | 443 |
|
| API 服务器 | https://fc.funmc.cn | 443 |
|
||||||
| 中继节点 - 主线路 | funmc.com | 7900 (UDP/QUIC) |
|
| 中继节点 - 主线路 | fc.funmc.cn | 7900 (UDP/QUIC) |
|
||||||
| 中继节点 - 备用线路 | funmc.com | 7901 (UDP/QUIC) |
|
| 中继节点 - 备用线路 | fc.funmc.cn | 7901 (UDP/QUIC) |
|
||||||
|
|
||||||
## 🔧 故障排除
|
## 🔧 故障排除
|
||||||
|
|
||||||
@@ -464,6 +464,6 @@ cargo tauri build --target x86_64-unknown-linux-gnu
|
|||||||
|
|
||||||
**魔幻方开发** ⭐
|
**魔幻方开发** ⭐
|
||||||
|
|
||||||
[官网](https://funmc.com) • [文档](https://docs.funmc.com) • [反馈](https://github.com/mofangfang/funmc/issues)
|
[官网](https://fc.funmc.cn) • [文档](https://fc.funmc.cn/docs) • [反馈](https://gt.funmc.cn/xiaobai/FunConnect/issues)
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS user_session (
|
|||||||
avatar_seed TEXT NOT NULL,
|
avatar_seed TEXT NOT NULL,
|
||||||
access_token TEXT NOT NULL,
|
access_token TEXT NOT NULL,
|
||||||
refresh_token TEXT NOT NULL,
|
refresh_token TEXT NOT NULL,
|
||||||
server_url TEXT NOT NULL DEFAULT 'https://funmc.com',
|
server_url TEXT NOT NULL DEFAULT 'https://fc.funmc.cn',
|
||||||
created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
|
created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ pub const APP_NAME: &str = "FunMC";
|
|||||||
pub const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
|
pub const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||||
pub const APP_AUTHOR: &str = "魔幻方";
|
pub const APP_AUTHOR: &str = "魔幻方";
|
||||||
|
|
||||||
pub const DEFAULT_API_SERVER: &str = "https://funmc.com";
|
pub const DEFAULT_API_SERVER: &str = "https://fc.funmc.cn";
|
||||||
pub const DEFAULT_RELAY_HOST: &str = "funmc.com";
|
pub const DEFAULT_RELAY_HOST: &str = "fc.funmc.cn";
|
||||||
pub const DEFAULT_RELAY_PORT: u16 = 7900;
|
pub const DEFAULT_RELAY_PORT: u16 = 7900;
|
||||||
pub const BACKUP_RELAY_PORT: u16 = 7901;
|
pub const BACKUP_RELAY_PORT: u16 = 7901;
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ export default function ServerSetupPage() {
|
|||||||
type="text"
|
type="text"
|
||||||
value={serverUrl}
|
value={serverUrl}
|
||||||
onChange={(e) => setServerUrl(e.target.value)}
|
onChange={(e) => setServerUrl(e.target.value)}
|
||||||
placeholder="例如: funmc.com:3000 或 192.168.1.100:3000"
|
placeholder="例如: fc.funmc.cn:3000 或 192.168.1.100:3000"
|
||||||
className="w-full px-4 py-3 bg-gray-700/50 border border-gray-600 rounded-xl text-white placeholder-gray-500 focus:outline-none focus:border-green-500 transition-colors"
|
className="w-full px-4 py-3 bg-gray-700/50 border border-gray-600 rounded-xl text-white placeholder-gray-500 focus:outline-none focus:border-green-500 transition-colors"
|
||||||
onKeyDown={(e) => e.key === 'Enter' && handleManualConnect()}
|
onKeyDown={(e) => e.key === 'Enter' && handleManualConnect()}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -272,7 +272,7 @@ export default function SettingsPage() {
|
|||||||
</div>
|
</div>
|
||||||
<div className="flex justify-between">
|
<div className="flex justify-between">
|
||||||
<span className="text-text-muted">官网</span>
|
<span className="text-text-muted">官网</span>
|
||||||
<a href="https://funmc.com" target="_blank" rel="noopener" className="text-accent-green hover:underline">funmc.com</a>
|
<a href="https://fc.funmc.cn" target="_blank" rel="noopener" className="text-accent-green hover:underline">fc.funmc.cn</a>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex justify-between">
|
<div className="flex justify-between">
|
||||||
<span className="text-text-muted">框架</span>
|
<span className="text-text-muted">框架</span>
|
||||||
|
|||||||
10
deploy.sh
10
deploy.sh
@@ -3,7 +3,7 @@
|
|||||||
# FunMC 一键 Docker 部署脚本
|
# FunMC 一键 Docker 部署脚本
|
||||||
#
|
#
|
||||||
# 用法:
|
# 用法:
|
||||||
# curl -fsSL https://raw.githubusercontent.com/mofangfang/funmc/main/deploy.sh | bash
|
# curl -fsSL https://gt.funmc.cn/xiaobai/FunConnect/raw/main/deploy.sh | bash
|
||||||
# 或
|
# 或
|
||||||
# ./deploy.sh
|
# ./deploy.sh
|
||||||
#
|
#
|
||||||
@@ -47,10 +47,10 @@ cd "$INSTALL_DIR"
|
|||||||
# 下载文件 (如果不存在)
|
# 下载文件 (如果不存在)
|
||||||
if [ ! -f "docker-compose.yml" ]; then
|
if [ ! -f "docker-compose.yml" ]; then
|
||||||
echo -e "${YELLOW}下载配置文件...${NC}"
|
echo -e "${YELLOW}下载配置文件...${NC}"
|
||||||
curl -fsSL https://raw.githubusercontent.com/mofangfang/funmc/main/docker-compose.yml -o docker-compose.yml
|
curl -fsSL https://gt.funmc.cn/xiaobai/FunConnect/raw/main/docker-compose.yml -o docker-compose.yml
|
||||||
curl -fsSL https://raw.githubusercontent.com/mofangfang/funmc/main/Dockerfile.server -o Dockerfile.server
|
curl -fsSL https://gt.funmc.cn/xiaobai/FunConnect/raw/main/Dockerfile.server -o Dockerfile.server
|
||||||
curl -fsSL https://raw.githubusercontent.com/mofangfang/funmc/main/Dockerfile.relay -o Dockerfile.relay
|
curl -fsSL https://gt.funmc.cn/xiaobai/FunConnect/raw/main/Dockerfile.relay -o Dockerfile.relay
|
||||||
curl -fsSL https://raw.githubusercontent.com/mofangfang/funmc/main/.env.example -o .env.example
|
curl -fsSL https://gt.funmc.cn/xiaobai/FunConnect/raw/main/.env.example -o .env.example
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 生成配置
|
# 生成配置
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=FunMC Relay Server - QUIC Relay for Minecraft Traffic
|
Description=FunMC Relay Server - QUIC Relay for Minecraft Traffic
|
||||||
Documentation=https://github.com/mofangfang/funmc
|
Documentation=https://gt.funmc.cn/xiaobai/FunConnect
|
||||||
After=network.target
|
After=network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=FunMC Main Server - Minecraft Multiplayer Assistant API
|
Description=FunMC Main Server - Minecraft Multiplayer Assistant API
|
||||||
Documentation=https://github.com/mofangfang/funmc
|
Documentation=https://gt.funmc.cn/xiaobai/FunConnect
|
||||||
After=network.target postgresql.service
|
After=network.target postgresql.service
|
||||||
Requires=postgresql.service
|
Requires=postgresql.service
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ http {
|
|||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name funmc.com www.funmc.com;
|
server_name fc.funmc.cn www.fc.funmc.cn;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
return 301 https://$server_name$request_uri;
|
return 301 https://$server_name$request_uri;
|
||||||
@@ -18,7 +18,7 @@ http {
|
|||||||
|
|
||||||
server {
|
server {
|
||||||
listen 443 ssl http2;
|
listen 443 ssl http2;
|
||||||
server_name funmc.com www.funmc.com;
|
server_name fc.funmc.cn www.fc.funmc.cn;
|
||||||
|
|
||||||
ssl_certificate /etc/nginx/ssl/fullchain.pem;
|
ssl_certificate /etc/nginx/ssl/fullchain.pem;
|
||||||
ssl_certificate_key /etc/nginx/ssl/privkey.pem;
|
ssl_certificate_key /etc/nginx/ssl/privkey.pem;
|
||||||
|
|||||||
@@ -53,13 +53,13 @@ sudo apt install docker-compose-plugin
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 克隆仓库
|
# 克隆仓库
|
||||||
git clone https://github.com/mofangfang/funmc.git
|
git clone https://gt.funmc.cn/xiaobai/FunConnect.git
|
||||||
cd funmc
|
cd FunConnect
|
||||||
|
|
||||||
# 或者只下载 Docker 配置
|
# 或者只下载 Docker 配置
|
||||||
mkdir funmc && cd funmc
|
mkdir funmc && cd funmc
|
||||||
curl -O https://raw.githubusercontent.com/mofangfang/funmc/main/docker/docker-compose.yml
|
curl -O https://gt.funmc.cn/xiaobai/FunConnect/raw/main/docker-compose.yml
|
||||||
curl -O https://raw.githubusercontent.com/mofangfang/funmc/main/.env.example
|
curl -O https://gt.funmc.cn/xiaobai/FunConnect/raw/main/.env.example
|
||||||
```
|
```
|
||||||
|
|
||||||
### 3. 配置环境变量
|
### 3. 配置环境变量
|
||||||
@@ -198,8 +198,8 @@ sudo systemctl restart postgresql
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 克隆仓库
|
# 克隆仓库
|
||||||
git clone https://github.com/mofangfang/funmc.git
|
git clone https://gt.funmc.cn/xiaobai/FunConnect.git
|
||||||
cd funmc
|
cd FunConnect
|
||||||
|
|
||||||
# 编译主服务器
|
# 编译主服务器
|
||||||
cargo build --release -p funmc-server
|
cargo build --release -p funmc-server
|
||||||
@@ -565,9 +565,9 @@ Error: connection timed out
|
|||||||
|
|
||||||
如有问题,请通过以下方式获取帮助:
|
如有问题,请通过以下方式获取帮助:
|
||||||
|
|
||||||
- GitHub Issues: https://github.com/mofangfang/funmc/issues
|
- 项目 Issues: https://gt.funmc.cn/xiaobai/FunConnect/issues
|
||||||
- 官方文档: https://docs.funmc.com
|
- 官方文档: https://fc.funmc.cn/docs
|
||||||
- 邮箱: support@funmc.com
|
- 邮箱: support@fc.funmc.cn
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -27,8 +27,8 @@
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 1. 克隆项目
|
# 1. 克隆项目
|
||||||
git clone https://github.com/mofangfang/funmc.git
|
git clone https://gt.funmc.cn/xiaobai/FunConnect.git
|
||||||
cd funmc
|
cd FunConnect
|
||||||
|
|
||||||
# 2. 启动数据库
|
# 2. 启动数据库
|
||||||
docker run -d --name funmc-db \
|
docker run -d --name funmc-db \
|
||||||
@@ -301,8 +301,8 @@ ____________________________________________
|
|||||||
|
|
||||||
如测试中遇到问题,请通过以下方式反馈:
|
如测试中遇到问题,请通过以下方式反馈:
|
||||||
|
|
||||||
- GitHub Issues: https://github.com/mofangfang/funmc/issues
|
- 项目 Issues: https://gt.funmc.cn/xiaobai/FunConnect/issues
|
||||||
- 邮箱: support@funmc.com
|
- 邮箱: support@fc.funmc.cn
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 在云服务器上一键部署
|
# 在云服务器上一键部署
|
||||||
curl -fsSL https://raw.githubusercontent.com/mofangfang/funmc/main/deploy.sh | bash
|
curl -fsSL https://gt.funmc.cn/xiaobai/FunConnect/raw/main/deploy.sh | bash
|
||||||
```
|
```
|
||||||
|
|
||||||
优点:
|
优点:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# FunMC 一键部署脚本 (Windows)
|
# FunMC 一键部署脚本 (Windows)
|
||||||
# 用法: irm funmc.com/install.ps1 | iex
|
# 用法: irm fc.funmc.cn/install.ps1 | iex
|
||||||
#
|
#
|
||||||
|
|
||||||
$ErrorActionPreference = "Stop"
|
$ErrorActionPreference = "Stop"
|
||||||
@@ -145,7 +145,7 @@ function Build-FunMC {
|
|||||||
Set-Location $srcDir
|
Set-Location $srcDir
|
||||||
git pull
|
git pull
|
||||||
} else {
|
} else {
|
||||||
git clone https://github.com/mofangfang/funmc.git $srcDir
|
git clone https://gt.funmc.cn/xiaobai/FunConnect.git $srcDir
|
||||||
Set-Location $srcDir
|
Set-Location $srcDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# FunMC 一键部署脚本
|
# FunMC 一键部署脚本
|
||||||
# 用法: curl -fsSL https://funmc.com/install.sh | bash
|
# 用法: curl -fsSL https://fc.funmc.cn/install.sh | bash
|
||||||
#
|
#
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
@@ -138,7 +138,7 @@ build_funmc() {
|
|||||||
cd $INSTALL_DIR/src
|
cd $INSTALL_DIR/src
|
||||||
git pull
|
git pull
|
||||||
else
|
else
|
||||||
git clone https://github.com/mofangfang/funmc.git $INSTALL_DIR/src
|
git clone https://gt.funmc.cn/xiaobai/FunConnect.git $INSTALL_DIR/src
|
||||||
cd $INSTALL_DIR/src
|
cd $INSTALL_DIR/src
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ name = "funmc-relay-server"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "FunMC 中继服务端 - 为 Minecraft 玩家提供网络中继服务"
|
description = "FunMC 中继服务端 - 为 Minecraft 玩家提供网络中继服务"
|
||||||
authors = ["魔幻方 <dev@funmc.com>"]
|
authors = ["魔幻方 <dev@fc.funmc.cn>"]
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "relay-server"
|
name = "relay-server"
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ async fn run_ping_responder(addr: SocketAddr) -> Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn build_server_config() -> Result<ServerConfig> {
|
fn build_server_config() -> Result<ServerConfig> {
|
||||||
let CertifiedKey { cert, key_pair } = generate_simple_self_signed(vec!["funmc.com".into()])
|
let CertifiedKey { cert, key_pair } = generate_simple_self_signed(vec!["fc.funmc.cn".into()])
|
||||||
.context("生成自签名证书失败")?;
|
.context("生成自签名证书失败")?;
|
||||||
|
|
||||||
let cert_der = CertificateDer::from(cert.der().to_vec());
|
let cert_der = CertificateDer::from(cert.der().to_vec());
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
# 用法: .\scripts\build-client.ps1 -Platform <平台> -ServerUrl <服务器URL>
|
# 用法: .\scripts\build-client.ps1 -Platform <平台> -ServerUrl <服务器URL>
|
||||||
#
|
#
|
||||||
# 示例:
|
# 示例:
|
||||||
# .\scripts\build-client.ps1 -Platform all -ServerUrl "http://funmc.com:3000"
|
# .\scripts\build-client.ps1 -Platform all -ServerUrl "http://fc.funmc.cn:3000"
|
||||||
# .\scripts\build-client.ps1 -Platform windows -ServerUrl "http://192.168.1.100:3000"
|
# .\scripts\build-client.ps1 -Platform windows -ServerUrl "http://192.168.1.100:3000"
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
# 用法: ./scripts/build-client.sh [平台] [服务器URL]
|
# 用法: ./scripts/build-client.sh [平台] [服务器URL]
|
||||||
#
|
#
|
||||||
# 示例:
|
# 示例:
|
||||||
# ./scripts/build-client.sh all http://funmc.com:3000
|
# ./scripts/build-client.sh all http://fc.funmc.cn:3000
|
||||||
# ./scripts/build-client.sh windows http://192.168.1.100:3000
|
# ./scripts/build-client.sh windows http://192.168.1.100:3000
|
||||||
# ./scripts/build-client.sh macos-arm64 https://mc.example.com
|
# ./scripts/build-client.sh macos-arm64 https://mc.example.com
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -13,5 +13,5 @@ CREATE TABLE relay_nodes (
|
|||||||
|
|
||||||
-- Seed with official relay nodes
|
-- Seed with official relay nodes
|
||||||
INSERT INTO relay_nodes (name, url, region, priority) VALUES
|
INSERT INTO relay_nodes (name, url, region, priority) VALUES
|
||||||
('官方节点 - 主线路', 'funmc.com:7900', 'auto', 100),
|
('官方节点 - 主线路', 'fc.funmc.cn:7900', 'auto', 100),
|
||||||
('官方节点 - 备用线路', 'funmc.com:7901', 'auto', 50);
|
('官方节点 - 备用线路', 'fc.funmc.cn:7901', 'auto', 50);
|
||||||
|
|||||||
Reference in New Issue
Block a user