Merge pull request #632 from hicccc77/dev

Dev

.gitignore

@@ -72,3 +72,4 @@ pnpm-lock.yaml
 /pnpm-workspace.yaml
 wechat-research-site
 .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

@@ -40,7 +40,7 @@
         "@vitejs/plugin-react": "^4.3.4",
         "electron": "^41.1.1",
         "electron-builder": "^26.8.1",
-        "sass": "^1.99.0",
+        "sass": "^1.98.0",
         "sharp": "^0.34.5",
         "typescript": "^6.0.2",
         "vite": "^7.0.0",
@@ -8908,9 +8908,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.99.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz",
-      "integrity": "sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.98.0.tgz",
+      "integrity": "sha512-+4N/u9dZ4PrgzGgPlKnaaRQx64RO0JBKs9sDhQ2pLgN6JQZ25uPQZKQYaBJU48Kd5BxgXoJ4e09Dq7nMcOUW3A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -54,7 +54,7 @@
     "@vitejs/plugin-react": "^4.3.4",
     "electron": "^41.1.1",
     "electron-builder": "^26.8.1",
-    "sass": "^1.99.0",
+    "sass": "^1.98.0",
     "sharp": "^0.34.5",
     "typescript": "^6.0.2",
     "vite": "^7.0.0",

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">

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>