From 458b5317570acc6ad036f4feb5626b2de26ae2dd Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 6 Sep 2024 14:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development      | 3 ++-
 .env.test             | 2 ++
 dist-electron/main.js | 3 +--
 electron/main.js      | 7 ++-----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.env.development b/.env.development
index 8ee0381..a877acb 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,6 @@
 # 本地环境
 ENV = development
 
-
 # 正式ws
 # VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client'
 
@@ -32,5 +31,7 @@ VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api'
 # 测试
 VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
 
+# VITE_API_URL = 'https://36z1017t45.goho.co/cashier-client'
+
 # 正式
 # VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client'
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 50492d7..e82c85c 100644
--- a/.env.test
+++ b/.env.test
@@ -19,5 +19,7 @@ VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api'
 # 测试
 VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
 
+# VITE_API_URL = 'https://36z1017t45.goho.co/cashier-client'
+
 # 正式
 # VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client'
\ No newline at end of file
diff --git a/dist-electron/main.js b/dist-electron/main.js
index 556592a..34f5dcf 100644
--- a/dist-electron/main.js
+++ b/dist-electron/main.js
@@ -15710,7 +15710,7 @@ electron.app.whenReady().then(() => {
   }
   const installExe = async (exePath) => {
     return new Promise((resolve, reject) => {
-      child_process.exec(`start ${exePath}`, (error, stdout, stderr) => {
+      child_process.exec(`${exePath}`, (error, stdout, stderr) => {
         if (error) {
           reject(error);
         } else {
@@ -15762,7 +15762,6 @@ electron.app.whenReady().then(() => {
   });
   electron.ipcMain.on("getPrintList", () => {
     win.webContents.getPrintersAsync().then((res) => {
-      console.log("打印机列表", res);
       win.webContents.send("printList", res);
     });
   });
diff --git a/electron/main.js b/electron/main.js
index 6c89d87..1aec930 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -34,7 +34,7 @@ app.whenReady().then(() => {
 
   const installExe = async (exePath) => {
     return new Promise((resolve, reject) => {
-      exec(`start ${exePath}`, (error, stdout, stderr) => {
+      exec(`${exePath}`, (error, stdout, stderr) => {
         if (error) {
           reject(error);
         } else {
@@ -65,12 +65,10 @@ app.whenReady().then(() => {
             "temp-exe-file.exe"
           );
           fs.writeFileSync(tempFilePath, response.data);
-
           setTimeout(() => {
             win = null;
             app.exit();
           }, 1500);
-
           const installResult = await installExe(tempFilePath);
           console.log(`安装结果：${installResult}`);
         } catch (error) {
@@ -98,8 +96,7 @@ app.whenReady().then(() => {
   // 给渲染进程返回打印机列表
   ipcMain.on("getPrintList", () => {
     win.webContents.getPrintersAsync().then((res) => {
-      console.log("打印机列表", res);
-
+      // console.log("打印机列表", res);
       win.webContents.send("printList", res);
     });
   });