Merge remote-tracking branch 'origin/main'

.idea/workspace.xml

@@ -4,11 +4,7 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ae3fb6a0-aca4-4c0a-858b-91952e6dcdd3" name="更改" comment="update 26.8.11">
+    <list default="true" id="ae3fb6a0-aca4-4c0a-858b-91952e6dcdd3" name="更改" comment="update 26.8.11" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/4600Pro/OpenClaw/.env" beforeDir="false" afterPath="$PROJECT_DIR$/4600Pro/OpenClaw/.env" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/4600Pro/OpenClaw/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/4600Pro/OpenClaw/docker-compose.yml" afterDir="false" />
-    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -86,7 +82,7 @@
       <workItem from="1786323616451" duration="105000" />
       <workItem from="1786409759648" duration="770000" />
       <workItem from="1787022222565" duration="1218000" />
-      <workItem from="1787030835540" duration="2233000" />
+      <workItem from="1787030835540" duration="2629000" />
     </task>
     <task id="LOCAL-00001" summary="update 26.7.27">
       <option name="closed" value="true" />
@@ -240,7 +236,15 @@
       <option name="project" value="LOCAL" />
       <updated>1787031207232</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="update 26.8.11">
+      <option name="closed" value="true" />
+      <created>1787033233020</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1787033233020</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

4600Pro/OpenClaw/.env

@@ -1,13 +0,0 @@
-OPENCLAW_IMAGE=ghcr.io/openclaw/openclaw:latest
-
-# OpenClaw 内部 Gateway 端口
-OPENCLAW_GATEWAY_PORT=18789
-
-# Bridge 内部端口
-OPENCLAW_BRIDGE_PORT=18790
-
-OPENCLAW_GATEWAY_BIND=lan
-
-OPENCLAW_GATEWAY_TOKEN=fV3cYPabGURAEH
-
-OPENCLAW_TZ=Asia/Shanghai

4600Pro/OpenClaw/docker-compose.yml

@@ -1,113 +0,0 @@
-services:
-  openclaw-gateway:
-    image: ${OPENCLAW_IMAGE:-ghcr.io/openclaw/openclaw:latest}
-    container_name: openclaw-gateway
-
-    # 你的 /volume2 无法正常 chown 给 UID 1000，
-    # 因此当前环境用 root 运行，解决持久化目录写权限问题
-    user: "0:0"
-
-    env_file:
-      - .env
-
-    environment:
-      TZ: ${OPENCLAW_TZ:-Asia/Shanghai}
-
-      HOME: /root
-      OPENCLAW_HOME: /root
-      TERM: xterm-256color
-
-      OPENCLAW_STATE_DIR: /root/.openclaw
-      OPENCLAW_CONFIG_PATH: /root/.openclaw/openclaw.json
-      OPENCLAW_CONFIG_DIR: /root/.openclaw
-      OPENCLAW_WORKSPACE_DIR: /root/.openclaw/workspace
-
-      # OpenClaw 内部始终认 18789
-      OPENCLAW_GATEWAY_PORT: "18789"
-      OPENCLAW_GATEWAY_BIND: ${OPENCLAW_GATEWAY_BIND:-lan}
-      OPENCLAW_GATEWAY_TOKEN: ${OPENCLAW_GATEWAY_TOKEN}
-
-    volumes:
-      # 所有长期数据统一持久化
-      - /volume2/docker/docker_projects/openclaw/data:/root/.openclaw
-
-    ports:
-      # 宿主机 Web UI 2800 -> 容器 Gateway 18789
-      - "2800:18789"
-
-      # 如果你希望 Bridge 外部仍用 2799
-      - "2799:18790"
-
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-    init: true
-    restart: unless-stopped
-
-    command:
-      [
-        "node",
-        "dist/index.js",
-        "gateway",
-        "--bind",
-        "lan",
-        "--port",
-        "18789"
-      ]
-
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "node",
-          "-e",
-          "fetch('http://127.0.0.1:18789/healthz').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"
-        ]
-      interval: 30s
-      timeout: 5s
-      retries: 5
-      start_period: 20s
-
-
-  openclaw-cli:
-    image: ${OPENCLAW_IMAGE:-ghcr.io/openclaw/openclaw:latest}
-    container_name: openclaw-cli
-
-    user: "0:0"
-
-    env_file:
-      - .env
-
-    # 官方 Compose 就是让 CLI 与 Gateway 共用 network namespace
-    network_mode: "service:openclaw-gateway"
-
-    environment:
-      TZ: ${OPENCLAW_TZ:-Asia/Shanghai}
-
-      HOME: /root
-      OPENCLAW_HOME: /root
-      TERM: xterm-256color
-      BROWSER: echo
-
-      OPENCLAW_STATE_DIR: /root/.openclaw
-      OPENCLAW_CONFIG_PATH: /root/.openclaw/openclaw.json
-      OPENCLAW_CONFIG_DIR: /root/.openclaw
-      OPENCLAW_WORKSPACE_DIR: /root/.openclaw/workspace
-
-      OPENCLAW_GATEWAY_PORT: "18789"
-      OPENCLAW_GATEWAY_BIND: ${OPENCLAW_GATEWAY_BIND:-lan}
-      OPENCLAW_GATEWAY_TOKEN: ${OPENCLAW_GATEWAY_TOKEN}
-
-    volumes:
-      - /volume2/docker/docker_projects/openclaw/data:/root/.openclaw
-
-    stdin_open: true
-    tty: true
-    init: true
-
-    entrypoint:
-      - node
-      - dist/index.js
-
-    depends_on:
-      - openclaw-gateway

4600Pro/so-novel/docker-compose.yaml

@@ -0,0 +1,11 @@
+services:
+  sonovel:
+    image: ghcr.io/freeok/sonovel:latest
+    container_name: sonovel
+    ports:
+      - "2800:7765"
+    environment:
+      JAVA_OPTS: "-Dmode=web"
+    volumes:
+      - /volume2/docker/docker_projects/sonovel_data:/sonovel
+    restart: unless-stopped

README.md

@@ -26,7 +26,7 @@ UgreenNas（芯片：N6005，运行内存：32G，储存：1TB固态+35TB机械
 7. qinglongPanel：`http://192.168.0.111:2500` 【python代码托管】【Frp:ql.kunle777.top】
 8. komga：`http://192.168.0.112:2600` 【漫画阅读器】【Frp:komga.kunle777.top】
 9. yuvomi：`http://192.168.0.111:2700` 【家庭管理平台】
-10. OpenClaw：`http://192.168.0.111:2800` 【家庭管理平台】
+10. so-novel：`http://192.168.0.111:2800` 
 
 
 ### 480t主机