From b2297473df2779c50abc69f9d5a9635cac9040af Mon Sep 17 00:00:00 2001
From: seagull <24163551@qq.com>
Date: Fri, 24 Nov 2017 17:17:36 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E5=A4=8DDebug=20API=E7=9A=84bug=202?=
 =?UTF-8?q?:=E4=BC=98=E5=8C=96=E5=90=84=E4=B8=AA=E6=89=B9=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=91=BD=E4=BB=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/Resources/start_service.cmd                         | 1 +
 src/main/Resources/task.cmd                                  | 3 +++
 src/main/Resources/task_batch.cmd                            | 3 +++
 src/main/Resources/task_onecase.cmd                          | 3 +++
 src/main/Resources/web_debugcase.cmd                         | 5 ++++-
 .../luckyclient/caserun/exinterface/ApiTestCaseDebug.java    | 4 ++--
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/Resources/start_service.cmd b/src/main/Resources/start_service.cmd
index 774dbdd..18e8f0d 100644
--- a/src/main/Resources/start_service.cmd
+++ b/src/main/Resources/start_service.cmd
@@ -1,3 +1,4 @@
+title 【LuckyFrame客户端监听程序,请保持开启状态】
 set classpath=%CLASSPATH%;.\luckyclient;
 @echo 指定任务执行
 @echo 项目名称 任务ID
diff --git a/src/main/Resources/task.cmd b/src/main/Resources/task.cmd
index 75c0b1f..d1866a5 100644
--- a/src/main/Resources/task.cmd
+++ b/src/main/Resources/task.cmd
@@ -1,5 +1,8 @@
+title 测试任务执行【%1】 
 set classpath=%CLASSPATH%;.\luckyclient;
 @echo 指定任务执行
 @echo 项目名称 任务ID
 java -Djava.ext.dirs=./lib;.%2 luckyclient.caserun.RunAutomationTest %1
+@echo 当前测试任务执行窗口将在90秒后退出
+ping 127.0.0.1 -n 90 >nul
 exit
\ No newline at end of file
diff --git a/src/main/Resources/task_batch.cmd b/src/main/Resources/task_batch.cmd
index 366a92b..1e0fa9f 100644
--- a/src/main/Resources/task_batch.cmd
+++ b/src/main/Resources/task_batch.cmd
@@ -1,5 +1,8 @@
+title 用例批量执行【%1】 
 set classpath=%CLASSPATH%;.\luckyclient;
 @echo 批量执行用例
 @echo 参数说明 依次为：项目名称 tastId 用例集 
 java -Djava.ext.dirs=./lib;.%3 luckyclient.caserun.BatchCaseExecute %1 %2
+@echo 当前用例批量执行窗口将在90秒后退出
+ping 127.0.0.1 -n 90 >nul
 exit
diff --git a/src/main/Resources/task_onecase.cmd b/src/main/Resources/task_onecase.cmd
index 730c337..0547696 100644
--- a/src/main/Resources/task_onecase.cmd
+++ b/src/main/Resources/task_onecase.cmd
@@ -1,5 +1,8 @@
+title 用例单条执行【%2】 
 set classpath=%CLASSPATH%;.\luckyclient;
 @echo 项目单条用例执行
 @echo 参数说明 依次为：项目名称 tastId 用例编号 用例版本号 
 java -Djava.ext.dirs=./lib;.%4 luckyclient.caserun.OneCaseExecute %1 %2 %3
+@echo 当前用例单条执行窗口将在90秒后退出
+ping 127.0.0.1 -n 90 >nul
 exit
diff --git a/src/main/Resources/web_debugcase.cmd b/src/main/Resources/web_debugcase.cmd
index e8dd00f..b9b31c1 100644
--- a/src/main/Resources/web_debugcase.cmd
+++ b/src/main/Resources/web_debugcase.cmd
@@ -1,5 +1,8 @@
+title Web界面用例调试【%1】
 set classpath=%CLASSPATH%;.\luckyclient;
 @echo Web界面调试用例接口
 @echo 参数说明 依次为：用例编号 执行者
 java -Djava.ext.dirs=./lib;.%3 luckyclient.caserun.WebDebugExecute %1 %2
-exit
+@echo 当前用例调试窗口将在90秒后退出
+ping 127.0.0.1 -n 90 >nul
+exit
\ No newline at end of file
diff --git a/src/main/java/luckyclient/caserun/exinterface/ApiTestCaseDebug.java b/src/main/java/luckyclient/caserun/exinterface/ApiTestCaseDebug.java
index 2f55092..424b0f5 100644
--- a/src/main/java/luckyclient/caserun/exinterface/ApiTestCaseDebug.java
+++ b/src/main/java/luckyclient/caserun/exinterface/ApiTestCaseDebug.java
@@ -111,7 +111,7 @@ public class ApiTestCaseDebug{
 				    			while(keys.hasNext()){
 				    				keyexistidentity = 0;
 				    				key = (String)keys.next();
-				    				if(uservariable.indexOf(key)>-1){
+				    				if(uservariable1.indexOf(key)>-1){
 				    					keyexistidentity = 1;
 				    					uservariable1 = key;
 							    		break;
@@ -123,7 +123,7 @@ public class ApiTestCaseDebug{
 				    			while(keys.hasNext()){
 				    				keyexistidentity = 0;
 				    				key = (String)keys.next();
-				    				if(uservariable.indexOf(key)>-1){
+				    				if(uservariable2.indexOf(key)>-1){
 				    					keyexistidentity = 1;
 				    					uservariable2 = key;
 							    		break;