qiushang před 1 dnem
rodič
revize
eac4300a09

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.3.5.0"
+!define PRODUCT_VERSION        		"2.3.5.1"
 !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.3.5.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.3.5.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/XYCapture/uninstallWeb/?v=2.3.5.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.3.5.1"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

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

+ 39 - 15
src/renderer/components/header.vue

@@ -130,9 +130,9 @@
 			<div>
 				<el-divider content-position="left">
 					账号登录
-					<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="账号登录完成后请关闭浏览器使用">
+					<!-- <el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="账号登录完成后请关闭浏览器使用">
 						<i class="el-icon-info" slot="reference" style="margin-left: 10px; color: #F56C6C;"></i>
-					</el-popover>
+					</el-popover> -->
 				</el-divider>
 				<el-row type="flex" justify="space-around">
 					<el-button size="mini" @click="toLogin('alibaba')" :loading="alibabaLoading">阿里巴巴</el-button>
@@ -176,7 +176,13 @@
 					</el-popover>
 				</el-divider>
 				<el-row style="text-align: center;">
-					<el-input-number v-model="gap" :min="1" :max="60" label="间隔时间" size="mini" style="margin-right: 5px;"></el-input-number>秒
+					间隔时间:<el-input-number v-model="gap" :min="1" :max="600" label="间隔时间" size="mini" style="margin-right: 5px;"></el-input-number>秒<i class="el-icon-info" style="visibility: hidden; margin-left: 15px"></i>
+					<div style="margin-top: 5px;">
+						随机范围:<el-input-number v-model="gapRandom" :min="1" :max="100" label="随机范围" size="mini" style="margin-right: 5px;"></el-input-number>秒
+						<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="间隔时间为5s,随机范围为2s,最终任务执行时间为5s-7s内的整数值">
+							<i class="el-icon-info" slot="reference" style="margin-left: 10px; color: #F56C6C;"></i>
+						</el-popover>
+					</div>
 				</el-row>
 				<el-divider content-position="left">
 					页面滚动速度
@@ -196,8 +202,23 @@
 						<el-option :value="1000"></el-option>
 						<el-option :value="1200"></el-option>
 						<el-option :value="1400"></el-option>
+						<el-option :value="2000"></el-option>
+						<el-option :value="4000"></el-option>
+						<el-option :value="5000"></el-option>
 					</el-select>毫秒
 				</el-row>
+				<el-divider content-position="left">
+					任务执行模式:
+					<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="默认任务后台运行,请谨慎选择!任务执行时浏览器前台显示请不要操作点击浏览器">
+						<i class="el-icon-info" slot="reference" style="margin-left: 10px; color: #F56C6C;"></i>
+					</el-popover>
+				</el-divider>
+				<el-row style="text-align: center;">
+					<el-radio-group v-model="exeType">
+						<el-radio :label="1">浏览器后台运行</el-radio>
+						<el-radio :label="2">浏览器前台显示</el-radio>
+					</el-radio-group>
+				</el-row>
 				<el-divider content-position="left">清理缓存</el-divider>
 				<el-row style="text-align: center;">
 					<el-button size="small" type="primary" @click="clearCache()" :loading="cacheLoading">点击清除软件缓存</el-button>
@@ -219,17 +240,8 @@
 		<el-dialog title="开发者模式" :visible.sync="developerModal" width="400px" :close-on-click-modal="false" :close-on-press-escape="false">
 			<div>
 				<p style="text-align: center; color: #F56C6C;">开发者参数设置,软件退出后会重置</p>
-				<p style="text-align: center; color: #F56C6C;">(无头模式:true|网络连接:networkidle2)</p>
-				<el-divider content-position="left">
-					无头模式
-				</el-divider>
-				<el-row style="text-align: center;">
-					<el-radio-group v-model="headless">
-					    <el-radio :label="1">true</el-radio>
-					    <el-radio :label="2">false</el-radio>
-					</el-radio-group>
-				</el-row>
-				<el-divider content-position="left">网络连接</el-divider>
+				<p style="text-align: center; color: #F56C6C;">(网络连接:networkidle2)</p>
+				<el-divider content-position="left">网络连接模式</el-divider>
 				<el-row style="text-align: center;">
 					<el-radio-group v-model="waitUntil">
 						<el-radio style="margin-bottom: 20px;" label="load">load</el-radio>
@@ -285,6 +297,8 @@
 				chromeType: 2,
 				chromePath: '',
 				gap: 3,
+				gapRandom: 2,
+				exeType: 1,
 				pageMs: 600,
 				isRemember:true,
 				//
@@ -539,7 +553,7 @@
 			saveSetting(){
 				this.saveLoading = true;
 				if(this.chromeType == 1){ // 用户选择电脑本地的浏览器使用
-					let chromePath = this.chromePath.replace(/"/g, "");
+					let chromePath = this.chromePath.replace(/^["']|["']$/g, '');
 					if(!chromePath.endsWith('.exe') || /[\u4e00-\u9fff]/.test(chromePath)){ //判断文件路径结尾而且不包含中文
 						this.$notify({
 							title: '提示',
@@ -575,6 +589,8 @@
 				this.$utils.setStorage('closeType', this.closeType);
 				this.$utils.setStorage('pageMs', this.pageMs);
 				this.$utils.setStorage('gap', this.gap);
+				this.$utils.setStorage('gapRandom', this.gapRandom);
+				this.$utils.setStorage('exeType', this.exeType);
 				this.$utils.setStorage('versionType', this.versionType);
 				this.$utils.setStorage('isRemember', true);
 				this.$utils.setStorage('chromeType', this.chromeType);
@@ -899,6 +915,8 @@
 					let closeType = this.$utils.getStorage('closeType');
 					let pageMs = this.$utils.getStorage('pageMs');
 					let gap = this.$utils.getStorage('gap');
+					let gapRandom = this.$utils.getStorage('gapRandom');
+					let exeType = this.$utils.getStorage('exeType');
 					let versionType = this.$utils.getStorage('versionType');
 					let chromeType = this.$utils.getStorage('chromeType');
 					let chromePath = this.$utils.getStorage('chromePath');
@@ -911,6 +929,12 @@
 					if(gap){
 						this.gap = gap;
 					}
+					if(gapRandom){
+						this.gapRandom = gapRandom;
+					}
+					if(exeType){
+						this.exeType = exeType;
+					}
 					if(versionType){
 						this.versionType = versionType;
 					}

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

@@ -613,8 +613,15 @@
 			// 任务下载间隔时间
 			initGap(){
 				let gap = this.$utils.getStorage('gap');
+				let gapRandom = this.$utils.getStorage('gapRandom');
 				if(gap){
-					return Number(gap);
+					let g = Number(gap);
+					let r = 0;
+					if(gapRandom){
+						r = Number(gapRandom) + 1;
+					}
+					let n = Math.floor(Math.random() * r) + g;
+					return n;
 				}else{
 					return 1;
 				}
@@ -625,7 +632,7 @@
 					headless: true,
 					waitUntil: 'networkidle2'
 				};
-				let n1 = this.$utils.getStorage('headless');
+				let n1 = this.$utils.getStorage('exeType');
 				let n2 = this.$utils.getStorage('waitUntil');
 				if(n1){
 					if(n1 == 1){