From 527629ef3efce800ad473f108e648aaef5ed8e1c Mon Sep 17 00:00:00 2001 From: seagull <24163551@qq.com> Date: Wed, 16 May 2018 15:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0HTTPS=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 730 +++++++++--------- .../entity/ProjectProtocolTemplate.java | 7 + .../resources/ProjectProtocolTemplate.hbm.xml | 3 + src/main/webapp/jsp/plancase/ptctemplate.jsp | 21 +- .../webapp/jsp/plancase/templateparam.jsp | 11 +- 5 files changed, 401 insertions(+), 371 deletions(-) diff --git a/pom.xml b/pom.xml index 8b3d558..335fb09 100644 --- a/pom.xml +++ b/pom.xml @@ -1,365 +1,365 @@ - - 4.0.0 - com.seagull - LuckyFrameServer - war - 0.0.1-SNAPSHOT - LuckyFrameServer Maven Webapp - http://maven.apache.org - - LuckyFrameServer - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - src/main/resources - - **/*.properties - **/*.xml - - true - - - - - UTF-8 - - - - junit - junit - 3.8.1 - test - - - antlr - antlr - 2.7.7 - - - aopalliance - aopalliance - 1.0 - - - org.aspectj - aspectjweaver - 1.8.10 - - - org.hibernate - hibernate-validator - 5.4.0.Final - - - c3p0 - c3p0 - 0.9.1.2 - - - - commons-beanutils - commons-beanutils - 1.9.3 - - - commons-codec - commons-codec - 1.10 - - - commons-collections - commons-collections - 3.2.2 - - - commons-dbcp - commons-dbcp - 1.4 - - - commons-digester - commons-digester - 2.1 - - - commons-discovery - commons-discovery - 0.5 - - - commons-fileupload - commons-fileupload - 1.3.2 - - - commons-httpclient - commons-httpclient - 3.1 - - - commons-io - commons-io - 2.5 - - - commons-lang - commons-lang - 2.6 - - - commons-logging - commons-logging - 1.2 - - - commons-pool - commons-pool - 1.6 - - - dom4j - dom4j - 1.6.1 - - - commons-validator - commons-validator - 1.5.1 - - - org.hibernate - ejb3-persistence - 3.3.2.Beta1 - - - net.sf.ezmorph - ezmorph - 1.0.6 - - - org.springframework - spring-hibernate3 - 2.0.8 - - - org.hibernate - hibernate-annotations - 3.5.6-Final - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.1.Final - - - org.hibernate - hibernate-validator-annotation-processor - 5.3.4.Final - - - org.javassist - javassist - 3.21.0-GA - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - javax.servlet - javax.servlet-api - 3.1.0 - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - - jstl - jstl - 1.2 - - - javax.transaction - jta - 1.1 - - - log4j - log4j - 1.2.17 - - - mysql - mysql-connector-java - 6.0.5 - - - org.quartz-scheduler - quartz - 1.8.6 - - - opensymphony - quartz-all - 1.6.2 - - - org.quartz-scheduler - quartz-commonj - 1.8.6 - - - org.quartz-scheduler - quartz-oracle - 1.8.6 - - - org.w3c.css - sac - 1.3 - - - org.slf4j - slf4j-api - 1.7.22 - - - org.slf4j - slf4j-log4j12 - 1.7.22 - - - org.springframework - spring-aop - 4.3.6.RELEASE - - - org.springframework - spring-aspects - 4.3.6.RELEASE - - - org.springframework - spring-beans - 4.3.6.RELEASE - - - org.springframework - spring-context - 4.3.6.RELEASE - - - org.springframework - spring-context-support - 4.3.6.RELEASE - - - org.springframework - spring-core - 4.3.6.RELEASE - - - org.springframework - spring-expression - 4.3.6.RELEASE - - - org.springframework - spring-instrument - 4.3.6.RELEASE - - - org.springframework - spring-instrument-tomcat - 4.3.6.RELEASE - - - org.springframework - spring-jdbc - 4.3.6.RELEASE - - - org.springframework - spring-jms - 4.3.6.RELEASE - - - org.springframework - spring-orm - 4.3.6.RELEASE - - - org.springframework - spring-oxm - 4.3.6.RELEASE - - - org.springframework - spring-struts - 3.2.18.RELEASE - - - org.springframework - spring-test - 4.3.6.RELEASE - - - org.springframework - spring-tx - 4.3.6.RELEASE - - - org.springframework - spring-web - 4.3.6.RELEASE - - - org.springframework - spring-webmvc - 4.3.6.RELEASE - - - taglibs - standard - 1.1.2 - - - javax.validation - validation-api - 1.1.0.Final - - - - + + 4.0.0 + com.seagull + LuckyFrameServer + war + 0.0.1-SNAPSHOT + LuckyFrameServer Maven Webapp + http://maven.apache.org + + LuckyFrameServer + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + src/main/resources + + **/*.properties + **/*.xml + + true + + + + + UTF-8 + + + + junit + junit + 3.8.1 + test + + + antlr + antlr + 2.7.7 + + + aopalliance + aopalliance + 1.0 + + + org.aspectj + aspectjweaver + 1.8.10 + + + org.hibernate + hibernate-validator + 5.4.0.Final + + + c3p0 + c3p0 + 0.9.1.2 + + + + commons-beanutils + commons-beanutils + 1.9.3 + + + commons-codec + commons-codec + 1.10 + + + commons-collections + commons-collections + 3.2.2 + + + commons-dbcp + commons-dbcp + 1.4 + + + commons-digester + commons-digester + 2.1 + + + commons-discovery + commons-discovery + 0.5 + + + commons-fileupload + commons-fileupload + 1.3.2 + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-io + commons-io + 2.5 + + + commons-lang + commons-lang + 2.6 + + + commons-logging + commons-logging + 1.2 + + + commons-pool + commons-pool + 1.6 + + + dom4j + dom4j + 1.6.1 + + + commons-validator + commons-validator + 1.5.1 + + + org.hibernate + ejb3-persistence + 3.3.2.Beta1 + + + net.sf.ezmorph + ezmorph + 1.0.6 + + + org.springframework + spring-hibernate3 + 2.0.8 + + + org.hibernate + hibernate-annotations + 3.5.6-Final + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.1.Final + + + org.hibernate + hibernate-validator-annotation-processor + 5.3.4.Final + + + org.javassist + javassist + 3.21.0-GA + + + javax.servlet.jsp + javax.servlet.jsp-api + 2.3.1 + + + javax.servlet + javax.servlet-api + 3.1.0 + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + jstl + jstl + 1.2 + + + javax.transaction + jta + 1.1 + + + log4j + log4j + 1.2.17 + + + mysql + mysql-connector-java + 8.0.11 + + + org.quartz-scheduler + quartz + 1.8.6 + + + opensymphony + quartz-all + 1.6.2 + + + org.quartz-scheduler + quartz-commonj + 1.8.6 + + + org.quartz-scheduler + quartz-oracle + 1.8.6 + + + org.w3c.css + sac + 1.3 + + + org.slf4j + slf4j-api + 1.7.22 + + + org.slf4j + slf4j-log4j12 + 1.7.22 + + + org.springframework + spring-aop + 4.3.6.RELEASE + + + org.springframework + spring-aspects + 4.3.6.RELEASE + + + org.springframework + spring-beans + 4.3.6.RELEASE + + + org.springframework + spring-context + 4.3.6.RELEASE + + + org.springframework + spring-context-support + 4.3.6.RELEASE + + + org.springframework + spring-core + 4.3.6.RELEASE + + + org.springframework + spring-expression + 4.3.6.RELEASE + + + org.springframework + spring-instrument + 4.3.6.RELEASE + + + org.springframework + spring-instrument-tomcat + 4.3.6.RELEASE + + + org.springframework + spring-jdbc + 4.3.6.RELEASE + + + org.springframework + spring-jms + 4.3.6.RELEASE + + + org.springframework + spring-orm + 4.3.6.RELEASE + + + org.springframework + spring-oxm + 4.3.6.RELEASE + + + org.springframework + spring-struts + 3.2.18.RELEASE + + + org.springframework + spring-test + 4.3.6.RELEASE + + + org.springframework + spring-tx + 4.3.6.RELEASE + + + org.springframework + spring-web + 4.3.6.RELEASE + + + org.springframework + spring-webmvc + 4.3.6.RELEASE + + + taglibs + standard + 1.1.2 + + + javax.validation + validation-api + 1.1.0.Final + + + + diff --git a/src/main/java/luckyweb/seagull/spring/entity/ProjectProtocolTemplate.java b/src/main/java/luckyweb/seagull/spring/entity/ProjectProtocolTemplate.java index 0670950..1a25914 100644 --- a/src/main/java/luckyweb/seagull/spring/entity/ProjectProtocolTemplate.java +++ b/src/main/java/luckyweb/seagull/spring/entity/ProjectProtocolTemplate.java @@ -21,6 +21,7 @@ public class ProjectProtocolTemplate implements java.io.Serializable{ private int projectid; private String name; private String protocoltype; + private String cerpath; private String contentencoding; private int connecttimeout; private String time; @@ -30,6 +31,12 @@ public class ProjectProtocolTemplate implements java.io.Serializable{ private String headmsg; + public String getCerpath() { + return cerpath; + } + public void setCerpath(String cerpath) { + this.cerpath = cerpath; + } public String getHeadmsg() { return headmsg; } diff --git a/src/main/resources/ProjectProtocolTemplate.hbm.xml b/src/main/resources/ProjectProtocolTemplate.hbm.xml index 1ad13b9..da44c36 100644 --- a/src/main/resources/ProjectProtocolTemplate.hbm.xml +++ b/src/main/resources/ProjectProtocolTemplate.hbm.xml @@ -20,6 +20,9 @@ + + + diff --git a/src/main/webapp/jsp/plancase/ptctemplate.jsp b/src/main/webapp/jsp/plancase/ptctemplate.jsp index ea1f459..116550f 100644 --- a/src/main/webapp/jsp/plancase/ptctemplate.jsp +++ b/src/main/webapp/jsp/plancase/ptctemplate.jsp @@ -117,6 +117,14 @@ +
+ +
+ +
+
+
@@ -379,6 +387,16 @@ } } }, + cerpath : { + message : '证书路径无效！', + validators : { + stringLength : { + min : 0, + max : 300, + message : '证书存放路径长度必须小于300个字符' + } + } + }, remark : { message : '模板备注无效！', validators : { @@ -443,13 +461,14 @@ $("#projectid").val(row[0].projectid); $("#name").val("COPY "+row[0].name); $("#protocoltype").val(row[0].protocoltype); + $("#cerpath").val(row[0].cerpath); $("#headmsg").val(row[0].headmsg); $("#contentencoding").val(row[0].contentencoding); $("#connecttimeout").val(row[0].connecttimeout); $("#remark").val(row[0].remark); $("#id").val(row[0].id); $("#addModal").modal('show'); - } + } }else{ toastr.warning('要复制模板有且只能选择一条记录哦！'); } diff --git a/src/main/webapp/jsp/plancase/templateparam.jsp b/src/main/webapp/jsp/plancase/templateparam.jsp index 59b5111..909df59 100644 --- a/src/main/webapp/jsp/plancase/templateparam.jsp +++ b/src/main/webapp/jsp/plancase/templateparam.jsp @@ -59,13 +59,14 @@ 项目名称：${ptemplate.projectname} 模板名称：${ptemplate.name} - 请求头域：${ptemplate.headmsg} + 请求头域：${ptemplate.headmsg} + 协议类型：${ptemplate.protocoltype} - 协议类型：${ptemplate.protocoltype} - 编码格式：${ptemplate.contentencoding} - 超时时间：${ptemplate.connecttimeout} - 备注：${ptemplate.remark} + 编码格式：${ptemplate.contentencoding} + 备注：${ptemplate.remark} + 证书路径：${ptemplate.cerpath} + 超时时间：${ptemplate.connecttimeout}