Commit Graph

4 Commits

Author SHA1 Message Date
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
leijun
ae98d37d01 增加导出功能 2018-10-24 18:36:31 +08:00
zhanghongqing
554a6a5ea5 配置取消审核操作时增加来函选择,并展示 2018-10-22 21:27:08 +08:00
duandongmei
d16db28a1e 拦截文件策略功能更改 2018-08-24 15:41:05 +08:00