Commit Graph

5 Commits

Author SHA1 Message Date
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
d6bf1e9ccb 证书策略去掉业务类型选项,domain拦截修改domian自定义域bug更改 2018-08-30 19:47:40 +08:00
duandongmei
8b48aa4a50 修改拦截证书策略模块 拦截类型修改失败bug
清表sql增加证书表清楚
ip白名单列表详情去掉方向和协议
2018-08-30 09:48:04 +08:00
duandongmei
d16db28a1e 拦截文件策略功能更改 2018-08-24 15:41:05 +08:00