qiushang 11 months ago
parent
commit
5b8bb9d6ab
3 changed files with 21 additions and 4 deletions
  1. 3 3
      nsis/test.nsi
  2. 1 1
      package.json
  3. 17 0
      src/renderer/components/home.vue

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.0.2.0"
+!define PRODUCT_VERSION        		"2.0.2.3"
 !define PRODUCT_NAME           		"星优图片下载器"
 !define INSTALL_OUTPUT_NAME    		"XYCapture_XY.exe" 
 !define EXE_NAME               		"XYCapture.exe"
 !define PRODUCT_PATHNAME           	"XYCapture"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYCapture"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.2.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.2.3.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/XYCapture/uninstallWeb/?v=2.0.2.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.2.3"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYCapture",
-	"version": "2.0.2.0",
+	"version": "2.0.2.3",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "capture",

+ 17 - 0
src/renderer/components/home.vue

@@ -319,6 +319,10 @@
 			} else {
 				this.downloadDir = homedir + separator + "Downloads"
 			}
+			
+			if (!fs.existsSync(os.tmpdir() + separator + 'chrome-data-capture')) {
+				fs.mkdirSync(os.tmpdir() + separator + 'chrome-data-capture');
+			}
 
 			// 打开浏览器
 			const {
@@ -515,6 +519,9 @@
 			loginUrl(url){
 				(async () => {
 					try{
+						if (!fs.existsSync(os.tmpdir() + separator + 'chrome-data-capture')) {
+							fs.mkdirSync(os.tmpdir() + separator + 'chrome-data-capture');
+						}
 						const tbBrowser = await puppeteer.launch({
 							headless: false,
 							executablePath: puppeteer.executablePath().replace('win32-1', 'win64-1'),
@@ -523,6 +530,12 @@
 						});
 						const page = await tbBrowser.newPage();
 						await page.setViewport({ width: 1280, height: 800 });
+						
+						await page.evaluateOnNewDocument(() => {
+						    const newProto = navigator.__proto__;
+							delete newProto.webdriver;
+							navigator.__proto__ = newProto;
+						});
 						await page.goto(url, {waitUntil : 'networkidle2'});
 					}catch(e){
 						this.showError(e);
@@ -569,6 +582,10 @@
 						}, 60000);
 					}
 					
+					if (!fs.existsSync(os.tmpdir() + separator + 'chrome-data-capture')) {
+						fs.mkdirSync(os.tmpdir() + separator + 'chrome-data-capture');
+					}
+					
 					let taskArr = [];
 					let task = "";
 					for(let i = 0; i < fileList.length; i++){