Merge branch 'feature/zoujing' of https://git.nianxx.cn/duanshuwen/zn-ai into feature/dsw

forge.config.ts

@@ -3,9 +3,11 @@ import { MakerSquirrel } from '@electron-forge/maker-squirrel';
 import { MakerZIP } from '@electron-forge/maker-zip';
 import { MakerDeb } from '@electron-forge/maker-deb';
 import { MakerRpm } from '@electron-forge/maker-rpm';
+import { MakerDMG } from '@electron-forge/maker-dmg';
 import { VitePlugin } from '@electron-forge/plugin-vite';
 import { FusesPlugin } from '@electron-forge/plugin-fuses';
 import { FuseV1Options, FuseVersion } from '@electron/fuses';
+import MakerWix from '@electron-forge/maker-wix';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import * as esbuild from 'esbuild';
@@ -14,13 +16,28 @@ const config: ForgeConfig = {
   packagerConfig: {
     asar: true,
     tmpdir: path.resolve(process.cwd(), '..', 'electron-packager-tmp'),
+    name: 'NianXX',
+    icon: path.join(__dirname, 'public/logo'),
+    appCopyright: 'Copyright © 2026 智念科技',
   },
   rebuildConfig: {},
   makers: [
-    new MakerSquirrel({}),
+    new MakerSquirrel({
+      iconUrl: path.join(__dirname, 'public/logo.ico'), // 快捷方式的图标，需要在线的地址
+      setupIcon: path.join(__dirname, 'public/logo.ico'),
+      setupExe: 'NianXX.exe',
+      // loadingGif: path.join(__dirname, 'public/loading.gif'), // 修改默认安装图片
+    }),
     new MakerZIP({}, ['darwin']),
     new MakerRpm({}),
     new MakerDeb({}),
+    new MakerDMG({}),
+    new MakerWix({
+      language: 2052,
+      ui: {
+        chooseDirectory: true,
+      }
+    }),
   ],
   plugins: [
     new VitePlugin({

package.json

@@ -24,8 +24,10 @@
   "devDependencies": {
     "@electron-forge/cli": "^7.8.3",
     "@electron-forge/maker-deb": "^7.10.2",
+    "@electron-forge/maker-dmg": "^7.11.1",
     "@electron-forge/maker-rpm": "^7.10.2",
     "@electron-forge/maker-squirrel": "^7.10.2",
+    "@electron-forge/maker-wix": "^7.11.1",
     "@electron-forge/maker-zip": "^7.10.2",
     "@electron-forge/plugin-auto-unpack-natives": "^7.10.2",
     "@electron-forge/plugin-fuses": "^7.10.2",

src/main/process/runTaskOperationService.ts

@@ -51,8 +51,7 @@ export function runTaskOperationService() {
         ['fzName', 'fg_trace.js'],
         ['mtName', 'mt_trace.js'],
         ['dyHotelName', 'dy_hotel_trace.js'],
-        ['dyHotSpringName', 'dy_hot_spring_trace.js'],
-        ['xcName', 'xc_trace.js'],
+        ['dyHotSpringName', 'dy_hot_spring_trace.js']
       ]
       const scriptEntries = pairs.filter(([prop]) => roomType?.[prop])
 
@@ -75,9 +74,14 @@ export function runTaskOperationService() {
           dyHotelName: 'douyin',
           dyHotSpringName: 'douyin',
         }
+        const defaultTabIndexMap: Record<string, number> = {
+          fliggy: 0,
+          meituan: 1,
+          douyin: 2
+        }
         const mappedName = channelNameMap[item.channel]
-        const tabIndex = mappedName ? (openedTabIndexByChannelName.get(mappedName) ?? i) : i
-        log.info(`Launching script for channel ${item.channel}: ${item.scriptPath}`)
+        const tabIndex = mappedName ? (openedTabIndexByChannelName.get(mappedName) ?? defaultTabIndexMap[mappedName] ?? i) : i
+        log.info(`Launching script for channel ${item.channel}: ${item.scriptPath} (tabIndex: ${tabIndex})`)
         const result = await executeScriptServiceInstance.executeScript(item.scriptPath, {
           roomType: roomType[item.channel],
           startTime: options.startTime,

src/main/scripts/common/tabs.js

@@ -24,6 +24,7 @@ const isSameOrigin = (currentUrl, targetUrl) => {
   const current = normalizeUrl(currentUrl);
   const target = normalizeUrl(targetUrl);
   if (!current || !target) return false;
+  
   return current.origin === target.origin;
 };
 

src/main/scripts/dy_hot_spring_trace.js

@@ -220,5 +220,6 @@ const navigateToRoomStatusManagement = async (page) => {
     process.exitCode = 1;
   } finally {
     await safeDisconnectBrowser(browser);
+    process.exit(process.exitCode || 0);
   }
 })();

src/main/scripts/dy_hotel_trace.js

@@ -220,5 +220,6 @@ const navigateToRoomStatusManagement = async (page) => {
     process.exitCode = 1;
   } finally {
     await safeDisconnectBrowser(browser);
+    process.exit(process.exitCode || 0);
   }
 })();

src/main/scripts/fg_trace.js

@@ -169,5 +169,6 @@ const toggleRoomByDateIndex = async (container, { roomType, dateIndex, operation
     process.exitCode = 1;
   } finally {
     await safeDisconnectBrowser(browser);
+    process.exit(process.exitCode || 0);
   }
 })();

src/main/scripts/mt_trace.js

@@ -232,5 +232,6 @@ const toggleRoom = async (page, { roomType, mmdd, operation }) => {
     process.exitCode = 1;
   } finally {
     await safeDisconnectBrowser(browser);
+    process.exit(process.exitCode || 0);
   }
 })();

