From 69997486260deb1fceb3aa652d18c9c901fa1264 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Mon, 13 Apr 2020 10:20:08 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E7=AC=A6=E5=90=88=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82=E7=9A=84=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/db_druid.properties        |   2 +-
 src/main/resources/log4j.properties           |   4 ++--
 src/main/webapp/index.html                    |   2 --
 .../webapp/libs/h-ui.admin/images/logo.png    | Bin 7465 -> 7512 bytes
 src/main/webapp/login.html                    |   2 +-
 src/main/webapp/resource/message/interface.js |   2 +-
 .../resource/message/setCategoryList.html     |   1 +
 src/main/webapp/resource/user/mail.js         |   2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/db_druid.properties b/src/main/resources/db_druid.properties
index be7f0dd..5304a6a 100644
--- a/src/main/resources/db_druid.properties
+++ b/src/main/resources/db_druid.properties
@@ -1,7 +1,7 @@
 jdbc.url=jdbc:mysql://localhost:3306/atp?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.username=root
-jdbc.password=KeYpZrZx
+jdbc.password=123456
 druid.filters=stat
 druid.maxActive=20
 druid.initialSize=1
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index d9cfdf0..1611bd7 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -16,7 +16,7 @@ log4j.appender.console.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%l]-
 log4j.appender.R = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.R.DatePattern='.'yyyy-MM-dd
 #the absolute route of the log4j file
-log4j.appender.R.File = /data/wwwlogs/yi/app.log
+log4j.appender.R.File = ../logs/app.log
 # set this kind LV
 log4j.appender.R.Threshold = INFO
 log4j.appender.R.Append = true
@@ -30,7 +30,7 @@ log4j.appender.R.layout.ConversionPattern=%-d{yyyy-MM-dd HH\:mm\:ss} [%l]-[%p] -
 
 #error log
 log4j.appender.E = org.apache.log4j.RollingFileAppender  
-log4j.appender.E.File = /data/wwwlogs/yi/error.log  
+log4j.appender.E.File = ../logs/error.log  
 log4j.appender.E.Append = true  
 log4j.appender.E.Threshold = ERROR 
 log4j.appender.E.MaxFileSize=5MB  
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 5021f8a..cdadc3b 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -45,8 +45,6 @@
                         <ul class="dropDown-menu menu radius box-shadow">
                             <li class="redirect-to-page"><a href="javascript:" onclick="to_changePasswd();">修改密码</a></li>
                             <li class="redirect-to-page"><a href="javascript:;" onclick="to_changeUser();">切换账户</a></li>
-                            <li class="redirect-to-page"><a  target="_blank" href="https://yi.xuwangcheng.com/">交流论坛</a></li>
-                            <li class="redirect-to-page"><a  target="_blank" href="https://gitee.com/xuwangcheng/masteryi-automated-testing/wikis/pages">操作手册</a></li>
                             <li><a href="javascript:;" onclick="to_logout()">退出</a></li>
                         </ul>
                     </li>
diff --git a/src/main/webapp/libs/h-ui.admin/images/logo.png b/src/main/webapp/libs/h-ui.admin/images/logo.png
index 1f1a505c3e68e72362af5a599b848e06c1d21925..f6e03821b6a920101e541599c5447f871e96d6fc 100644
GIT binary patch
literal 7512
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
K#kG<9#s348zJO%_

literal 7465
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
LZ=zSN1Bv}VW%1Ww

diff --git a/src/main/webapp/login.html b/src/main/webapp/login.html
index 0c60f65..9c3493a 100644
--- a/src/main/webapp/login.html
+++ b/src/main/webapp/login.html
@@ -61,7 +61,7 @@
         </form>
     </div>
 </div>
-<div class="footer">Copyright By MasterYi Devops@2017-2019 <script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1275927783'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s23.cnzz.com/z_stat.php%3Fid%3D1275927783%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script></div>
+<div class="footer">Copyright By Dcits Devops@2017-2019 </div>
 <script type="text/javascript" src="libs/jquery/1.9.1/jquery.js"></script>
 <script type="text/javascript" src="libs/h-ui/js/H-ui.js"></script>
 <script type="text/javascript" src="libs/layer/2.1/layer.js"></script>
