diff --git a/electron/controller/example.js b/electron/controller/example.js index 134a598..3f94cb0 100644 --- a/electron/controller/example.js +++ b/electron/controller/example.js @@ -418,14 +418,16 @@ class ExampleController extends Controller { } // 资源路径不同 - let softwarePath = ''; - if (electronApp.isPackaged) { - // 打包后 execDir为 应用程序 exe\dmg\dep软件所在目录;打包前该值是项目根目录 - softwarePath = path.join(this.app.config.execDir, "resources", "extraResources", softName); - } else { - // 打包前 - softwarePath = path.join(this.app.config.execDir, "build", "extraResources", softName); - } + // let softwarePath = ''; + // if (electronApp.isPackaged) { + // // 打包后 execDir为 应用程序 exe\dmg\dep软件所在目录;打包前该值是项目根目录 + // softwarePath = path.join(this.app.config.execDir, "resources", "extraResources", softName); + // } else { + // // 打包前 + // softwarePath = path.join(this.app.config.execDir, "build", "extraResources", softName); + // } + let softwarePath = path.join(Utils.getExtraResourcesDir(), softName); + this.app.logger.info('[openSoftware] softwarePath:', softwarePath); // 检查程序是否存在 if (!fs.existsSync(softwarePath)) { diff --git a/electron/preload/index.js b/electron/preload/index.js index 4d9f0d6..b9413e4 100644 --- a/electron/preload/index.js +++ b/electron/preload/index.js @@ -11,6 +11,7 @@ const awaken = require('../library/awaken'); /** * 预加载模块入口 + * @param {Object} app - 全局app对象 */ module.exports = async (app) => {