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

完善操控配置功能，修改配置更新界面属性位置

Browse Source
This commit is contained in:
zhangwenqing
2019-05-27 09:47:20 +08:00
parent 8472c6efcf
commit 5ad397d752
17 changed files with 357 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2571,7 +2571,7 @@ public abstract class BaseService {
actionParam.setMethod("block");
actionParam.setCode(Integer.valueOf(_cfg.getUserRegion1()));
actionParam.setMessage(_cfg.getUserRegion2());
actionParam.setHtml_profile(Integer.valueOf(_cfg.getUserRegion4()));
actionParam.setHtml_profile(0);
}else if(regionDict.getAction().equals(85)) {
actionParam.setMethod("hijack");
actionParam.setHijack_profile(Integer.valueOf(_cfg.getUserRegion4()));
@@ -2720,7 +2720,7 @@ public abstract class BaseService {
actionParam.setMethod("block");
actionParam.setCode(Integer.valueOf(_cfg.getUserRegion1()));
actionParam.setMessage(_cfg.getUserRegion2());
actionParam.setHtml_profile(Integer.valueOf(_cfg.getUserRegion4()));
actionParam.setHtml_profile(0);
}else if(regionDict.getAction().equals(85)) {
actionParam.setMethod("hijack");
actionParam.setHijack_profile(Integer.valueOf(_cfg.getUserRegion4()));
@@ -2851,7 +2851,7 @@ public abstract class BaseService {
actionParam.setMethod("block");
actionParam.setCode(Integer.valueOf(cfg.getUserRegion1()));
actionParam.setMessage(cfg.getUserRegion2());
actionParam.setHtml_profile(Integer.valueOf(cfg.getUserRegion4()));
actionParam.setHtml_profile(0);
}else if(regionDict.getAction().equals(85)) {
actionParam.setMethod("hijack");
actionParam.setHijack_profile(Integer.valueOf(cfg.getUserRegion4()));
@@ -3293,8 +3293,8 @@ public abstract class BaseService {
}else if(cfg.getUserRegion5().equals("16")) {
actionParam.setMethod("block");
actionParam.setCode(Integer.valueOf(cfg.getUserRegion1()));
actionParam.setMessage(cfg.getUserRegion2());
actionParam.setHtml_profile(Integer.valueOf(cfg.getUserRegion4()));
actionParam.setMessage(StringUtils.isNotBlank(cfg.getUserRegion2())?cfg.getUserRegion2():"");
actionParam.setHtml_profile(Integer.valueOf(StringUtils.isNotBlank(cfg.getUserRegion3())?cfg.getUserRegion3():"0"));
}else if(cfg.getUserRegion5().equals("85")) {
actionParam.setMethod("hijack");
actionParam.setHijack_profile(Integer.valueOf(cfg.getUserRegion4()));

34
src/main/java/com/nis/web/service/configuration/ManipulatPolicyService.java
View File

@@ -6,10 +6,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.Model;
import com.nis.domain.Page;
import com.nis.domain.callback.ProxyFileHijackCfg;
@@ -45,6 +50,7 @@ import com.nis.web.dao.configuration.ProxyFileStrategyDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.dao.configuration.WebsiteCfgDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
import com.nis.web.service.CrudService;
/**
@@ -520,8 +526,8 @@ public class ManipulatPolicyService extends CrudService<WebsiteCfgDao,CfgIndexIn
if(Integer.valueOf(entity.getUserRegion5()).equals(16)){
actionParam.setMethod("block");
actionParam.setCode(Integer.valueOf(entity.getUserRegion1()));
actionParam.setMessage(entity.getUserRegion2());
actionParam.setHtml_profile(Integer.valueOf(entity.getUserRegion4()));
actionParam.setMessage(StringUtils.isNotBlank(entity.getUserRegion2())?entity.getUserRegion2():"");
actionParam.setHtml_profile(Integer.valueOf(StringUtils.isNotBlank(entity.getUserRegion3())?entity.getUserRegion3():"0"));
}
// Redirect
if(Integer.valueOf(entity.getUserRegion5()).equals(48)){
@@ -550,6 +556,8 @@ public class ManipulatPolicyService extends CrudService<WebsiteCfgDao,CfgIndexIn
}
userRegion = gsonToJson(actionParam);
//userRegion = StringEscapeUtils.unescapeJava(userRegion);
if(StringUtil.isEmpty(userRegion)){
userRegion = Constants.USER_REGION_PLACEHOLDER;
}
@@ -605,19 +613,37 @@ public class ManipulatPolicyService extends CrudService<WebsiteCfgDao,CfgIndexIn
}else if(source == 85) {
ProxyFileHijackCfg searchEntity = new ProxyFileHijackCfg();
searchEntity.setIsAudit(1);
List<ProxyFileHijackCfg> list = proxyFileHijackDao.findPage(searchEntity);
List<ProxyFileHijackCfg> list = proxyFileHijackDao.findHijackFiles(searchEntity);
for (BaseCfg cfg : list) {
resultList.add(cfg);
}
}else if(source == 90) {
ProxyFileInsertScriptCfg searchEntity = new ProxyFileInsertScriptCfg();
searchEntity.setIsAudit(1);
List<ProxyFileInsertScriptCfg> list = proxyFileInsertDao.findPage(searchEntity);
List<ProxyFileInsertScriptCfg> list = proxyFileInsertDao.findInsertFiles(searchEntity);
for (BaseCfg cfg : list) {
resultList.add(cfg);
}
}
return resultList;
}
public void setFileRegion(Model model) {
ProxyFileStrategyCfg searchEntity = new ProxyFileStrategyCfg();
searchEntity.setIsAudit(1);
ProxyFileHijackCfg hijackSearch = new ProxyFileHijackCfg();
searchEntity.setIsAudit(1);
ProxyFileInsertScriptCfg insertSearch = new ProxyFileInsertScriptCfg();
searchEntity.setIsAudit(1);
List<ProxyFileStrategyCfg> resFileList = proxyFileDao.fingResPages(searchEntity);
List<ProxyFileHijackCfg> hajackFilelist = proxyFileHijackDao.findHijackFiles(hijackSearch);
List<ProxyFileInsertScriptCfg> InsertFilelist = proxyFileInsertDao.findInsertFiles(insertSearch);
model.addAttribute("allResponseFiles", resFileList);
model.addAttribute("allHijackFiles", hajackFilelist);
model.addAttribute("allInsertFiles", InsertFilelist);
}
}