diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 47fb0d7..c548b3d 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -8,16 +8,37 @@ "type": "tabs", "children": [ { - "id": "99b1c6e083344754", + "id": "1184ee15ec1fc896", "type": "leaf", "state": { - "type": "empty", - "state": {}, + "type": "markdown", + "state": { + "file": "personal/服务器-香港.md", + "mode": "source", + "source": false, + "backlinks": false + }, "icon": "lucide-file", - "title": "新标签页" + "title": "服务器-香港" + } + }, + { + "id": "c3b31f156a70117f", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "000-inbox/2026-03-29_16-52-52.md", + "mode": "source", + "source": false, + "backlinks": false + }, + "icon": "lucide-file", + "title": "2026-03-29_16-52-52" } } - ] + ], + "currentTab": 1 } ], "direction": "vertical" @@ -49,7 +70,7 @@ "state": { "type": "search", "state": { - "query": "container_name: rebuild-n8n", + "query": "file:香港", "matchingCase": false, "explainSearch": true, "collapseAll": false, @@ -91,12 +112,13 @@ "state": { "type": "outline", "state": { + "file": "000-inbox/2026-03-29_16-52-52.md", "followCursor": true, "showSearch": false, "searchQuery": "" }, "icon": "lucide-list", - "title": "大纲" + "title": "2026-03-29_16-52-52 的大纲" } }, { @@ -191,7 +213,7 @@ } ], "direction": "horizontal", - "width": 277.5 + "width": 281.5 }, "left-ribbon": { "hiddenItems": { @@ -205,23 +227,28 @@ "templater-obsidian:Templater": false } }, - "active": "99b1c6e083344754", + "active": "c3b31f156a70117f", "lastOpenFiles": [ + "000-inbox/2026-03-29_16-51-46.md", + "personal/服务器-香港.md", + "000-inbox/2026-03-30_20-38-38.md", + "resource/系统/ubuntu.md", + "resource/ai/大模型安装笔记/关于模型思考问题.md", + "000-inbox/n8n 安装.md", + "000-inbox/2026-03-29_16-55-23.md", + "000-inbox/2026-03-29_22-08-03.md", + "000-inbox/2026-03-29_16-52-52.md", "attachment/Pasted image 20260329165253.png", "000-inbox/2026-03-291.md", "000-inbox/2026-03-291111111111111111111.md", "000-inbox/2026-03-2911.md", "000-inbox/202603292037501.md", - "000-inbox/2026-03-29_16-51-13.md", "attachment/templates/time.md", "000-inbox/2026-03-29_19-37-09.md", "000-inbox/2026-03-29_17-01-36.md", "attachment/Pasted image 20260329170137.png", - "000-inbox/2026-03-29_16-55-23.md", - "000-inbox/2026-03-29_16-52-52.md", "attachment/Pasted image 20260329165321.png", "attachment/Pasted image 20260329165301.png", - "000-inbox/2026-03-29_16-51-46.md", "attachment/templates/日常记录-闪念笔记.md", "resource/go/待总结/010 Go 语言 IO 流.md", "attachment/images-paste/image-20230226203841579.png", @@ -233,10 +260,6 @@ "calendar/diary/2026-03-28.md", "calendar/diary/2026-03-27.md", "000-inbox/Untitled 2.md", - "000-inbox/Untitled 3.md", - "000-inbox/tg-bot.md", - "000-inbox/jinja.md", - "000-inbox/Docker 核心知识与实战笔记.md", "attachment/Pasted image 20260329133947.png", "attachment/jsscripts/openTerminal.js", "attachment/jsscripts/新建文本文档.txt", diff --git a/000-inbox/2026-03-29_16-51-46.md b/000-inbox/2026-03-29_16-51-46.md deleted file mode 100644 index 5165936..0000000 --- a/000-inbox/2026-03-29_16-51-46.md +++ /dev/null @@ -1,17 +0,0 @@ -``` -services: - sub-store: - image: xream/sub-store:http-meta - container_name: sub-store - restart: always - network_mode: host - environment: - SUB_STORE_BACKEND_API_HOST: 127.0.0.1 - SUB_STORE_BACKEND_API_PORT: 3001 - SUB_STORE_BACKEND_MERGE: true - SUB_STORE_FRONTEND_BACKEND_PATH: /PVM!xwm7hkz4hek2xjy - PORT: 9876 - HOST: 127.0.0.1 - volumes: - - /opt/docker/data/sub-store:/opt/app/data -``` diff --git a/000-inbox/2026-03-29_16-55-23.md b/000-inbox/2026-03-29_16-55-23.md deleted file mode 100644 index ba66baa..0000000 --- a/000-inbox/2026-03-29_16-55-23.md +++ /dev/null @@ -1,7 +0,0 @@ -docker7530 - -``` -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBfW4LWZ/HxIHdQcT+bnUUa5Tqbbag5otkv+y6OkDa9I -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP87fXzm4HSwkS3XaJHGTsEeiu4o9lLlu+ZEwHGuSbzS github-actions - -``` diff --git a/000-inbox/2026-03-29_16-51-13.md b/000-inbox/n8n 安装.md similarity index 100% rename from 000-inbox/2026-03-29_16-51-13.md rename to 000-inbox/n8n 安装.md diff --git a/personal/服务器-香港.md b/personal/服务器-香港.md index b6adfd9..b23b298 100644 --- a/personal/服务器-香港.md +++ b/personal/服务器-香港.md @@ -4,6 +4,8 @@ # 1Panel【域名】 +## （1）安装面板 + [1Panel 服务器运维管理面板](https://1panel.cn/) ``` @@ -13,106 +15,44 @@ 面板密码: 6cd500f202 ``` -Cloudflare DNS 账户 +## （2）申请面板证书 + +DNS 账户 Cloudflare ``` MPLkv5dlbyKh_q0DdvH5ECxaUHVr5BVg0Ogf5AOH ``` +为 1panel.excalicode.org 申请证书 + +## （3）面板设置 + +1. 面板设置 - 安全 里关掉安全入口，对绑定域名后用域名访问面板友好 +2. 面板设置 - 安全 里 开启面板 SSL +3. 在系统 - SSH 管理修改链接端口、关闭密码认证、开启密钥认证、授权密钥 +4. 配置终端，方便后续操作 + +``` +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBfW4LWZ/HxIHdQcT+bnUUa5Tqbbag5otkv+y6OkDa9I +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP87fXzm4HSwkS3XaJHGTsEeiu4o9lLlu+ZEwHGuSbzS github-actions +``` + +## （4）CF 设置 + 1. cloudflare DNS 添加记录 -2. 在 面板设置 - 安全 里关掉安全入口，对绑定域名后用域名访问面板友好 -3. 为 1panel.excalicode.org 申请证书 -4. 在 Cloudflare 中先设定好 Origin Rules 以准备将面板域名请求自动重写到 1Panel 端口，目标端口： 选择 重写到 面板端口号 -5. 在 1Panel 设置 SSL、绑定域名 -6. 在面板中设置 ssh 管理，增加安全性 +2. 在 Cloudflare 中先设定好 Origin Rules 以准备将面板域名请求自动重写到 1Panel 端口，目标端口： 选择 重写到 面板端口号 -一些建议设置 +CF 小技巧： -``` -在 Cloudflare 中将 SSL/TLS 加密模式改为完全（严格），并修改一些其他设置 -在 Cloudflare 的侧栏点击 SSL/TLS -选择 完全（严格） -在侧栏点击 边缘证书 -开启下列选项 -始终使用 HTTPS -随机加密 -TLS 1.3 -自动 HTTPS 重写 -证书透明度监视 -``` +1. 在 Cloudflare 的侧栏点击 SSL/TLS，选择**完全（严格）** +2. 在侧栏点击**边缘证书**，开启下列选项： + - 始终使用 HTTPS + - 随机加密 + - TLS 1.3 + - 自动 HTTPS 重写 + - 证书透明度监视 ---- - -# OpenClaw【域名】 - -``` -r5hzczwdpd2bin2zxapbnqjmwdjny2kz - -mq7swt5pxdhhz6mmryz28n3ytgma83fb - -18789 -18790 - -http://82.158.226.4:18789?token=r5hzczwdpd2bin2zxapbnqjmwdjny2kz - -https://openclaw.excalicode.org?token=mq7swt5pxdhhz6mmryz28n3ytgma83fb -``` - -# Openresty - -# MySQL - -``` -root -ykz2WKZ@vke6rmk*req - -端口 13306 -``` - -# Redis - -``` -jgw5wpe!HVB@vem2wmp - -端口 16379 -``` - -# Gitea - -``` -数据库 gitea -数据库用户 gitea -数据库密码 ykz2WKZ@vke6rmk*req - -HTTP 端口 3000 -SSH 端口 222 -``` - -# PostgreSQL - -``` -user_kJd5rr -uPN2gbSgWI5yb5 - -端口 15432 -``` - -# sonarqube - -``` -http://82.158.226.4:19000 -数据库名 sonarqube -数据库用户 sonarqube -数据库用户密码 8hIu5ys14x7mbT -端口 19000 - -登录用户 - -admin -WhrNNu*Lcd5&2h -``` - ---- +## （5）安装 Openresty # Sub-Store【域名】 @@ -129,19 +69,65 @@ services: SUB_STORE_BACKEND_API_HOST: 127.0.0.1 SUB_STORE_BACKEND_API_PORT: 3001 SUB_STORE_BACKEND_MERGE: true - SUB_STORE_FRONTEND_BACKEND_PATH: /PVM!xwm7hkz4hek2xjy + SUB_STORE_FRONTEND_BACKEND_PATH: /AZmFbXAp9Tyhws PORT: 9876 HOST: 127.0.0.1 volumes: - - /opt/docker/data/sub-store:/opt/app/data + - sub-store-data:/opt/app/data + +volumes: + sub-store-data: ``` -在 Openresty 中反向代理 3001 +申请证书并在 Openresty 中反向代理 3001 访问地址 ``` -https://sub-store.excalicode.org?api=https://sub-store.excalicode.org/PVM!xwm7hkz4hek2xjy +https://sub-store.excalicode.org?api=https://sub-store.excalicode.org/AZmFbXAp9Tyhws +``` + +# OpenClaw【域名】 + +``` +r5hzczwdpd2bin2zxapbnqjmwdjny2kz + +mq7swt5pxdhhz6mmryz28n3ytgma83fb + +18789 +18790 + +http://82.158.226.4:18789?token=r5hzczwdpd2bin2zxapbnqjmwdjny2kz + +https://openclaw.excalicode.org?token=mq7swt5pxdhhz6mmryz28n3ytgma83fb +``` + +# MySQL + +``` +root +ykz2WKZ@vke6rmk*req + +13306 +``` + +# Redis + +``` +jgw5wpe!HVB@vem2wmp + +16379 +``` + +# Gitea + +``` +数据库 gitea +数据库用户 gitea +数据库密码 ykz2WKZ@vke6rmk*req + +HTTP 端口 3000 +SSH 端口 222 ``` # s-ui diff --git a/resource/ai/大模型安装笔记/关于模型思考问题.md b/resource/ai/大模型安装笔记/关于模型思考问题.md index 69a2bc3..c22cacf 100644 --- a/resource/ai/大模型安装笔记/关于模型思考问题.md +++ b/resource/ai/大模型安装笔记/关于模型思考问题.md @@ -210,3 +210,7 @@ else: 你提供的 JSON 结构中，其实有一个字段叫 `"reasoning": null`（在某些兼容 OpenAI 格式的框架如 vLLM 中叫 `reasoning_content`）。 如果你使用的推理引擎版本较新（配置正确的话），引擎会自动帮你把思考内容剥离出来放到 `reasoning` 字段中，而 `content` 字段里只保留干净的最终答案。你现在它还是 `null`，说明当前的引擎/版本只是把完整字符串粗暴地全塞进了 `content` 里。 + +# 如何关闭本地部署r1的思考过程 + +[如何关闭本地部署r1的思考过程 · 议题 #512 · deepseek-ai/DeepSeek-R1](https://github.com/deepseek-ai/DeepSeek-R1/issues/512)