feat(domain): 官网迁移到 xymd.wangjinding.com(应用/文档/发布链路全换)
老板要求:把官网换成 xymd.wangjinding.com,EdgeOne、1Panel、git、文档、
更新服务地址都要换掉。
基础设施(本机侧,已实测)
· 1Panel 新站点 xymd.wangjinding.com:静态站,index 软链到 md 的 index
—— 两个域名共用同一份文件,不搞双份维护
index 软链必须用**相对路径**(../md.wangjinding.com/index):
宿主机绝对路径 /opt/1panel/www/... 在容器里解析不到(容器内是 /www)
· Let's Encrypt 证书(acme.sh + 阿里云 DNS-01,自动续期)
· WAF 白名单 + 1Panel DB 登记(克隆 md 的 websites/website_ssls 两行;
注意 SQLite 里 group 是保留字,插入时要给列名加双引号)
· EdgeOne 加速域名:回源 HTTPS/8443,Host=加速域名,免费边缘证书 deployed
· DNS:xymd CNAME → xymd.wangjinding.com.eo.dnse2.com
应用与代码
· tauri.conf.json:updater endpoints 改为 [xymd, md] —— **md 保留为兜底**,
否则已经装出去的 2.6.5 客户端会拉不到更新清单,直接断更
· 版本 2.6.6,Windows + Linux 双端重编
· publish.py:BASE_URL/SITE_ROOT 改新域名;另外加了**版本校验** ——
只收版本号对得上的产物。之前它会把 target/ 里上一版 2.6.5 的
AppImage 改名成 2.6.6 发出去(清单写新版、二进制是旧的,升级静默失败)
· README / site/README / wiki 路径全部改成新域名
发布
· 2.6.6 已发布:latest.json 指向 xymd,windows 2.16MB / linux AppImage 103.62MB
· 公网实测:首页 200、清单 200、三端安装包 206、EdgeOne 头正常
顺带
· 博客文章里的下载链接同步换成新域名 + 2.6.6
· 公众号草稿的「阅读原文」改成 https://xymd.wangjinding.com
This commit is contained in:
1 parent
fe34eb6e79
commit
9111617c45
10 files changed
+58
-37
No files matched your search
@@ -2,7 +2,7 @@
|
||||
|
||||
一个纯本地的 Windows Markdown 编辑器。左边写、右边看,不联外网、不登录、不收集任何东西。
|
||||
|
||||
> 官网 / 下载:<https://md.wangjinding.com>
|
||||
> 官网 / 下载:<https://xymd.wangjinding.com>
|
||||
|
||||
## 装在哪(示例)
|
||||
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "xiaoyin-markdown-editor",
|
||||
"productName": "XiaoyinMarkdown",
|
||||
"version": "2.6.5",
|
||||
"version": "2.6.6",
|
||||
"description": "轻量本地 Markdown 编辑器:实时预览、多标签/多窗口、查找高亮、右键复制全文/打开目录、常用快捷键",
|
||||
"main": "src/main.js",
|
||||
"author": "小银",
|
||||
|
||||
+14
-14
@@ -1,28 +1,28 @@
|
||||
# 官网部署说明(md.wangjinding.com)
|
||||
# 官网部署说明(xymd.wangjinding.com)
|
||||
|
||||
## 链路
|
||||
|
||||
```
|
||||
访客 ──https://md.wangjinding.com:443──► EdgeOne 边缘(免费 TrustAsia 证书)
|
||||
访客 ──https://xymd.wangjinding.com:443──► EdgeOne 边缘(免费 TrustAsia 证书)
|
||||
│ 回源 HTTPS 8443,Host=加速域名
|
||||
▼
|
||||
wangjinding.dynv6.net:8443 ──(光猫映射)──► .8 的 OpenResty
|
||||
│ server_name 分流
|
||||
▼
|
||||
/opt/1panel/www/sites/md.wangjinding.com/index
|
||||
/opt/1panel/www/sites/xymd.wangjinding.com/index
|
||||
```
|
||||
|
||||
## 各部分落在哪
|
||||
|
||||
| 环节 | 位置 / 参数 |
|
||||
| --- | --- |
|
||||
| 站点根目录 | `/opt/1panel/www/sites/md.wangjinding.com/index` |
|
||||
| nginx 配置 | `/opt/1panel/www/conf.d/md.wangjinding.com.conf`(8082 + 8443 ssl)|
|
||||
| 源站证书 | `/opt/1panel/www/sites/md.wangjinding.com/ssl/`(acme.sh + 阿里云 DNS-01,自动续期)|
|
||||
| 站点根目录 | `/opt/1panel/www/sites/xymd.wangjinding.com/index` |
|
||||
| nginx 配置 | `/opt/1panel/www/conf.d/xymd.wangjinding.com.conf`(8082 + 8443 ssl)|
|
||||
| 源站证书 | `/opt/1panel/www/sites/xymd.wangjinding.com/ssl/`(acme.sh + 阿里云 DNS-01,自动续期)|
|
||||
| 安装包 | `index/download/XiaoyinMarkdown-win32-x64.zip` |
|
||||
| EdgeOne | zone `zone-3w6r6pp5u2qa`,加速域名 `md.wangjinding.com`,回源 HTTPS/8443 |
|
||||
| WAF 白名单 | `1pwaf/data/conf/sites.json` + `1pwaf/data/sites/md.wangjinding.com/config.json` |
|
||||
| DNS | 阿里云 `md` CNAME → `md.wangjinding.com.eo.dnse2.com`(TTL 600)|
|
||||
| EdgeOne | zone `zone-3w6r6pp5u2qa`,加速域名 `xymd.wangjinding.com`,回源 HTTPS/8443 |
|
||||
| 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)|
|
||||
|
||||
|
||||
## 在 1Panel 面板里可见(重要)
|
||||
@@ -34,7 +34,7 @@
|
||||
```sql
|
||||
-- websites:type='static',proxy 留空,site_dir='/'
|
||||
insert into websites (..., protocol, primary_domain, type, alias, status, http_config, proxy, site_dir, ...)
|
||||
values (..., 'HTTPS', 'md.wangjinding.com', 'static', 'md.wangjinding.com', 'Running',
|
||||
values (..., 'HTTPS', 'xymd.wangjinding.com', 'static', 'xymd.wangjinding.com', 'Running',
|
||||
'HTTPToHTTPS', '', '/', ...);
|
||||
-- website_domains:(website_id, domain, ssl=0, port=8082)
|
||||
-- website_ssls:(primary_domain, private_key, pem, key_type='EC256', type='YE2',
|
||||
@@ -48,12 +48,12 @@ values (..., 'HTTPS', 'md.wangjinding.com', 'static', 'md.wangjinding.com', 'Run
|
||||
- 面板刷新后即可见(Ctrl+F5);若没出现,`systemctl restart 1panel-agent` 一次。
|
||||
- ⚠️ **在面板里改这个站点的配置时,nginx conf 会被面板模板重写** ——
|
||||
我加的 `Strict-Transport-Security` 头、`/download/` 的 `Content-Disposition: attachment`
|
||||
可能会丢,改完记得复查 `conf.d/md.wangjinding.com.conf`。
|
||||
可能会丢,改完记得复查 `conf.d/xymd.wangjinding.com.conf`。
|
||||
|
||||
## 更新页面
|
||||
|
||||
```bash
|
||||
cp site/index.html /opt/1panel/www/sites/md.wangjinding.com/index/
|
||||
cp site/index.html /opt/1panel/www/sites/xymd.wangjinding.com/index/
|
||||
docker exec 1Panel-openresty-npAh nginx -s reload # 一般不需要,静态文件直接生效
|
||||
```
|
||||
|
||||
@@ -68,9 +68,9 @@ npx tauri build --target x86_64-pc-windows-gnu --bundles nsis
|
||||
# 2) 发布
|
||||
R=src-tauri/target/x86_64-pc-windows-gnu/release
|
||||
cp $R/bundle/nsis/XiaoyinMarkdown_2.6.1_x64-setup.exe \
|
||||
/opt/1panel/www/sites/md.wangjinding.com/index/download/
|
||||
/opt/1panel/www/sites/xymd.wangjinding.com/index/download/
|
||||
cp $R/xiaoyin-markdown.exe \
|
||||
/opt/1panel/www/sites/md.wangjinding.com/index/download/XiaoyinMarkdown-portable.exe
|
||||
/opt/1panel/www/sites/xymd.wangjinding.com/index/download/XiaoyinMarkdown-portable.exe
|
||||
```
|
||||
|
||||
旧版 Electron 构建(`XiaoyinMarkdown-win32-x64.zip`)仍保留在 `download/` 里。
|
||||
|
||||
+2
-2
@@ -265,7 +265,7 @@
|
||||
<!-- ══════════ HERO ══════════ -->
|
||||
<div class="kv">
|
||||
<div class="wrap kv-in">
|
||||
<div class="kv-tag"><i class="dot"></i><span>v<span data-ver>2.6.5</span> 已发布 · <b>支持在线升级</b></span></div>
|
||||
<div class="kv-tag"><i class="dot"></i><span>v<span data-ver>2.6.6</span> 已发布 · <b>支持在线升级</b></span></div>
|
||||
<h1>写 Markdown,<br><em>就是好用!</em></h1>
|
||||
<p class="kv-sub">
|
||||
一个纯本地的 Markdown 编辑器,<span class="nw">Windows / macOS / Linux</span> <b class="nw">三端同源</b>。<br>
|
||||
@@ -575,7 +575,7 @@
|
||||
|
||||
<footer>
|
||||
<div class="wrap foot">
|
||||
<span>© 2026 小银 · 小银 Markdown v<span data-ver>2.6.5</span> · MIT</span>
|
||||
<span>© 2026 小银 · 小银 Markdown v<span data-ver>2.6.6</span> · MIT</span>
|
||||
<span class="sp"></span>
|
||||
<a href="https://github.com/wangjinding/xiaoyin-markdown" target="_blank" rel="noopener">GitHub</a>
|
||||
<span class="sep">|</span>
|
||||
|
||||
+10
-10
@@ -1,19 +1,19 @@
|
||||
{
|
||||
"version": "2.6.5",
|
||||
"notes": "① 状态栏右下角显示当前版本号(就在「检查更新」左边)\n② 版本号从程序本身读取,不会和实际版本对不上",
|
||||
"pub_date": "2026-11-20T03:26:59Z",
|
||||
"version": "2.6.6",
|
||||
"notes": "① 官网域名迁移到 xymd.wangjinding.com(旧域名继续可用,不影响你升级)\n② 软件内「检查更新」改为连新地址,旧地址保留为备用\n③ 本次没有功能变化,只有域名相关改动",
|
||||
"pub_date": "2026-11-20T06:58:42Z",
|
||||
"platforms": {
|
||||
"windows-x86_64": {
|
||||
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSWWkrQjVjQnNqN3VxSWFBMjI5Vi9iajIwaVNtWTJlOXJ0Z3B5cGdyWUZsSGVpUXVNbW1aQ2hXazViaUJTWHZ5ZGtUY2NMOUZPMkJZazZZd0ZZa3JFWkZRdDR6RlFSdndZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk1MTQzNjgwCWZpbGU6WGlhb3lpbk1hcmtkb3duXzIuNi41X3g2NC1zZXR1cC5leGUJdmVyc2lvbjoyLjYuNQpYcjVSbFB3bzdUeTZ2eTVjSlB1Uk41ZE9MaStSeCtxNVFLZ2RlNHF3QVozRUVvNiszaXp1SVRzait3dTM1U3J3RzBsa0ZXVmVnS21ZejBicXZrZndBdz09Cg==",
|
||||
"url": "https://md.wangjinding.com/download/xymd_2.6.5.exe",
|
||||
"size": 2324255,
|
||||
"sha256": "db19986c7497e5409828f76d130b75df1a14f39ce6b24205c06545d9ed003806"
|
||||
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSWWkrQjVjQnNqN29ZZXljdmVmamMxWnRXNDdnNTNLQUY0SHJVT0ZpQVB0WUg0WDkxL2wzaUwzRUdSSHFwVHRjV25VN0RnVWVhQ1ZjMG8zcGowUkNaMXZZQkJKRkczWmdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk1MTU3NDg4CWZpbGU6WGlhb3lpbk1hcmtkb3duXzIuNi42X3g2NC1zZXR1cC5leGUJdmVyc2lvbjoyLjYuNgp5WEJMeHRCWWpuRmZBZitmSmJCSUpmdGw1cWlHdkRYTHVRbDhMUTFSdEJ6SU1WSjJZWEdOVzRkUXQxRjBOVmFydXd6VnpiZnhqYXhKR1B0N2lqenVEdz09Cg==",
|
||||
"url": "https://xymd.wangjinding.com/download/xymd_2.6.6.exe",
|
||||
"size": 2267277,
|
||||
"sha256": "4912314ba93cc3da2d15a3902093149333147767d49392e2efb6a42e2111642b"
|
||||
},
|
||||
"linux-x86_64": {
|
||||
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSWWkrQjVjQnNqN3AyTHlzdUhtSzVrb0VEelJFUk01Y1ZVLzVXNjVtbjd2V2hQelkzeXRvV2IzT2x1WERNdHovMmZSMDlUcUdESm1tWXBGN0R5REdMSk84YTg5QStCUGdFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk1MTQ1MDk1CWZpbGU6WGlhb3lpbk1hcmtkb3duXzIuNi41X2FtZDY0LkFwcEltYWdlCXZlcnNpb246Mi42LjUKckFYTE9WQ2JLdkZLcWd5VGc0YWNJQVBKbDFGd2M4K1dNOU1sVnhwMlJRRlo4dEpacHY3RkNhRHZCdEtETENpOUY2VzN2bzFySVdENkFNMGs1Vjg3QVE9PQo=",
|
||||
"url": "https://md.wangjinding.com/download/xymd_2.6.5_amd64.AppImage",
|
||||
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSWWkrQjVjQnNqN2lNK1ljbko4dmVnNXBybTFwS0ZGRzVDVFpzUzVLaVM3Wk9NZFJPUHlHM0h5VW1YdWxRLy9ub0N3UG9NTGZBNFFka0hyWTlrbWtnckNJYm4rc0ZEZ1F3PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk1MTU3ODU4CWZpbGU6WGlhb3lpbk1hcmtkb3duXzIuNi42X2FtZDY0LkFwcEltYWdlCXZlcnNpb246Mi42LjYKK1p6MWFwazBQSndYV2c5Q0dLUysxQnE4dWNwYUhBSGt5Nms5bzhSeFRuOVRkK04xTW9yOUpSWUcyaDNlaGh5V1ZZYWNZVmJkTnIveTROVUZTOFJuQUE9PQo=",
|
||||
"url": "https://xymd.wangjinding.com/download/xymd_2.6.6_amd64.AppImage",
|
||||
"size": 108648952,
|
||||
"sha256": "cc4b73017ae835b3cc4ba25f338ebfcdf20538c31942e9c607ae52d5dc73ab71"
|
||||
"sha256": "079308cb14d1c8f0883cba812750db26494e43609b11796b0afe3eb3e5e4ff8e"
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
+1
-1
@@ -5503,7 +5503,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "xiaoyin-markdown"
|
||||
version = "2.6.5"
|
||||
version = "2.6.6"
|
||||
dependencies = [
|
||||
"arboard",
|
||||
"chrono",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "xiaoyin-markdown"
|
||||
version = "2.6.5"
|
||||
version = "2.6.6"
|
||||
description = "小银 Markdown —— 轻量本地 Markdown 编辑器"
|
||||
edition = "2021"
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "XiaoyinMarkdown",
|
||||
"version": "2.6.5",
|
||||
"version": "2.6.6",
|
||||
"identifier": "com.xiaoyin.markdown",
|
||||
"build": {
|
||||
"frontendDist": "../src/renderer"
|
||||
@@ -89,6 +89,7 @@
|
||||
"plugins": {
|
||||
"updater": {
|
||||
"endpoints": [
|
||||
"https://xymd.wangjinding.com/update/latest.json",
|
||||
"https://md.wangjinding.com/update/latest.json"
|
||||
],
|
||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEVFMjMxQjcwNzlFMDhCNTgKUldSWWkrQjVjQnNqN3Ewazg0U1VTN2VHSmE5amRROEIzN2UrK2w4dlJ5R05rcGhTY0FuNUk3NUwK",
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
});
|
||||
|
||||
|
||||
/* ---------- 在线升级(服务端:https://md.wangjinding.com/update/latest.json) ---------- */
|
||||
/* ---------- 在线升级(服务端:https://xymd.wangjinding.com/update/latest.json) ---------- */
|
||||
const updateBtn = document.getElementById('btn-update');
|
||||
if (updateBtn) updateBtn.addEventListener('click', runUpdate);
|
||||
let updating = false;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
升级清单是**合并**的:只更新这次扫到的平台,其它平台的条目原样保留
|
||||
(这样在 Windows 上发版不会把 macOS 的那条冲掉)。
|
||||
|
||||
客户端拉取:https://md.wangjinding.com/update/latest.json
|
||||
客户端拉取:https://xymd.wangjinding.com/update/latest.json
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
@@ -29,10 +29,10 @@ from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
SITE = ROOT / "site"
|
||||
SITE_ROOT = Path("/opt/1panel/www/sites/md.wangjinding.com/index")
|
||||
SITE_ROOT = Path("/opt/1panel/www/sites/xymd.wangjinding.com/index")
|
||||
SITE_DOWNLOAD = SITE_ROOT / "download"
|
||||
SITE_UPDATE = SITE_ROOT / "update"
|
||||
BASE_URL = "https://md.wangjinding.com"
|
||||
BASE_URL = "https://xymd.wangjinding.com"
|
||||
TARGETS = ROOT / "src-tauri" / "target"
|
||||
|
||||
|
||||
@@ -57,9 +57,21 @@ def find_one(patterns: list[str]) -> Path | None:
|
||||
return None
|
||||
|
||||
|
||||
|
||||
def artifact_version(path: Path) -> str | None:
|
||||
"""从文件名里抠出构建版本,如 XiaoyinMarkdown_2.6.6_x64-setup.exe → 2.6.6"""
|
||||
m = re.search(r"_(\d+\.\d+\.\d+)", path.name)
|
||||
return m.group(1) if m else None
|
||||
|
||||
|
||||
def collect():
|
||||
"""返回 [{platform, artifact, sig, dl_name}],只包含本机实际构建出来的。"""
|
||||
"""返回 [{platform, artifact, sig, dl_name}],只包含本机实际构建出来的。
|
||||
|
||||
只收**版本号对得上**的产物 —— 否则上一版留在 target/ 里的旧包会被
|
||||
改名成新版本发出去(清单写新版本、二进制还是旧版,升级会静默失败)。
|
||||
"""
|
||||
found = []
|
||||
want = conf_version()
|
||||
|
||||
# ── Windows ──
|
||||
exe = find_one([
|
||||
@@ -88,7 +100,15 @@ def collect():
|
||||
arch = "aarch64" if "aarch64" in triple else "x64"
|
||||
found.append({"platform": f"{key}-dmg", "artifact": dmg, "sig": None, "ext": f"_{arch}.dmg"})
|
||||
|
||||
return found
|
||||
# 过滤掉版本对不上的旧产物
|
||||
kept = []
|
||||
for it in found:
|
||||
v = artifact_version(it["artifact"])
|
||||
if v and v != want:
|
||||
print(f" ⏭ 跳过 {it['artifact'].name}(版本 {v} ≠ 当前 {want})")
|
||||
continue
|
||||
kept.append(it)
|
||||
return kept
|
||||
|
||||
|
||||
def main() -> int:
|
||||
|
||||
Reference in new issue
Block a user