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://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
leijun
2018-10-16 09:14:35 +08:00
parent 8c77c1e054 f73cdd0741
commit 35e0446279
11 changed files with 106 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/util/Constants.java
View File

@@ -656,6 +656,7 @@ public final class Constants {
public static String INTERCEPT_IP_MONIT_USER_REGION_KEY=Configurations.getStringProperty("keyring_id", "keyring_id");
public static String INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY=Configurations.getStringProperty("Droprate", "Droprate");
public static String INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY=Configurations.getStringProperty("Bandwidth", "Bandwidth");
public static String INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY=Configurations.getStringProperty("intercept_domain_intensity", "DOMAIN_INTENSITY");
//大屏统计分析查询接口URL
public static final String DASHBOARD_URL = Configurations.getStringProperty("dashboardUrl","dashboardUrl");

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

@@ -365,6 +365,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
maatCfg.setUserRegion(userRegion);
}
//域名拦截需要增加域名id和域名字符串自定义配置
if(StringUtil.isEmpty(maatCfg.getUserRegion())
|| maatCfg.getUserRegion().equals(Constants.USER_REGION_PLACEHOLDER)){
if(doaminFlag){
@@ -378,6 +379,18 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
}
}
//域名拦截需要增加拦截强度自定义域
if(doaminFlag){
if(StringUtil.isEmpty(entity.getUserRegion5()) || maatCfg.getUserRegion().equals(Constants.USER_REGION_PLACEHOLDER)){
userRegion= Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5();
maatCfg.setUserRegion(userRegion);
}else{
userRegion= maatCfg.getUserRegion();
userRegion=userRegion+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5();
maatCfg.setUserRegion(userRegion);
}
}
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(entity.getAuditTime());

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

@@ -1244,4 +1244,8 @@ mail_address=Mail Address
mail_address_whitelist=Mail Address Whitelist
mail_address_monit=Mail Address Monit
mail_address_reject=Mail Address Reject
ipsec_protocol=IPSEC Protocol
ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Intensity
weak_intensity=Weak
stronger_intensity=Strong
strong_intensity=Stronger

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

@@ -1248,11 +1248,24 @@ traffic_ipactive_hour_max=Active IPTOP10 Maximum In Nearly One Hour
ip_addr=IP
area_id=Area
link_num=Link Number
stat_time=Statistical Time
stat_time=Statistical Time
log_menu=Operation Menu
log_management=Log Management
log_date=Date Range
log_exception=Query Exception
log_user=Operating User
log_submission=Submission
log_ip=Operator IP
log_exception_info=Exception Information
system_log=Log Management
protected_ddos=Protected DDOS
usual_ddos=Usual DDOS
mail_address=Mail Address
mail_address_whitelist=Mail Address Whitelist
mail_address_monit=Mail Address Monit
mail_address_reject=Mail Address Reject
ipsec_protocol=IPSEC Protocol
ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Intensity
weak_intensity=Weak
stronger_intensity=Strong
strong_intensity=Stronger

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

@@ -1224,17 +1224,23 @@ area_id=\u5730\u57DF
link_num=\u8FDE\u63A5\u6B21\u6570
stat_time=\u7EDF\u8BA1\u65F6\u95F4
log_menu=\u64CD\u4F5C\u83DC\u5355
system_log=\u65E5\u5FD7\u7BA1\u7406
log_management=\u65E5\u5FD7\u7BA1\u7406
log_date=\u65E5\u671F\u8303\u56F4
log_exception=\u53EA\u67E5\u8BE2\u5F02\u5E38\u4FE1\u606F
log_user=\u64CD\u4F5C\u7528\u6237
log_submission=\u63D0\u4EA4\u65B9\u5F0F
log_ip=\u64CD\u4F5C\u8005IP
log_exception_info=\u5F02\u5E38\u4FE1\u606F
system_log=Log Management
protected_ddos=\u4FDD\u62A4DDOS\u653B\u51FB
usual_ddos=\u5E38\u7528DDOS\u653B\u51FB
mail_address=\u90AE\u4EF6\u5730\u5740
mail_address_whitelist=\u90AE\u4EF6\u5730\u5740\u767D\u540D\u5355
mail_address_monit=\u90AE\u4EF6\u5730\u5740\u76D1\u6D4B
mail_address_reject=\u90AE\u4EF6\u5730\u5740\u7BA1\u63A7
ipsec_protocol=IPSEC\u534F\u8BAE
ipsec_protocol=IPSEC\u534F\u8BAE
intercept_intensity=\u62E6\u622A\u5F3A\u5EA6
weak_intensity=\u5F31
stronger_intensity=\u8F83\u5F3A
strong_intensity=\u5F3A