diff --git a/src/main/webapp/resource/message/interface.js b/src/main/webapp/resource/message/interface.js
index bd60f31..430e8e1 100644
--- a/src/main/webapp/resource/message/interface.js
+++ b/src/main/webapp/resource/message/interface.js
@@ -1,7 +1,7 @@
 var interfaceId; //当前正在编辑的interface的id
 
 var templateParams = {
-		tableTheads:["名称", "中文名","类型","协议","创建时间","状态","创建用户","最后修改","报文管理", "参数管理", "备注","操作"],
+		tableTheads:["名称", "中文名","类型","协议","创建时间","状态","创建用户","最后修改","报文管理", "入参节点", "备注","操作"],
 		btnTools:[{
 			type:"primary",
 			size:"M",
diff --git a/src/main/webapp/resource/message/setCategoryList.html b/src/main/webapp/resource/message/setCategoryList.html
index c8b6c2d..f3dcfb7 100644
--- a/src/main/webapp/resource/message/setCategoryList.html
+++ b/src/main/webapp/resource/message/setCategoryList.html
@@ -17,6 +17,7 @@
     <link rel="stylesheet" type="text/css" href="../../libs/h-ui.admin/skin/default/skin.css" id="skin" />   
     <link rel="stylesheet" type="text/css" href="../../css/dcits.css" />
     <link rel="stylesheet" type="text/css" href="../../libs/layui/css/layui.css" />
+
     <!--[if IE 6]>
     <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
     <script>DD_belatedPNG.fix('*');</script>
diff --git a/src/main/webapp/resource/user/mail.js b/src/main/webapp/resource/user/mail.js
index bcafa14..8673d63 100644
--- a/src/main/webapp/resource/user/mail.js
+++ b/src/main/webapp/resource/user/mail.js
@@ -67,7 +67,7 @@ var columnsSetting = [
 var eventList = {
 		"#batch-del-object":function(){
 			var checkboxList = $(".selectMail:checked");
-			batchDelObjs(checkboxList, REQUEST_URL.MAIL.GET, null, null, function() {
+			batchDelObjs(checkboxList, REQUEST_URL.MAIL.DEL, null, null, function() {
                 (top['welcome']).getMailNum();
             });
 		},
-- 
Gitee


From 7bd0abd35c9296c0efba28c9577e0d6659aa7c51 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Wed, 6 May 2020 15:20:02 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8DURL=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B9=B1=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/bean/ComplexParameter.hbm.xml         |  6 +++++-
 .../business/message/bean/ComplexParameter.java   | 15 ++++++++++++++-
 .../coretest/message/parse/URLMessageParse.java   |  7 +++++--
 src/main/resources/db_druid.properties            |  4 ++--
 src/main/resources/update/1.0.5                   |  1 +
 update.md                                         |  5 +++++
 6 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/update/1.0.5

diff --git a/src/main/java/yi/master/business/message/bean/ComplexParameter.hbm.xml b/src/main/java/yi/master/business/message/bean/ComplexParameter.hbm.xml
index ca5ff3c..e9c6d1a 100644
--- a/src/main/java/yi/master/business/message/bean/ComplexParameter.hbm.xml
+++ b/src/main/java/yi/master/business/message/bean/ComplexParameter.hbm.xml
@@ -14,7 +14,7 @@
             <column name="self_parameter_id" />
         </many-to-one>             
         
-        <set name="childComplexParameters" cascade="all-delete-orphan" lazy="true" inverse="true" order-by="id asc">
+        <set name="childComplexParameters" cascade="all-delete-orphan" lazy="true" inverse="true" order-by="seq,id asc">
             <key>
                 <column name="next_complex_parameter_id" />
             </key>
@@ -26,6 +26,10 @@
         </many-to-one>  
         
        <one-to-one name="message" property-ref="complexParameter"></one-to-one>
+
+        <property name="seq" type="java.lang.Integer">
+            <column name="seq" length="6" />
+        </property>
         
     </class>
 </hibernate-mapping>
diff --git a/src/main/java/yi/master/business/message/bean/ComplexParameter.java b/src/main/java/yi/master/business/message/bean/ComplexParameter.java
index 646e1e4..491b00d 100644
--- a/src/main/java/yi/master/business/message/bean/ComplexParameter.java
+++ b/src/main/java/yi/master/business/message/bean/ComplexParameter.java
@@ -41,6 +41,11 @@ public class ComplexParameter implements Serializable {
 	 * 所属报文
 	 */
 	private Message message;
+
+    /**
+     * 排序
+     */
+	private Integer seq;
 	
 
 	public ComplexParameter(Integer id, Parameter selfParameter,
@@ -183,7 +188,15 @@ public class ComplexParameter implements Serializable {
 		}
 	}
 
-	@Override
+    public void setSeq(Integer seq) {
+        this.seq = seq;
+    }
+
+    public Integer getSeq() {
+        return seq;
+    }
+
+    @Override
 	public String toString() {
 		return "ComplexParameter [id=" + id + ", selfParameter="
 				+ selfParameter + "]";
diff --git a/src/main/java/yi/master/coretest/message/parse/URLMessageParse.java b/src/main/java/yi/master/coretest/message/parse/URLMessageParse.java
index eef9bb2..6c3854e 100644
--- a/src/main/java/yi/master/coretest/message/parse/URLMessageParse.java
+++ b/src/main/java/yi/master/coretest/message/parse/URLMessageParse.java
@@ -46,8 +46,11 @@ public class URLMessageParse extends MessageParse {
 		ParameterService service = (ParameterService) FrameworkUtil.getSpringBean("parameterService");
 		ComplexParameter cp =  new ComplexParameter(service.get(SystemConsts.DefaultObjectId.PARAMETER_OBJECT.getId()),
 				new HashSet<ComplexParameter>(), null);
+		int i = 0;
 		for (String key:urlParams.keySet()) {
-			cp.addChildComplexParameter(new ComplexParameter(findParamter(params, key, MessageKeys.MESSAGE_PARAMETER_DEFAULT_ROOT_PATH),  new HashSet<ComplexParameter>(), cp));
+		    ComplexParameter child = new ComplexParameter(findParamter(params, key, MessageKeys.MESSAGE_PARAMETER_DEFAULT_ROOT_PATH),  new HashSet<ComplexParameter>(), cp);
+			child.setSeq(i++);
+		    cp.addChildComplexParameter(child);
 		}
 		
 		return cp;
@@ -169,7 +172,7 @@ public class URLMessageParse extends MessageParse {
 	 */
 	public static Map<String, String> parseUrlToMap(String message, String[] excludeAttributeNames) {
 		
-		Map<String, String> params = new HashMap<String, String>();
+		Map<String, String> params = new LinkedHashMap<>();
 		
 		String[] urlParams = message.split("&");
 		
diff --git a/src/main/resources/db_druid.properties b/src/main/resources/db_druid.properties
index be7f0dd..b075cce 100644
--- a/src/main/resources/db_druid.properties
+++ b/src/main/resources/db_druid.properties
@@ -1,7 +1,7 @@
-jdbc.url=jdbc:mysql://localhost:3306/atp?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false
+jdbc.url=jdbc:mysql://localhost:3306/yi?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.username=root
-jdbc.password=KeYpZrZx
+jdbc.password=
 druid.filters=stat
 druid.maxActive=20
 druid.initialSize=1
diff --git a/src/main/resources/update/1.0.5 b/src/main/resources/update/1.0.5
new file mode 100644
index 0000000..7347530
--- /dev/null
+++ b/src/main/resources/update/1.0.5
@@ -0,0 +1 @@
+ALTER TABLE `at_complex_parameter` ADD COLUMN `seq` int(6) NULL DEFAULT NULL COMMENT '节点顺序' AFTER `next_complex_parameter_id`;
\ No newline at end of file
diff --git a/update.md b/update.md
index 37bdd0e..900cca2 100644
--- a/update.md
+++ b/update.md
@@ -1,3 +1,8 @@
+### v1.0.5
+#### 2020.5.6
+- 修复：报文中URL格式的参数保存顺序不正确的问题；
+
+
 ### v1.0.4
 #### 2020.3.9
 - 修复：性能测试结果文件保存出错的问题；
-- 
Gitee


From 27c8fea7b5fc00c00eb4138cd2fdb0bdcff02003 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Mon, 11 May 2020 10:57:20 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E5=9C=A8=E7=99=BB=E9=99=86=E5=A4=B1=E8=B4=A5=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/yi/master/business/user/action/UserAction.java     | 3 ++-
 src/main/webapp/index.js                                    | 2 ++
 src/main/webapp/login.html                                  | 6 ++++--
 update.md                                                   | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/yi/master/business/user/action/UserAction.java b/src/main/java/yi/master/business/user/action/UserAction.java
index c1ec51d..0096e47 100644
--- a/src/main/java/yi/master/business/user/action/UserAction.java
+++ b/src/main/java/yi/master/business/user/action/UserAction.java
@@ -91,8 +91,9 @@ public class UserAction extends BaseAction<User>{
 			//如果是账号密码登录，先验证验证码
 			if (StringUtils.isBlank(verifyCode) 
 					|| !verifyCode.equalsIgnoreCase(FrameworkUtil.getSessionMap().get(SystemConsts.SESSION_ATTRIBUTE_VERIFY_CODE).toString())) {
-				throw new YiException(AppErrorCode.USER_VERIFY_CODE_ERROR);
+			    throw new YiException(AppErrorCode.USER_VERIFY_CODE_ERROR);
 			}
+            FrameworkUtil.getSessionMap().put(SystemConsts.SESSION_ATTRIBUTE_VERIFY_CODE, "");
 			model = userService.login(model.getUsername(), MD5Util.code(model.getPassword()));
 			passwdLogin = true;
 		}
diff --git a/src/main/webapp/index.js b/src/main/webapp/index.js
index a3694b1..1721daf 100644
--- a/src/main/webapp/index.js
+++ b/src/main/webapp/index.js
@@ -260,8 +260,10 @@ function userLogin(){
             if(data.returnCode==0){
                 location.reload();
             }else if (data.returnCode==2){
+                $("#verifyCode").siblings('img').click();
                 layer.alert(data.msg, {icon: 4});
             }else {
+                $("#verifyCode").siblings('img').click();
                 tipMsg.text(data.msg);
             }
         });
diff --git a/src/main/webapp/login.html b/src/main/webapp/login.html
index 0c60f65..dfeb5f0 100644
--- a/src/main/webapp/login.html
+++ b/src/main/webapp/login.html
@@ -61,7 +61,7 @@
         </form>
     </div>
 </div>
-<div class="footer">Copyright By MasterYi Devops@2017-2019 <script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1275927783'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s23.cnzz.com/z_stat.php%3Fid%3D1275927783%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script></div>
+<div class="footer">Copyright By MasterYi Devops@2017-2019 </div>
 <script type="text/javascript" src="libs/jquery/1.9.1/jquery.js"></script>
 <script type="text/javascript" src="libs/h-ui/js/H-ui.js"></script>
 <script type="text/javascript" src="libs/layer/2.1/layer.js"></script>
@@ -110,6 +110,7 @@
         var username = $("#username").val();
         var password = $("#password").val();
         var verifyCode = $("#verifyCode").val();
+        var tipMsg = $("#loginTip");
         if(username != "" && username != null 
         		&& password != "" && password != null 
         		&& verifyCode != "" && verifyCode != null){
@@ -134,7 +135,8 @@
             	}
                 location.href="index.html";
             }else {
-            	 tipMsg.text(data.msg);
+                $("#verifyCode").siblings('img').click();
+            	tipMsg.text(data.msg);
             }
         });
     }
diff --git a/update.md b/update.md
index 900cca2..14b9bd9 100644
--- a/update.md
+++ b/update.md
@@ -1,6 +1,7 @@
 ### v1.0.5
 #### 2020.5.6
 - 修复：报文中URL格式的参数保存顺序不正确的问题；
+- 修复：登陆失败时验证码不刷新的问题；
 
 
 ### v1.0.4
-- 
Gitee


From d931cfcd32bc02f4b8253ce73e5c155f2074aad5 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Sat, 16 May 2020 12:55:29 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=98=E9=87=8F=E6=97=B6=E9=97=B4=E6=88=B3=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=BB=BA=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=9D=A5=E8=AE=BE=E7=BD=AE=E5=81=8F=E7=A7=BB=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/testconfig/bean/GlobalVariable.java       |  8 +++++++-
 .../yi/master/constant/GlobalVariableConstant.java     |  3 +++
 src/main/webapp/resource/setting/variable.js           | 10 +++++-----
 src/main/webapp/resource/template/customTemplate.htm   |  7 ++++++-
 update.md                                              |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/main/java/yi/master/business/testconfig/bean/GlobalVariable.java b/src/main/java/yi/master/business/testconfig/bean/GlobalVariable.java
index 78ccafb..2876167 100644
--- a/src/main/java/yi/master/business/testconfig/bean/GlobalVariable.java
+++ b/src/main/java/yi/master/business/testconfig/bean/GlobalVariable.java
@@ -1,5 +1,6 @@
 package yi.master.business.testconfig.bean;
 
+import cn.hutool.core.util.NumberUtil;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -314,7 +315,12 @@ public class GlobalVariable implements Serializable {
 						&& !forceCreate) {
 					return this.lastCreateValue;
 				}
-				this.lastCreateValue = String.valueOf(System.currentTimeMillis());
+				String offset = maps.get(GlobalVariableConstant.TIMESTAMP_OFFSET_MS);
+				if (StringUtils.isNotBlank(offset) && NumberUtil.isLong(offset)) {
+					this.lastCreateValue = String.valueOf(System.currentTimeMillis() + Long.valueOf(offset));
+				} else {
+					this.lastCreateValue = String.valueOf(System.currentTimeMillis());
+				}
 				update();
 				return this.lastCreateValue;
 			}
diff --git a/src/main/java/yi/master/constant/GlobalVariableConstant.java b/src/main/java/yi/master/constant/GlobalVariableConstant.java
index 0c4a0d8..0a10ad8 100644
--- a/src/main/java/yi/master/constant/GlobalVariableConstant.java
+++ b/src/main/java/yi/master/constant/GlobalVariableConstant.java
@@ -47,6 +47,9 @@ public interface GlobalVariableConstant {
 	String DB_SQL_ROW_SEQ = "rowSeq";
 	String DB_SQL_COL_SEQ = "colSeq";
 
+	/**时间戳*/
+	String TIMESTAMP_OFFSET_MS = "timeOffset";
+
 	/**
 	 * 使用方式，左边界
 	 */
diff --git a/src/main/webapp/resource/setting/variable.js b/src/main/webapp/resource/setting/variable.js
index f1a59b6..8627a8c 100644
--- a/src/main/webapp/resource/setting/variable.js
+++ b/src/main/webapp/resource/setting/variable.js
@@ -106,8 +106,10 @@ var variableTypeInfo = {
 		},
 		currentTimestamp:{
 			text:"时间戳",
-			settingValue:"",
-			layerHeight:"",
+			settingValue:{
+				timeOffset: ""
+			},
+			layerHeight:"230",
 			keyIsNull:false,
 			ifCreate:true
 		},
@@ -703,12 +705,10 @@ function changeFormByVariableType (variableType) {
 		case "datetime":
 		case "randomNum":
 		case "randomString":
+        case "currentTimestamp":
 		case "uuid":
 			showOrHideInput('hidden', 'button', 'hidden', null);
 			break;
-		case "currentTimestamp":
-			showOrHideInput('hidden', 'hidden', 'hidden', ' ');
-			break;	
 		case "constant":
 			showOrHideInput('text', 'hidden', 'hidden', null);
 			break;
diff --git a/src/main/webapp/resource/template/customTemplate.htm b/src/main/webapp/resource/template/customTemplate.htm
index 1be8797..26973bd 100644
--- a/src/main/webapp/resource/template/customTemplate.htm
+++ b/src/main/webapp/resource/template/customTemplate.htm
@@ -1041,7 +1041,12 @@
             <input type="text" class="input-text" id="colSeq" placeholder="如果查询出来有多个列名则按照此值获取指定列数据，默认为1">
         </div>
     </div>
-
+	<div class="row cl currentTimestamp hide">
+		<label class="form-label col-xs-4 col-sm-3">偏移量（毫秒）：</label>
+		<div class="formControls col-xs-8 col-sm-9">
+			<input type="text" class="input-text" id="timeOffset" placeholder="请用正负整数表示当前时间戳的偏移毫秒数">
+		</div>
+	</div>
 	<div class="row cl">
 		<div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-3">
 			<button class="btn btn-primary radius" type="button" id="save-setting-variable-value"><i class="Hui-iconfont">&#xe632;</i>保存</button>
diff --git a/update.md b/update.md
index 14b9bd9..4ac79cc 100644
--- a/update.md
+++ b/update.md
@@ -2,7 +2,7 @@
 #### 2020.5.6
 - 修复：报文中URL格式的参数保存顺序不正确的问题；
 - 修复：登陆失败时验证码不刷新的问题；
-
+- 优化：全局变量时间戳类型可以新建多个并且可配置参数来设置偏移量；
 
 ### v1.0.4
 #### 2020.3.9
-- 
Gitee


From 014be9a9bee254e48bd8c74790b50f7dcf587121 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Fri, 5 Jun 2020 14:43:17 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B1=AB=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=9E=E5=8A=A0=E8=A7=A3=E5=AF=86=E5=A4=84=E7=90=86=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  43 +++++--
 .../java/yi/master/constant/MessageKeys.java  |   4 +-
 .../process/HeNanYsbGjjMessageProcess.java    | 106 ++++++++++++++++++
 .../HeNanYsbGjjMsgProcessParameter.java       |  36 ++++++
 .../message/process/util/ysb/YsbSM4Util.java  |  54 +++++++++
 src/main/webapp/js/globalConstant.js          |   4 +
 6 files changed, 239 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/yi/master/coretest/message/process/HeNanYsbGjjMessageProcess.java
 create mode 100644 src/main/java/yi/master/coretest/message/process/config/HeNanYsbGjjMsgProcessParameter.java
 create mode 100644 src/main/java/yi/master/coretest/message/process/util/ysb/YsbSM4Util.java

diff --git a/pom.xml b/pom.xml
index 0363024..12e9cdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -360,7 +360,9 @@
 	    <artifactId>javax.mail</artifactId>
 	    <version>1.6.1</version>
 	</dependency>	
-	
+
+
+      <!--安徽移动网厅-->
 	<dependency>  
 	    <groupId>com.openApiClient</groupId>  
 	    <artifactId>openApiClient</artifactId>  
@@ -376,7 +378,9 @@
 	    <scope>system</scope>  
 	    <systemPath>${project.basedir}/lib/javabase64-1.3.1.jar</systemPath>  
 	</dependency> 
-	
+
+
+      <!--webservice-->
   	<!-- https://mvnrepository.com/artifact/org.apache.axis/axis-ant -->
 	<dependency>
 	    <groupId>org.apache.axis</groupId>
@@ -405,11 +409,11 @@
 	</dependency>
 	 
 	 <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15 -->
-	<dependency>
-	    <groupId>org.bouncycastle</groupId>
-	    <artifactId>bcprov-jdk15</artifactId>
-	    <version>1.46</version>
-	</dependency>
+	<!--<dependency>-->
+	    <!--<groupId>org.bouncycastle</groupId>-->
+	    <!--<artifactId>bcprov-jdk15</artifactId>-->
+	    <!--<version>1.46</version>-->
+	<!--</dependency>-->
 	 
 	 
 	 <!-- 接口mock相关 -->
@@ -472,6 +476,31 @@
           <version>1.11.3</version>
       </dependency>
 
+
+      <!--河南豫事办-->
+      <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
+      <dependency>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+          <version>1.58</version>
+      </dependency>
+
+      <dependency>
+          <groupId>com.cryptography.neu</groupId>
+          <artifactId>sm</artifactId>
+          <version>1.0</version>
+          <scope>system</scope>
+          <systemPath>${project.basedir}/lib/neu-cryptography.jar</systemPath>
+      </dependency>
+
+      <dependency>
+          <groupId>com.cryptography.neu</groupId>
+          <artifactId>BASE64Decoder</artifactId>
+          <version>1.0</version>
+          <scope>system</scope>
+          <systemPath>${project.basedir}/lib/sun.misc.BASE64Decoder.jar</systemPath>
+      </dependency>
+
   </dependencies>
 <!--   <repositories>
     <repository>
diff --git a/src/main/java/yi/master/constant/MessageKeys.java b/src/main/java/yi/master/constant/MessageKeys.java
index 03c9603..0916e8f 100644
--- a/src/main/java/yi/master/constant/MessageKeys.java
+++ b/src/main/java/yi/master/constant/MessageKeys.java
@@ -2,6 +2,7 @@ package yi.master.constant;
 
 import yi.master.coretest.message.parse.*;
 import yi.master.coretest.message.process.AnHuiAPPEncryptMessageProcess;
+import yi.master.coretest.message.process.HeNanYsbGjjMessageProcess;
 import yi.master.coretest.message.process.MessageProcess;
 import yi.master.coretest.message.process.ShanXiOpenApiMessageProcess;
 import yi.master.coretest.message.protocol.*;
@@ -236,7 +237,8 @@ public interface MessageKeys {
 	 */
 	enum MessageProcessType {
 		ShanXiOpenApi(ShanXiOpenApiMessageProcess.getInstance()),
-		AnhuiApp(AnHuiAPPEncryptMessageProcess.getInstance());
+		AnhuiApp(AnHuiAPPEncryptMessageProcess.getInstance()),
+        HeNanYsb(HeNanYsbGjjMessageProcess.getInstance());
 
 		private MessageProcess processor;
 
diff --git a/src/main/java/yi/master/coretest/message/process/HeNanYsbGjjMessageProcess.java b/src/main/java/yi/master/coretest/message/process/HeNanYsbGjjMessageProcess.java
new file mode 100644
index 0000000..c7e9082
--- /dev/null
+++ b/src/main/java/yi/master/coretest/message/process/HeNanYsbGjjMessageProcess.java
@@ -0,0 +1,106 @@
+package yi.master.coretest.message.process;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cryptography.neu.sm.SM2Result;
+import com.cryptography.neu.sm.SM2Util;
+import com.cryptography.neu.sm.SM4Util;
+import com.cryptography.neu.sm.Util;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import yi.master.coretest.message.process.config.HeNanYsbGjjMsgProcessParameter;
+import yi.master.coretest.message.process.util.ysb.YsbSM4Util;
+
+/**
+ *
+ * 河南豫事办公积金加解密
+ * @author xuwangcheng
+ * @version 1.0.0
+ * @description
+ * @date 2020/6/5 9:44
+ */
+public class HeNanYsbGjjMessageProcess extends MessageProcess {
+    public static final Logger LOGGER = Logger.getLogger(HeNanYsbGjjMessageProcess.class);
+    private static HeNanYsbGjjMessageProcess heNanYsbGjjMessageProcess;
+
+    private HeNanYsbGjjMessageProcess() {}
+
+    public static HeNanYsbGjjMessageProcess getInstance() {
+        if (heNanYsbGjjMessageProcess == null) {
+            heNanYsbGjjMessageProcess = new HeNanYsbGjjMessageProcess();
+        }
+
+        return heNanYsbGjjMessageProcess;
+    }
+
+    @Override
+    public String processRequestMessage(String requestMessage, String processParameter) {
+        JSONObject obj = JSONObject.parseObject(processParameter);
+        HeNanYsbGjjMsgProcessParameter parameter = JSONObject.toJavaObject(obj, HeNanYsbGjjMsgProcessParameter.class);
+
+        return encrypt(parameter, requestMessage);
+    }
+
+    @Override
+    public String processResponseMessage(String responseMessage, String processParameter) {
+        JSONObject obj = JSONObject.parseObject(processParameter);
+        HeNanYsbGjjMsgProcessParameter parameter = JSONObject.toJavaObject(obj, HeNanYsbGjjMsgProcessParameter.class);
+
+        return decode(parameter, responseMessage);
+    }
+
+
+    private String encrypt(HeNanYsbGjjMsgProcessParameter parameter, String requestMessage) {
+        if (StringUtils.isBlank(parameter.getPriKey()) || StringUtils.isBlank(parameter.getPubKey())) {
+            LOGGER.error("河南豫事办公积金接口加密失败：私钥和公钥均不能为空！");
+            return requestMessage;
+        }
+        JSONObject jsonObject = new JSONObject();
+        try {
+            byte[] secretKey = SM4Util.generateKey();
+            String ciphertext = YsbSM4Util.encryptData_ECB(requestMessage, secretKey);
+            SM2Result sm2Result = SM2Util.Sm2Sign(parameter.getPriKey(), ciphertext);
+            String strKey = Util.byteToHex(secretKey);
+            String skey = SM2Util.encrypt(parameter.getPubKey(), strKey);
+            jsonObject.put("ciphertext", ciphertext);
+            jsonObject.put("skey", skey);
+            jsonObject.put("sign_r", sm2Result.str_r);
+            jsonObject.put("sign_s", sm2Result.str_s);
+        } catch (Exception e) {
+            LOGGER.error("河南豫事办公积金接口加密失败", e);
+            return requestMessage;
+        }
+
+        return jsonObject.toJSONString();
+    }
+
+    private String decode(HeNanYsbGjjMsgProcessParameter parameter, String responseMessage) {
+        if (StringUtils.isBlank(parameter.getPriKey()) || StringUtils.isBlank(parameter.getPubKey())) {
+            LOGGER.error("河南豫事办公积金接口解密失败：私钥和公钥均不能为空！");
+            return responseMessage;
+        }
+
+        try {
+            JSONObject jsonObject = JSONObject.parseObject(responseMessage);
+            boolean verifySignResult = SM2Util.Sm2Verify(parameter.getPubKey(), jsonObject.getString("ciphertext")
+                    , jsonObject.getString("sign_r"), jsonObject.getString("sign_s"));
+            jsonObject.put("verifySignResult", verifySignResult);
+            //验签不正确
+            if (!verifySignResult) {
+                return jsonObject.toJSONString();
+            }
+            byte[] secretKey = SM4Util.generateKey();
+            String strKey = Util.byteToHex(secretKey);
+            String skey = SM2Util.encrypt(parameter.getPubKey(), strKey);
+            String decrypt = SM2Util.decrypt(parameter.getPriKey(), skey);
+            byte[] secretKeyB = Util.hexStringToBytes_sy(decrypt);
+            String strResult = YsbSM4Util.decryptData_ECB(jsonObject.getString("ciphertext"), secretKeyB);
+            jsonObject.put("decodeResult", JSONObject.parse(strResult));
+
+            return jsonObject.toJSONString();
+        } catch (Exception e) {
+            LOGGER.error("河南豫事办公积金接口解密失败", e);
+            return responseMessage;
+        }
+
+    }
+}
diff --git a/src/main/java/yi/master/coretest/message/process/config/HeNanYsbGjjMsgProcessParameter.java b/src/main/java/yi/master/coretest/message/process/config/HeNanYsbGjjMsgProcessParameter.java
new file mode 100644
index 0000000..3fcf9bb
--- /dev/null
+++ b/src/main/java/yi/master/coretest/message/process/config/HeNanYsbGjjMsgProcessParameter.java
@@ -0,0 +1,36 @@
+package yi.master.coretest.message.process.config;
+
+/**
+ * 河南豫事办报文处理器参数
+ * @author xuwangcheng
+ * @version 1.0.0
+ * @description
+ * @date 2020/6/5 9:41
+ */
+public class HeNanYsbGjjMsgProcessParameter {
+    /**
+     * 私钥，每个地市不一样
+     */
+    private String priKey;
+    /**
+     * 公钥，每个地市不一样
+     */
+    private String pubKey;
+
+
+    public void setPriKey(String priKey) {
+        this.priKey = priKey;
+    }
+
+    public void setPubKey(String pubKey) {
+        this.pubKey = pubKey;
+    }
+
+    public String getPriKey() {
+        return priKey;
+    }
+
+    public String getPubKey() {
+        return pubKey;
+    }
+}
diff --git a/src/main/java/yi/master/coretest/message/process/util/ysb/YsbSM4Util.java b/src/main/java/yi/master/coretest/message/process/util/ysb/YsbSM4Util.java
new file mode 100644
index 0000000..a0315bb
--- /dev/null
+++ b/src/main/java/yi/master/coretest/message/process/util/ysb/YsbSM4Util.java
@@ -0,0 +1,54 @@
+package yi.master.coretest.message.process.util.ysb;
+
+import Decoder.BASE64Decoder;
+import Decoder.BASE64Encoder;
+import com.cryptography.neu.sm.SM4;
+import com.cryptography.neu.sm.SM4_Context;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author xuwangcheng
+ * @version 1.0.0
+ * @description
+ * @date 2020/6/5 10:40
+ */
+public class YsbSM4Util {
+    public static String decryptData_ECB(String cipherText, byte[] secretKey) {
+        try {
+            SM4_Context ctx = new SM4_Context();
+            ctx.isPadding = true;
+            ctx.mode = 0;
+            SM4 sm4 = new SM4();
+            sm4.sm4_setkey_dec(ctx, secretKey);
+            byte[] decrypted = sm4.sm4_crypt_ecb(ctx, (new BASE64Decoder()).decodeBuffer(cipherText));
+            return new String(decrypted, "GBK");
+        } catch (Exception var4) {
+            var4.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String encryptData_ECB(String plainText, byte[] secretKey) {
+        try {
+            SM4_Context ctx = new SM4_Context();
+            ctx.isPadding = true;
+            ctx.mode = 1;
+            SM4 sm4 = new SM4();
+            sm4.sm4_setkey_enc(ctx, secretKey);
+            byte[] encrypted = sm4.sm4_crypt_ecb(ctx, plainText.getBytes("GBK"));
+            String cipherText = (new BASE64Encoder()).encode(encrypted);
+            Matcher m = null;
+            if (cipherText != null && cipherText.trim().length() > 0) {
+                Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+                m = p.matcher(cipherText);
+            }
+
+            return m.replaceAll("");
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            return null;
+        }
+    }
+}
diff --git a/src/main/webapp/js/globalConstant.js b/src/main/webapp/js/globalConstant.js
index abc8a2c..ea9b7a0 100644
--- a/src/main/webapp/js/globalConstant.js
+++ b/src/main/webapp/js/globalConstant.js
@@ -422,6 +422,10 @@ var MESSAGE_PROCESS = {
         "sensitiveInformation":"userIn.userPasswd,imsi,imei",
         "publicKey":"",
         "algorithmType":"RSA"
+    },
+    "HeNanYsb":{
+        "priKey":"",
+        "pubKey":""
     }
 }
 
-- 
Gitee


From 1f5c262553304d56ac614b644f696c15b601e32a Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Wed, 10 Jun 2020 10:03:23 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E5=8F=AF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E6=9D=A5=E6=9D=A5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A5=E5=A4=A9=E4=B8=BA=E5=8D=95=E4=BD=8D=E7=9A=84?=
 =?UTF-8?q?=E5=81=8F=E7=A7=BB=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../master/business/testconfig/bean/GlobalVariable.java  | 9 ++++++++-
 .../java/yi/master/constant/GlobalVariableConstant.java  | 1 +
 src/main/webapp/resource/setting/variable.js             | 6 ++++--
 src/main/webapp/resource/template/customTemplate.htm     | 6 ++++++
 update.md                                                | 1 +
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/yi/master/business/testconfig/bean/GlobalVariable.java b/src/main/java/yi/master/business/testconfig/bean/GlobalVariable.java
index 2876167..19002c9 100644
--- a/src/main/java/yi/master/business/testconfig/bean/GlobalVariable.java
+++ b/src/main/java/yi/master/business/testconfig/bean/GlobalVariable.java
@@ -1,5 +1,6 @@
 package yi.master.business.testconfig.bean;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
@@ -331,7 +332,13 @@ public class GlobalVariable implements Serializable {
 						&& !forceCreate) {
 					return this.lastCreateValue;
 				}
-				this.lastCreateValue = PracticalUtils.formatDate(parseJsonToMap().get(GlobalVariableConstant.DATETIME_FORMAT_ATTRIBUTE_NAME), new Date());
+				Date formatDate = new Date();
+				String offset = maps.get(GlobalVariableConstant.DATETIME_OFFSET_ATTRIBUTE_NAME);
+				if (NumberUtil.isDouble(offset) || NumberUtil.isInteger(offset)) {
+                    formatDate = DateUtil.offsetHour(formatDate, (int) Math.floor(Double.valueOf(offset) * 24));
+                }
+
+				this.lastCreateValue = PracticalUtils.formatDate(maps.get(GlobalVariableConstant.DATETIME_FORMAT_ATTRIBUTE_NAME), formatDate);
 				update();
 				return this.lastCreateValue;
 			}
diff --git a/src/main/java/yi/master/constant/GlobalVariableConstant.java b/src/main/java/yi/master/constant/GlobalVariableConstant.java
index 0a10ad8..dcb336d 100644
--- a/src/main/java/yi/master/constant/GlobalVariableConstant.java
+++ b/src/main/java/yi/master/constant/GlobalVariableConstant.java
@@ -18,6 +18,7 @@ public interface GlobalVariableConstant {
 	
 	/**格式化日期*/
 	String DATETIME_FORMAT_ATTRIBUTE_NAME = "datetimeFormat";
+	String DATETIME_OFFSET_ATTRIBUTE_NAME = "dateTimeOffset";
 	
 	/**随机字符串*/
 	String RANDOM_STRING_MODE_ATTRIBUTE_NAME = "randomStringMode";
diff --git a/src/main/webapp/resource/setting/variable.js b/src/main/webapp/resource/setting/variable.js
index 8627a8c..6ea4d0f 100644
--- a/src/main/webapp/resource/setting/variable.js
+++ b/src/main/webapp/resource/setting/variable.js
@@ -88,9 +88,11 @@ var variableTypeInfo = {
 		datetime:{
 			text:"日期",
 			settingValue:{
-				datetimeFormat:""
+				datetimeFormat:"",
+                dateTimeOffset: ""
 			},
-			layerHeight:"310",
+			layerHeight:"355",
+            layerWidth:"710",
 			keyIsNull:false,
 			ifCreate:true
 		},
diff --git a/src/main/webapp/resource/template/customTemplate.htm b/src/main/webapp/resource/template/customTemplate.htm
index 26973bd..e17d030 100644
--- a/src/main/webapp/resource/template/customTemplate.htm
+++ b/src/main/webapp/resource/template/customTemplate.htm
@@ -867,6 +867,12 @@
 			<input type="text" class="input-text" id="datetimeFormat" placeholder="yyyy-MM-dd HH:mm:ss">
 		</div>
 	</div>
+    <div class="row cl datetime hide">
+        <label class="form-label col-xs-4 col-sm-3">日期偏移天数：</label>
+        <div class="formControls col-xs-8 col-sm-9">
+            <input type="text" class="input-text" id="dateTimeOffset" placeholder="可填写小数，负数">
+        </div>
+    </div>
 			
 	<div class="row cl randomNum hide">
 		<label class="form-label col-xs-4 col-sm-3">随机数最小值：</label>
diff --git a/update.md b/update.md
index 4ac79cc..a6d4949 100644
--- a/update.md
+++ b/update.md
@@ -3,6 +3,7 @@
 - 修复：报文中URL格式的参数保存顺序不正确的问题；
 - 修复：登陆失败时验证码不刷新的问题；
 - 优化：全局变量时间戳类型可以新建多个并且可配置参数来设置偏移量；
+- 优化：全局变量日期时间类型可配置参数来来设置以天为单位的偏移量；
 
 ### v1.0.4
 #### 2020.3.9
-- 
Gitee


From 530bb1722c4f90309ccad7c3a0eb3d68740fd9af Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Wed, 10 Jun 2020 11:08:40 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=9C=B0=E5=B8=82?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HeNanYsbGjjMsgProcessParameter.java       | 25 ++++++
 .../message/process/util/ysb/MDFive.java      | 84 +++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 src/main/java/yi/master/coretest/message/process/util/ysb/MDFive.java

diff --git a/src/main/java/yi/master/coretest/message/process/config/HeNanYsbGjjMsgProcessParameter.java b/src/main/java/yi/master/coretest/message/process/config/HeNanYsbGjjMsgProcessParameter.java
index 3fcf9bb..10eda45 100644
--- a/src/main/java/yi/master/coretest/message/process/config/HeNanYsbGjjMsgProcessParameter.java
+++ b/src/main/java/yi/master/coretest/message/process/config/HeNanYsbGjjMsgProcessParameter.java
@@ -17,6 +17,15 @@ public class HeNanYsbGjjMsgProcessParameter {
      */
     private String pubKey;
 
+    /**
+     * 某些地市的特殊请求头生成需要的参数
+     */
+    private String clientId;
+    /**
+     * 某些地市的特殊请求头生成需要的参数
+     */
+    private String secretKey;
+
 
     public void setPriKey(String priKey) {
         this.priKey = priKey;
@@ -33,4 +42,20 @@ public class HeNanYsbGjjMsgProcessParameter {
     public String getPubKey() {
         return pubKey;
     }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public void setSecretKey(String secretKey) {
+        this.secretKey = secretKey;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public String getSecretKey() {
+        return secretKey;
+    }
 }
diff --git a/src/main/java/yi/master/coretest/message/process/util/ysb/MDFive.java b/src/main/java/yi/master/coretest/message/process/util/ysb/MDFive.java
new file mode 100644
index 0000000..ae43867
--- /dev/null
+++ b/src/main/java/yi/master/coretest/message/process/util/ysb/MDFive.java
@@ -0,0 +1,84 @@
+package yi.master.coretest.message.process.util.ysb;
+
+import cn.hutool.core.date.DateUtil;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+
+/**
+ * @author 502341194@gmail.com
+ * @ClassName MDFive
+ * @date 2020/1/15 9:24
+ * @Description TODO
+ * @Version 1.0
+ **/
+public class MDFive {
+
+    private static final String[] hexDigits = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};
+
+
+    public static String getMD5(String sourceStr)
+            throws UnsupportedEncodingException {
+        String resultStr = "";
+        try {
+            byte[] temp = sourceStr.getBytes();
+            MessageDigest md5 = MessageDigest.getInstance("MD5");
+            md5.update(temp);
+
+            byte[] b = md5.digest();
+            for (int i = 0; i < b.length; i++) {
+                char[] digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+                char[] ob = new char[2];
+                ob[0] = digit[(b[i] >>> 4 & 0xF)];
+                ob[1] = digit[(b[i] & 0xF)];
+                resultStr = resultStr + new String(ob);
+            }
+            return resultStr;
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static String byteArrayToHexString(byte[] b) {
+        StringBuffer resultSb = new StringBuffer();
+        for (int i = 0; i < b.length; i++) {
+            resultSb.append(byteToHexString(b[i]));
+        }
+        return resultSb.toString();
+    }
+
+    private static String byteToHexString(byte b) {
+        int n = b;
+        if (n < 0)
+            n += 256;
+        int d1 = n / 16;
+        int d2 = n % 16;
+        return hexDigits[d1] + hexDigits[d2];
+    }
+
+    public static String MD5Encode(String origin, String charsetname) {
+        String resultString = null;
+        try {
+            resultString = new String(origin);
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            if ((charsetname == null) || ("".equals(charsetname))) {
+                resultString = byteArrayToHexString(md.digest(resultString.getBytes()));
+            } else
+                resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetname)));
+        } catch (Exception exception) {
+        }
+        return resultString;
+    }
+
+    public static void main(String args[]) throws Exception {
+      //  String signStr = "hnysb001hnds@2020#@@114.215.139.111hnlkysbkey";
+        System.out.println(DateUtil.format(new Date() ,"yyyyMMdd"));
+        String signStr = "hnysb001hnds@2020#@@"+ DateUtil.format(new Date() ,"yyyyMMdd");
+        System.out.println(getMD5(signStr));
+        // 0C801C285DB007E8A27D7D9BA09EFE99
+    }
+}
-- 
Gitee


From 0bd53692a1443ff663c97e4277001bb718ccdc25 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Wed, 10 Jun 2020 11:23:59 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=89=8D=E7=BD=AE=E5=90=8E=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=99=A8=E5=A2=9E=E5=8A=A0=E5=AF=B9=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=A4=B4=EF=BC=88=E5=A6=82=E6=9E=9C=E6=98=AFHTTP?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=9A=84=E8=AF=9D=EF=BC=89=E7=9A=84=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/AnHuiAPPEncryptMessageProcess.java  |  2 +-
 .../message/process/MessageProcess.java         |  5 ++++-
 .../process/ShanXiOpenApiMessageProcess.java    | 17 ++++++++---------
 .../coretest/message/test/MessageAutoTest.java  |  8 +++++++-
 update.md                                       |  1 +
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/main/java/yi/master/coretest/message/process/AnHuiAPPEncryptMessageProcess.java b/src/main/java/yi/master/coretest/message/process/AnHuiAPPEncryptMessageProcess.java
index 9f6b8ba..e2be719 100644
--- a/src/main/java/yi/master/coretest/message/process/AnHuiAPPEncryptMessageProcess.java
+++ b/src/main/java/yi/master/coretest/message/process/AnHuiAPPEncryptMessageProcess.java
@@ -59,7 +59,7 @@ public class AnHuiAPPEncryptMessageProcess extends MessageProcess {
             + "9aYqgE7zyTRZYX9byQIDAQAB" + "\r";  
 
 	@Override
-	public String processRequestMessage(String requestMessage, String processParameter) {
+	public String processRequestMessage(String requestMessage, Map<String, String> headers, String processParameter) {
 		
 		JSONObject obj = JSONObject.fromObject(processParameter);
 		AnHuiAppMsgProcessParameter parameter = (AnHuiAppMsgProcessParameter) JSONObject.toBean(obj, AnHuiAppMsgProcessParameter.class);
diff --git a/src/main/java/yi/master/coretest/message/process/MessageProcess.java b/src/main/java/yi/master/coretest/message/process/MessageProcess.java
index b2f35ad..a7eee3d 100644
--- a/src/main/java/yi/master/coretest/message/process/MessageProcess.java
+++ b/src/main/java/yi/master/coretest/message/process/MessageProcess.java
@@ -2,6 +2,8 @@ package yi.master.coretest.message.process;
 
 import yi.master.constant.MessageKeys;
 
+import java.util.Map;
+
 /**
  * 在进行测试前需要进行特殊处理的操作,比如加密、解密、格式化等
  * @author xuwangcheng
@@ -13,10 +15,11 @@ public abstract class MessageProcess {
 	/**
 	 * 处理请求报文
 	 * @param requestMessage 请求报文
+     * @param headers 请求头
 	 * @param processParameter 处理类型的参数设定
 	 * @return 返回经过处理的入参报文
 	 */
-	public abstract String processRequestMessage(String requestMessage, String processParameter);
+	public abstract String processRequestMessage(String requestMessage, Map<String, String> headers, String processParameter);
 	/**
 	 * 处理返回报文
 	 * @param responseMessage 返回保温
diff --git a/src/main/java/yi/master/coretest/message/process/ShanXiOpenApiMessageProcess.java b/src/main/java/yi/master/coretest/message/process/ShanXiOpenApiMessageProcess.java
index 6930384..8043c98 100644
--- a/src/main/java/yi/master/coretest/message/process/ShanXiOpenApiMessageProcess.java
+++ b/src/main/java/yi/master/coretest/message/process/ShanXiOpenApiMessageProcess.java
@@ -1,17 +1,16 @@
 package yi.master.coretest.message.process;
 
-import java.net.URLEncoder;
-import java.security.PrivateKey;
-
+import com.open.common.util.MD5;
+import com.open.common.util.RSAUtils;
+import com.open.common.util.StringUtil;
 import net.sf.json.JSONObject;
-
 import org.apache.log4j.Logger;
-
 import yi.master.coretest.message.process.config.ShanXiOpenApiMsgProcessParameter;
 import yi.master.util.PracticalUtils;
-import com.open.common.util.MD5;
-import com.open.common.util.RSAUtils;
-import com.open.common.util.StringUtil;
+
+import java.net.URLEncoder;
+import java.security.PrivateKey;
+import java.util.Map;
 
 /**
  * @author xuwangcheng
@@ -34,7 +33,7 @@ public class ShanXiOpenApiMessageProcess extends MessageProcess {
 	}
 
 	@Override
-	public String processRequestMessage(String requestMessage, String processParameter) {
+	public String processRequestMessage(String requestMessage, Map<String, String> headers, String processParameter) {
 		try {
 			JSONObject obj = JSONObject.fromObject(processParameter);
 			ShanXiOpenApiMsgProcessParameter parameter = (ShanXiOpenApiMsgProcessParameter) JSONObject.toBean(obj, ShanXiOpenApiMsgProcessParameter.class);
diff --git a/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java b/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java
index 10e0bb2..98b92a2 100644
--- a/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java
+++ b/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java
@@ -162,7 +162,13 @@ public class MessageAutoTest {
 		//是否需要进行特殊处理
 		MessageProcess processUtil = MessageProcess.getProcessInstance(msg.getProcessType());
 		if (processUtil != null) {
-			testScene.setRequestMessage(processUtil.processRequestMessage(testScene.getRequestMessage(), msg.getProcessParameter()));
+            Map<String, String> headers = null;
+		    if (testScene.getCallParameter().get(MessageKeys.HTTP_PARAMETER_HEADER) != null) {
+                headers = (Map<String, String>) testScene.getCallParameter().get(MessageKeys.HTTP_PARAMETER_HEADER);
+            }
+
+			testScene.setRequestMessage(processUtil.processRequestMessage(testScene.getRequestMessage()
+                    , headers, msg.getProcessParameter()));
 		}
 		
 		result.setRequestMessage(testScene.getRequestMessage());
diff --git a/update.md b/update.md
index a6d4949..380ca20 100644
--- a/update.md
+++ b/update.md
@@ -4,6 +4,7 @@
 - 修复：登陆失败时验证码不刷新的问题；
 - 优化：全局变量时间戳类型可以新建多个并且可配置参数来设置偏移量；
 - 优化：全局变量日期时间类型可配置参数来来设置以天为单位的偏移量；
+- 优化：前置后置处理器增加对请求头（如果是HTTP请求的话）的自定义处理；
 
 ### v1.0.4
 #### 2020.3.9
-- 
Gitee


From 27648c79bdf0a9624307d64eedcc3ecb4085e05b Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Wed, 10 Jun 2020 11:40:41 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E8=B1=AB=E4=BA=8B=E5=8A=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/process/HeNanYsbGjjMessageProcess.java | 14 +++++++++++++-
 .../coretest/message/process/util/ysb/MDFive.java  |  7 +++----
 src/main/webapp/js/globalConstant.js               |  4 +++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/yi/master/coretest/message/process/HeNanYsbGjjMessageProcess.java b/src/main/java/yi/master/coretest/message/process/HeNanYsbGjjMessageProcess.java
index c7e9082..cb42275 100644
--- a/src/main/java/yi/master/coretest/message/process/HeNanYsbGjjMessageProcess.java
+++ b/src/main/java/yi/master/coretest/message/process/HeNanYsbGjjMessageProcess.java
@@ -1,5 +1,7 @@
 package yi.master.coretest.message.process;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.cryptography.neu.sm.SM2Result;
 import com.cryptography.neu.sm.SM2Util;
@@ -8,8 +10,12 @@ import com.cryptography.neu.sm.Util;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import yi.master.coretest.message.process.config.HeNanYsbGjjMsgProcessParameter;
+import yi.master.coretest.message.process.util.ysb.MDFive;
 import yi.master.coretest.message.process.util.ysb.YsbSM4Util;
 
+import java.util.Date;
+import java.util.Map;
+
 /**
  *
  * 河南豫事办公积金加解密
@@ -33,10 +39,16 @@ public class HeNanYsbGjjMessageProcess extends MessageProcess {
     }
 
     @Override
-    public String processRequestMessage(String requestMessage, String processParameter) {
+    public String processRequestMessage(String requestMessage, Map<String, String> headers, String processParameter) {
         JSONObject obj = JSONObject.parseObject(processParameter);
         HeNanYsbGjjMsgProcessParameter parameter = JSONObject.toJavaObject(obj, HeNanYsbGjjMsgProcessParameter.class);
 
+        //单独地市的请求头处理
+        if (StringUtils.isNotBlank(parameter.getClientId()) && StringUtils.isNotBlank(parameter.getSecretKey())
+                && MapUtil.isNotEmpty(headers)) {
+            headers.put("partner", MDFive.getMD5(parameter.getClientId() + parameter.getSecretKey() + DateUtil.format(new Date(), "yyyyMMdd")));
+        }
+
         return encrypt(parameter, requestMessage);
     }
 
diff --git a/src/main/java/yi/master/coretest/message/process/util/ysb/MDFive.java b/src/main/java/yi/master/coretest/message/process/util/ysb/MDFive.java
index ae43867..b4ccc5f 100644
--- a/src/main/java/yi/master/coretest/message/process/util/ysb/MDFive.java
+++ b/src/main/java/yi/master/coretest/message/process/util/ysb/MDFive.java
@@ -2,7 +2,6 @@ package yi.master.coretest.message.process.util.ysb;
 
 import cn.hutool.core.date.DateUtil;
 
-import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
@@ -19,8 +18,7 @@ public class MDFive {
     private static final String[] hexDigits = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};
 
 
-    public static String getMD5(String sourceStr)
-            throws UnsupportedEncodingException {
+    public static String getMD5(String sourceStr) {
         String resultStr = "";
         try {
             byte[] temp = sourceStr.getBytes();
@@ -67,8 +65,9 @@ public class MDFive {
             MessageDigest md = MessageDigest.getInstance("MD5");
             if ((charsetname == null) || ("".equals(charsetname))) {
                 resultString = byteArrayToHexString(md.digest(resultString.getBytes()));
-            } else
+            } else {
                 resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetname)));
+            }
         } catch (Exception exception) {
         }
         return resultString;
diff --git a/src/main/webapp/js/globalConstant.js b/src/main/webapp/js/globalConstant.js
index ea9b7a0..74a1013 100644
--- a/src/main/webapp/js/globalConstant.js
+++ b/src/main/webapp/js/globalConstant.js
@@ -425,7 +425,9 @@ var MESSAGE_PROCESS = {
     },
     "HeNanYsb":{
         "priKey":"",
-        "pubKey":""
+        "pubKey":"",
+        "clientId":"",
+        "secretKey":""
     }
 }
 
-- 
Gitee


From ad11c187002f1e2b1f95d88e5ec597f6756b5287 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Fri, 12 Jun 2020 09:50:11 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9C=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8A=A5=E6=96=87=E7=9A=84=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=97=B6=E4=BC=9A=E5=9C=A8=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=97=B6=E5=AF=BC=E8=87=B4=E7=B3=BB=E7=BB=9F=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=B5=8B=E8=AF=95=E9=9B=86=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=BB=93=E6=9D=9F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/yi/master/coretest/message/test/MessageAutoTest.java   | 2 +-
 src/main/java/yi/master/util/PracticalUtils.java                | 2 +-
 update.md                                                       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java b/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java
index 98b92a2..c846927 100644
--- a/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java
+++ b/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java
@@ -163,7 +163,7 @@ public class MessageAutoTest {
 		MessageProcess processUtil = MessageProcess.getProcessInstance(msg.getProcessType());
 		if (processUtil != null) {
             Map<String, String> headers = null;
-		    if (testScene.getCallParameter().get(MessageKeys.HTTP_PARAMETER_HEADER) != null) {
+		    if (testScene.getCallParameter() != null && testScene.getCallParameter().get(MessageKeys.HTTP_PARAMETER_HEADER) != null) {
                 headers = (Map<String, String>) testScene.getCallParameter().get(MessageKeys.HTTP_PARAMETER_HEADER);
             }
 
diff --git a/src/main/java/yi/master/util/PracticalUtils.java b/src/main/java/yi/master/util/PracticalUtils.java
index 8415656..b81f870 100644
--- a/src/main/java/yi/master/util/PracticalUtils.java
+++ b/src/main/java/yi/master/util/PracticalUtils.java
@@ -986,7 +986,7 @@ public class PracticalUtils {
 	 */
 	public static Map<String, Object> jsonToMap(String json) {
 		if (StringUtils.isBlank(json)) {
-			return null;
+			return new HashMap<>();
 		}
 		Map<String, Object> maps = null;
 		try {
diff --git a/update.md b/update.md
index 380ca20..63552ce 100644
--- a/update.md
+++ b/update.md
@@ -5,6 +5,7 @@
 - 优化：全局变量时间戳类型可以新建多个并且可配置参数来设置偏移量；
 - 优化：全局变量日期时间类型可配置参数来来设置以天为单位的偏移量；
 - 优化：前置后置处理器增加对请求头（如果是HTTP请求的话）的自定义处理；
+- 修复：未配置报文的调用参数时会在执行时导致系统内部错误测试集无法正常结束的问题；
 
 ### v1.0.4
 #### 2020.3.9
-- 
Gitee


From c25d849bfb0ef25ad140a4d47f368b47f2f0d855 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Mon, 13 Jul 2020 10:01:12 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E5=9C=BA=E6=99=AF=E5=9C=A8=E5=88=A0=E9=99=A4=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=9C=BA=E6=99=AF=E4=B9=8B=E5=90=8E=E6=9C=89=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E4=BC=9A=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E6=B5=8B=E8=AF=95=E5=9C=BA=E6=99=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/yi/master/business/message/bean/ComplexScene.java | 7 ++-----
 src/main/webapp/resource/message/setScene.js               | 3 ++-
 update.md                                                  | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/yi/master/business/message/bean/ComplexScene.java b/src/main/java/yi/master/business/message/bean/ComplexScene.java
index eddd387..0efd337 100644
--- a/src/main/java/yi/master/business/message/bean/ComplexScene.java
+++ b/src/main/java/yi/master/business/message/bean/ComplexScene.java
@@ -131,7 +131,6 @@ public class ComplexScene  implements Serializable {
 	public String delScene (Integer sequenceNum) {		
 		if (complexSceneConfigs.containsKey(String.valueOf(sequenceNum))) {
 			complexSceneConfigs.remove(String.valueOf(sequenceNum));
-			String removeKey = null;
 			
 			List<String> keys = new ArrayList<String>(complexSceneConfigs.keySet());
 			Collections.sort(keys);
@@ -139,12 +138,9 @@ public class ComplexScene  implements Serializable {
 			for (String key:keys) {
 				if (Integer.parseInt(key) > sequenceNum) {
 					complexSceneConfigs.put(String.valueOf((Integer.parseInt(key) - 1)), complexSceneConfigs.get(key));
-					removeKey = key;
+                    complexSceneConfigs.remove(key);
 				}
 			}
-			if (removeKey != null) {
-				complexSceneConfigs.remove(removeKey);
-			}
 			setConfigInfo(JSONObject.fromObject(complexSceneConfigs).toString());
 		}
 		
@@ -200,6 +196,7 @@ public class ComplexScene  implements Serializable {
 		}
 		//按照执行顺序排序
 		Collections.sort(scenes, new Comparator() {
+		    @Override
 			public int compare(Object a, Object b) {
 				Integer aId = ((MessageScene) a).getSequenceNum();
 				Integer bId = ((MessageScene) b).getSequenceNum();
diff --git a/src/main/webapp/resource/message/setScene.js b/src/main/webapp/resource/message/setScene.js
index cd24b07..0e2ad9f 100644
--- a/src/main/webapp/resource/message/setScene.js
+++ b/src/main/webapp/resource/message/setScene.js
@@ -354,7 +354,8 @@ var mySetting = {
 			columnsSetting:columnsSetting,
 			columnsJson:[0, 9],
 			dtOtherSetting:{
-				serverSide:true
+				serverSide:true,
+                bStateSave: false
 			},
 			exportExcel:false
 		},
diff --git a/update.md b/update.md
index 63552ce..accbff4 100644
--- a/update.md
+++ b/update.md
@@ -6,6 +6,7 @@
 - 优化：全局变量日期时间类型可配置参数来来设置以天为单位的偏移量；
 - 优化：前置后置处理器增加对请求头（如果是HTTP请求的话）的自定义处理；
 - 修复：未配置报文的调用参数时会在执行时导致系统内部错误测试集无法正常结束的问题；
+- 修复：组合场景在删除一个场景之后有时候会无法添加单个测试场景的问题；
 
 ### v1.0.4
 #### 2020.3.9
-- 
Gitee


From d2abdeba65ca994d04e7ad9f470947d69fd96e6a Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Mon, 13 Jul 2020 10:36:47 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/index.html                    |   2 ++
 .../webapp/libs/h-ui.admin/images/logo.png    | Bin 7512 -> 7465 bytes
 src/main/webapp/login.html                    |   6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index cdadc3b..5021f8a 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -45,6 +45,8 @@
                         <ul class="dropDown-menu menu radius box-shadow">
                             <li class="redirect-to-page"><a href="javascript:" onclick="to_changePasswd();">修改密码</a></li>
                             <li class="redirect-to-page"><a href="javascript:;" onclick="to_changeUser();">切换账户</a></li>
+                            <li class="redirect-to-page"><a  target="_blank" href="https://yi.xuwangcheng.com/">交流论坛</a></li>
+                            <li class="redirect-to-page"><a  target="_blank" href="https://gitee.com/xuwangcheng/masteryi-automated-testing/wikis/pages">操作手册</a></li>
                             <li><a href="javascript:;" onclick="to_logout()">退出</a></li>
                         </ul>
                     </li>
diff --git a/src/main/webapp/libs/h-ui.admin/images/logo.png b/src/main/webapp/libs/h-ui.admin/images/logo.png
index f6e03821b6a920101e541599c5447f871e96d6fc..1f1a505c3e68e72362af5a599b848e06c1d21925 100644
GIT binary patch
literal 7465
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
LZ=zSN1Bv}VW%1Ww

literal 7512
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
K#kG<9#s348zJO%_

diff --git a/src/main/webapp/login.html b/src/main/webapp/login.html
index 9c3493a..dfeb5f0 100644
--- a/src/main/webapp/login.html
+++ b/src/main/webapp/login.html
@@ -61,7 +61,7 @@
         </form>
     </div>
 </div>
-<div class="footer">Copyright By Dcits Devops@2017-2019 </div>
+<div class="footer">Copyright By MasterYi Devops@2017-2019 </div>
 <script type="text/javascript" src="libs/jquery/1.9.1/jquery.js"></script>
 <script type="text/javascript" src="libs/h-ui/js/H-ui.js"></script>
 <script type="text/javascript" src="libs/layer/2.1/layer.js"></script>
@@ -110,6 +110,7 @@
         var username = $("#username").val();
         var password = $("#password").val();
         var verifyCode = $("#verifyCode").val();
+        var tipMsg = $("#loginTip");
         if(username != "" && username != null 
         		&& password != "" && password != null 
         		&& verifyCode != "" && verifyCode != null){
@@ -134,7 +135,8 @@
             	}
                 location.href="index.html";
             }else {
-            	 tipMsg.text(data.msg);
+                $("#verifyCode").siblings('img').click();
+            	tipMsg.text(data.msg);
             }
         });
     }
-- 
Gitee


From 8c0e2375d5978662281f55537eb7567abe8b73c9 Mon Sep 17 00:00:00 2001
From: xuwangcheng <xuwangcheng14@163.com>
Date: Mon, 13 Jul 2020 10:45:41 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=88=B0v1.0.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/yi/master/constant/SystemConsts.java      | 2 +-
 src/main/java/yi/master/listener/VersionUpdateUtil.java | 1 +
 update.md                                               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/yi/master/constant/SystemConsts.java b/src/main/java/yi/master/constant/SystemConsts.java
index 0413631..4b50a71 100644
--- a/src/main/java/yi/master/constant/SystemConsts.java
+++ b/src/main/java/yi/master/constant/SystemConsts.java
@@ -13,7 +13,7 @@ public interface SystemConsts {
 	/**
 	 * 当前版本号
 	 */
-	String VERSION = "1.0.4";
+	String VERSION = "1.0.5";
 
 
 	/**
diff --git a/src/main/java/yi/master/listener/VersionUpdateUtil.java b/src/main/java/yi/master/listener/VersionUpdateUtil.java
index 5bf870b..1a93b51 100644
--- a/src/main/java/yi/master/listener/VersionUpdateUtil.java
+++ b/src/main/java/yi/master/listener/VersionUpdateUtil.java
@@ -50,6 +50,7 @@ public class VersionUpdateUtil {
         ALL_VERSION_LIST.add("1.0.2");
         ALL_VERSION_LIST.add("1.0.3");
         ALL_VERSION_LIST.add("1.0.4");
+        ALL_VERSION_LIST.add("1.0.5");
     }
 
     /**
diff --git a/update.md b/update.md
index accbff4..80be661 100644
--- a/update.md
+++ b/update.md
@@ -1,5 +1,5 @@
 ### v1.0.5
-#### 2020.5.6
+#### 2020.7.13
 - 修复：报文中URL格式的参数保存顺序不正确的问题；
 - 修复：登陆失败时验证码不刷新的问题；
 - 优化：全局变量时间戳类型可以新建多个并且可配置参数来设置偏移量；
-- 
Gitee