Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yujianwangzivayy
MaxKey
提交
0276059f
MaxKey
项目概览
yujianwangzivayy
/
MaxKey
与 Fork 源项目一致
Fork自
MaxKey单点登录官方(MaxKeyTop) / MaxKey
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0276059f
编写于
7月 18, 2020
作者:
MaxKey单点登录官方
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resources ,ids
上级
17fe3412
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
97 addition
and
78 deletion
+97
-78
maxkey-core/src/main/java/org/maxkey/domain/Resources.java
maxkey-core/src/main/java/org/maxkey/domain/Resources.java
+54
-56
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
...g/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
+2
-2
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java
...n/java/org/maxkey/web/contorller/ResourcesController.java
+1
-1
maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
...ge/src/main/resources/templates/views/groups/groupAdd.ftl
+7
-1
maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl
.../main/resources/templates/views/resources/resourceAdd.ftl
+15
-9
maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl
...in/resources/templates/views/resources/resourceUpdate.ftl
+6
-6
maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl
...ain/resources/templates/views/resources/resourcesList.ftl
+5
-2
maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl
...nage/src/main/resources/templates/views/roles/roleAdd.ftl
+6
-0
maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl
...e/src/main/resources/templates/views/roles/roleUpdate.ftl
+1
-1
未找到文件。
maxkey-core/src/main/java/org/maxkey/domain/Resources.java
浏览文件 @
0276059f
...
...
@@ -37,15 +37,15 @@ public class Resources extends JpaBaseDomain implements Serializable {
@Column
String
appId
;
@Column
String
p
i
d
;
String
p
arentI
d
;
@Column
String
p
n
ame
;
String
p
arentN
ame
;
@Column
String
resType
;
String
res
ource
Type
;
@Column
String
resUrl
;
String
res
ource
Url
;
@Column
String
resAction
;
String
res
ource
Action
;
@Column
String
status
;
@Column
...
...
@@ -80,102 +80,100 @@ public class Resources extends JpaBaseDomain implements Serializable {
this
.
name
=
name
;
}
public
String
get
Status
()
{
return
status
;
public
String
get
AppId
()
{
return
appId
;
}
public
void
set
Status
(
String
status
)
{
this
.
status
=
status
;
public
void
set
AppId
(
String
appId
)
{
this
.
appId
=
appId
;
}
public
String
get
Description
()
{
return
description
;
public
String
get
ParentId
()
{
return
parentId
;
}
public
void
set
Description
(
String
description
)
{
this
.
description
=
description
;
public
void
set
ParentId
(
String
parentId
)
{
this
.
parentId
=
parentId
;
}
public
String
get
CreatedBy
()
{
return
createdBy
;
public
String
get
ParentName
()
{
return
parentName
;
}
public
void
set
CreatedBy
(
String
createdBy
)
{
this
.
createdBy
=
createdBy
;
public
void
set
ParentName
(
String
parentName
)
{
this
.
parentName
=
parentName
;
}
public
String
get
CreatedDat
e
()
{
return
createdDat
e
;
public
String
get
ResourceTyp
e
()
{
return
resourceTyp
e
;
}
public
void
set
CreatedDate
(
String
createdDat
e
)
{
this
.
createdDate
=
createdDat
e
;
public
void
set
ResourceType
(
String
resourceTyp
e
)
{
this
.
resourceType
=
resourceTyp
e
;
}
public
String
get
ModifiedBy
()
{
return
modifiedBy
;
public
String
get
ResourceUrl
()
{
return
resourceUrl
;
}
public
void
set
ModifiedBy
(
String
modifiedBy
)
{
this
.
modifiedBy
=
modifiedBy
;
public
void
set
ResourceUrl
(
String
resourceUrl
)
{
this
.
resourceUrl
=
resourceUrl
;
}
public
String
get
ModifiedDate
()
{
return
modifiedDate
;
public
String
get
ResourceAction
()
{
return
resourceAction
;
}
public
void
set
ModifiedDate
(
String
modifiedDate
)
{
this
.
modifiedDate
=
modifiedDate
;
public
void
set
ResourceAction
(
String
resourceAction
)
{
this
.
resourceAction
=
resourceAction
;
}
public
String
get
ResType
()
{
return
resType
;
public
String
get
Status
()
{
return
status
;
}
public
void
set
ResType
(
String
resType
)
{
this
.
resType
=
resType
;
public
void
set
Status
(
String
status
)
{
this
.
status
=
status
;
}
public
String
get
ResUrl
()
{
return
resUrl
;
public
String
get
Description
()
{
return
description
;
}
public
void
set
ResUrl
(
String
resUrl
)
{
this
.
resUrl
=
resUrl
;
public
void
set
Description
(
String
description
)
{
this
.
description
=
description
;
}
public
String
get
ResAction
()
{
return
resAction
;
public
String
get
CreatedBy
()
{
return
createdBy
;
}
public
void
set
ResAction
(
String
resAction
)
{
this
.
resAction
=
resAction
;
public
void
set
CreatedBy
(
String
createdBy
)
{
this
.
createdBy
=
createdBy
;
}
public
String
get
Pid
()
{
return
pid
;
public
String
get
CreatedDate
()
{
return
createdDate
;
}
public
void
set
Pid
(
String
pid
)
{
this
.
pid
=
pid
;
public
void
set
CreatedDate
(
String
createdDate
)
{
this
.
createdDate
=
createdDate
;
}
public
String
get
Pname
()
{
return
pname
;
public
String
get
ModifiedBy
()
{
return
modifiedBy
;
}
public
void
set
Pname
(
String
pname
)
{
this
.
pname
=
pname
;
public
void
set
ModifiedBy
(
String
modifiedBy
)
{
this
.
modifiedBy
=
modifiedBy
;
}
public
String
get
AppId
()
{
return
appId
;
public
String
get
ModifiedDate
()
{
return
modifiedDate
;
}
public
void
set
AppId
(
String
appId
)
{
this
.
appId
=
appId
;
public
void
set
ModifiedDate
(
String
modifiedDate
)
{
this
.
modifiedDate
=
modifiedDate
;
}
}
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
浏览文件 @
0276059f
...
...
@@ -9,8 +9,8 @@
<if
test=
"appId != null and appId != ''"
>
AND APPID = #{appId}
</if>
<if
test=
"p
id != null and pi
d != ''"
>
AND P
ID = #{pi
d}
<if
test=
"p
arentId != null and parentI
d != ''"
>
AND P
ARENTID = #{parentI
d}
</if>
<if
test=
"name != null and name != ''"
>
AND NAME LIKE '%${name}%'
...
...
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java
浏览文件 @
0276059f
...
...
@@ -170,7 +170,7 @@ public class ResourcesController {
for
(
Resources
res
:
resourcesList
)
{
TreeNode
treeNode
=
new
TreeNode
(
res
.
getId
(),
res
.
getName
());
treeNode
.
setAttr
(
"data"
,
res
);
treeNode
.
setPId
(
res
.
getP
i
d
());
treeNode
.
setPId
(
res
.
getP
arentI
d
());
treeNodeList
.
addTreeNode
(
treeNode
.
getAttr
());
}
...
...
maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
浏览文件 @
0276059f
...
...
@@ -15,7 +15,13 @@
<table
border=
"0"
cellpadding=
"0"
cellspacing=
"0"
class=
"table table-bordered"
>
<tbody>
<tr>
<th><
@
locale
code=
"group.name"
/>
:
</th>
<th><
@
locale
code=
"group.id"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"id"
name=
"id"
class=
"form-control"
title=
""
value=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"role.name"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"name"
name=
"name"
class=
"form-control"
title=
""
value=
""
required=
""
/>
</td>
...
...
maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl
浏览文件 @
0276059f
...
...
@@ -13,8 +13,8 @@
<script
type=
"text/javascript"
>
$
(
function
()
{
$
(
"
#appId
"
).
val
(
$
.
cookie
(
"
select_app_id
"
));
$
(
"
#p
i
d
"
).
val
(
$
.
cookie
(
"
select_res_id
"
));
$
(
"
#p
n
ame
"
).
val
(
$
.
cookie
(
"
select_res_name
"
));
$
(
"
#p
arentI
d
"
).
val
(
$
.
cookie
(
"
select_res_id
"
));
$
(
"
#p
arentN
ame
"
).
val
(
$
.
cookie
(
"
select_res_name
"
));
});
</script>
</head>
...
...
@@ -22,46 +22,52 @@ $(function () {
<form
id=
"actionForm"
method=
"post"
type=
"label"
autoclose=
"true"
action=
"<@base/>/resources/add"
class=
"needs-validation"
novalidate
>
<table
border=
"0"
cellpadding=
"0"
cellspacing=
"0"
class=
"table table-bordered"
>
<tbody>
<tr>
<th><
@
locale
code=
"resource.id"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"id"
name=
"id"
class=
"form-control"
title=
""
value=
""
required=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.name"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"name"
name=
"name"
class=
"form-control"
title=
""
value=
""
required=
""
/>
</td>
</tr>
<tr>
<tr
style=
"display:none;"
>
<th><
@
locale
code=
"apps.id"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"appId"
name=
"appId"
class=
"form-control"
title=
""
value=
""
required=
""
/>
<input
type=
"text"
id=
"appId"
name=
"appId"
class=
"form-control"
title=
""
value=
""
required=
""
readonly
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.pid"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"p
id"
name=
"pi
d"
class=
"form-control"
title=
""
value=
""
required=
""
/>
<input
type=
"text"
id=
"p
arentId"
name=
"parentI
d"
class=
"form-control"
title=
""
value=
""
required=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.pname"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"p
name"
name=
"pn
ame"
class=
"form-control"
title=
""
value=
""
required=
""
/>
<input
type=
"text"
id=
"p
arentName"
name=
"parentN
ame"
class=
"form-control"
title=
""
value=
""
required=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.resType"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"res
Type"
name=
"res
Type"
class=
"form-control"
title=
""
value=
""
required=
""
/>
<input
type=
"text"
id=
"res
ourceType"
name=
"resource
Type"
class=
"form-control"
title=
""
value=
""
required=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.resUrl"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"res
Url"
name=
"res
Url"
class=
"form-control"
title=
""
value=
""
required=
""
/>
<input
type=
"text"
id=
"res
ourceUrl"
name=
"resource
Url"
class=
"form-control"
title=
""
value=
""
required=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.resAction"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"res
Action"
name=
"res
Action"
class=
"form-control"
title=
""
value=
""
required=
""
/>
<input
type=
"text"
id=
"res
ourceAction"
name=
"resource
Action"
class=
"form-control"
title=
""
value=
""
required=
""
/>
</td>
</tr>
<tr>
...
...
maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl
浏览文件 @
0276059f
...
...
@@ -29,10 +29,10 @@
<tr>
<th><
@
locale
code=
"resource.pid"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"p
id"
name=
"pid"
class=
"form-control"
title=
""
value=
"${model.pi
d!}"
required=
""
/>
<input
type=
"text"
id=
"p
arentId"
name=
"parentId"
class=
"form-control"
title=
""
value=
"${model.parentI
d!}"
required=
""
/>
</td>
</tr>
<tr>
<tr
style=
"display:none;"
>
<th><
@
locale
code=
"apps.id"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"appId"
name=
"appId"
class=
"form-control"
title=
""
value=
"${model.appId!}"
required=
""
/>
...
...
@@ -41,25 +41,25 @@
<tr>
<th><
@
locale
code=
"resource.pname"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"p
name"
name=
"pname"
class=
"form-control"
title=
""
value=
"${model.pn
ame!}"
required=
""
/>
<input
type=
"text"
id=
"p
arentName"
name=
"parentName"
class=
"form-control"
title=
""
value=
"${model.parentN
ame!}"
required=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.resType"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"res
Type"
name=
"resType"
class=
"form-control"
title=
""
value=
"${model.res
Type!}"
required=
""
/>
<input
type=
"text"
id=
"res
ourceType"
name=
"resourceType"
class=
"form-control"
title=
""
value=
"${model.resource
Type!}"
required=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.resUrl"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"res
Url"
name=
"resUrl"
class=
"form-control"
title=
""
value=
"${model.res
Url!}"
required=
""
/>
<input
type=
"text"
id=
"res
ourceUrl"
name=
"resourceUrl"
class=
"form-control"
title=
""
value=
"${model.resource
Url!}"
required=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"resource.resAction"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"res
Action"
name=
"resAction"
class=
"form-control"
title=
""
value=
"${model.res
Action!}"
required=
""
/>
<input
type=
"text"
id=
"res
ourceAction"
name=
"resourceAction"
class=
"form-control"
title=
""
value=
"${model.resource
Action!}"
required=
""
/>
</td>
</tr>
<tr>
...
...
maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl
浏览文件 @
0276059f
...
...
@@ -7,7 +7,7 @@
function
onClick
(
event
,
treeId
,
treeNode
)
{
$
(
"
#p
i
d
"
).
val
(
treeNode
.
id
);
$
(
"
#p
arentI
d
"
).
val
(
treeNode
.
id
);
$
.
cookie
(
"
select_res_id
"
,
treeNode
.
id
,
{
path
:
'
/
'
});
$
.
cookie
(
"
select_app_id
"
,
$
(
"
#appId
"
).
val
(),
{
path
:
'
/
'
});
$
.
cookie
(
"
select_res_name
"
,
treeNode
.
name
,{
path
:
'
/
'
});
...
...
@@ -173,7 +173,7 @@ $(function () {
<td
width=
"450px"
>
<form
id=
"basic_search_form"
>
<input
class=
"form-control appId"
id=
"appId"
name=
"appId"
value=
""
type=
"hidden"
>
<input
class=
"form-control"
id=
"p
id"
name=
"pi
d"
value=
""
type=
"hidden"
>
<input
class=
"form-control"
id=
"p
arentId"
name=
"parentI
d"
value=
""
type=
"hidden"
>
<input
class=
"form-control appName"
style=
"width:200px;float: left;"
value=
""
id=
"appName"
name=
"appName"
type=
"text"
>
<input
class=
"button btn btn-success mr-3 window"
style=
"float: left;"
id=
"selectBtn"
type=
"button"
value=
"<@locale code="
button.text.select
"
/>
"
wurl="
<
@
base
/>
/apps/select"
...
...
@@ -240,6 +240,9 @@ $(function () {
<th
data-checkbox=
"true"
></th>
<th
data-sortable=
"true"
data-field=
"id"
data-visible=
"false"
>
Id
</th>
<th
data-field=
"name"
><
@
locale
code=
"resource.name"
/></th>
<th
data-field=
"resourceType"
><
@
locale
code=
"resource.resType"
/></th>
<th
data-field=
"resourceUrl"
><
@
locale
code=
"resource.resUrl"
/></th>
<th
data-field=
"resourceAction"
><
@
locale
code=
"resource.resAction"
/></th>
<th
data-field=
"description"
><
@
locale
code=
"common.text.description"
/></th>
</tr>
...
...
maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl
浏览文件 @
0276059f
...
...
@@ -14,6 +14,12 @@
<form
id=
"actionForm"
method=
"post"
type=
"label"
autoclose=
"true"
action=
"<@base/>/roles/add"
class=
"needs-validation"
novalidate
>
<table
border=
"0"
cellpadding=
"0"
cellspacing=
"0"
class=
"table table-bordered"
>
<tbody>
<tr>
<th><
@
locale
code=
"role.id"
/>
:
</th>
<td
nowrap
>
<input
type=
"text"
id=
"id"
name=
"id"
class=
"form-control"
title=
""
value=
""
/>
</td>
</tr>
<tr>
<th><
@
locale
code=
"role.name"
/>
:
</th>
<td
nowrap
>
...
...
maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl
浏览文件 @
0276059f
...
...
@@ -14,7 +14,7 @@
<form
id=
"actionForm"
method=
"post"
type=
"label"
autoclose=
"true"
action=
"<@base/>/roles/update"
class=
"needs-validation"
novalidate
>
<table
border=
"0"
cellpadding=
"0"
cellspacing=
"0"
class=
"table table-bordered"
>
<tbody>
<tr
style=
"display:none1"
>
<tr>
<th><
@
locale
code=
"role.id"
/>
:
</th>
<td
nowrap
>
<input
id=
"id"
type=
"text"
readonly
name=
"id"
class=
"form-control"
value=
"${model.id}"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录