diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java index 95b4940360fb30684e6c48898d0cd15a8f52b632..303053a17ca6dbfce70c797c268df51a030b2736 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java @@ -37,15 +37,15 @@ public class Resources extends JpaBaseDomain implements Serializable { @Column String appId; @Column - String pid; + String parentId; @Column - String pname; + String parentName; @Column - String resType; + String resourceType; @Column - String resUrl; + String resourceUrl; @Column - String resAction; + String resourceAction; @Column String status; @Column @@ -80,102 +80,100 @@ public class Resources extends JpaBaseDomain implements Serializable { this.name = name; } - public String getStatus() { - return status; + public String getAppId() { + return appId; } - public void setStatus(String status) { - this.status = status; + public void setAppId(String appId) { + this.appId = appId; } - public String getDescription() { - return description; + public String getParentId() { + return parentId; } - public void setDescription(String description) { - this.description = description; + public void setParentId(String parentId) { + this.parentId = parentId; } - public String getCreatedBy() { - return createdBy; + public String getParentName() { + return parentName; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; + public void setParentName(String parentName) { + this.parentName = parentName; } - public String getCreatedDate() { - return createdDate; + public String getResourceType() { + return resourceType; } - public void setCreatedDate(String createdDate) { - this.createdDate = createdDate; + public void setResourceType(String resourceType) { + this.resourceType = resourceType; } - public String getModifiedBy() { - return modifiedBy; + public String getResourceUrl() { + return resourceUrl; } - public void setModifiedBy(String modifiedBy) { - this.modifiedBy = modifiedBy; + public void setResourceUrl(String resourceUrl) { + this.resourceUrl = resourceUrl; } - public String getModifiedDate() { - return modifiedDate; + public String getResourceAction() { + return resourceAction; } - public void setModifiedDate(String modifiedDate) { - this.modifiedDate = modifiedDate; + public void setResourceAction(String resourceAction) { + this.resourceAction = resourceAction; } - public String getResType() { - return resType; + public String getStatus() { + return status; } - public void setResType(String resType) { - this.resType = resType; + public void setStatus(String status) { + this.status = status; } - public String getResUrl() { - return resUrl; + public String getDescription() { + return description; } - public void setResUrl(String resUrl) { - this.resUrl = resUrl; + public void setDescription(String description) { + this.description = description; } - public String getResAction() { - return resAction; + public String getCreatedBy() { + return createdBy; } - public void setResAction(String resAction) { - this.resAction = resAction; + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; } - public String getPid() { - return pid; + public String getCreatedDate() { + return createdDate; } - public void setPid(String pid) { - this.pid = pid; + public void setCreatedDate(String createdDate) { + this.createdDate = createdDate; } - public String getPname() { - return pname; + public String getModifiedBy() { + return modifiedBy; } - public void setPname(String pname) { - this.pname = pname; + public void setModifiedBy(String modifiedBy) { + this.modifiedBy = modifiedBy; } - public String getAppId() { - return appId; + public String getModifiedDate() { + return modifiedDate; } - public void setAppId(String appId) { - this.appId = appId; + public void setModifiedDate(String modifiedDate) { + this.modifiedDate = modifiedDate; } - - - + } diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml index 63b3ef671a359e9a6decf82736212fc0af4b7f7d..86aa7e0eb0874c01e95c92fac515b621ac8ad136 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml @@ -9,8 +9,8 @@ AND APPID = #{appId} - - AND PID = #{pid} + + AND PARENTID = #{parentId} AND NAME LIKE '%${name}%' diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java index b9b40d1d2a0291381a57cd179d7d0f365afbaa6d..68e4460a7278c12c011629bbc7f8943f02a8d12f 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java @@ -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.getPid()); + treeNode.setPId(res.getParentId()); treeNodeList.addTreeNode(treeNode.getAttr()); } diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl index 13a6e5157148851c20411ae27d55f4d154d6a3ce..484d8fd84479838266dc0302e34263f84c8e00d6 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl @@ -15,7 +15,13 @@ - + + + + + diff --git a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl index dd5ea81f6d43eb389f3a1441c25a46c514938913..5d41ade7c7d21800b849cae504090bddadf8f219 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl @@ -13,8 +13,8 @@ @@ -22,46 +22,52 @@ $(function () {
<@locale code="group.name" />:<@locale code="group.id" />: + +
<@locale code="role.name" />:
+ + + + - + diff --git a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl index c393af24612c3242d228278aacad7d7c497dbd48..60fc2b32c5b94300584d56cd1436031a060f2b3e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl @@ -29,10 +29,10 @@ - + diff --git a/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl b/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl index 8b7af77249eb9969f1e3b343969f4f79da85cb9d..64703ba6bcce9d2eb73c0d9843727dff743df60e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl @@ -7,7 +7,7 @@ function onClick (event, treeId, treeNode) { - $("#pid").val(treeNode.id); + $("#parentId").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 () { + + + diff --git a/maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl index ab7c1339e62b116f2e59627c9118d3745ffb1c58..6bfdeacc3b076a59de4b67b7afadedd6227d1fc4 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl @@ -14,6 +14,12 @@
<@locale code="resource.id" />: + +
<@locale code="resource.name" />:
<@locale code="apps.id" />: - +
<@locale code="resource.pid" />: - +
<@locale code="resource.pname" />: - +
<@locale code="resource.resType" />: - +
<@locale code="resource.resUrl" />: - +
<@locale code="resource.resAction" />: - +
<@locale code="resource.pid" />: - +
<@locale code="apps.id" />: @@ -41,25 +41,25 @@
<@locale code="resource.pname" />: - +
<@locale code="resource.resType" />: - +
<@locale code="resource.resUrl" />: - +
<@locale code="resource.resAction" />: - +
- + " wurl="<@base/>/apps/select" @@ -240,6 +240,9 @@ $(function () { Id <@locale code="resource.name"/><@locale code="resource.resType"/><@locale code="resource.resUrl"/><@locale code="resource.resAction"/> <@locale code="common.text.description"/>
+ + + +
<@locale code="role.id" />: + +
<@locale code="role.name" />: diff --git a/maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl index 0326dba822ac1696e56a960a9dbb9b126636357d..3e485166458d87ce00d0aaeb3b0337a0c3569520 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl @@ -14,7 +14,7 @@ - +
<@locale code="role.id" />: