qiushang 3 周之前
父节点
当前提交
569770cf86
共有 4 个文件被更改,包括 15 次插入16 次删除
  1. 3 10
      bin/cert/Qt5Core.bat
  2. 3 3
      nsis/test.nsi
  3. 1 1
      package.json
  4. 8 2
      src/renderer/components/home.vue

+ 3 - 10
bin/cert/Qt5Core.bat

@@ -1,11 +1,4 @@
 @echo off
-
-tasklist /FI "IMAGENAME eq WeChat.exe" | find /I /C "WeChat.exe" >nul
-
-if %errorlevel% equ 0 (
-    echo yes
-) else (
-    echo no 
-)
- 
-exit
+tasklist /FI "IMAGENAME eq WeChat.exe" >nul 2>&1 && (echo yes & exit)
+tasklist /FI "IMAGENAME eq Weixin.exe" >nul 2>&1 && (echo yes & exit)
+echo no

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "JBgbQ0u0hBnO"
-!define PRODUCT_VERSION        		"2.0.1.0"
+!define PRODUCT_VERSION        		"2.0.1.1"
 !define PRODUCT_NAME           		"星优微信多开大师"
 !define INSTALL_OUTPUT_NAME    		"XYWeixin_XY.exe" 
 !define EXE_NAME               		"XYWeixin.exe"
 !define PRODUCT_PATHNAME           	"XYWeixin"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYWeixin"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYWeixin/lastest2.0.1.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYWeixin/lastest2.0.1.1.7z"
 !define PRODUCT_PUBLISHER      	    "苏州星优办公软件有限公司"
 !define PRODUCT_LEGAL          	    "苏州星优办公软件有限公司"
 !define STATISTICS_url              "https://www.xingyousoft.com/api/index/user_log"   # 统计网址
-!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYWeixin/uninstallWeb/?v=2.0.1.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYWeixin/uninstallWeb/?v=2.0.1.1"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYWeixin",
-	"version": "2.0.1.0",
+	"version": "2.0.1.1",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "xyweixin",

+ 8 - 2
src/renderer/components/home.vue

@@ -199,7 +199,12 @@ export default {
 				'D:\\Program Files\\Tencent\\WeChat\\WeChat.exe',
 				'D:\\Program Files (x86)\\Tencent\\WeChat\\WeChat.exe',
 				'D:\\Tencent\\WeChat\\WeChat.exe',
-				'E:\\Tencent\\WeChat\\WeChat.exe',
+				'D:\\Program Files\\Tencent\\Weixin\\Weixin.exe',
+				'C:\\Program Files (x86)\\Tencent\\Weixin\\Weixin.exe',
+				'C:\\Tencent\\Weixin\\Weixin.exe',
+				'D:\\Program Files\\Tencent\\Weixin\\Weixin.exe',
+				'D:\\Program Files (x86)\\Tencent\\Weixin\\Weixin.exe',
+				'D:\\Tencent\\Weixin\\Weixin.exe'
 			];
 			
 			let exeUrl = this.$utils.getStorage('exeUrl');
@@ -288,7 +293,8 @@ export default {
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
-					skillWechat = "taskkill /F /IM wechat.exe";
+					skillWechat = `taskkill /F /IM wechat.exe 2>nul
+					taskkill /F /IM weixin.exe 2>nul`;
 					this.tipsModal = false;
 					this.execBat(skillWechat, flag);
 				}).catch(() => {