duandongmei
|
e59d98499e
|
Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into
develop
Conflicts:
src/main/resources/messages/message_en.properties
src/main/resources/messages/message_ru.properties
src/main/resources/messages/message_zh_CN.properties
证书颁发机构及 吊销列表功能提交
|
2018-11-08 19:50:04 +08:00 |
|
duandongmei
|
e579e0d617
|
Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into
develop
Conflicts:
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
证书增加CN和SAN列，修改时间类型
common.js去掉无用字符
国际化增加cert_not_match_domain
|
2018-11-06 11:36:31 +08:00 |
|
duandongmei
|
aaf7942222
|
Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into
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校验证书
字符串模板导出问题修复
|
2018-10-20 13:46:41 +08:00 |
|