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

1、新增 http redirect&block 支持文件作为应答内容

Browse Source
This commit is contained in:
fangshunjian
2018-08-20 22:12:05 +08:00
parent 10ebfca48d
commit 1bb113766b
16 changed files with 1390 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -408,15 +408,25 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
if(entity.getAction().equals(16)){
String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1();
userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1;
String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+userRegion2;
String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3();//应答文件
if(StringUtils.isNotBlank(userRegion3)) {
userRegion=userRegion+";"+Constants.CONTENT_FILE_ID_KEY+"="+userRegion3;
}else {//应答内容
String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+userRegion2;
}
}
//HTTP redirect： response code is not null ;response content is not null(userRegion is not null)
if(entity.getAction().equals(48)){
String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1();
userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1;
String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+userRegion2;
String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3();//应答文件
if(StringUtils.isNotBlank(userRegion3)) {
userRegion=userRegion+";"+Constants.CONTENT_FILE_ID_KEY+"="+userRegion3;
}else {//应答内容
String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+userRegion2;
}
}
//HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null)
if(entity.getAction().equals(80)){

114
src/main/java/com/nis/web/service/configuration/ProxyFileStrategyService.java Normal file
View File

@@ -0,0 +1,114 @@
package com.nis.web.service.configuration;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import com.nis.domain.Page;
import com.nis.domain.SysUser;
import com.nis.domain.callback.ProxyFileStrategyCfg;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.HttpBodyCfg;
import com.nis.domain.maat.ToMaatResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.ProxyFileStrategyDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@Service
public class ProxyFileStrategyService extends BaseService{
@Autowired
protected ProxyFileStrategyDao proxyFileDao;
/**
* 分页查询
* @param page
* @param entity
* @return
*/
public Page<ProxyFileStrategyCfg> findPage(Page page, ProxyFileStrategyCfg entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);
List<ProxyFileStrategyCfg> list=proxyFileDao.findPage(entity);
page.setList(list);
return page;
}
public ProxyFileStrategyCfg getCfgById(Long cfgId) {
return proxyFileDao.getCfgById(cfgId);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdate(ProxyFileStrategyCfg entity){
Date createTime=new Date();
//设置区域运营商信息
setAreaEffectiveIds(entity);
//新增
if(entity.getCfgId()==null){
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
entity.setIsValid(0);
entity.setIsAudit(0);
//修改
proxyFileDao.insert(entity);
}else{
Date editTime=new Date();
entity.setIsValid(0);
entity.setIsAudit(0);
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
proxyFileDao.update(entity);
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void update(Integer isAudit,Integer isValid,String ids,Integer functionId){
ProxyFileStrategyCfg entity = new ProxyFileStrategyCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity.setCfgId(Long.parseLong(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(new Date());
proxyFileDao.update(entity);
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void audit(Integer isAudit,Integer isValid,Integer functionId,String id){
Date auditTime = new Date();//审核时间
ProxyFileStrategyCfg entity = proxyFileDao.getCfgById(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(auditTime);
proxyFileDao.update(entity);
}
/**
* 获取所有的 响应文件 策略
* @return
*/
public List<ProxyFileStrategyCfg> getProxyFileStrategyCfgList(ProxyFileStrategyCfg entity){
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
List<ProxyFileStrategyCfg> list=proxyFileDao.findPage(entity);
return list;
}
}