src/main/scripts/open_all_channel.js

@@ -128,5 +128,6 @@ const isBlankLikePage = (url) => {
         }
       } catch {}
     }
+    process.exit(process.exitCode || 0);
   }
 })();

src/main/scripts/xc_trace.js

@@ -1,4 +0,0 @@
-import log from 'electron-log';
-
-log.info('xc_trace.mjs placeholder: not implemented');
-process.exit(0);

src/main/utils/chrome/launchLocalChrome.ts

@@ -46,6 +46,6 @@ export async function launchLocalChrome() {
     // 延迟几秒等浏览器起来
     setTimeout(() => {
       resolve(0);
-    }, 3000); // 延迟3秒
+    }, 1000); // 延迟1秒
   });
 }

src/main/utils/db.ts

@@ -0,0 +1,5 @@
+import Dexie from 'dexie'
+
+export const db = new Dexie('NianXX') as Dexie & {}
+
+db.version(1).stores({})

src/main/utils/index.ts

@@ -31,6 +31,6 @@ export function createLogo() {
   if (logo != null) {
     return logo;
   }
-  logo = path.join(__dirname, 'logo.ico');
+  logo = path.join(__dirname, '/public/logo.ico');
   return logo;
 }

src/renderer/components/HeaderBar/index.vue

@@ -8,23 +8,23 @@
       <native-tooltip :content="t('window.minimize')">
         <button v-show="isMinimizable" class="flex items-center justify-center cursor-pointer w-[40px] h-[40px]"
           @click="minimizeWindow">
-          <iconify-icon icon="material-symbols:check-indeterminate-small" color="#525866" :width="btnSize"
+          <iconify-icon icon="material-symbols:check-indeterminate-small" :color="color" :width="btnSize"
             :height="btnSize" />
         </button>
       </native-tooltip>
       <native-tooltip :content="isMaximized ? t('window.restore') : t('window.maximize')">
         <button v-show="isMaximizable" class="flex items-center justify-center cursor-pointer w-[40px] h-[40px]"
           @click="maximizeWindow">
-          <iconify-icon icon="material-symbols:chrome-maximize-outline-sharp" color="#525866" :width="btnSize"
+          <iconify-icon icon="material-symbols:chrome-maximize-outline-sharp" :color="color" :width="btnSize"
             :height="btnSize" v-show="!isMaximized" />
-          <iconify-icon icon="material-symbols:chrome-restore-outline-sharp" color="#525866" :width="btnSize"
+          <iconify-icon icon="material-symbols:chrome-restore-outline-sharp" :color="color" :width="btnSize"
             :height="btnSize" v-show="isMaximized" />
         </button>
       </native-tooltip>
       <native-tooltip :content="t('window.close')">
         <button v-show="isClosable" class="flex items-center justify-center cursor-pointer w-[40px] h-[40px]"
           @click="handleClose">
-          <iconify-icon icon="material-symbols:close" color="#525866" :width="btnSize" :height="btnSize" />
+          <iconify-icon icon="material-symbols:close" :color="color" :width="btnSize" :height="btnSize" />
         </button>
       </native-tooltip>
     </div>
@@ -42,9 +42,10 @@ interface HeaderBarProps {
   isMaximizable?: boolean;
   isMinimizable?: boolean;
   isClosable?: boolean;
+  color?: string;
 }
 
-defineOptions({ name: 'HeaderBar' })
+defineOptions({ name: 'HeaderBar', color: '#525866' })
 
 withDefaults(defineProps<HeaderBarProps>(), {
   isMaximizable: true,

src/renderer/constant/channel.ts

@@ -20,6 +20,6 @@ export const channels: Item[] = [
     {
         id: uuidv4(),
         channelName: 'douyin',
-        channelUrl: 'https://life.douyin.com/p/goods_winetour/physical_room_list?groupid=1816249020842116',
+        channelUrl: 'https://life.douyin.com/p/travel-ari/hotel/price_amount_state?groupid=1816249020842116',
     }
 ]

src/renderer/views/login/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="h-screen login-bg flex flex-col">
-    <header-bar>
+    <header-bar color="#fff">
       <drag-region class="w-full" />
     </header-bar>