关键字转url时,新增的http url配置来函取自关键字配置

This commit is contained in:
duandongmei
2018-11-10 12:26:00 +08:00
parent 7772c0c206
commit 40bcfea683
6 changed files with 18 additions and 4 deletions

View File

@@ -138,9 +138,12 @@ public class WhiteListController extends CommonController{
@RequestMapping(value = {"saveHttpUrlCfgs"}) @RequestMapping(value = {"saveHttpUrlCfgs"})
public String saveHttpUrlCfgs(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,CfgIndexInfo entity) { public String saveHttpUrlCfgs(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,CfgIndexInfo entity) {
if(!StringUtil.isEmpty(entity) && !StringUtil.isEmpty(entity.getHttpUrlList())){ if(!StringUtil.isEmpty(entity) && !StringUtil.isEmpty(entity.getHttpUrlList())){
CfgIndexInfo sourceCfg=websiteCfgService.getCfgIndexInfo(entity.getHttpUrlList().get(0).getSourceCompileId());
for (HttpUrlCfg httpUrlCfg : entity.getHttpUrlList()) { for (HttpUrlCfg httpUrlCfg : entity.getHttpUrlList()) {
CfgIndexInfo cfg=new CfgIndexInfo(); CfgIndexInfo cfg=new CfgIndexInfo();
List httpList=new ArrayList<>(); List httpList=new ArrayList<>();
httpUrlCfg.setRequestId(sourceCfg.getRequestId());
BeanUtils.copyProperties(httpUrlCfg, cfg); BeanUtils.copyProperties(httpUrlCfg, cfg);
httpList.add(httpUrlCfg); httpList.add(httpUrlCfg);
cfg.setHttpUrlList(httpList); cfg.setHttpUrlList(httpList);

View File

@@ -353,7 +353,7 @@
and cfg_id=#{cfgId} and cfg_id=#{cfgId}
</if> </if>
<if test="compileId != null"> <if test="compileId != null">
and compileId=#{compileId} and compile_id=#{compileId}
</if> </if>
<if test="functionId != null"> <if test="functionId != null">
and function_id=#{functionId} and function_id=#{functionId}

View File

@@ -62,6 +62,15 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
@Autowired @Autowired
private ServiceDictInfoDao serviceDictInfoDao; private ServiceDictInfoDao serviceDictInfoDao;
public CfgIndexInfo getCfgIndexInfo(Integer compileId){
CfgIndexInfo entity=new CfgIndexInfo();
entity.setCompileId(compileId);
List<CfgIndexInfo> cfgs=websiteCfgDao.getCfgIndexInfos(entity);
if(!StringUtil.isEmpty(cfgs)){
entity=cfgs.get(0);
}
return entity;
}
public CfgIndexInfo getHttpCfg(Long cfgId){ public CfgIndexInfo getHttpCfg(Long cfgId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId); CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity); List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);

View File

@@ -1283,7 +1283,7 @@ not_multiple=%s\u4e0d\u652f\u6301\u591a\u4e2a\u5173\u952e\u5b57
template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef.\u8bf7\u9009\u62e9\u4e0e\u7cfb\u7edf\u8bed\u8a00\u4e00\u81f4\uff0c\u5e76\u4e14\u914d\u7f6e\u7c7b\u578b\u4e00\u81f4\u7684\u6a21\u677f\u5bfc\u5165. template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef.\u8bf7\u9009\u62e9\u4e0e\u7cfb\u7edf\u8bed\u8a00\u4e00\u81f4\uff0c\u5e76\u4e14\u914d\u7f6e\u7c7b\u578b\u4e00\u81f4\u7684\u6a21\u677f\u5bfc\u5165.
asn_no=ASN asn_no=ASN
query=Query query=Query
cfg_operation_log=\u914d\u7f6e\u64e6\u6b27\u6d32\u54e6\u65e5\u5fd7 cfg_operation_log=\u914D\u7F6E\u64CD\u4F5C\u65E5\u5FD7
function_name=\u64cd\u4f5c\u6a21\u5757 function_name=\u64cd\u4f5c\u6a21\u5757
config_service_statistics=\u914d\u7f6e\u7edf\u8ba1 config_service_statistics=\u914d\u7f6e\u7edf\u8ba1
ruleLimitTip=\u6709\u6548\u89c4\u5219\u91cf\u5df2\u8fbe\u5230\u9650\u5236(%s). ruleLimitTip=\u6709\u6548\u89c4\u5219\u91cf\u5df2\u8fbe\u5230\u9650\u5236(%s).
@@ -1320,6 +1320,7 @@ ip_behavior_data=\u7528\u6237IP\u7edf\u8ba1
not_valid_domain=%s\u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u57df\u540d not_valid_domain=%s\u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u57df\u540d
cert_not_match_domain=\u57df\u540d\u4e0e\u6240\u9009\u8bc1\u4e66\u4fe1\u606f\u4e0d\u7b26\u5408\uff01 cert_not_match_domain=\u57df\u540d\u4e0e\u6240\u9009\u8bc1\u4e66\u4fe1\u606f\u4e0d\u7b26\u5408\uff01
crl_file_error=CRL\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF crl_file_error=CRL\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
PXY_OBJ_TRUSTED_CA_CERT=\u53EF\u4FE1\u8BC1\u4E66
crl_issuer_error=crl\u6587\u4EF6\u7684issuer\u4E0E\u8BC1\u4E66\u6587\u4EF6\u7684issuer\u4E0D\u5339\u914D \u7FFB\u8BD1 crl_issuer_error=crl\u6587\u4EF6\u7684issuer\u4E0E\u8BC1\u4E66\u6587\u4EF6\u7684issuer\u4E0D\u5339\u914D \u7FFB\u8BD1
cert_name=\u8BC1\u4E66\u540D\u79F0 cert_name=\u8BC1\u4E66\u540D\u79F0
add_crl_file=Add CRL File add_crl_file=Add CRL File

View File

@@ -107,7 +107,7 @@ var submitCrlFrom=function(){
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font <label class="control-label col-md-3"><font
color="red">*</font><spring:message code="crl" /> <spring:message code="file" /></label> color="red">*</font><spring:message code="CRL" /> <spring:message code="file" /></label>
<div class="col-md-6"> <div class="col-md-6">
<input id="crlFileI" name="crlFileI" type="file" <input id="crlFileI" name="crlFileI" type="file"
style="width: 330px; display: none" /> style="width: 330px; display: none" />

View File

@@ -200,7 +200,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb"> <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead> <thead>
<tr> <tr>
<th><spring:message code="log"/></th> <th><input type="checkbox" class="i-checks" id="checkAll"><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th> <th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> <th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th> <th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -239,6 +239,7 @@
<c:forEach var="log" items="${page.list }" varStatus="status"> <c:forEach var="log" items="${page.list }" varStatus="status">
<tr> <tr>
<td> <td>
<input type="checkbox" class="i-checks child-checks" compileId="${log.cfgId }" url="${log.url}" value="${log.cfgId }">
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td> </td>
<td>${log.cfgId }</td> <td>${log.cfgId }</td>