diff --git a/Bench4Q-Master/src/main/resources/org/bench4q/master/config/httpCaptureConfig/recordFlag.html b/Bench4Q-Master/src/main/resources/org/bench4q/master/config/httpCaptureConfig/recordFlag.html index c4f83664..3b7059e0 100644 --- a/Bench4Q-Master/src/main/resources/org/bench4q/master/config/httpCaptureConfig/recordFlag.html +++ b/Bench4Q-Master/src/main/resources/org/bench4q/master/config/httpCaptureConfig/recordFlag.html @@ -1,6 +1,6 @@
-
- RecordingScript +
+ Recording  
\ No newline at end of file diff --git a/Bench4Q-Recorder/src/main/java/org/bench4q/recorder/httpcapture/generator/ResponseHeader.java b/Bench4Q-Recorder/src/main/java/org/bench4q/recorder/httpcapture/generator/ResponseHeader.java index bce7d1fb..1e4059d6 100644 --- a/Bench4Q-Recorder/src/main/java/org/bench4q/recorder/httpcapture/generator/ResponseHeader.java +++ b/Bench4Q-Recorder/src/main/java/org/bench4q/recorder/httpcapture/generator/ResponseHeader.java @@ -38,7 +38,7 @@ public class ResponseHeader { } public String getCharset() { - return charset == null ? "utf-8":charset; + return charset;// == null ? "utf-8":charset; } public void setCharset(String charset) { diff --git a/Bench4Q-Web/src/main/webapp/i18n/i18n.properties b/Bench4Q-Web/src/main/webapp/i18n/i18n.properties index 92a40310..c7711697 100644 --- a/Bench4Q-Web/src/main/webapp/i18n/i18n.properties +++ b/Bench4Q-Web/src/main/webapp/i18n/i18n.properties @@ -48,4 +48,5 @@ plugin_jsp_addPage=Add Page stopTestPlan_fail=Stop running test plan fail startRecordingMessage=Please click start recording stopRecordingMessage=Please click stop recording -failed-connect-server=failed to connect server \ No newline at end of file +failed-connect-server=failed to connect server +close-proxy-setting=clear the proxy setting \ No newline at end of file diff --git a/Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties b/Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties index 5e387298..29e4a1e8 100644 --- a/Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties +++ b/Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties @@ -44,4 +44,5 @@ plugin_jsp_addPage=\u52A0\u9875 stopTestPlan_fail=\u505C\u6B62\u8FD0\u884C\u6D4B\u8BD5\u8BA1\u5212\u5931\u8D25 startRecordingMessage=\u8bf7\u70b9\u51fb\u5f00\u59cb\u5f55\u5236 stopRecordingMessage=\u8bf7\u70b9\u51fb\u505c\u6b62\u5f55\u5236 -failed-connect-server=\u8FDE\u63A5\u670D\u52A1\u5668\u5931\u8D25\uFF01 \ No newline at end of file +failed-connect-server=\u8FDE\u63A5\u670D\u52A1\u5668\u5931\u8D25\uFF01 +close-proxy-setting=\u8BF7\u5173\u95ED\u4EE3\u7406 \ No newline at end of file diff --git a/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js b/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js index e5e729a5..8f2a63ff 100644 --- a/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js +++ b/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js @@ -26,7 +26,7 @@ function startServer() { information($.i18n.prop("startServerFail") + data.failedMessage); } }, "json").error(function(){ - information($.i18n.prop('failed-connect-server')); + information($.i18n.prop('failed-connect-server')+$.i18n.prop('close-proxy-setting')); }); } @@ -49,9 +49,10 @@ function startRecording() { $('#stopRecording').attr('disabled', false); $('#startRecording').attr('disabled', true); startRecordingSuccess = true; + $('#fileName').hide(); } }, "json").error(function(){ - information($.i18n.prop('failed-connect-server')); + information($.i18n.prop('failed-connect-server')+$.i18n.prop('close-proxy-setting')); }); } else { $('#scriptInfo3').text("record script server has not started"); @@ -79,7 +80,7 @@ function stopRecording(isStopServer) { } $('#stopRecording').attr('disabled', true); }, "json").error(function(){ - information($.i18n.prop('failed-connect-server')); + information($.i18n.prop('failed-connect-server')+$.i18n.prop('close-proxy-setting')); }); } else { $('#scriptInfo3').text("record script server has not started"); @@ -101,7 +102,7 @@ function stopServer() { server = null; } }, "json").error(function(){ - information($.i18n.prop('failed-connect-server')); + information($.i18n.prop('failed-connect-server')+$.i18n.prop('close-proxy-setting')); }); } else { $('#scriptInfo3').text("record script server has not started"); @@ -122,7 +123,7 @@ function testRecordProxy() { $("#ProxySettingMessage").attr("class","show"); } }, "json").error(function(){ - information($.i18n.prop('failed-connect-server')); + information($.i18n.prop('failed-connect-server')+$.i18n.prop('close-proxy-setting')); }); } @@ -147,6 +148,6 @@ function saveScript() { } loadScript(table, 2); }).error(function(){ - information("failed to connect server"); + information($.i18n.prop('failed-connect-server')+$.i18n.prop('close-proxy-setting')); }); } diff --git a/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptUI.js b/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptUI.js index 4470fdfe..54e47cad 100644 --- a/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptUI.js +++ b/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptUI.js @@ -16,6 +16,7 @@ function dismiss(container){ }else if(startServerSuccess) stopServer(); resetMsg(); + $('#fileName').hide(); } $('#uploadScript')