Skip to content

MaxKey
MaxKey

yujianwangzivayy / MaxKey
与 Fork 源项目一致

Fork自 MaxKey单点登录官方(MaxKeyTop) / MaxKey

通知 1
Star 0
Fork 0
MaxKey
MaxKey

体验新版 GitCode，发现更多精彩内容 >>

提交 0276059f 编写于 作者: MaxKey单点登录官方's avatar MaxKey单点登录官方
浏览文件
操作

Resources ,ids

上级 17fe3412
隐藏空白更改
内联 并排
Showing with 97 addition and 78 deletion
maxkey-core/src/main/java/org/maxkey/domain/Resources.java
浏览文件 @ 0276059f
...@@ -37,15 +37,15 @@ public class Resources extends JpaBaseDomain implements Serializable { ...@@ -37,15 +37,15 @@ public class Resources extends JpaBaseDomain implements Serializable {
@Column @Column
String appId; String appId;
@Column @Column
String pid; String parentId;
@Column @Column
String pname; String parentName;
@Column @Column
String resType; String resourceType;
@Column @Column
String resUrl; String resourceUrl;
@Column @Column
String resAction; String resourceAction;
@Column @Column
String status; String status;
@Column @Column
...@@ -80,102 +80,100 @@ public class Resources extends JpaBaseDomain implements Serializable { ...@@ -80,102 +80,100 @@ public class Resources extends JpaBaseDomain implements Serializable {
this.name = name; this.name = name;
} }
public String getStatus() { public String getAppId() {
return status; return appId;
} }
public void setStatus(String status) { public void setAppId(String appId) {
this.status = status; this.appId = appId;
} }
public String getDescription() { public String getParentId() {
return description; return parentId;
} }
public void setDescription(String description) { public void setParentId(String parentId) {
this.description = description; this.parentId = parentId;
} }
public String getCreatedBy() { public String getParentName() {
return createdBy; return parentName;
} }
public void setCreatedBy(String createdBy) { public void setParentName(String parentName) {
this.createdBy = createdBy; this.parentName = parentName;
} }
public String getCreatedDate() { public String getResourceType() {
return createdDate; return resourceType;
} }
public void setCreatedDate(String createdDate) { public void setResourceType(String resourceType) {
this.createdDate = createdDate; this.resourceType = resourceType;
} }
public String getModifiedBy() { public String getResourceUrl() {
return modifiedBy; return resourceUrl;
} }
public void setModifiedBy(String modifiedBy) { public void setResourceUrl(String resourceUrl) {
this.modifiedBy = modifiedBy; this.resourceUrl = resourceUrl;
} }
public String getModifiedDate() { public String getResourceAction() {
return modifiedDate; return resourceAction;
} }
public void setModifiedDate(String modifiedDate) { public void setResourceAction(String resourceAction) {
this.modifiedDate = modifiedDate; this.resourceAction = resourceAction;
} }
public String getResType() { public String getStatus() {
return resType; return status;
} }
public void setResType(String resType) { public void setStatus(String status) {
this.resType = resType; this.status = status;
} }
public String getResUrl() { public String getDescription() {
return resUrl; return description;
} }
public void setResUrl(String resUrl) { public void setDescription(String description) {
this.resUrl = resUrl; this.description = description;
} }
public String getResAction() { public String getCreatedBy() {
return resAction; return createdBy;
} }
public void setResAction(String resAction) { public void setCreatedBy(String createdBy) {
this.resAction = resAction; this.createdBy = createdBy;
} }
public String getPid() { public String getCreatedDate() {
return pid; return createdDate;
} }
public void setPid(String pid) { public void setCreatedDate(String createdDate) {
this.pid = pid; this.createdDate = createdDate;
} }
public String getPname() { public String getModifiedBy() {
return pname; return modifiedBy;
} }
public void setPname(String pname) { public void setModifiedBy(String modifiedBy) {
this.pname = pname; this.modifiedBy = modifiedBy;
} }
public String getAppId() { public String getModifiedDate() {
return appId; return modifiedDate;
} }
public void setAppId(String appId) { public void setModifiedDate(String modifiedDate) {
this.appId = appId; this.modifiedDate = modifiedDate;
} }
} }
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
浏览文件 @ 0276059f
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<if test="appId != null and appId != ''"> <if test="appId != null and appId != ''">
AND APPID = #{appId} AND APPID = #{appId}
</if> </if>
<if test="pid != null and pid != ''"> <if test="parentId != null and parentId != ''">
AND PID = #{pid} AND PARENTID = #{parentId}
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
AND NAME LIKE '%${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 { ...@@ -170,7 +170,7 @@ public class ResourcesController {
for (Resources res : resourcesList) { for (Resources res : resourcesList) {
TreeNode treeNode = new TreeNode(res.getId(), res.getName()); TreeNode treeNode = new TreeNode(res.getId(), res.getName());
treeNode.setAttr("data", res); treeNode.setAttr("data", res);
treeNode.setPId(res.getPid()); treeNode.setPId(res.getParentId());
treeNodeList.addTreeNode(treeNode.getAttr()); treeNodeList.addTreeNode(treeNode.getAttr());
} }
......
maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
浏览文件 @ 0276059f
...@@ -15,7 +15,13 @@ ...@@ -15,7 +15,13 @@
<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" > <table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
<tbody> <tbody>
<tr> <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> <td nowrap>
<input type="text" id="name" name="name" class="form-control" title="" value="" required="" /> <input type="text" id="name" name="name" class="form-control" title="" value="" required="" />
</td> </td>
......
maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl
浏览文件 @ 0276059f
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$("#appId").val($.cookie("select_app_id")); $("#appId").val($.cookie("select_app_id"));
$("#pid").val($.cookie("select_res_id")); $("#parentId").val($.cookie("select_res_id"));
$("#pname").val($.cookie("select_res_name")); $("#parentName").val($.cookie("select_res_name"));
}); });
</script> </script>
</head> </head>
...@@ -22,46 +22,52 @@ $(function () { ...@@ -22,46 +22,52 @@ $(function () {
<form id="actionForm" method="post" type="label" autoclose="true" action="<@base/>/resources/add" class="needs-validation" novalidate> <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" > <table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
<tbody> <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> <tr>
<th><@locale code="resource.name" />：</th> <th><@locale code="resource.name" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="name" name="name" class="form-control" title="" value="" required="" /> <input type="text" id="name" name="name" class="form-control" title="" value="" required="" />
</td> </td>
</tr> </tr>
<tr> <tr style="display:none;">
<th><@locale code="apps.id" />：</th> <th><@locale code="apps.id" />：</th>
<td nowrap> <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> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="resource.pid" />：</th> <th><@locale code="resource.pid" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="pid" name="pid" class="form-control" title="" value="" required="" /> <input type="text" id="parentId" name="parentId" class="form-control" title="" value="" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="resource.pname" />：</th> <th><@locale code="resource.pname" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="pname" name="pname" class="form-control" title="" value="" required="" /> <input type="text" id="parentName" name="parentName" class="form-control" title="" value="" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="resource.resType" />：</th> <th><@locale code="resource.resType" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="resType" name="resType" class="form-control" title="" value="" required="" /> <input type="text" id="resourceType" name="resourceType" class="form-control" title="" value="" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="resource.resUrl" />：</th> <th><@locale code="resource.resUrl" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="resUrl" name="resUrl" class="form-control" title="" value="" required="" /> <input type="text" id="resourceUrl" name="resourceUrl" class="form-control" title="" value="" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="resource.resAction" />：</th> <th><@locale code="resource.resAction" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="resAction" name="resAction" class="form-control" title="" value="" required="" /> <input type="text" id="resourceAction" name="resourceAction" class="form-control" title="" value="" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
......
maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl
浏览文件 @ 0276059f
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
<tr> <tr>
<th><@locale code="resource.pid" />：</th> <th><@locale code="resource.pid" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="pid" name="pid" class="form-control" title="" value="${model.pid!}" required="" /> <input type="text" id="parentId" name="parentId" class="form-control" title="" value="${model.parentId!}" required="" />
</td> </td>
</tr> </tr>
<tr> <tr style="display:none;">
<th><@locale code="apps.id" />：</th> <th><@locale code="apps.id" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="appId" name="appId" class="form-control" title="" value="${model.appId!}" required="" /> <input type="text" id="appId" name="appId" class="form-control" title="" value="${model.appId!}" required="" />
...@@ -41,25 +41,25 @@ ...@@ -41,25 +41,25 @@
<tr> <tr>
<th><@locale code="resource.pname" />：</th> <th><@locale code="resource.pname" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="pname" name="pname" class="form-control" title="" value="${model.pname!}" required="" /> <input type="text" id="parentName" name="parentName" class="form-control" title="" value="${model.parentName!}" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="resource.resType" />：</th> <th><@locale code="resource.resType" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="resType" name="resType" class="form-control" title="" value="${model.resType!}" required="" /> <input type="text" id="resourceType" name="resourceType" class="form-control" title="" value="${model.resourceType!}" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="resource.resUrl" />：</th> <th><@locale code="resource.resUrl" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="resUrl" name="resUrl" class="form-control" title="" value="${model.resUrl!}" required="" /> <input type="text" id="resourceUrl" name="resourceUrl" class="form-control" title="" value="${model.resourceUrl!}" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="resource.resAction" />：</th> <th><@locale code="resource.resAction" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="resAction" name="resAction" class="form-control" title="" value="${model.resAction!}" required="" /> <input type="text" id="resourceAction" name="resourceAction" class="form-control" title="" value="${model.resourceAction!}" required="" />
</td> </td>
</tr> </tr>
<tr> <tr>
......
maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl
浏览文件 @ 0276059f
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
$("#pid").val(treeNode.id); $("#parentId").val(treeNode.id);
$.cookie("select_res_id", treeNode.id, { path: '/' }); $.cookie("select_res_id", treeNode.id, { path: '/' });
$.cookie("select_app_id", $("#appId").val(), { path: '/' }); $.cookie("select_app_id", $("#appId").val(), { path: '/' });
$.cookie("select_res_name", treeNode.name,{ path: '/' }); $.cookie("select_res_name", treeNode.name,{ path: '/' });
...@@ -173,7 +173,7 @@ $(function () { ...@@ -173,7 +173,7 @@ $(function () {
<td width="450px"> <td width="450px">
<form id="basic_search_form"> <form id="basic_search_form">
<input class="form-control appId" id="appId" name="appId" value="" type="hidden" > <input class="form-control appId" id="appId" name="appId" value="" type="hidden" >
<input class="form-control" id="pid" name="pid" value="" type="hidden" > <input class="form-control" id="parentId" name="parentId" value="" type="hidden" >
<input class="form-control appName" style="width:200px;float: left;" value="" id="appName" name="appName" type="text" > <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"/>" <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" wurl="<@base/>/apps/select"
...@@ -240,6 +240,9 @@ $(function () { ...@@ -240,6 +240,9 @@ $(function () {
<th data-checkbox="true"></th> <th data-checkbox="true"></th>
<th data-sortable="true" data-field="id" data-visible="false">Id</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="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> <th data-field="description"><@locale code="common.text.description"/></th>
</tr> </tr>
......
maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl
浏览文件 @ 0276059f
...@@ -14,6 +14,12 @@ ...@@ -14,6 +14,12 @@
<form id="actionForm" method="post" type="label" autoclose="true" action="<@base/>/roles/add" class="needs-validation" novalidate> <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" > <table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
<tbody> <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> <tr>
<th><@locale code="role.name" />：</th> <th><@locale code="role.name" />：</th>
<td nowrap> <td nowrap>
......
maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl
浏览文件 @ 0276059f
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<form id="actionForm" method="post" type="label" autoclose="true" action="<@base/>/roles/update" class="needs-validation" novalidate> <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"> <table border="0" cellpadding="0" cellspacing="0" class="table table-bordered">
<tbody> <tbody>
<tr style="display:none1"> <tr>
<th><@locale code="role.id" />：</th> <th><@locale code="role.id" />：</th>
<td nowrap> <td nowrap>
<input id="id" type="text" readonly name="id" class="form-control" value="${model.id}"/> <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.
先完成此消息的编辑！
想要评论请 注册 或