Compare commits
18
Commits
31d6d7b3b9
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6185caa48 | ||
|
|
8efbddd44f | ||
|
|
1c3bc5681c | ||
|
|
40f748b5c5 | ||
|
|
08f42cf1ce | ||
|
|
580e875be5 | ||
|
|
b0c3ae4209 | ||
|
|
8513120d6e | ||
|
|
1fe5b8d0b5 | ||
|
|
9222e79760 | ||
|
|
b0e2d91376 | ||
|
|
c1c86bfa4b | ||
|
|
9a788dadfb | ||
|
|
0e09d307e3 | ||
|
|
b2d59873bb | ||
|
|
81c90ed060 | ||
|
|
bb794b7d81 | ||
|
|
3604cff181 |
No files matched your search
+10
-10
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
> **2026-11-20 域名迁移完成**:官网从 `md.wangjinding.com` 迁到 `xymd.wangjinding.com`。
|
> **2026-11-20 域名迁移完成**:官网从 `md.wangjinding.com` 迁到 `xymd.wangjinding.com`。
|
||||||
> 旧域名已**彻底下线** —— EdgeOne 加速域名、1Panel 站点、WAF 条目、DNS 记录、acme 证书全部删除。
|
> 旧域名已**彻底下线** —— EdgeOne 加速域名、1Panel 站点、WAF 条目、DNS 记录、acme 证书全部删除。
|
||||||
> 站点根目录现在是真的独立目录(`/opt/1panel/www/sites/xymd.wangjinding.com/index`),
|
> 站点根目录现在是真的独立目录(`/opt/1panel/www/sites/<域名>/index`),
|
||||||
> 不再是软链,删旧站不会影响新站。
|
> 不再是软链,删旧站不会影响新站。
|
||||||
|
|
||||||
|
|
||||||
@@ -12,21 +12,21 @@
|
|||||||
访客 ──https://xymd.wangjinding.com:443──► EdgeOne 边缘(免费 TrustAsia 证书)
|
访客 ──https://xymd.wangjinding.com:443──► EdgeOne 边缘(免费 TrustAsia 证书)
|
||||||
│ 回源 HTTPS 8443,Host=加速域名
|
│ 回源 HTTPS 8443,Host=加速域名
|
||||||
▼
|
▼
|
||||||
wangjinding.dynv6.net:8443 ──(光猫映射)──► .8 的 OpenResty
|
<回源域名>:8443 ──(光猫映射)──► .8 的 OpenResty
|
||||||
│ server_name 分流
|
│ server_name 分流
|
||||||
▼
|
▼
|
||||||
/opt/1panel/www/sites/xymd.wangjinding.com/index
|
/opt/1panel/www/sites/<域名>/index
|
||||||
```
|
```
|
||||||
|
|
||||||
## 各部分落在哪
|
## 各部分落在哪
|
||||||
|
|
||||||
| 环节 | 位置 / 参数 |
|
| 环节 | 位置 / 参数 |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| 站点根目录 | `/opt/1panel/www/sites/xymd.wangjinding.com/index` |
|
| 站点根目录 | `/opt/1panel/www/sites/<域名>/index` |
|
||||||
| nginx 配置 | `/opt/1panel/www/conf.d/xymd.wangjinding.com.conf`(8082 + 8443 ssl)|
|
| nginx 配置 | `/opt/1panel/www/conf.d/<域名>.conf`(8082 + 8443 ssl)|
|
||||||
| 源站证书 | `/opt/1panel/www/sites/xymd.wangjinding.com/ssl/`(acme.sh + 阿里云 DNS-01,自动续期)|
|
| 源站证书 | `/opt/1panel/www/sites/<域名>/ssl/`(acme.sh + 阿里云 DNS-01,自动续期)|
|
||||||
| 安装包 | `index/download/XiaoyinMarkdown-win32-x64.zip` |
|
| 安装包 | `index/download/XiaoyinMarkdown-win32-x64.zip` |
|
||||||
| EdgeOne | zone `zone-3w6r6pp5u2qa`,加速域名 `xymd.wangjinding.com`,回源 HTTPS/8443 |
|
| EdgeOne | zone `zone-xxxxxxxx`,加速域名 `xymd.wangjinding.com`,回源 HTTPS/8443 |
|
||||||
| WAF 白名单 | `1pwaf/data/conf/sites.json` + `1pwaf/data/sites/xymd.wangjinding.com/config.json` |
|
| WAF 白名单 | `1pwaf/data/conf/sites.json` + `1pwaf/data/sites/xymd.wangjinding.com/config.json` |
|
||||||
| DNS | 阿里云 `xymd` CNAME → `xymd.wangjinding.com.eo.dnse2.com`(TTL 600)|
|
| DNS | 阿里云 `xymd` CNAME → `xymd.wangjinding.com.eo.dnse2.com`(TTL 600)|
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ values (..., 'HTTPS', 'xymd.wangjinding.com', 'static', 'xymd.wangjinding.com',
|
|||||||
## 更新页面
|
## 更新页面
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cp site/index.html /opt/1panel/www/sites/xymd.wangjinding.com/index/
|
cp site/index.html /opt/1panel/www/sites/<域名>/index/
|
||||||
docker exec 1Panel-openresty-npAh nginx -s reload # 一般不需要,静态文件直接生效
|
docker exec 1Panel-openresty-npAh nginx -s reload # 一般不需要,静态文件直接生效
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -74,9 +74,9 @@ npx tauri build --target x86_64-pc-windows-gnu --bundles nsis
|
|||||||
# 2) 发布
|
# 2) 发布
|
||||||
R=src-tauri/target/x86_64-pc-windows-gnu/release
|
R=src-tauri/target/x86_64-pc-windows-gnu/release
|
||||||
cp $R/bundle/nsis/XiaoyinMarkdown_2.6.1_x64-setup.exe \
|
cp $R/bundle/nsis/XiaoyinMarkdown_2.6.1_x64-setup.exe \
|
||||||
/opt/1panel/www/sites/xymd.wangjinding.com/index/download/
|
/opt/1panel/www/sites/<域名>/index/download/
|
||||||
cp $R/xiaoyin-markdown.exe \
|
cp $R/xiaoyin-markdown.exe \
|
||||||
/opt/1panel/www/sites/xymd.wangjinding.com/index/download/XiaoyinMarkdown-portable.exe
|
/opt/1panel/www/sites/<域名>/index/download/XiaoyinMarkdown-portable.exe
|
||||||
```
|
```
|
||||||
|
|
||||||
旧版 Electron 构建(`XiaoyinMarkdown-win32-x64.zip`)仍保留在 `download/` 里。
|
旧版 Electron 构建(`XiaoyinMarkdown-win32-x64.zip`)仍保留在 `download/` 里。
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
ROOT = Path(__file__).resolve().parents[2]
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
SITE = ROOT / "site"
|
SITE = ROOT / "site"
|
||||||
SITE_ROOT = Path("/opt/1panel/www/sites/xymd.wangjinding.com/index")
|
SITE_ROOT = Path("/opt/1panel/www/sites/<域名>/index")
|
||||||
SITE_DOWNLOAD = SITE_ROOT / "download"
|
SITE_DOWNLOAD = SITE_ROOT / "download"
|
||||||
SITE_UPDATE = SITE_ROOT / "update"
|
SITE_UPDATE = SITE_ROOT / "update"
|
||||||
BASE_URL = "https://xymd.wangjinding.com"
|
BASE_URL = "https://xymd.wangjinding.com"
|
||||||
|
|||||||
Reference in new issue
Block a user