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

修正HTTP(S)重定向配置导入应答码默认值.

Browse Source
This commit is contained in:
zhangwenqing
2019-03-28 17:29:28 +08:00
parent bea5312e9f
commit 5e1095f2bb
7 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/configuration/template/DomainInterceptMonitTemplate.java
View File

@@ -12,7 +12,7 @@ public class DomainInterceptMonitTemplate extends StringAllNotDoLogTemplate{
private String userRegion5; private String userRegion5;
private String cfgKeywords; private String cfgKeywords;
@ExcelField(title="intercept_intensity",dictType="INTERCEPT_DOMAIN_INTENSITY",align=2,sort=2) @ExcelField(title="intercept_intensity",dictType="INTERCEPT_DOMAIN_INTENSITY",align=2,sort=12)
public String getUserRegion5() { public String getUserRegion5() {
return userRegion5; return userRegion5;
} }

2
src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java
View File

@@ -155,7 +155,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
// 代理 HTTP(s)重定向 // 代理 HTTP(s)重定向
if (regionDict.getFunctionId().equals(208)) { if (regionDict.getFunctionId().equals(208)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
baseStringCfg.setUserRegion1("301"); baseStringCfg.setUserRegion1("302");
} }
String userRegion1 = baseStringCfg.getUserRegion1();// 重定向应答码 String userRegion1 = baseStringCfg.getUserRegion1();// 重定向应答码
String userRegion2 = baseStringCfg.getUserRegion2();// 重定向URL String userRegion2 = baseStringCfg.getUserRegion2();// 重定向URL

2
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -439,7 +439,7 @@ public class CheckIpFormatThread implements Callable<String>{
// 代理 HTTP(s)重定向 // 代理 HTTP(s)重定向
if (regionDict.getFunctionId().equals(208)) { if (regionDict.getFunctionId().equals(208)) {
if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) { if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) {
baseIpCfg.setUserRegion1("301"); baseIpCfg.setUserRegion1("302");
} }
String userRegion1 = baseIpCfg.getUserRegion1();// 重定向应答码 String userRegion1 = baseIpCfg.getUserRegion1();// 重定向应答码
String userRegion2 = baseIpCfg.getUserRegion2();// 重定向URL String userRegion2 = baseIpCfg.getUserRegion2();// 重定向URL

2
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -205,7 +205,7 @@ public class CheckStringFormatThread implements Callable<String>{
// 代理 HTTP(s)重定向 // 代理 HTTP(s)重定向
if (regionDict.getFunctionId().equals(208)) { if (regionDict.getFunctionId().equals(208)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
baseStringCfg.setUserRegion1("301"); baseStringCfg.setUserRegion1("302");
} }
String userRegion1 = baseStringCfg.getUserRegion1();// 重定向应答码 String userRegion1 = baseStringCfg.getUserRegion1();// 重定向应答码
String userRegion2 = baseStringCfg.getUserRegion2();// 重定向URL String userRegion2 = baseStringCfg.getUserRegion2();// 重定向URL

3
src/main/java/com/nis/web/controller/basics/InnerProtectionListController.java
View File

@@ -1,18 +1,15 @@
package com.nis.web.controller.basics; package com.nis.web.controller.basics;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;

1
src/main/java/com/nis/web/service/basics/InnerProtectionListService.java
View File

@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.google.common.collect.Lists;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.basics.ProtectionListInfo; import com.nis.domain.basics.ProtectionListInfo;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;

12
src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
View File

@@ -228,10 +228,10 @@
<c:forEach items="${_cfg.httpUrlList}" var="cfg"> <c:forEach items="${_cfg.httpUrlList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }"> <c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}"> <div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='keywords' />: <label><spring:message code='domain' />:
${fn:replace(cfg.cfgKeywords, "***and***", " ")} ${fn:replace(cfg.cfgKeywords, "***and***", " ")}
</label> </label>
</div> </div>
@@ -249,8 +249,8 @@
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<label><spring:message code='match_method' />:</label> <label><spring:message code='match_method' />:</label>
@@ -261,8 +261,8 @@
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<c:if test="${cfg.isHexbin==0 }"> <c:if test="${cfg.isHexbin==0 }">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">