Merge pull request #485 from H3CoF6/feat/linux

fix: 修复linux版本一些bug

electron/main.ts

@@ -17,6 +17,7 @@ import { annualReportService } from './services/annualReportService'
 import { exportService, ExportOptions, ExportProgress } from './services/exportService'
 import { KeyService } from './services/keyService'
 import { KeyServiceMac } from './services/keyServiceMac'
+import { KeyServiceLinux} from "./services/keyServiceLinux"
 import { voiceTranscribeService } from './services/voiceTranscribeService'
 import { videoService } from './services/videoService'
 import { snsService, isVideoUrl } from './services/snsService'
@@ -95,7 +96,7 @@ let keyService: any
 if (process.platform === 'darwin') {
   keyService = new KeyServiceMac()
 } else if (process.platform === 'linux') {
-  const { KeyServiceLinux } = require('./services/keyServiceLinux')
+   // const { KeyServiceLinux } = require('./services/keyServiceLinux')
   keyService = new KeyServiceLinux()
 } else {
   keyService = new KeyService()
@@ -280,12 +281,18 @@ const requestMainWindowCloseConfirmation = (win: BrowserWindow): void => {
 function createWindow(options: { autoShow?: boolean } = {}) {
   // 获取图标路径 - 打包后在 resources 目录
   const { autoShow = true } = options
+  let iconName = 'icon.ico';
+  if (process.platform === 'linux') {
+    iconName = 'icon.png';
+  } else if (process.platform === 'darwin') {
+    iconName = 'icon.icns';
+  }
+
   const isDev = !!process.env.VITE_DEV_SERVER_URL
+
   const iconPath = isDev
-    ? join(__dirname, '../public/icon.ico')
+      ? join(__dirname, `../public/${iconName}`)
-    : (process.platform === 'darwin' 
+      : join(process.resourcesPath, iconName);
-        ? join(process.resourcesPath, 'icon.icns')
-        : join(process.resourcesPath, 'icon.ico'))
 
   const win = new BrowserWindow({
     width: 1400,
@@ -2533,12 +2540,20 @@ app.whenReady().then(async () => {
   updateSplashProgress(30, '正在加载界面...')
   mainWindow = createWindow({ autoShow: false })
 
-  // 初始化系统托盘图标（与其他窗口 icon 路径逻辑保持一致）
+  let iconName = 'icon.ico';
-  const resolvedTrayIcon = process.platform === 'win32'
+  if (process.platform === 'linux') {
-    ? join(__dirname, '../public/icon.ico')
+    iconName = 'icon.png';
-    : (process.platform === 'darwin'
+  } else if (process.platform === 'darwin') {
-        ? join(process.resourcesPath, 'icon.icns')
+    iconName = 'icon.icns';
-        : join(process.resourcesPath, 'icon.ico'))
+  }
+
+  const isDev = !!process.env.VITE_DEV_SERVER_URL
+
+  const resolvedTrayIcon = isDev
+      ? join(__dirname, `../public/${iconName}`)
+      : join(process.resourcesPath, iconName);
+
+
   try {
     tray = new Tray(resolvedTrayIcon)
     tray.setToolTip('WeFlow')

electron/services/wcdbCore.ts

@@ -551,6 +551,7 @@ export class WcdbCore {
 
       const dllDir = dirname(dllPath)
       const isMac = process.platform === 'darwin'
+      const isLinux = process.platform === 'linux'
       
       // 预加载依赖库
       if (isMac) {
@@ -564,6 +565,8 @@ export class WcdbCore {
             this.writeLog(`预加载 libWCDB.dylib 失败: ${String(e)}`)
           }
         }
+      } else if (isLinux) {
+        // 如果有libWCDB.so的话， 没有就算了
       } else {
         const wcdbCorePath = join(dllDir, 'WCDB.dll')
         if (existsSync(wcdbCorePath)) {

package.json

@@ -89,6 +89,18 @@
       ],
       "icon": "public/icon.ico"
     },
+    "linux": {
+      "icon": "public/icon.png",
+      "target": [
+        "AppImage",
+        "pacman",
+        "deb",
+        "tar.gz"
+      ],
+      "category": "Utility",
+      "executableName": "weflow",
+      "synopsis": "WeFlow for Linux"
+    },
     "nsis": {
       "oneClick": false,
       "differentialPackage": false,
@@ -155,4 +167,4 @@
     ],
     "icon": "resources/icon.icns"
   }
-}
+}