gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-08-23 10:00:54 +08:00
parent 42554ecb8b f2e72bef46
commit 2d2a342d44
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -261,9 +261,6 @@
<if test="functionId != null">
AND a.function_id=#{functionId,jdbcType=INTEGER}
</if>
<if test="doLog != null">
AND a.do_log=#{doLog,jdbcType=INTEGER}
</if>
<if test="ipPort!=null">
AND a.compile_id in (select t.compile_id from ip_port_cfg t
<where>
@@ -284,7 +281,7 @@
)
</if>
<if test="ntcSubscribeIdCfg != null">
AND r.compile_id in (select f.compile_id from ntc_subscribe_id_cfg f
AND a.compile_id in (select f.compile_id from ntc_subscribe_id_cfg f
<where>
<if test="ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != ''">
and f.cfg_keywords like concat(concat('%',#{ntcSubscribeIdCfg.cfgKeywords,jdbcType=VARCHAR}),'%')

2
src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
View File

@@ -10,7 +10,7 @@
</style>
<script type="text/javascript">
$(function(){
initCommIpVal();
// initCommIpVal();
// $("#cancel").on("click",function(){
// window.history.back();
// });

8
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
View File

@@ -5,7 +5,7 @@
<title><spring:message code="encrypted_tunnel_behavior"></spring:message></title>
<script type="text/javascript">
$(function(){
initCommIpVal();
// initCommIpVal();
/* $("#cancel").on("click",function(){
window.history.back();
}); */
@@ -35,7 +35,7 @@ $(function(){
},
submitHandler: function(form){
var flag = true;
$("input[name$='cfgKeywords']").each(function(){
$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
if($(this).val()==''){
$(this).parents(".form-group").find(
"div[for='"
@@ -57,6 +57,10 @@ $(function(){
}
}
});
var flag1=validateInvisibleCharTag();
if(flag){
flag=flag1;
}
if(flag){
//将disable属性的元素删除
$(".disabled").each(function(){

2
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
View File

@@ -350,7 +350,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq cfg.doLog }">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>