develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	src/main/resources/nis.properties
修复单个appHTTP界面cfgType多余问题
x509校验证书
字符串模板导出问题修复
This commit is contained in:
duandongmei
2018-10-20 13:46:41 +08:00
40 changed files with 1333 additions and 158 deletions

View File

@@ -537,4 +537,4 @@ cert_file_path=/home/cert/
#证书校验工具名称
cert_validate_file=x509
#证书校验成功的关键信息
cert_validate_success_info=Successful
cert_validate_success_info=Successful