From 4afbc02af0a2bf95c6d5ab4c1bc64ddc970d9402 Mon Sep 17 00:00:00 2001 From: gaoshuaixing Date: Mon, 21 Oct 2024 17:55:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ electron/addon/autoUpdater/index.js | 2 +- electron/controller/framework.js | 7 +++++-- frontend/src/api/main.js | 8 +++++--- go/api/example.go | 29 ++++++++++++++--------------- go/demo/index.go | 6 +++--- go/go.mod | 2 +- package.json | 1 + 8 files changed, 32 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index df48b7d..45ca771 100644 --- a/.gitignore +++ b/.gitignore @@ -13,9 +13,11 @@ yalc.lock go/public/ build/extraResources/goapp.exe go/go.sum +go/tmp/ build/extraResources/java-app.jar build/extraResources/jre1.8.0_201/ python/.venv/ python/*.spec python/build/ python/dist/ +*DS_Store diff --git a/electron/addon/autoUpdater/index.js b/electron/addon/autoUpdater/index.js index 63baf58..3e37be9 100644 --- a/electron/addon/autoUpdater/index.js +++ b/electron/addon/autoUpdater/index.js @@ -135,7 +135,7 @@ class AutoUpdaterAddon { */ sendStatusToWindow(content = {}) { const textJson = JSON.stringify(content); - const channel = 'app.updater'; + const channel = 'custom.app.updater'; const win = CoreWindow.getMainWindow(); win.webContents.send(channel, textJson); } diff --git a/electron/controller/framework.js b/electron/controller/framework.js index e99bebf..0436a66 100644 --- a/electron/controller/framework.js +++ b/electron/controller/framework.js @@ -130,10 +130,13 @@ class FrameworkController extends Controller { if (!fs.existsSync(softwarePath)) { return false; } - // 命令行字符串 并 执行 - let cmdStr = 'start ' + softwarePath; + // 命令行字符串 并 执行, start 命令后面的路径要加双引号 + let cmdStr = `start "${softwarePath}"`; exec(cmdStr); + // 方法二 + // 推荐使用cross模块 + return true; } diff --git a/frontend/src/api/main.js b/frontend/src/api/main.js index 29c83fc..a569700 100644 --- a/frontend/src/api/main.js +++ b/frontend/src/api/main.js @@ -1,6 +1,7 @@ /** * 主进程与渲染进程通信频道定义 + * 格式：控制器.文件名.方法 * Definition of communication channels between main process and rendering process */ const ipcApiRoute = { @@ -64,12 +65,13 @@ const ipcApiRoute = { /** * 自定义频道 + * 格式：自定义（推荐添加一个前缀） * custom chennel */ const specialIpcRoute = { - appUpdater: 'app.updater', // updater channel - window1ToWindow2: 'window1-to-window2', // windows channel - window2ToWindow1: 'window2-to-window1', // windows channel + appUpdater: 'custom.app.updater', // updater channel + window1ToWindow2: 'custom.window1-to-window2', // windows channel + window2ToWindow1: 'custom.window2-to-window1', // windows channel } export { diff --git a/go/api/example.go b/go/api/example.go index 48a20bb..0e4f63e 100644 --- a/go/api/example.go +++ b/go/api/example.go @@ -9,8 +9,7 @@ import ( "github.com/wallace5303/ee-go/elog" "github.com/gin-gonic/gin" - - "electron-egg/demo/sql/sqlitelib" + //"electron-egg/demo/sql/sqlitelib" ) // 使用 router Ctx @@ -41,27 +40,27 @@ func SetValue(c *router.Ctx) { ret := ehelper.GetJson() defer c.JSON(ret) - arg, ok := c.ArgJson() - if !ok { - return - } + // arg, ok := c.ArgJson() + // if !ok { + // return + // } - keyName := arg["key"].(string) - vallue := arg["value"] + // keyName := arg["key"].(string) + // vallue := arg["value"] - sqlitelib.SetStatData(keyName, vallue) + // sqlitelib.SetStatData(keyName, vallue) } func GetValue(c *router.Ctx) { ret := ehelper.GetJson() defer c.JSON(ret) - arg, ok := c.ArgJson() - if !ok { - return - } + // arg, ok := c.ArgJson() + // if !ok { + // return + // } - keyName := arg["key"].(string) + // keyName := arg["key"].(string) - ret.Data = sqlitelib.GetStat(keyName) + // ret.Data = sqlitelib.GetStat(keyName) } diff --git a/go/demo/index.go b/go/demo/index.go index 2028c5a..8c92980 100644 --- a/go/demo/index.go +++ b/go/demo/index.go @@ -2,7 +2,7 @@ package demo import ( "electron-egg/demo/job" - "electron-egg/demo/sql/sqlitelib" + //"electron-egg/demo/sql/sqlitelib" "electron-egg/demo/util" "github.com/wallace5303/ee-go/eapp" @@ -16,11 +16,11 @@ func Index() { // 初始化基础数据 util.Boot() // 初始化数据库 - sqlitelib.InitDB(false) + //sqlitelib.InitDB(false) // 初始化任务 job.Boot() // 注册关闭前的处理函数 eapp.Register("beforeClose", func() { - sqlitelib.CloseDatabase() + //sqlitelib.CloseDatabase() }) } diff --git a/go/go.mod b/go/go.mod index 784c3b7..b305292 100644 --- a/go/go.mod +++ b/go/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/gin-gonic/gin v1.9.1 github.com/glebarez/go-sqlite v1.22.0 - github.com/wallace5303/ee-go v1.0.0 + github.com/wallace5303/ee-go v1.2.1 ) require ( diff --git a/package.json b/package.json index 5dc0c66..edf36df 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "build-l-arm64": "electron-builder --config=./electron/config/builder.json -l=deb --arm64", "build-l-armv7l": "electron-builder --config=./electron/config/builder.json -l=deb --armv7l", "build-lr-64": "electron-builder --config=./electron/config/builder.json -l=rpm --x64", + "build-lr-arm64": "electron-builder --config=./electron/config/builder.json -l=rpm --arm64", "build-lp-64": "electron-builder --config=./electron/config/builder.json -l=pacman --x64", "test": "set DEBUG=* && electron . --env=local" },