Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
iBiz4j Spring R7
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz-R7后台标准模板
iBiz4j Spring R7
提交
8036604c
提交
8036604c
编写于
5月 26, 2020
作者:
zhouweidong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
权限按照Authority返回
上级
12d3a520
变更
7
展开全部
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
138 行增加
和
175 行删除
+138
-175
systemResource.json.ftl
...ore/src/main/resources/permission/systemResource.json.ftl
+1
-0
IBZUAAFallback.java.ftl
...in/java/%SYS_PKGPATH%/util/client/IBZUAAFallback.java.ftl
+2
-2
IBZUAAFeignClient.java.ftl
...java/%SYS_PKGPATH%/util/client/IBZUAAFeignClient.java.ftl
+4
-5
PermissionSyncJob.java.ftl
...in/java/%SYS_PKGPATH%/util/job/PermissionSyncJob.java.ftl
+6
-2
AppController.java.ftl
.../main/java/%SYS_PKGPATH%/util/rest/AppController.java.ftl
+22
-13
AuthPermissionEvaluator.java.ftl
...S_PKGPATH%/util/security/AuthPermissionEvaluator.java.ftl
+99
-153
IBZUSERServiceImpl.java.ftl
...va/%SYS_PKGPATH%/util/service/IBZUSERServiceImpl.java.ftl
+4
-0
未找到文件。
SLN/%PUBPRJ%-core/src/main/resources/permission/systemResource.json.ftl
浏览文件 @
8036604c
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
TARGET=PSSYSTEM
TARGET=PSSYSTEM
</#ibiztemplate>
</#ibiztemplate>
{
{
"systemid":"${sys.getName()}",
"unires":[
"unires":[
<#if sys.getAllPSSysUniReses()??>
<#if sys.getAllPSSysUniReses()??>
<#list sys.getAllPSSysUniReses() as unires>
<#list sys.getAllPSSysUniReses() as unires>
...
...
SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZUAAFallback.java.ftl
浏览文件 @
8036604c
...
@@ -12,8 +12,8 @@ import com.alibaba.fastjson.JSONObject;
...
@@ -12,8 +12,8 @@ import com.alibaba.fastjson.JSONObject;
public
class
IBZUAAFallback
implements
IBZUAAFeignClient
{
public
class
IBZUAAFallback
implements
IBZUAAFeignClient
{
@
Override
@
Override
public
boolean
pushSystemPermissionData
(
String
systemid
,
JSONObject
systemPermissionData
)
{
public
Boolean
syncSysAuthority
(
JSONObject
system
)
{
return
false
;
return
null
;
}
}
@
Override
@
Override
...
...
SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZUAAFeignClient.java.ftl
浏览文件 @
8036604c
...
@@ -13,13 +13,12 @@ import com.alibaba.fastjson.JSONObject;
...
@@ -13,13 +13,12 @@ import com.alibaba.fastjson.JSONObject;
public
interface
IBZUAAFeignClient
public
interface
IBZUAAFeignClient
{
{
/**
/**
*
推送系统权限数据到
uaa
*
同步系统资源到
uaa
*
@
param
systemid
*
@
param
system
系统资源信息
*
@
param
systemPermissionData
*
@
return
*
@
return
*/
*/
@
PostMapping
(
"/syspssystems/
{systemid}/permissiondata
"
)
@
PostMapping
(
"/syspssystems/
save
"
)
boolean
pushSystemPermissionData
(@
PathVariable
(
"systemid"
)
String
systemid
,@
RequestBody
JSONObject
systemPermissionData
);
Boolean
syncSysAuthority
(@
RequestBody
JSONObject
system
);
/**
/**
*
用户登录
*
用户登录
...
...
SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/job/PermissionSyncJob.java.ftl
浏览文件 @
8036604c
...
@@ -40,10 +40,14 @@ public class PermissionSyncJob implements ApplicationRunner {
...
@@ -40,10 +40,14 @@ public class PermissionSyncJob implements ApplicationRunner {
Thread
.
sleep
(
10000
);
Thread
.
sleep
(
10000
);
InputStream
permission
=
this
.
getClass
().
getResourceAsStream
(
"/permission/systemResource.json"
);
//
获取当前系统所有实体资源能力
InputStream
permission
=
this
.
getClass
().
getResourceAsStream
(
"/permission/systemResource.json"
);
//
获取当前系统所有实体资源能力
String
permissionResult
=
IOUtils
.
toString
(
permission
,
"UTF-8"
);
String
permissionResult
=
IOUtils
.
toString
(
permission
,
"UTF-8"
);
if
(
client
.
pushSystemPermissionData
(
systemId
,
JSONObject
.
parseObject
(
permissionResult
))){
JSONObject
system
=
new
JSONObject
();
system
.
put
(
"pssystemid"
,
systemId
);
system
.
put
(
"pssystemname"
,
systemId
);
system
.
put
(
"sysstructure"
,
JSONObject
.
parseObject
(
permissionResult
));
if
(
client
.
syncSysAuthority
(
system
)){
log
.
info
(
"向[UAA]同步系统资源成功"
);
log
.
info
(
"向[UAA]同步系统资源成功"
);
}
else
{
}
else
{
log
.
info
(
String
.
format
(
"向[UAA]同步系统资源失败"
)
);
log
.
error
(
"向[UAA]同步系统资源失败"
);
}
}
}
}
catch
(
Exception
ex
)
{
catch
(
Exception
ex
)
{
...
...
SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/rest/AppController.java.ftl
浏览文件 @
8036604c
...
@@ -3,18 +3,21 @@ TARGET=PSSYSTEM
...
@@ -3,18 +3,21 @@ TARGET=PSSYSTEM
</#
ibiztemplate
>
</#
ibiztemplate
>
package
${
pub
.
getPKGCodeName
()}.
util
.
rest
;
package
${
pub
.
getPKGCodeName
()}.
util
.
rest
;
import
com
.
alibaba
.
fastjson
.
JSONArray
;
import
com
.
alibaba
.
fastjson
.
JSONObject
;
import
com
.
alibaba
.
fastjson
.
JSONObject
;
import
${
pub
.
getPKGCodeName
()}.
util
.
security
.
AuthenticationUser
;
import
${
pub
.
getPKGCodeName
()}.
util
.
service
.
AuthenticationUserService
;
import
org
.
springframework
.
beans
.
factory
.
annotation
.
Autowired
;
import
org
.
springframework
.
beans
.
factory
.
annotation
.
Value
;
import
org
.
springframework
.
http
.
HttpStatus
;
import
org
.
springframework
.
http
.
HttpStatus
;
import
org
.
springframework
.
http
.
ResponseEntity
;
import
org
.
springframework
.
http
.
ResponseEntity
;
import
org
.
springframework
.
util
.
ObjectUtils
;
import
org
.
springframework
.
security
.
core
.
GrantedAuthority
;
import
org
.
springframework
.
web
.
bind
.
annotation
.
RequestMapping
;
import
org
.
springframework
.
web
.
bind
.
annotation
.
RequestMapping
;
import
org
.
springframework
.
web
.
bind
.
annotation
.
RequestMethod
;
import
org
.
springframework
.
web
.
bind
.
annotation
.
RequestMethod
;
import
org
.
springframework
.
web
.
bind
.
annotation
.
RestController
;
import
org
.
springframework
.
web
.
bind
.
annotation
.
RestController
;
import
org
.
springframework
.
beans
.
factory
.
annotation
.
Value
;
import
java
.
util
.
Collection
;
import
org
.
springframework
.
beans
.
factory
.
annotation
.
Autowired
;
import
java
.
util
.
HashSet
;
import
${
pub
.
getPKGCodeName
()}.
util
.
security
.
AuthenticationUse
r
;
import
java
.
util
.
Iterato
r
;
import
${
pub
.
getPKGCodeName
()}.
util
.
service
.
AuthenticationUserService
;
import
java
.
util
.
Set
;
@
RestController
@
RestController
@
RequestMapping
(
value
=
""
)
@
RequestMapping
(
value
=
""
)
...
@@ -30,13 +33,19 @@ public class AppController {
...
@@ -30,13 +33,19 @@ public class AppController {
public
ResponseEntity
<
JSONObject
>
getAppData
()
{
public
ResponseEntity
<
JSONObject
>
getAppData
()
{
JSONObject
appData
=
new
JSONObject
()
;
JSONObject
appData
=
new
JSONObject
()
;
JSONArray
uniRes
=
new
JSONArray
();
Set
<
String
>
appMenu
=
new
HashSet
();
JSONArray
appMenu
=
new
JSONArray
();
Set
<
String
>
uniRes
=
new
HashSet
();
if
(
enablePermissionValid
){
if
(
enablePermissionValid
){
JSONObject
userPermission
=
AuthenticationUser
.
getAuthenticationUser
().
getPermissionList
();
Collection
<
GrantedAuthority
>
authorities
=
AuthenticationUser
.
getAuthenticationUser
().
getAuthorities
();
if
(
!ObjectUtils.isEmpty(userPermission)){
Iterator
it
=
authorities
.
iterator
();
uniRes
=
userPermission
.
getJSONArray
(
"unires"
);
while
(
it
.
hasNext
())
{
appMenu
=
userPermission
.
getJSONArray
(
"appmenu"
);
GrantedAuthority
authority
=
(
GrantedAuthority
)
it
.
next
();
String
strAuthority
=
authority
.
getAuthority
();
if
(
strAuthority
.
startsWith
(
"UNIRES"
))
uniRes
.
add
(
strAuthority
);
else
if
(
strAuthority
.
startsWith
(
"APPMENU"
))
appMenu
.
add
(
strAuthority
);
}
}
}
}
appData
.
put
(
"unires"
,
uniRes
);
appData
.
put
(
"unires"
,
uniRes
);
...
...
SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/security/AuthPermissionEvaluator.java.ftl
浏览文件 @
8036604c
此差异已折叠。
点击以展开。
SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/service/IBZUSERServiceImpl.java.ftl
浏览文件 @
8036604c
...
@@ -17,6 +17,7 @@ import ${pub.getPKGCodeName()}.util.domain.IBZUSER;
...
@@ -17,6 +17,7 @@ import ${pub.getPKGCodeName()}.util.domain.IBZUSER;
import
org
.
springframework
.
util
.
DigestUtils
;
import
org
.
springframework
.
util
.
DigestUtils
;
import
org
.
springframework
.
util
.
StringUtils
;
import
org
.
springframework
.
util
.
StringUtils
;
import
org
.
springframework
.
boot
.
autoconfigure
.
condition
.
ConditionalOnExpression
;
import
org
.
springframework
.
boot
.
autoconfigure
.
condition
.
ConditionalOnExpression
;
import
org
.
springframework
.
security
.
core
.
authority
.
AuthorityUtils
;
/**
/**
*
实体
[
IBZUSER
]
服务对象接口实现
*
实体
[
IBZUSER
]
服务对象接口实现
...
@@ -75,6 +76,9 @@ public class IBZUSERServiceImpl extends ServiceImpl<IBZUSERMapper, IBZUSER> impl
...
@@ -75,6 +76,9 @@ public class IBZUSERServiceImpl extends ServiceImpl<IBZUSERMapper, IBZUSER> impl
public
AuthenticationUser
createUserDetails
(
IBZUSER
user
)
{
public
AuthenticationUser
createUserDetails
(
IBZUSER
user
)
{
AuthenticationUser
userdatail
=
new
AuthenticationUser
();
AuthenticationUser
userdatail
=
new
AuthenticationUser
();
CachedBeanCopier
.
copy
(
user
,
userdatail
);
CachedBeanCopier
.
copy
(
user
,
userdatail
);
if
(
userdatail
.
getSuperuser
()==
1
){
userdatail
.
setAuthorities
(
AuthorityUtils
.
createAuthorityList
(
"ROLE_SUPERADMIN"
));
}
return
userdatail
;
return
userdatail
;
}
}
}
}
\ No newline at end of file
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录