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 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
This commit is contained in:
duandongmei
2018-08-21 13:35:57 +08:00
parent 29a1eeac70 de567f9e35
commit 5ee8b5a857
4 changed files with 996 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/domain/log/NtcMailLog.java
View File

@@ -9,7 +9,15 @@ public class NtcMailLog extends BaseLogEntity<NtcMailLog> {
private String mailTo; private String mailTo;
private String subject; private String subject;
private String emlFile; private String emlFile;
private String emlKey;
public String getEmlKey() {
return emlKey;
}
public void setEmlKey(String emlKey) {
this.emlKey = emlKey;
}
public String getMailProto() { public String getMailProto() {
return mailProto; return mailProto;
} }

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

@@ -1043,6 +1043,7 @@ app_desc=Application Description
tunnel_code=Tunnel Behavior No tunnel_code=Tunnel Behavior No
tunnel_name=Tunnel Behavior Name tunnel_name=Tunnel Behavior Name
tunnel_desc=Tunnel Behavior Description tunnel_desc=Tunnel Behavior Description
<<<<<<< HEAD
call_external_procedures_failed=Call external procedures failed call_external_procedures_failed=Call external procedures failed
is_hex=Is HEX is_hex=Is HEX
is_case_insenstive=Is Case-senstive is_case_insenstive=Is Case-senstive
@@ -1084,6 +1085,9 @@ certificate=Certificate
app_ssl_config=APP SSL Cert Feature app_ssl_config=APP SSL Cert Feature
call_external_procedures_failed=Call external procedures failed call_external_procedures_failed=Call external procedures failed
=======
call_external_procedures_failed=Call external procedures failedfile_strategy=\u6587\u4ef6\u7b56\u7565
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
file_strategy=File Strategy file_strategy=File Strategy
file_desc=File Desc file_desc=File Desc
content_type=Content Type content_type=Content Type

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

File diff suppressed because it is too large Load Diff

1
src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
View File

@@ -168,6 +168,7 @@
<th><spring:message code="mail_to"/></th> <th><spring:message code="mail_to"/></th>
<th><spring:message code="subject"/></th> <th><spring:message code="subject"/></th>
<th><spring:message code="eml_file"/></th> <th><spring:message code="eml_file"/></th>
<th><spring:message code="eml_key"/></th>
<th><spring:message code="clj_ip"/></th> <th><spring:message code="clj_ip"/></th>
<th><spring:message code="protocol"/></th> <th><spring:message code="protocol"/></th>