修改sql文件后缀

全量更新特定服务模块数据与亦庄环境数据同步
修改证书管理以及可信证书模块bug
This commit is contained in:
duandongmei
2018-11-09 14:17:52 +08:00
parent ab1e55c5cd
commit 9b3caca055
7 changed files with 71 additions and 32 deletions

View File

@@ -341,9 +341,7 @@ function privateFileValidate(){
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="certificate_validity"/></label>
<fmt:formatDate var="notBeforeTime" value="${_cfg.notBeforeTime }" pattern="yyyy-MM-dd HH:ss:mm"/>
<fmt:formatDate var="notAfterTime" value="${_cfg.notAfterTime }" pattern="yyyy-MM-dd HH:ss:mm"/>
<label class=" col-md-6" style="padding-top:7px">${notBeforeTime }-${notAfterTime }</label>
<label class=" col-md-6" style="padding-top:7px">${_cfg.notBeforeTime }-${_cfg.notAfterTime }</label>
</div>
</div>
</div>

View File

@@ -124,8 +124,11 @@
onClick="javascript:window.location='${ctx}/proxy/intercept/strateagy/trustedCertForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
</shiro:hasPermission>
<shiro:hasPermission name="proxy:trustedCert:built-in">
<button type="button" class="btn btn-primary"
onClick="addCrlFile(this)">
onClick="addCrlFile(this)">
<i class="fa fa-plus"></i>
<spring:message code="import_crl"></spring:message></button>
</shiro:hasPermission>