Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

src/main/java/com/nis/domain/log/NtcConnRecordLog.java

@@ -6,7 +6,7 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
 
 	private static final long serialVersionUID = -4947912502754359817L;
 	@ExcelField(title = "social_app", sort = 8)
-	protected Integer appLabel;
+	protected String appLabel;
 
 	@ExcelField(title = "c2s_pkt_num", sort = 9)
 	protected String c2sPktNum;
@@ -20,11 +20,11 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
 	@ExcelField(title = "s2c_byte_num", sort = 13)
 	protected String s2cByteNum;
 
-	public Integer getAppLabel() {
+	public String getAppLabel() {
 		return appLabel;
 	}
 
-	public void setAppLabel(Integer appLabel) {
+	public void setAppLabel(String appLabel) {
 		this.appLabel = appLabel;
 	}
 

src/main/resources/messages/message_en.properties

@@ -1219,7 +1219,7 @@ http_keyword_monit=Website Keyword Monitor
 http_keyword_reject=Website Keyword Block
 has_invisible_char=%s has invisible characters
 not_multiple=%s do not support multiple keywords
-template_error=The import template is incorrect. Pleace choose a proper template which has the same language with the system and the same configure type.
+template_error=The import template is incorrect.
 asn_no=ASN
 query=Query
 cfg_operation_log=Configuration Operation Log

src/main/resources/messages/message_ru.properties

@@ -1219,7 +1219,7 @@ http_keyword_monit=\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433
 http_keyword_reject=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432 \u0432\u0435\u0431-c\u0430\u0439\u0442\u0430
 has_invisible_char=%s \u0438\u043c\u0435\u0435\u0442 \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b
 not_multiple=%s \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044e\u0442 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432
-template_error=\u0428\u0430\u0431\u043b\u043e\u043d \u0438\u043c\u043f\u043e\u0440\u0442\u0430 \u043d\u0435\u0432\u0435\u0440\u0435\u043d. \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043f\u043e\u0434\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u0448\u0430\u0431\u043b\u043e\u043d, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0438\u043c\u0435\u0435\u0442 \u0442\u043e\u0442 \u0436\u0435 \u044f\u0437\u044b\u043a \u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u043e\u0439 \u0438 \u0442\u043e\u0442 \u0436\u0435 \u0442\u0438\u043f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438.
+template_error=\u0428\u0430\u0431\u043b\u043e\u043d \u0438\u043c\u043f\u043e\u0440\u0442\u0430 \u043d\u0435\u0432\u0435\u0440\u0435\u043d.
 asn_no=ASN
 query=\u0417\u0430\u043f\u0440\u043e\u0441
 cfg_operation_log=\u0416\u0443\u0440\u043d\u0430\u043b \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0439 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438

src/main/resources/messages/message_zh_CN.properties

@@ -1214,7 +1214,7 @@ http_keyword_monit=\u7f51\u9875\u5173\u952e\u5b57\u76d1\u6d4b
 http_keyword_reject=\u7f51\u9875\u5173\u952e\u5b57\u963b\u65ad
 has_invisible_char=%s\u5305\u542b\u4e0d\u53ef\u89c1\u5b57\u7b26
 not_multiple=%s\u4e0d\u652f\u6301\u591a\u4e2a\u5173\u952e\u5b57
-template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef.\u8bf7\u9009\u62e9\u4e0e\u7cfb\u7edf\u8bed\u8a00\u4e00\u81f4\uff0c\u5e76\u4e14\u914d\u7f6e\u7c7b\u578b\u4e00\u81f4\u7684\u6a21\u677f\u5bfc\u5165.
+template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef.
 asn_no=ASN
 query=Query
 cfg_operation_log=\u914d\u7f6e\u64cd\u4f5c\u65e5\u5fd7

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp

@@ -187,7 +187,7 @@ $(function(){
 									      <div class="form-group">
 									          <label class="control-label col-md-3"><spring:message code="bps_threadshold"/></label>
 									          <div class="col-md-6">
-									              <input id="bpsThreadshold" class="form-control digits" placeholder="Bit Per Second" maxlength="18" type="text" name="bpsThreadshold" value="${_cfg.bpsThreadshold}">
+									              <input id="bpsThreadshold" class="form-control digits" placeholder="Bit Per Second" min="1000000" maxlength="18" type="text" name="bpsThreadshold" value="${_cfg.bpsThreadshold}">
 									          </div>
 									          <div for="bpsThreadshold"></div>
 									      </div>
@@ -196,7 +196,7 @@ $(function(){
 									      <div class="form-group">
 									          <label class="control-label col-md-3"><spring:message code="pps_threadshold"/></label>
 									          <div class="col-md-6">
-									              <input id="ppsThreadshold" class="form-control digits" placeholder="Packet Per Second"  maxlength="18" type="text" name="ppsThreadshold" value="${_cfg.ppsThreadshold}">
+									              <input id="ppsThreadshold" class="form-control digits" placeholder="Packet Per Second" min="1000" maxlength="18" type="text" name="ppsThreadshold" value="${_cfg.ppsThreadshold}">
 									          </div>
 									          <div for="ppsThreadshold"></div>
 									      </div>