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

证书策略去掉业务类型选项，domain拦截修改domian自定义域bug更改

Browse Source
This commit is contained in:
duandongmei
2018-08-30 19:47:40 +08:00
parent d200aeb034
commit d6bf1e9ccb
5 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
View File

@@ -162,8 +162,8 @@
<if test="isAudit == 1">
AND r.is_audit =1
</if>
<if test="cfgType != null">
AND r.cfg_type =#{cfgType,jdbcType=VARCHAR}
<if test="cfgType == 'ip' ">
<![CDATA[AND r.keyring_type <> 'end-entity']]>
</if>
<if test="cfgId != null">
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}

10
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.InterceptPktBin;
@@ -283,7 +284,14 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){
doaminFlag=true;
domainUserRegion=Constants.USERREGION_DOMAIN_ID+"="+entity.getCompileId();
domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+entity.getHttpUrlList().get(0).getCfgKeywords();
String domainStr="";
if(entity != null && entity.getHttpUrlList() != null && entity.getHttpUrlList().size() > 0){
BaseStringCfg httpUrl= entity.getHttpUrlList().get(0);
domainStr=httpUrl.getCfgKeywords();
}
//entity.getHttpUrlList().get(0).getCfgKeywords();
domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr;
HttpUrlCfg cfg = new HttpUrlCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
cfg.setTableName(HttpUrlCfg.getTablename());