提交 2e49fbe1 编写于 作者: zhouweidong's avatar zhouweidong

合并分支 'dev' 到 'master'

Dev合并到master

查看合并请求 !16
......@@ -57,6 +57,10 @@ zuul:
path: /v7/login
serviceId: ibzuaa-api
stripPrefix: false
changepwd:
path: /v7/changepwd
serviceId: ibzuaa-api
stripPrefix: false
uaa:
path: /uaa/**
serviceId: ibzuaa-api
......
......@@ -69,6 +69,10 @@ zuul:
path: /v7/login
serviceId: ibzuaa-api
stripPrefix: false
changepwd:
path: /v7/changepwd
serviceId: ibzuaa-api
stripPrefix: false
uaa:
path: /uaa/**
serviceId: ibzuaa-api
......
......@@ -619,9 +619,9 @@ public class ${itemCodeName}Resource {
</#if>
</#if>
<#comment>数据查询Security权限校验</#comment>
<#comment>数据查询Security权限校验(分组不鉴权)</#comment>
<#macro DataQuerySecurityAnnotation dataset>
<#if de.getStorageMode()==1 || de.getStorageMode()==2>
<#if (de.getStorageMode()==1 || de.getStorageMode()==2 ) && dataset.isEnableGroup()==false>
<#if hasDEPrefield==false>
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-search${dataset.codeName}-all')")
<#else>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册