Merge pull request #632 from hicccc77/dev

Dev

.gitignore

@@ -71,4 +71,5 @@ resources/wx_send
 pnpm-lock.yaml
 /pnpm-workspace.yaml
 wechat-research-site
-.codex
+.codex
+weflow-web-offical

electron/main.ts

@@ -136,6 +136,7 @@ const shouldOfferUpdateForTrack = (latestVersion: string, currentVersion: string
 }
 
 let lastAppliedUpdaterChannel: string | null = null
+let lastAppliedUpdaterFeedUrl: string | null = null
 const resetUpdaterProviderCache = () => {
   const updater = autoUpdater as any
   // electron-updater 会缓存 provider；切换 channel 后需清理缓存，避免仍请求旧通道
@@ -146,23 +147,41 @@ const resetUpdaterProviderCache = () => {
   }
 }
 
+const getUpdaterFeedUrlByTrack = (track: 'stable' | 'preview' | 'dev'): string => {
+  const repoBase = 'https://github.com/hicccc77/WeFlow/releases'
+  if (track === 'stable') return `${repoBase}/latest/download`
+  if (track === 'preview') return `${repoBase}/download/nightly-preview`
+  return `${repoBase}/download/nightly-dev`
+}
+
 const applyAutoUpdateChannel = (reason: 'startup' | 'settings' = 'startup') => {
   const track = getEffectiveUpdateTrack()
   const currentTrack = inferUpdateTrackFromVersion(appVersion)
   const baseUpdateChannel = track === 'stable' ? 'latest' : track
+  const nextFeedUrl = getUpdaterFeedUrlByTrack(track)
   const nextUpdaterChannel =
     process.platform === 'win32' && process.arch === 'arm64'
       ? `${baseUpdateChannel}-arm64`
       : baseUpdateChannel
-  if (lastAppliedUpdaterChannel && lastAppliedUpdaterChannel !== nextUpdaterChannel) {
+  if (
+    (lastAppliedUpdaterChannel && lastAppliedUpdaterChannel !== nextUpdaterChannel) ||
+    (lastAppliedUpdaterFeedUrl && lastAppliedUpdaterFeedUrl !== nextFeedUrl)
+  ) {
     resetUpdaterProviderCache()
   }
   autoUpdater.allowPrerelease = track !== 'stable'
   // 只要用户当前选择的目标通道与当前安装版本所属通道不同，就允许跨通道更新（含降级）
   autoUpdater.allowDowngrade = track !== currentTrack
+  // 统一走 generic feed，确保 preview/dev 命中各自固定发布页，不受 GitHub provider 的 prerelease 选择影响。
+  autoUpdater.setFeedURL({
+    provider: 'generic',
+    url: nextFeedUrl,
+    channel: nextUpdaterChannel
+  })
   autoUpdater.channel = nextUpdaterChannel
   lastAppliedUpdaterChannel = nextUpdaterChannel
-  console.log(`[Update](${reason}) 当前版本 ${appVersion}，当前轨道: ${currentTrack}，渠道偏好: ${track}，更新通道: ${autoUpdater.channel}，allowDowngrade=${autoUpdater.allowDowngrade}`)
+  lastAppliedUpdaterFeedUrl = nextFeedUrl
+  console.log(`[Update](${reason}) 当前版本 ${appVersion}，当前轨道: ${currentTrack}，渠道偏好: ${track}，更新通道: ${autoUpdater.channel}，feed=${nextFeedUrl}，allowDowngrade=${autoUpdater.allowDowngrade}`)
 }
 
 applyAutoUpdateChannel('startup')

package-lock.json

@@ -19,7 +19,7 @@
         "html2canvas": "^1.4.1",
         "jieba-wasm": "^2.2.0",
         "jszip": "^3.10.1",
-        "koffi": "^2.15.4",
+        "koffi": "^2.9.0",
         "lucide-react": "^1.7.0",
         "react": "^19.2.3",
         "react-dom": "^19.2.3",
@@ -6531,9 +6531,9 @@
       }
     },
     "node_modules/koffi": {
-      "version": "2.15.4",
+      "version": "2.15.2",
-      "resolved": "https://registry.npmjs.org/koffi/-/koffi-2.15.4.tgz",
+      "resolved": "https://registry.npmjs.org/koffi/-/koffi-2.15.2.tgz",
-      "integrity": "sha512-6l7xxt8heHWQ63WyGd8ofne4TrzhqeKHhvSlI3GnxMIHp3PlDrOPyZbW5YNINXNma1qrKkpM/PGLY8U0V8Hxbw==",
+      "integrity": "sha512-r9tjJLVRSOhCRWdVyQlF3/Ugzeg13jlzS4czS82MAgLff4W+BcYOW7g8Y62t9O5JYjYOLAjAovAZDNlDfZNu+g==",
       "hasInstallScript": true,
       "license": "MIT",
       "funding": {

package.json

@@ -33,7 +33,7 @@
     "html2canvas": "^1.4.1",
     "jieba-wasm": "^2.2.0",
     "jszip": "^3.10.1",
-    "koffi": "^2.15.4",
+    "koffi": "^2.9.0",
     "lucide-react": "^1.7.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",

src/App.tsx

@@ -591,9 +591,13 @@ function App() {
               <div className="agreement-notice">
                 <strong>这是免费软件，如果你是付费购买的话请骂死那个骗子。</strong>
                 <span className="agreement-notice-link">
-                  我们唯一的官方网站：
+                  官方网站：
+                  <a href="https://weflow.top" target="_blank" rel="noreferrer">
+                    https://weflow.top
+                  </a>
+                  &nbsp;·&nbsp;
                   <a href="https://github.com/hicccc77/WeFlow" target="_blank" rel="noreferrer">
-                    https://github.com/hicccc77/WeFlow
+                    GitHub 仓库
                   </a>
                 </span>
               </div>
@@ -608,7 +612,7 @@ function App() {
                 <p>因使用本软件产生的任何直接或间接损失，开发者不承担任何责任。请确保你的使用行为符合当地法律法规。</p>
 
                 <h4>4. 隐私保护</h4>
-                <p>本软件不收集任何用户数据。软件更新检测仅获取版本信息，不涉及任何个人隐私。</p>
+                <p>本软件不收集任何用户隐私数据。软件更新检测仅获取版本信息，不涉及任何个人隐私。</p>
               </div>
             </div>
             <div className="agreement-footer">
@@ -666,30 +670,30 @@ function App() {
       )}
 
       {showWaylandWarning && (
-          <div className="agreement-overlay">
+        <div className="agreement-overlay">
-            <div className="agreement-modal">
+          <div className="agreement-modal">
-              <div className="agreement-header">
+            <div className="agreement-header">
-                <Shield size={32} />
+              <Shield size={32} />
-                <h2>环境兼容性提示 (Wayland)</h2>
+              <h2>环境兼容性提示 (Wayland)</h2>
+            </div>
+            <div className="agreement-content">
+              <div className="agreement-text">
+                <p>检测到您当前正在使用 <strong>Wayland</strong> 显示服务器。</p>
+                <p>在 Wayland 环境下，出于系统级的安全与设计机制，<strong>应用程序无法直接控制新弹出窗口的位置</strong>。</p>
+                <p>这可能导致某些独立窗口（如消息通知、图片查看器等）出现位置随机、或不受控制的情况。这是底层机制导致的，对此我们无能为力。</p>
+                <br />
+                <p>如果您觉得窗口位置异常严重影响了使用体验，建议尝试：</p>
+                <p>1. 在系统登录界面，将会话切换回 <strong>X11 (Xorg)</strong> 模式。</p>
+                <p>2. 修改您的桌面管理器 (WM/DE) 配置，强制指定该应用程序的窗口规则。</p>
               </div>
-              <div className="agreement-content">
+            </div>
-                <div className="agreement-text">
+            <div className="agreement-footer">
-                  <p>检测到您当前正在使用 <strong>Wayland</strong> 显示服务器。</p>
+              <div className="agreement-actions">
-                  <p>在 Wayland 环境下，出于系统级的安全与设计机制，<strong>应用程序无法直接控制新弹出窗口的位置</strong>。</p>
+                <button className="btn btn-primary" onClick={handleDismissWaylandWarning}>我知道了，不再提示</button>
-                  <p>这可能导致某些独立窗口（如消息通知、图片查看器等）出现位置随机、或不受控制的情况。这是底层机制导致的，对此我们无能为力。</p>
-                  <br />
-                  <p>如果您觉得窗口位置异常严重影响了使用体验，建议尝试：</p>
-                  <p>1. 在系统登录界面，将会话切换回 <strong>X11 (Xorg)</strong> 模式。</p>
-                  <p>2. 修改您的桌面管理器 (WM/DE) 配置，强制指定该应用程序的窗口规则。</p>
-                </div>
-              </div>
-              <div className="agreement-footer">
-                <div className="agreement-actions">
-                  <button className="btn btn-primary" onClick={handleDismissWaylandWarning}>我知道了，不再提示</button>
-                </div>
               </div>
             </div>
           </div>
+        </div>
       )}
 
       {/* 更新提示对话框 */}

src/pages/SettingsPage.tsx

@@ -2508,7 +2508,9 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
       <div className="about-footer">
         <p className="about-desc">微信聊天记录分析工具</p>
         <div className="about-links">
-          <a href="#" onClick={(e) => { e.preventDefault(); window.electronAPI.shell.openExternal('https://github.com/hicccc77/WeFlow') }}>官网</a>
+          <a href="#" onClick={(e) => { e.preventDefault(); window.electronAPI.shell.openExternal('https://weflow.top') }}>官网</a>
+          <span>·</span>
+          <a href="#" onClick={(e) => { e.preventDefault(); window.electronAPI.shell.openExternal('https://github.com/hicccc77/WeFlow') }}>GitHub 仓库</a>
           <span>·</span>
           <a href="#" onClick={(e) => { e.preventDefault(); window.electronAPI.shell.openExternal('https://chatlab.fun') }}>ChatLab</a>
           <span>·</span>