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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
zhanghongqing
2018-08-01 12:56:21 +08:00
parent 0942c2fa83 21ad7208a5
commit 170249033b
8 changed files with 22 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
View File

@@ -847,21 +847,11 @@
<if test="functionId != null" >
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="userRegion1 != null and userRegion1 != ''" >
user_region1 = #{userRegion1,jdbcType=VARCHAR},
</if>
<if test="userRegion2 != null and userRegion2 != ''" >
user_region2 = #{userRegion2,jdbcType=VARCHAR},
</if>
<if test="userRegion3 != null and userRegion3 != ''" >
user_region3 = #{userRegion3,jdbcType=VARCHAR},
</if>
<if test="userRegion4 != null and userRegion4 != ''" >
user_region4 = #{userRegion4,jdbcType=VARCHAR},
</if>
<if test="userRegion5 != null and userRegion5 != ''" >
user_region5 = #{userRegion5,jdbcType=VARCHAR},
</if>
dns_strategy_id = #{dnsStrategyId,jdbcType=INTEGER},
</trim>
</set>

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

@@ -404,39 +404,19 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
//判断http配置是否需要设置自定义域参数
String userRegion = "";
/*if(!StringUtil.isEmpty(entity.getUserRegion1())){
if(entity.getUserRegion1().startsWith(Constants.REDIRECT_RESPONSE_CODE_STARTWITH)){
userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+entity.getUserRegion1()+
Constants.USER_REGION_SPLIT+
Constants.REDIRECT_URL_KEY+"="+entity.getUserRegion2();
}else{
userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+entity.getUserRegion1()+
Constants.USER_REGION_SPLIT+
Constants.REDIRECT_CONTENT_KEY+"="+entity.getUserRegion2();
}
}*/
//HTTP block
if(entity.getAction().equals(16)){
if(!StringUtil.isEmpty(entity.getUserRegion1())){
userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+entity.getUserRegion1();
if(!StringUtil.isEmpty(entity.getUserRegion2())){
userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+entity.getUserRegion2();
}else{
userRegion="";
}
}
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;
}
//HTTP redirect
if(entity.getAction().equals(48)){
if(!StringUtil.isEmpty(entity.getUserRegion1())){
userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+entity.getUserRegion1();
}
if(!StringUtil.isEmpty(entity.getUserRegion2())){
userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+entity.getUserRegion2();
}else{
userRegion="";
}
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;
}
//HTTP replace
if(entity.getAction().equals(80)){

12
src/main/resources/messages/message_en.properties
View File

@@ -168,6 +168,8 @@ realtime_report=Rule Usage
protocol_and_app=Protocol And App
text_content_monitor=Text Content Supervise
multimedia=Multimedia
ddos_system=Ddos System
ip_reuse_system=IP Reuse System
#==========menu end=====================
#==========yewu zidian begin=====================
@@ -881,11 +883,11 @@ id_not_valid=id of %s %s is invalid
num_split_by_comma=%s is a character separated by a comma
no_data=Unrelated data
must_be=%s value must be %s
permanet_redirect=Permanent Redirect
temporary_redirect=Temporary Redirect
prohibition_access=Prohibition Access
not_allowed_method=This method is not allowed to access
law_prohibition_access=It is not available for legal reasons
permanet_redirect=Moved Permanently
temporary_redirect=Found (Previously "Moved temporarily")
prohibition_access=Forbidden
not_allowed_method=Not Found
law_prohibition_access=Unavailable For Legal Reasons
http_block=HTTP Block
http_reddirect=HTTP Redirect
http_replace=HTTP Replace

2
src/main/resources/messages/message_ru.properties
View File

@@ -167,6 +167,8 @@ realtime_report=Realtime Report
protocol_and_app=Protocol And App
text_content_monitor=Text Content Supervise
multimedia=Multimedia
ddos_system=Ddos System
ip_reuse_system=IP Reuse System
#============menu end======================
#============yewu begin======================

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -168,6 +168,8 @@ realtime_report=\u5B9E\u65F6\u62A5\u8868
protocol_and_app=\u534F\u8BAE\u53CA\u5E94\u7528
text_content_monitor=\u6587\u672C\u5185\u5BB9\u76D1\u7BA1
multimedia=\u591A\u5A92\u4F53
ddos_system=DDOS\u7CFB\u7EDF
ip_reuse_system=IP\u8D44\u6E90\u590D\u7528\u7CFB\u7EDF
#==========menu end=====================
#==========yewu zidian begin=====================

6
src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
View File

@@ -22,9 +22,9 @@
<div class="col-md-6">
<select name="userRegion1"
class="selectpicker show-tick form-control">
<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if>><spring:message code="select"/></option>
<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if>>Silent</option>
<c:forEach items="${fns:getDictList('RESPONSE_CODE')}" var="responseCodeC">
<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode}">selected</c:if>><spring:message code="${responseCodeC.itemValue}"/></option>
<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${responseCodeC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -61,7 +61,7 @@
<select name="userRegion1"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE')}" var="redirectResponseCodeC">
<option value="${redirectResponseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==redirectResponseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>><spring:message code="${redirectResponseCodeC.itemValue}"/></option>
<option value="${redirectResponseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==redirectResponseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${redirectResponseCodeC.itemValue}"/></option>
</c:forEach>
</select>
</div>

18
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
View File

@@ -13,13 +13,6 @@
$(document)
.ready(
function() {
var action=$(".action").val();
if(action == 16){
userRegionSwitch($("select[name=userRegion1]").val());
$("select[name=userRegion1]").on("change", function() {
userRegionSwitch($(this).val());
});
}
$("#cancel").on("click", function() {
window.history.back();
});
@@ -102,17 +95,6 @@
$("." + contentClassName).addClass("hidden").addClass("disabled");
$("." + addBtnClassName).removeClass("hidden");
}
function userRegionSwitch(userRegion1){
if(userRegion1 == null || userRegion1 == ''){
$("input[name=userRegion2]").removeClass("required");
$("font[class=userRegion2]").addClass("hidden");
$("div[for=userRegion2]").addClass("hidden");
}else{
$(".userRegion2").removeClass("hidden");
$("input[name=userRegion2]").addClass("required");
$("div[for=userRegion2]").removeClass("hidden");
}
}
</script>
</head>
<body>

1
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -233,7 +233,6 @@
<c:set var="action" value="${serviceDict.action }"/>
</c:if>
</c:forEach>
${serviceName1 }
<div class="theme-panel hidden-xs hidden-sm">
<c:if test="${action eq 16 }">
<c:set var="configPermissionName" value="control:httpBlock:config"/>