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

src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp

@@ -164,6 +164,12 @@ $(document).ready(function(){
 									</div>
 									</div>
 								</div>
+							<div class="row">
+								<div class="col-md-2">
+									<label><spring:message code="cfg_id"></spring:message>：</label>
+									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+								</div>
+							</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>

src/main/webapp/WEB-INF/views/log/ntc/appList.jsp

@@ -152,6 +152,12 @@ $(document).ready(function(){
 									</div>
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>

src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp

@@ -152,6 +152,12 @@
 									</div>
 								</div>
 							</div>
+							<div class="row">
+								<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+								</div>
+							</div>
 						</div>
 						<!-- /筛选搜索内容栏    结束-->
 					</form:form>

src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp

@@ -142,6 +142,12 @@ $(document).ready(function(){
 									</div>
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>

src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp

@@ -156,8 +156,12 @@
 										<input name="qname" type="text" class="form-control" value="${log.qname }"/>
 									</div>
 								</div>
+								<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+								</div>
+							</div>
 							</div>
-						</div>
 						<!-- /筛选搜索内容栏    结束-->
 					</form:form>
 				</div>

src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp

@@ -152,6 +152,12 @@ $(document).ready(function(){
 									</div>
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>

src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp

@@ -157,8 +157,12 @@
 										<input name="url" type="text" class="form-control" value="${log.url }"/>
 									</div>
 								</div>
+								<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+								</div>
+							</div>
 							</div>
-						</div>
 						<!-- /筛选搜索内容栏    结束-->
 					</form:form>
 				</div>

src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp

@@ -152,6 +152,12 @@
 									</div>
 								</div>
 							</div>
+							<div class="row">
+								<div class="col-md-2">
+									<label><spring:message code="cfg_id"></spring:message>：</label>
+									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+								</div>
+							</div>
 						</div>
 						<!-- /筛选搜索内容栏    结束-->
 					</form:form>

src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp

@@ -141,6 +141,12 @@ $(document).ready(function(){
 									</div>
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>

src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp

@@ -148,8 +148,14 @@
 	                                            <input name="dIp" type="text" class="form-control" value="${log.dIp}"/>
 	                                        </div>
 										</div>
+										<div class="row">
+										<div class="col-md-2">
+											<label><spring:message code="cfg_id"></spring:message>：</label>
+											<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+										</div>
 									</div>
 								</div>
+								</div>
 							</form:form>
 
 						</div>

src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp

@@ -149,6 +149,12 @@
 									</div>
 								</div>
 							</div>
+							<div class="row">
+								<div class="col-md-2">
+									<label><spring:message code="cfg_id"></spring:message>：</label>
+									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+								</div>
+							</div>
 						</div>
 						<!-- /筛选搜索内容栏    结束-->
 					</form:form>

src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp

@@ -150,7 +150,12 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
+									
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>

src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp

@@ -208,8 +208,12 @@
 													value="${log.dIp}" />
 											</div>
 										</div>
+										<div class="col-md-2">
+											<label><spring:message code="cfg_id"></spring:message>：</label>
+											<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+										</div>
 									</div>
-								</div>
+							</div>
 								<!-- /筛选搜索内容栏    结束-->
 							</form:form>
 						</div>

src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp

@@ -149,7 +149,11 @@ $(document).ready(function(){
 										<div class="form-group">
 											<label><spring:message code="serverip"/>：</label>
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+										</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
 								</div>
 							</div>

src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp

@@ -151,6 +151,10 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
 								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->

src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp

@@ -152,6 +152,12 @@ $(document).ready(function(){
 									</div>
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>

src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp

@@ -171,7 +171,13 @@
 									</div>
 								</div>
 							</div>
-						</div>
+								<div class="row">
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
+							</div>
 						<!-- /筛选搜索内容栏    结束-->
 					</form:form>
 				</div>

src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp

@@ -148,8 +148,14 @@
 	                                            <input name="dIp" type="text" class="form-control" value="${log.dIp}"/>
 	                                        </div>
 										</div>
+									<div class="row">
+										<div class="col-md-2">
+											<label><spring:message code="cfg_id"></spring:message>：</label>
+											<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+										</div>
 									</div>
 								</div>
+								</div>
 							</form:form>
 
 						</div>

src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp

@@ -152,6 +152,12 @@ $(document).ready(function(){
 									</div>
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>

src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp

@@ -157,8 +157,14 @@
 	                                            <input name="dIp" type="text" class="form-control" value="${log.dIp}"/>
 	                                        </div>
 										</div>
+									</div>
+																<div class="row">
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
 								</div>
+							</div>
 							</form:form>
 
 						</div>

src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp

@@ -139,7 +139,13 @@
 									</div>
 								</div>
 							</div>
-						</div>
+							<div class="row">
+								<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+								</div>
+								</div>
+							</div>
 						<!-- /筛选搜索内容栏    结束-->
 					</form:form>
 				</div>