1
src/main/resources/nis.properties
View File

@@ -500,6 +500,7 @@ proto_id_region=PROTO_ID
keyring_id=keyring_id
droprate=Droprate
bandwidth=Bandwidth
intercept_domain_intensity=DOMAIN_INTENSITY
#IP\u9ed8\u8ba4\u503c
ipv4_default_ip_value=\:\:
ipv4_default_ip_subnet_value=0.0.0.0/32

1
src/main/resources/sql/20181012/update_stream_region.sql
View File

@@ -1 +0,0 @@
update function_region_dict set config_region_value ='NTC_SUBSCRIBE_ID' where dict_id='201';

19
src/main/resources/sql/20181015/add_dictionary.sql Normal file
View File

@@ -0,0 +1,19 @@
INSERT INTO sys_data_dictionary_name
(`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`)
VALUES
(116, '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǿ<EFBFBD><EFBFBD>', 'INTERCEPT_DOMAIN_INTENSITY', '', 'user:<3A><><EFBFBD><EFBFBD>Ա,2018-10-15 15:24:55edit|user:<3A><><EFBFBD><EFBFBD>Ա,2018-10-15 15:24:37edit', "2018/10/15 15:24:04", "2018/10/15 15:24:55", 1);
INSERT INTO sys_data_dictionary_item
(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`)
VALUES
(2703, '1', 'weak_intensity', '<EFBFBD><EFBFBD>', 0, 1, 1, 116);
INSERT INTO sys_data_dictionary_item
(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`)
VALUES
(2704, '2', 'stronger_strong_intensity', '<EFBFBD><EFBFBD>ǿ', 0, 1, 1, 116);
INSERT INTO sys_data_dictionary_item
(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`)
VALUES
(2705, '3', 'strong_intensity', 'ǿ', 0, 1, 1, 116);

2
src/main/resources/sql/20181015/update_function_service.sql Normal file
View File

@@ -0,0 +1,2 @@
update function_service_dict set is_valid=0 where dict_id=137 ;
update function_service_dict set function_id=5 where dict_id=108

31
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -239,8 +239,33 @@
</div>
</div>
<!-- dolog end-->
<!-- 域名拦截增加拦截强度 -->
<c:if test="${_cfg.functionId eq 201}">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="intercept_intensity" />
</label>
<div class="col-md-6">
<select name="userRegion5"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion5"></div>
</div>
</div>
</div>
</c:if>
<%-- action 为1 监测时 可以选择证书--%>
<div class="row monitAction hidden">
<h4 class="form-section">
<spring:message code="action_region" />
<small></small>
</h4>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message
@@ -256,8 +281,12 @@
</div>
</div>
</div>
<%-- action 为64 限速时 可以选择证书--%>
<%-- action 为64 限速时 --%>
<div class="row ratelimitAction hidden">
<h4 class="form-section">
<spring:message code="action_region" />
<small></small>
</h4>
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="limit_rate_type"/></label>

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

@@ -341,6 +341,9 @@
<th><spring:message code="replace_zone"/></th>
<th><spring:message code="replaced_content"/></th>
<th><spring:message code="replace_content"/></th>
</c:if>
<c:if test="${cfg.functionId eq 201 }">
<th><spring:message code="intercept_intensity"/></th>
</c:if>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th><spring:message code="do_log"/></th> --%>
@@ -403,6 +406,15 @@
${indexCfg.userRegion3 }
</td>
</c:if>
<c:if test="${cfg.functionId eq 201 }">
<td>
<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY') }" var="intentsityC">
<c:if test="${intentsityC.itemCode eq indexCfg.userRegion5 }">
<spring:message code="${intentsityC.itemValue }"/>
</c:if>
</c:forEach>
</td>
</c:if>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.action }">