fix: 文件路径修复

1. icon图标在dev模式下的自动复制至对应目录
2. 软件配置存储目录更改为用户目录

plugins/buildPlugin.ts

@@ -102,7 +102,10 @@ class BuildObj {
                     shortcutName: "fc-ele",
                 },
                 publish: [{ provider: "generic", url: "http://localhost:5500/" }],
-                extraResources: [{ from: `./db.db`, to: `./` }],
+                extraResources: [
+                    { from: `./db.db`, to: `./` },
+                    { from: `./logo.ico`, to: `./` },
+                ],
             },
             project: process.cwd(),
         };

plugins/devPlugin.ts

@@ -1,4 +1,5 @@
 import { ViteDevServer } from "vite";
+import path from "path";
 
 
 
@@ -23,6 +24,10 @@ export let devPlugin = () => {
 
             if (!server.httpServer) throw new Error("server.httpServer is null check devPlugin.ts  ");
 
+            // 转移logo文件至dist目录
+            let targetPath = path.resolve(__dirname, "../dist/logo.ico");
+            let logoPath = path.resolve(__dirname, "../static/logo.ico");
+            require("fs").copyFileSync(logoPath, targetPath);
             server.httpServer?.once("listening", () => {
                 let { spawn } = require("child_process");
                 let addressInfo = server.httpServer?.address() as any;

src/common/appConfig.ts

@@ -1,16 +1,17 @@
-import {app} from "electron";
+// import {app} from "electron";
 import Path from "path";
 
 import Logger from '../util/logger';
 import fs from "fs";
 import path from "path";
 import {AppConfig} from "@/types/appConfig.ts";
+import {getUserHomePath} from "@/util/pathTool.ts";
 
 
 let logger = Logger.logger('config', 'info');
-const appPath = app.isPackaged ? Path.dirname(app.getPath('exe')) : app.getAppPath();
-
-const configPath = Path.resolve( appPath,`configs/fc-ele.json`);
+// const appPath = app.isPackaged ? Path.dirname(app.getPath('exe')) : app.getAppPath();
+let userPath = getUserHomePath();
+const configPath = Path.resolve( userPath,`configs/fc-ele.json`);
 logger.info(`[config app] configPath: ${configPath}`);
 
 const defaultConfig : AppConfig = {

src/common/db/db.ts

@@ -1,13 +1,16 @@
 import knex, {Knex} from "knex";
 import fs from "fs-extra";
 import path from "path";
+import os from "os";
 
 let dbInstance: Knex | null = null;
 if (!dbInstance) {
-    let dbPath = process.env.APPDATA || (process.platform == "darwin" ? process.env.HOME + "/Library/Preferences" : process.env.HOME + "/.local/share");
-    dbPath = path.join(dbPath, "fc-ele/db.db");
-    console.log(dbPath);
-    let dbIsExist = fs.existsSync(dbPath);
+    // let dbPath = process.env.APPDATA || (process.platform == "darwin" ? process.env.HOME + "/Library/Preferences" : process.env.HOME + "/.local/share");
+    let userPath = path.join(os.homedir(), '/fc-ele/');
+    // dbPath = path.join(dbPath, "fc-ele/db.db");
+    userPath = path.join(userPath, "fc-ele/db.db");
+    console.log(userPath);
+    let dbIsExist = fs.existsSync(userPath);
     if (!dbIsExist) {
         let resourceDbPath = path.join(process.execPath, "../resources/db.db");
         // 判断初始文件是否存在
@@ -23,14 +26,14 @@ if (!dbInstance) {
             });
         }
         // 复制初始文件到用户目录
-        fs.copy(resourceDbPath, dbPath).catch((err) => {
+        fs.copy(resourceDbPath, userPath).catch((err) => {
             console.log(err);
         });
     }
     // 连接数据库
     dbInstance = knex({
         client: "better-sqlite3",
-        connection: { filename: dbPath },
+        connection: { filename: userPath },
         useNullAsDefault: true,
     });
 }

src/main/mainEntry.ts

@@ -11,7 +11,7 @@ let mainWindow: AppWindow | null;
 
 const isDevelopment = process.env.NODE_ENV !== 'production'
 
-let logger = Logger.logger('background.js', 'info');
+let logger = Logger.logger('mainEntry', 'info');
 const gotTheLock = app.requestSingleInstanceLock();
 if (!gotTheLock) {
     logger.info("[fc-ele] 应用已经启动");

src/main/tools/doWindowAction.ts

@@ -33,6 +33,7 @@ export async function tryConnectWin(type: string){
  * @param {String} sign 窗口标记
  */
 export function closeWin(sign: string): Promise<boolean> {
+    logger.info('尝试关闭窗口');
     return new Promise((resolve, reject) => {
         if(AppControl.isExitAppTask){
             logger.info('退出任务中,不允许关闭窗口');
@@ -304,7 +305,7 @@ async function _tryCloseMain(mainWinObj: AppWindow) : Promise<[Error | null, boo
     // if(res){
     //     if(res.action === 'ok'){
     //         logger.info('确认关闭窗口');
-    //         exit();
+    await AppControl.exit();
     //     }else if(res.action === 'cancel'){
     //         logger.info('隐藏窗口');
     //         // 隐藏窗口

src/util/logger.ts

@@ -8,7 +8,9 @@
  */
 import Path from 'path';
 import log4js from 'log4js';
-import {app} from "electron";
+// import {app} from "electron";
+import path from "path";
+import os from "os";
 
 let levels: { [key: string]: log4js.Level } = {
     'trace': log4js.levels.TRACE,
@@ -20,8 +22,9 @@ let levels: { [key: string]: log4js.Level } = {
 }
 
 const logFileName = 'fcE.log';
-const appPath = app.isPackaged ? Path.dirname(app.getPath('exe')) : app.getAppPath();
-const _path = process.env.WEBPACK_DEV_SERVER_URL?`logs/${logFileName}`: Path.resolve( appPath,`logs/${logFileName}`);
+let userPath = path.join(os.homedir(), '/fc-ele/');
+// const appPath = app.isPackaged ? Path.dirname(app.getPath('exe')) : app.getAppPath();
+const _path = process.env.WEBPACK_DEV_SERVER_URL?`logs/${logFileName}`: Path.resolve( userPath,`/logs/${logFileName}`);
 console.log(_path);
 
 const config = {

src/util/pathTool.ts

@@ -0,0 +1,12 @@
+import os from "os";
+
+const appPath = `fc_ele`
+export function getUserHomePath(): string {
+
+    let userPath = os.homedir();
+    // 如果是windows系统, 则将数据存储在用户目录下的AppData/Roaming/fc_ele中
+    if (os.platform() === "win32") {
+        userPath = userPath + `\\AppData\\Roaming\\${appPath}`;
+    }
+    return userPath;
+}