From de11428c6199c35213c9d139580d75cd2404c9b8 Mon Sep 17 00:00:00 2001
From: vakinge <vakinge@gmail.com>
Date: Sun, 17 Jul 2022 20:25:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/role/aside-table/index.vue   |  3 +-
 .../src/views/system/role/crud.jsx            | 43 +++++++----
 .../src/views/system/role/index.vue           | 49 ++++++++++---
 .../controller/UserRoleController.java        |  3 +-
 .../oneplatform/permission/dto/UserRole.java  | 21 +++---
 .../permission/dto/param/UserRoleParam.java   | 72 ++++++-------------
 .../permission/service/UserRoleService.java   | 26 ++++++-
 7 files changed, 131 insertions(+), 86 deletions(-)

diff --git a/oneplatform-admin-web-vue3/src/views/system/role/aside-table/index.vue b/oneplatform-admin-web-vue3/src/views/system/role/aside-table/index.vue
index cd8c27c..24215b0 100755
--- a/oneplatform-admin-web-vue3/src/views/system/role/aside-table/index.vue
+++ b/oneplatform-admin-web-vue3/src/views/system/role/aside-table/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <fs-crud ref="crudRef" v-bind="crudBinding" /> 
+  <fs-crud ref="crudRef" v-bind="crudBinding">
+  </fs-crud> 
 </template>
 
 <script>
diff --git a/oneplatform-admin-web-vue3/src/views/system/role/crud.jsx b/oneplatform-admin-web-vue3/src/views/system/role/crud.jsx
index 9f7d79a..bfa7c2d 100755
--- a/oneplatform-admin-web-vue3/src/views/system/role/crud.jsx
+++ b/oneplatform-admin-web-vue3/src/views/system/role/crud.jsx
@@ -1,15 +1,17 @@
 import * as api from './api';
 import { ref, shallowRef } from 'vue';
 import { compute } from '@fast-crud/fast-crud';
-export default function ({ expose, asideTableRef }) {
+export default function ({ expose, asideTableRef,checkedKeys }) {
   const editRequest = async ({ form, row }) => {
     form.id = row.id;
+    form.grantResourceIds = checkedKeys.value;
     return await api.UpdateObj(form);
   };
   const delRequest = async ({ row }) => {
     return await api.DelObj(row.id);
   };
   const addRequest = async ({ form }) => {
+    form.grantResourceIds = checkedKeys.value;
     return await api.AddObj(form);
   };
   const currentRow = ref();
@@ -49,6 +51,31 @@ export default function ({ expose, asideTableRef }) {
       rowHandle: {
         width: '150px',
         fixed: 'right',
+        buttons: {
+          view: { 
+            show: true,
+            async click(context) {
+              let rowData = await api.GetObj(context.row.id);
+              checkedKeys.value = rowData.grantResourceIds;
+              await expose.openView({
+                row: rowData,
+                index: context.index
+              });
+            },
+          },
+          edit: { 
+            show: true,
+            async click(context) {
+              let rowData = await api.GetObj(context.row.id);
+              checkedKeys.value = rowData.grantResourceIds;
+              await expose.openEdit({
+                row: rowData,
+                index: context.index
+              });
+            },
+          },
+          remove: { show: true },
+        },
       },
       toolbar: {
         show: true,
@@ -105,17 +132,7 @@ export default function ({ expose, asideTableRef }) {
             width: 100,
           },
           form: {
-            show: false,
-          },
-        },
-        birthday: {
-          title: '生日',
-          key: 'birthday',
-          column: {
-            width: 120,
-          },
-          form: {
-            show: false,
+            show: true,
           },
         },
         isDefault: {
@@ -148,7 +165,7 @@ export default function ({ expose, asideTableRef }) {
             show: false,
           },
         },
-        birthday: {
+        updatedAt: {
           title: '最后更新时间',
           key: 'updatedAt',
           column: {
diff --git a/oneplatform-admin-web-vue3/src/views/system/role/index.vue b/oneplatform-admin-web-vue3/src/views/system/role/index.vue
index a144b59..5f69ae2 100755
--- a/oneplatform-admin-web-vue3/src/views/system/role/index.vue
+++ b/oneplatform-admin-web-vue3/src/views/system/role/index.vue
@@ -1,7 +1,26 @@
 <template>
   <n-row class="demo-nest" :gutter="0">
     <n-col :span="14">
-      <fs-crud ref="crudRef" v-bind="crudBinding" />
+      <fs-crud ref="crudRef" v-bind="crudBinding">
+        <template #form-body-bottom>
+          <n-card title="权限">
+              <n-tree
+                block-line
+                cascade
+                checkable
+                selectable
+                multiple
+                :virtual-scroll="true"
+                :data="treeData"
+                :default-checked-keys="checkedKeys"
+                key-field="id"
+                label-field="name"
+                style="max-height: 550px; overflow: hidden"
+                @update:checked-keys="selectedTree"
+              />
+            </n-card>
+        </template>
+      </fs-crud>
     </n-col>
     <n-col :span="9" style="padding-left:10px;">
       <aside-table ref="asideTableRef" />
@@ -10,15 +29,20 @@
 </template>
 
 <script>
-  import { defineComponent, ref, onMounted } from 'vue';
+  import { ref, unref, defineComponent, onMounted } from 'vue';
   import createCrudOptions from './crud';
   import { useExpose, useCrud } from '@fast-crud/fast-crud';
   import AsideTable from './aside-table/index.vue';
+  import { getMenuList } from '@/api/system/menu';
+  import { getTreeItem } from '@/utils';
   export default defineComponent({
     name: 'RoleTable',
     // eslint-disable-next-line vue/no-unused-components
     components: { AsideTable },
     setup() {
+      const checkedKeys = ref([]);   
+      const treeData = ref([]);  
+      
       // crud组件的ref
       const crudRef = ref();
       // crud 配置的ref
@@ -27,25 +51,30 @@
       const { expose } = useExpose({ crudRef, crudBinding });
       // 你的crud配置
       const asideTableRef = ref();
-      const { crudOptions } = createCrudOptions({ expose, asideTableRef });
-      // 初始化crud配置
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+      const { crudOptions } = createCrudOptions({ expose, asideTableRef,checkedKeys });
       const { resetCrudOptions } = useCrud({ expose, crudOptions });
-      // 你可以调用此方法，重新初始化crud配置
-      // resetCrudOptions(options)
-
-      // 页面打开后获取列表数据
-      onMounted(() => {
+      
+      onMounted(async () => {
         expose.doRefresh();
+        const treeMenuList = await getMenuList();
+        treeData.value = treeMenuList;
       });
+      
+      function selectedTree(keys) {
+        checkedKeys.value = keys;
+      }
 
       return {
         crudBinding,
         crudRef,
         asideTableRef,
+        treeData,
+        checkedKeys,
+        selectedTree
       };
     },
   });
+ 
 </script>
 <style lang="less">
   .demo-nest {
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/UserRoleController.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/UserRoleController.java
index d54e93b..f237b21 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/UserRoleController.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/UserRoleController.java
@@ -69,8 +69,7 @@ public class UserRoleController {
 	@PostMapping("add")
 	public IdParam<Integer> add(@RequestBody UserRoleParam param) {
 		String tenantId = CurrentRuntimeContext.getTenantId(false);
-		param.setTenantId(tenantId);
-		return userRoleService.addUserRole(param);
+		return userRoleService.addUserRole(tenantId,param);
 	}
 
 	
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/UserRole.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/UserRole.java
index 09ee9b0..c960656 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/UserRole.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/UserRole.java
@@ -1,6 +1,7 @@
 package com.oneplatform.permission.dto;
 
 import java.util.Date;
+import java.util.List;
 
 public class UserRole {
 
@@ -35,8 +36,6 @@ public class UserRole {
     private String departmentId;
     
     private String departmentName;
-    
-    private String departmentLongCode;
 
     /**
      * 是否系统默认
@@ -69,6 +68,8 @@ public class UserRole {
      * 更新人姓名
      */
     private String updatedBy;
+    
+    private List<String> grantResourceIds;
 
 	public Integer getId() {
 		return id;
@@ -126,14 +127,6 @@ public class UserRole {
 		this.departmentName = departmentName;
 	}
 
-	public String getDepartmentLongCode() {
-		return departmentLongCode;
-	}
-
-	public void setDepartmentLongCode(String departmentLongCode) {
-		this.departmentLongCode = departmentLongCode;
-	}
-
 	public Boolean getIsDefault() {
 		return isDefault;
 	}
@@ -189,6 +182,14 @@ public class UserRole {
 	public void setUpdatedBy(String updatedBy) {
 		this.updatedBy = updatedBy;
 	}
+
+	public List<String> getGrantResourceIds() {
+		return grantResourceIds;
+	}
+
+	public void setGrantResourceIds(List<String> grantResourceIds) {
+		this.grantResourceIds = grantResourceIds;
+	}
     
     
 }
\ No newline at end of file
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/param/UserRoleParam.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/param/UserRoleParam.java
index 8567dc3..113dec3 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/param/UserRoleParam.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/param/UserRoleParam.java
@@ -1,5 +1,7 @@
 package com.oneplatform.permission.dto.param;
 
+import java.util.List;
+
 public class UserRoleParam {
 
     /**
@@ -11,73 +13,37 @@ public class UserRoleParam {
      * 用户组名称
      */
     private String name;
-
-    /**
-     * 关联租户id
-     */
-    private String tenantId;
-
     /**
      * 关联部门id
      */
     private String departmentId;
 
-    private String departmentName;
-    private String departmentLongCode;
 	private String remarks;
 
-    public Integer getId() {
-        return id;
-    }
+    private List<String> grantResourceIds;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-	 * @return the tenantId
-	 */
-	public String getTenantId() {
-		return tenantId;
+	public Integer getId() {
+		return id;
 	}
 
-	/**
-	 * @param tenantId the tenantId to set
-	 */
-	public void setTenantId(String tenantId) {
-		this.tenantId = tenantId;
+	public void setId(Integer id) {
+		this.id = id;
 	}
 
-	public String getDepartmentId() {
-        return departmentId;
-    }
-
-    public void setDepartmentId(String departmentId) {
-        this.departmentId = departmentId;
-    }
-
-	public String getDepartmentName() {
-		return departmentName;
+	public String getName() {
+		return name;
 	}
 
-	public void setDepartmentName(String departmentName) {
-		this.departmentName = departmentName;
+	public void setName(String name) {
+		this.name = name;
 	}
 
-	public String getDepartmentLongCode() {
-		return departmentLongCode;
+	public String getDepartmentId() {
+		return departmentId;
 	}
 
-	public void setDepartmentLongCode(String departmentLongCode) {
-		this.departmentLongCode = departmentLongCode;
+	public void setDepartmentId(String departmentId) {
+		this.departmentId = departmentId;
 	}
 
 	public String getRemarks() {
@@ -88,5 +54,13 @@ public class UserRoleParam {
 		this.remarks = remarks;
 	}
 
+	public List<String> getGrantResourceIds() {
+		return grantResourceIds;
+	}
+
+	public void setGrantResourceIds(List<String> grantResourceIds) {
+		this.grantResourceIds = grantResourceIds;
+	}
+
     
 }
\ No newline at end of file
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/service/UserRoleService.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/service/UserRoleService.java
index bad55ac..ee1bd55 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/service/UserRoleService.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/service/UserRoleService.java
@@ -1,6 +1,8 @@
 package com.oneplatform.permission.service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,6 +16,7 @@ import com.mendmix.common.model.PageParams;
 import com.mendmix.common.util.AssertUtil;
 import com.mendmix.common.util.BeanUtils;
 import com.mendmix.mybatis.plugin.pagination.PageExecutor;
+import com.oneplatform.permission.constants.GrantRelationType;
 import com.oneplatform.permission.dao.entity.UserRoleEntity;
 import com.oneplatform.permission.dao.mapper.UserRoleEntityMapper;
 import com.oneplatform.permission.dto.UserRole;
@@ -36,13 +39,22 @@ public class UserRoleService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public IdParam<Integer> addUserRole(UserRoleParam param){
+    public IdParam<Integer> addUserRole(String tenantId,UserRoleParam param){
 
         if(isExisted(param.getName())){
             throw new MendmixBaseException("用户组名称已经存在["+param.getName()+"]");
         }
         UserRoleEntity entity = BeanUtils.copy(param, UserRoleEntity.class);
+        entity.setTenantId(tenantId);
         userRoleMapper.insertSelective(entity);
+        //
+        if(param.getGrantResourceIds() != null && !param.getGrantResourceIds().isEmpty()) {
+        	GrantRelationParam relationParam = new GrantRelationParam();
+            relationParam.setRelationType(GrantRelationType.funcToRole);
+            relationParam.setTargetId(entity.getId().toString());
+            relationParam.setSourceIdList(param.getGrantResourceIds());
+            relationService.updateGrantRelations(relationParam);
+        }
 
         return new IdParam<>(entity.getId());
     }
@@ -66,6 +78,7 @@ public class UserRoleService {
      * 更新用户组信息
      * @param param 用户组param
      */
+    @Transactional(rollbackFor = Exception.class)
     public void updateUserRole(UserRoleParam param){
         AssertUtil.notNull(param.getId(),"参数缺失[id]");
         UserRoleEntity oldEntity = userRoleMapper.selectByPrimaryKey(param.getId());
@@ -76,6 +89,14 @@ public class UserRoleService {
         }
         UserRoleEntity entity = BeanUtils.copy(param,oldEntity);
         userRoleMapper.updateByPrimaryKeySelective(entity);
+        //
+        if(param.getGrantResourceIds() != null && !param.getGrantResourceIds().isEmpty()) {
+        	GrantRelationParam relationParam = new GrantRelationParam();
+            relationParam.setRelationType(GrantRelationType.funcToRole);
+            relationParam.setTargetId(entity.getId().toString());
+            relationParam.setSourceIdList(param.getGrantResourceIds());
+            relationService.updateGrantRelations(relationParam);
+        }
     }
 
     /**
@@ -102,6 +123,9 @@ public class UserRoleService {
             return null;
         }
         UserRole userGroup =  BeanUtils.copy(entity,UserRole.class);
+        //
+        Map<String, String> mappings = relationService.findGrantRelationIdMappings(GrantRelationType.funcToRole, id.toString());
+        userGroup.setGrantResourceIds(new ArrayList<>(mappings.keySet()));
         return userGroup;
     } 
 
-- 
Gitee


From 8eaa342e7f5b32fb3d724f240c59995708542dde Mon Sep 17 00:00:00 2001
From: vakinge <vakinge@gmail.com>
Date: Mon, 18 Jul 2022 22:51:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/menu.ts                    |   3 +-
 .../src/router/modules/system.ts              |   8 +
 oneplatform-admin-web-vue3/src/utils/index.ts |   2 +-
 .../src/views/system/menu/CreateDrawer.vue    | 316 ++++++++++--------
 .../src/views/system/menu/index.vue           |   6 +-
 .../src/views/system/module/api.js            |  57 ++++
 .../src/views/system/module/crud.jsx          | 132 ++++++++
 .../src/views/system/module/index.vue         |  40 +++
 .../permission-service/doc/ddl.sql            |   4 +-
 .../controller/ApiResourceController.java     |  25 ++
 .../controller/SystemModuleController.java    | 101 ++++++
 .../permission/dao/StandardBaseEntity.java    |   5 +-
 .../dao/entity/ApiResourceEntity.java         |  28 +-
 .../dao/entity/BizSystemPortalEntity.java     |  16 +-
 .../permission/dto/ApiResource.java           | 277 +++------------
 .../oneplatform/permission/dto/BaseDto.java   |   6 +-
 .../oneplatform/permission/dto/BizSystem.java | 209 ------------
 .../permission/dto/BizSystemModule.java       |  56 +---
 ...SystemDomain.java => BizSystemPortal.java} |  74 ++--
 .../dto/param/SystemModuleParam.java          |  85 +++++
 .../permission/service/BizSystemService.java  |  35 ++
 .../mapper/ApiResourceEntityMapper.xml        |   2 +-
 .../src/main/resources/application.properties |   5 +
 .../resources/application-local.properties    |   5 -
 24 files changed, 772 insertions(+), 725 deletions(-)
 create mode 100755 oneplatform-admin-web-vue3/src/views/system/module/api.js
 create mode 100755 oneplatform-admin-web-vue3/src/views/system/module/crud.jsx
 create mode 100755 oneplatform-admin-web-vue3/src/views/system/module/index.vue
 create mode 100644 oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/SystemModuleController.java
 delete mode 100644 oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystem.java
 rename oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/{BizSystemDomain.java => BizSystemPortal.java} (32%)
 create mode 100644 oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/param/SystemModuleParam.java

diff --git a/oneplatform-admin-web-vue3/src/api/system/menu.ts b/oneplatform-admin-web-vue3/src/api/system/menu.ts
index 951a3d5..6bbf5eb 100755
--- a/oneplatform-admin-web-vue3/src/api/system/menu.ts
+++ b/oneplatform-admin-web-vue3/src/api/system/menu.ts
@@ -46,13 +46,14 @@ function convertToMenuItems(items) {
    let currentActiveMenu = true;
 	 items.map((item,index)=>{
      let menu = {};
-     menu.path = item.router;
      menu.name = item.code;
      menu.component = item.type === 'catalog' ? 'LAYOUT' : item.viewPath;
      if(item.type === 'catalog'){
+       menu.path = item.router;
        menu.component = 'LAYOUT';
        menu.redirect = item.viewPath;
      }else {
+       menu.path = item.router.substr(item.router.lastIndexOf('/')+1);
        menu.component = item.viewPath;
      }
      menu.meta = {
diff --git a/oneplatform-admin-web-vue3/src/router/modules/system.ts b/oneplatform-admin-web-vue3/src/router/modules/system.ts
index 7f3c4ba..7170717 100755
--- a/oneplatform-admin-web-vue3/src/router/modules/system.ts
+++ b/oneplatform-admin-web-vue3/src/router/modules/system.ts
@@ -26,6 +26,14 @@ const routes: Array<RouteRecordRaw> = [
       sort: 1,
     },
     children: [
+      {
+        path: 'module',
+        name: 'system_module',
+        meta: {
+          title: '模块管理',
+        },
+        component: () => import('@/views/system/module/index.vue'),
+      },
       {
         path: 'account',
         name: 'system_account',
diff --git a/oneplatform-admin-web-vue3/src/utils/index.ts b/oneplatform-admin-web-vue3/src/utils/index.ts
index e823a3a..859baa5 100755
--- a/oneplatform-admin-web-vue3/src/utils/index.ts
+++ b/oneplatform-admin-web-vue3/src/utils/index.ts
@@ -136,7 +136,7 @@ export const withInstall = <T>(component: T, alias?: string) => {
 let result = null;
 export function getTreeItem(data: any[], key?: string | number): any {
   data.map((item) => {
-    if (item.key === key) {
+    if (item.id === key) {
       result = item;
     } else {
       if (item.children && item.children.length) {
diff --git a/oneplatform-admin-web-vue3/src/views/system/menu/CreateDrawer.vue b/oneplatform-admin-web-vue3/src/views/system/menu/CreateDrawer.vue
index 94c76f2..f0ef0f7 100755
--- a/oneplatform-admin-web-vue3/src/views/system/menu/CreateDrawer.vue
+++ b/oneplatform-admin-web-vue3/src/views/system/menu/CreateDrawer.vue
@@ -1,148 +1,172 @@
-<template>
-  <n-drawer v-model:show="isDrawer" width="500px" :placement="placement">
-    <n-drawer-content title="添加" closable>
-      <n-form
-        :model="formParams"
-        :rules="rules"
-        ref="formRef"
-        label-placement="left"
-        :label-width="100"
-      >
-        <n-form-item label="类型" path="type">
-          <span>{{formParams.type}}</span>
+<template>
+  <n-drawer v-model:show="isDrawer" width="500px" :placement="placement">
+    <n-drawer-content title="添加" closable>
+      <n-form :model="formParams" :rules="rules" ref="formRef" label-placement="left" :label-width="100">
+        <n-form-item label="类型" path="type">
+          <span>{{formParams.type}}</span>
+        </n-form-item>
+        <n-form-item label="父节点" path="parentId" v-if="formParams.parentId">
+          <span>{{formParams.parentName}}</span>
+        </n-form-item>
+        <n-form-item label="名称" path="name">
+          <n-input placeholder="请输入名称" v-model:value="formParams.name" />
+        </n-form-item>
+        <n-form-item label="路由" path="router" v-if="formParams.type !=='button'">
+          <n-input placeholder="请输入路由地址" v-model:value="formParams.router" />
         </n-form-item>
-        <n-form-item label="父节点" path="parentId" v-if="formParams.parentId">
-          <span>{{formParams.parentName}}</span>
-        </n-form-item>
-        <n-form-item label="名称" path="name">
-          <n-input placeholder="请输入名称" v-model:value="formParams.name" />
-        </n-form-item>
-        <n-form-item label="路由" path="router">
-          <n-input placeholder="请输入路由地址" v-model:value="formParams.router" />
-        </n-form-item>
-        <n-form-item label="页面路径" path="viewPath" v-if="formParams.type ==='menu'">
-          <n-input placeholder="请输入路径" v-model:value="formParams.viewPath" />
-        </n-form-item>
-        <n-form-item label="适用客户端" path="clientType" v-if="formParams.type ==='catalog'">
-          <n-radio-group v-model:value="formParams.clientType" name="clientType">
-            <n-space>
-              <n-radio key="pc" value="pc">PC端</n-radio>
-              <n-radio key="mobile" value="mobile">手机端</n-radio>
-            </n-space>
-          </n-radio-group>
-        </n-form-item>
-        <n-form-item label="是否展示" path="isDisplay">
-          <n-switch v-model:value="formParams.isDisplay" />
-        </n-form-item>
-        <n-form-item label="开放权限" path="isOpenAccess">
-          <n-switch v-model:value="formParams.isOpenAccess" />
-        </n-form-item>
-        <n-form-item label="排序" path="sort" v-if="formParams.type !=='button'">
-           <n-input-number size="small" v-model:value="formParams.sort" />
-        </n-form-item>
-      </n-form>
-
-      <template #footer>
-        <n-space>
-          <n-button type="primary" :loading="subLoading" @click="formSubmit">提交</n-button>
-          <n-button @click="handleReset">重置</n-button>
-        </n-space>
-      </template>
-    </n-drawer-content>
-  </n-drawer>
-</template>
-
-<script lang="ts">
-  import { defineComponent, reactive, ref, toRefs } from 'vue';
-  import { useMessage } from 'naive-ui';
-  import { addMenu } from '@/api/system/menu';
-
-  const rules = {
-    label: {
-      required: true,
-      message: '请输入标题',
-      trigger: 'blur',
-    },
-    path: {
-      required: true,
-      message: '请输入路径',
-      trigger: 'blur',
-    },
-  };
-  export default defineComponent({
-    name: 'CreateDrawer',
-    components: {},
-    props: {},
-    setup() {
-      const message = useMessage();
-      const formRef: any = ref(null);
-      let menuType = ref('');
-      let parentId = ref('');
-      let parentName = ref('');
-      
-      const defaultValueRef = () => ({
-        clientType: 'pc',
-        isDisplay: true,
-        isOpenAccess: false,
-      });
-      
-      const state = reactive({
-        isDrawer: false,
-        subLoading: false,
-        formParams: {
-          type: menuType,
-          parentId: parentId,
-          parentName: parentName,
-          clientType: 'pc',
-          isDisplay: true,
-          isOpenAccess: false,
-          sort: 99,
-        },
-        placement: 'right',
-      });
- 
-      function openDrawer(type,node) {
-        state.isDrawer = true;
-        menuType.value = type;
-        parentId.value = node.id;
-        parentName.value = node.name;
-      }
-
-      function closeDrawer() {
-        state.isDrawer = false;
-      }
-
-      function formSubmit() {
-        formRef.value.validate(async (errors) => {
-          if (!errors) {
-            delete state.formParams.children;
-            if(formParams.type === 'catalog'){
-              delete state.formParams.viewPath;
-            }
-            await addMenu(state.formParams);
-            message.success('添加成功');
-            handleReset();
-            closeDrawer();
-          } else {
-            message.error('请填写完整信息');
-          }
-        });
-      }
-
-      function handleReset() {
-        formRef.value.restoreValidation();
-        state.formParams = Object.assign(state.formParams, defaultValueRef());
-      }
-
-      return {
-        ...toRefs(state),
-        formRef,
-        rules,
-        formSubmit,
-        handleReset,
-        openDrawer,
-        closeDrawer,
-      };
-    },
-  });
+        <n-form-item label="编码" path="code" v-if="formParams.type ==='button'">
+          <n-input placeholder="按钮标识" v-model:value="formParams.code" />
+        </n-form-item>
+        <n-form-item label="页面路径" path="viewPath" v-if="formParams.type ==='menu'">
+          <n-input placeholder="请输入路径" v-model:value="formParams.viewPath" />
+        </n-form-item>
+        <n-form-item label="适用客户端" path="clientType" v-if="formParams.type ==='catalog'">
+          <n-radio-group v-model:value="formParams.clientType" name="clientType">
+            <n-space>
+              <n-radio key="pc" value="pc">PC端</n-radio>
+              <n-radio key="mobile" value="mobile">手机端</n-radio>
+            </n-space>
+          </n-radio-group>
+        </n-form-item>
+        <n-form-item label="是否展示" path="isDisplay" v-if="formParams.type !=='button'">
+          <n-switch v-model:value="formParams.isDisplay" />
+        </n-form-item>
+        <n-form-item label="开放权限" path="isOpenAccess">
+          <n-switch v-model:value="formParams.isOpenAccess" />
+        </n-form-item>
+        <n-form-item label="排序" path="sort" v-if="formParams.type !=='button'">
+          <n-input-number size="small" v-model:value="formParams.sort" />
+        </n-form-item>
+        <n-form-item label="绑定接口" path="sort" v-if="formParams.type !=='catalog'">
+          <n-tree-select :options="options" @update:value="handleUpdateValue" />
+        </n-form-item>
+      </n-form>
+
+      <template #footer>
+        <n-space>
+          <n-button type="primary" :loading="subLoading" @click="formSubmit">提交</n-button>
+          <n-button @click="handleReset">重置</n-button>
+        </n-space>
+      </template>
+    </n-drawer-content>
+  </n-drawer>
+</template>
+
+<script lang="ts">
+  import {
+    defineComponent,
+    reactive,
+    ref,
+    toRefs
+  } from 'vue';
+  import {
+    useMessage
+  } from 'naive-ui';
+  import {
+    addMenu
+  } from '@/api/system/menu';
+
+  const rules = {
+    label: {
+      required: true,
+      message: '请输入标题',
+      trigger: 'blur',
+    },
+    path: {
+      required: true,
+      message: '请输入路径',
+      trigger: 'blur',
+    },
+  };
+  export default defineComponent({
+    name: 'CreateDrawer',
+    components: {},
+    props: {},
+    setup() {
+      const message = useMessage();
+      const formRef: any = ref(null);
+      let menuType = ref('');
+      let parentId = ref('');
+      let parentName = ref('');
+
+      const defaultValueRef = () => ({
+        clientType: 'pc',
+        isDisplay: true,
+        isOpenAccess: false,
+      });
+
+      const state = reactive({
+        isDrawer: false,
+        subLoading: false,
+        formParams: {
+          type: menuType,
+          parentId: parentId,
+          parentName: parentName,
+          clientType: 'pc',
+          isDisplay: true,
+          isOpenAccess: false,
+          sort: 99,
+        },
+        placement: 'right',
+      });
+
+      function openDrawer(type, node) {
+        state.isDrawer = true;
+        menuType.value = type;
+        parentId.value = node.id;
+        parentName.value = node.name;
+      }
+
+      function closeDrawer() {
+        state.isDrawer = false;
+      }
+
+      function formSubmit() {
+        formRef.value.validate(async (errors) => {
+          if (!errors) {
+            delete state.formParams.children;
+            if (formParams.type === 'catalog') {
+              delete state.formParams.viewPath;
+            }
+            await addMenu(state.formParams);
+            message.success('添加成功');
+            handleReset();
+            closeDrawer();
+          } else {
+            message.error('请填写完整信息');
+          }
+        });
+      }
+
+      function handleReset() {
+        formRef.value.restoreValidation();
+        state.formParams = Object.assign(state.formParams, defaultValueRef());
+      }
+
+      return {
+        ...toRefs(state),
+        formRef,
+        rules,
+        formSubmit,
+        handleReset,
+        openDrawer,
+        closeDrawer,
+        options: [{
+          label: '用户管理',
+          key: 'Rubber Soul',
+          disabled: true,
+          children: [{
+            label: "新增用户",
+            key: "/add/user"
+          }]
+        }],
+        handleUpdateValue(
+          value: string | number | Array < string | number > | null,
+          option: TreeSelectOption | null | Array < TreeSelectOption | null >
+        ) {
+          console.log(value, option)
+        },
+      };
+    },
+  });
 </script>
diff --git a/oneplatform-admin-web-vue3/src/views/system/menu/index.vue b/oneplatform-admin-web-vue3/src/views/system/menu/index.vue
index 3e5dc19..ace2f43 100755
--- a/oneplatform-admin-web-vue3/src/views/system/menu/index.vue
+++ b/oneplatform-admin-web-vue3/src/views/system/menu/index.vue
@@ -39,9 +39,7 @@
                 <n-tree
                   block-line
                   cascade
-                  checkable
                   :virtual-scroll="true"
-                  :pattern="pattern"
                   :data="treeData"
                   key-field="id"
                   label-field="name"
@@ -150,7 +148,6 @@
   const loading = ref(true);
   const subLoading = ref(false);
   const isEditMenu = ref(false);
-  const pattern = ref('');
 
   const isDisabledMenu = computed(() => {
     return !selectTreeItem || selectTreeItem.type !== 'catalog';
@@ -181,7 +178,7 @@
   const formParams = reactive({});
 
   function selectAddMenu(key: string) {
-    if(key === 'catalog' && selectTreeItem.type !=='catalog'){
+    if(key === 'catalog' && selectTreeItem.type && selectTreeItem.type !=='catalog'){
       message.error('菜单目录才能添加目录');
       return;
     }
@@ -201,7 +198,6 @@
     if (keys.length) {
       const item = getTreeItem(unref(treeData), keys[0]);
       selectTreeItem = item;
-      //delete selectTreeItem.children;
       Object.assign(formParams, selectTreeItem);
       isEditMenu.value = true;
     } else {
diff --git a/oneplatform-admin-web-vue3/src/views/system/module/api.js b/oneplatform-admin-web-vue3/src/views/system/module/api.js
new file mode 100755
index 0000000..94cc755
--- /dev/null
+++ b/oneplatform-admin-web-vue3/src/views/system/module/api.js
@@ -0,0 +1,57 @@
+import { http } from '@/utils/http/axios';
+
+const apiPrefix = '/perm/system/module';
+export function GetList(query) {
+  return http.request({
+    url: apiPrefix + '/list',
+    method: 'post',
+    data: query,
+  });
+}
+
+export function AddObj(obj) {
+  return http.request({
+    url: apiPrefix + '/add',
+    method: 'post',
+    data: obj,
+  });
+}
+
+export function UpdateObj(obj) {
+  return http.request({
+    url: apiPrefix + '/update',
+    method: 'post',
+    data: obj,
+  });
+}
+
+export function DelObj(id) {
+  return http.request({
+    url: apiPrefix + '/delete',
+    method: 'post',
+    params: { id },
+  });
+}
+
+export function toggleObj(id) {
+  return http.request({
+    url: apiPrefix + '/toggle',
+    method: 'post',
+    data: { id: id },
+  });
+}
+
+export function GetObj(id) {
+  return http.request({
+    url: apiPrefix + '/' + id,
+    method: 'get',
+  });
+}
+
+export function BatchDelete(ids) {
+  return http.request({
+    url: apiPrefix + '/batchDelete',
+    method: 'post',
+    data: { ids },
+  });
+}
diff --git a/oneplatform-admin-web-vue3/src/views/system/module/crud.jsx b/oneplatform-admin-web-vue3/src/views/system/module/crud.jsx
new file mode 100755
index 0000000..1ea7b43
--- /dev/null
+++ b/oneplatform-admin-web-vue3/src/views/system/module/crud.jsx
@@ -0,0 +1,132 @@
+import * as api from './api';
+import { dict, compute } from '@fast-crud/fast-crud';
+import { useMessage } from 'naive-ui';
+export default function ({ expose }) {
+  const pageRequest = async (query) => {
+    return await api.GetList(query);
+  };
+  const editRequest = async ({ form, row }) => {
+    form.id = row.id;
+    return await api.UpdateObj(form);
+  };
+  const delRequest = async ({ row }) => {
+    return await api.DelObj(row.id);
+  };
+
+  const addRequest = async ({ form }) => {
+    return await api.AddObj(form);
+  };
+  const message = useMessage();
+  return {
+    crudOptions: {
+      request: {
+        pageRequest,
+        addRequest,
+        editRequest,
+        delRequest,
+      },
+      search: {
+        show: false,
+      },
+      rowHandle: {
+        width: '230px',
+      },
+      toolbar: {
+        show: false,
+      },
+      columns: {
+        id: {
+          title: 'ID',
+          key: 'id',
+          type: 'number',
+          column: {
+            width: 50,
+          },
+          form: {
+            show: false,
+          },
+        },
+        name: {
+          title: '名称',
+          key: 'name',
+          type: 'text',
+          column: {
+            width: 100,
+          },
+          form: {
+            helper: '添加和编辑时必填，编辑时额外需要校验长度',
+            rule: [{ required: true, message: '请输入服务名称', trigger: 'blur' }],
+            component: {
+              maxlength: 16, // 原生属性要写在这里
+              props: {
+                type: 'text',
+                showWordLimit: true,
+              },
+            },
+          }
+        },
+        serviceId: {
+          title: '服务标识',
+          key: 'serviceId',
+          type: 'text',
+          column: {
+            width: 100,
+          },
+          form: {
+            helper: '对应注册中心注册的服务名',
+            rule: [{ required: true, message: '请输入服务标识', trigger: 'blur' }],
+          }
+        },
+        routeName: {
+          title: '路由',
+          key: 'routeName',
+          type: 'text',
+          column: {
+            width: 100,
+          },
+          form: {
+            helper: '网关转发路径',
+            rule: [{ required: true, message: '请输入服务路由', trigger: 'blur' }],
+          }
+        },
+        proxyUrl: {
+          title: '代理地址',
+          key: 'proxyUrl',
+          type: 'text',
+          column: {
+            width: 100,
+          },
+          form: {
+            helper: '不填则使用lb://服务标识',
+            show: true,
+          },
+        },
+        enabled: {
+          title: '启用状态',
+          column:{
+              width: 100,
+              cellRender(scope){
+                if(scope.value)
+                  return <n-tag type="success"> 启用 </n-tag>;
+                else 
+                  return <n-tag type="warning"> 禁用 </n-tag>;
+              }
+          },
+          form: {
+            show: false,
+          },
+        },
+        updatedAt: {
+          title: '最后更新时间',
+          key: 'updatedAt',
+          column: {
+            width: 120,
+          },
+          form: {
+            show: false,
+          },
+        },
+      },
+    },
+  };
+}
diff --git a/oneplatform-admin-web-vue3/src/views/system/module/index.vue b/oneplatform-admin-web-vue3/src/views/system/module/index.vue
new file mode 100755
index 0000000..fc08dee
--- /dev/null
+++ b/oneplatform-admin-web-vue3/src/views/system/module/index.vue
@@ -0,0 +1,40 @@
+<template>
+  <fs-page>
+    <fs-crud ref="crudRef" v-bind="crudBinding" />
+  </fs-page>
+</template>
+
+<script>
+  import { defineComponent, ref, onMounted } from 'vue';
+  import { useCrud } from '@fast-crud/fast-crud';
+  import createCrudOptions from './crud';
+  import { useExpose } from '@fast-crud/fast-crud';
+  export default defineComponent({
+    name: 'FeatureDropdown',
+    setup() {
+      // crud组件的ref
+      const crudRef = ref();
+      // crud 配置的ref
+      const crudBinding = ref();
+      // 暴露的方法
+      const { expose } = useExpose({ crudRef, crudBinding });
+      // 你的crud配置
+      const { crudOptions } = createCrudOptions({ expose });
+      // 初始化crud配置
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+      const { resetCrudOptions } = useCrud({ expose, crudOptions });
+      // 你可以调用此方法，重新初始化crud配置
+      // resetCrudOptions(options)
+
+      // 页面打开后获取列表数据
+      onMounted(() => {
+        expose.doRefresh();
+      });
+
+      return {
+        crudBinding,
+        crudRef,
+      };
+    },
+  });
+</script>
diff --git a/oneplatform-services/permission-service/doc/ddl.sql b/oneplatform-services/permission-service/doc/ddl.sql
index e563024..d0b20b8 100644
--- a/oneplatform-services/permission-service/doc/ddl.sql
+++ b/oneplatform-services/permission-service/doc/ddl.sql
@@ -63,9 +63,9 @@ CREATE TABLE `api_resource` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
   `module_id` int(10) NOT NULL COMMENT '关联系统模块',
   `name` varchar(50) DEFAULT NULL COMMENT '资源名称',
-  `uri` varchar(200) DEFAULT NULL COMMENT 'uri',
   `http_method` enum('GET','POST') DEFAULT 'GET',
-  `grant_type` enum('Anonymous','LoginRequired','PermissionRequired') DEFAULT NULL COMMENT '授权类型',
+  `uri` varchar(200) DEFAULT NULL COMMENT 'uri',
+  `permission_level` enum('Anonymous','LoginRequired','PermissionRequired') DEFAULT NULL COMMENT '权限级别',
   `system_id` varchar(32) DEFAULT NULL,
   `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '可用状态(0:不可用;1:可用)',
   `deleted` tinyint(1) DEFAULT 0 COMMENT '是否删除',
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/ApiResourceController.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/ApiResourceController.java
index abcb2ac..970fad1 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/ApiResourceController.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/ApiResourceController.java
@@ -19,11 +19,14 @@ import com.mendmix.common.model.Page;
 import com.mendmix.common.model.PageParams;
 import com.mendmix.common.model.PageQueryRequest;
 import com.mendmix.common.model.SelectOption;
+import com.mendmix.common.model.TreeModel;
 import com.oneplatform.permission.dao.entity.ApiResourceEntity;
 import com.oneplatform.permission.dto.ApiResource;
+import com.oneplatform.permission.dto.BizSystemModule;
 import com.oneplatform.permission.dto.param.ApiResourceParam;
 import com.oneplatform.permission.dto.param.ApiResourceQueryParam;
 import com.oneplatform.permission.service.ApiResourceService;
+import com.oneplatform.permission.service.BizSystemService;
 
 
 @RestController("AppApiResourceController")
@@ -31,6 +34,7 @@ import com.oneplatform.permission.service.ApiResourceService;
 public class ApiResourceController {
 
     private @Autowired ApiResourceService apiResourceService;
+    private @Autowired BizSystemService systemService;
 
     
     @ApiMetadata(permissionLevel = PermissionLevel.PermissionRequired,actionLog = true)
@@ -90,5 +94,26 @@ public class ApiResourceController {
         }).collect(Collectors.toList());
     }
 
+    @ApiMetadata(permissionLevel = PermissionLevel.LoginRequired)
+    @GetMapping(value = "/tree")
+    @ResponseBody
+    public List<TreeModel> apiResourceTree() {
+    	ApiResourceQueryParam queryParam = new ApiResourceQueryParam();
+    	queryParam.setEnabled(true);
+    	queryParam.setGrantType(PermissionLevel.PermissionRequired.name());
+    	List<TreeModel> models = apiResourceService.listByQueryParam(queryParam).stream().map(o -> {
+    		String pid = o.getModuleId().toString();
+    		return new TreeModel(o.getId().toString(), o.getName(), o.getUri(), pid); 
+    	}).collect(Collectors.toList());
+    	//
+    	List<BizSystemModule> modules = systemService.getSystemModules();
+    	TreeModel model;
+    	for (BizSystemModule module : modules) {
+    		model = new TreeModel(module.getId().toString(), module.getName(), module.getServiceId(), null);
+    		models.add(model);
+		}
+    	
+		return TreeModel.build(models).getChildren();
+    }
 
 }
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/SystemModuleController.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/SystemModuleController.java
new file mode 100644
index 0000000..ae0d716
--- /dev/null
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/controller/SystemModuleController.java
@@ -0,0 +1,101 @@
+package com.oneplatform.permission.controller;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.mendmix.common.annotation.ApiMetadata;
+import com.mendmix.common.constants.PermissionLevel;
+import com.mendmix.common.model.IdParam;
+import com.mendmix.common.model.Page;
+import com.mendmix.common.model.PageQueryRequest;
+import com.mendmix.common.model.SelectOption;
+import com.mendmix.common.util.BeanUtils;
+import com.oneplatform.permission.dao.entity.BizSystemModuleEntity;
+import com.oneplatform.permission.dto.BizSystemModule;
+import com.oneplatform.permission.dto.param.SystemModuleParam;
+import com.oneplatform.permission.service.BizSystemService;
+
+
+@RestController
+@RequestMapping("/system/module")
+public class SystemModuleController {
+
+    private @Autowired BizSystemService systemService;
+
+    
+    @ApiMetadata(permissionLevel = PermissionLevel.PermissionRequired,actionLog = true)
+    @PostMapping(value = "add")
+    @ResponseBody
+    public IdParam<Integer> add(@RequestBody SystemModuleParam param) {
+    	BizSystemModuleEntity entity = BeanUtils.copy(param, BizSystemModuleEntity.class);
+        Integer id = systemService.addSystemModule(entity);
+        return new IdParam<Integer>(id);
+    }
+
+    
+    @ApiMetadata(permissionLevel = PermissionLevel.PermissionRequired,actionLog = true)
+    @PostMapping(value = "delete")
+    @ResponseBody
+    public void delete(@RequestBody IdParam<Integer> param) {
+    	BizSystemModuleEntity entity = systemService.findSystemModuleById(param.getId());
+    	entity.setDeleted(true);
+    	systemService.updateSystemModule(entity);
+    }
+
+    
+    @ApiMetadata(permissionLevel = PermissionLevel.PermissionRequired,actionLog = true)
+    @PostMapping("update")
+    @ResponseBody
+    public void update(@RequestBody SystemModuleParam param) {
+    	BizSystemModuleEntity entity = BeanUtils.copy(param, BizSystemModuleEntity.class);
+    	systemService.updateSystemModule(entity);
+    }
+
+    
+    @ApiMetadata(permissionLevel = PermissionLevel.PermissionRequired,actionLog = true)
+    @PostMapping("toggle")
+    @ResponseBody
+    public void toggleApi(@RequestBody IdParam<Integer> param) {
+    	BizSystemModuleEntity entity = systemService.findSystemModuleById(param.getId());
+    	entity.setEnabled(!entity.getEnabled());
+    	systemService.updateSystemModule(entity);
+    }
+
+    
+    @ApiMetadata(permissionLevel = PermissionLevel.PermissionRequired,actionLog = true)
+    @GetMapping(value = "{id}")
+    @ResponseBody
+    public BizSystemModule get(Integer id) {
+    	BizSystemModuleEntity entity = systemService.findSystemModuleById(id);
+        return BeanUtils.copy(entity, BizSystemModule.class);
+    }
+
+    
+    @ApiMetadata(permissionLevel = PermissionLevel.PermissionRequired,actionLog = true)
+    @PostMapping("list")
+    @ResponseBody
+    public Page<BizSystemModule> pageQry(@RequestBody PageQueryRequest<Void> queryParam) {
+        return systemService.pageQuerySystemModules(queryParam.asPageParam());
+    }
+
+    
+    @GetMapping("options")
+    @ResponseBody
+    public List<SelectOption> options() {
+    	List<BizSystemModule> list = systemService.getSystemModules();
+    	return list.stream().map(e -> {
+            return new SelectOption(e.getId().toString(),e.getName());
+        }).collect(Collectors.toList());
+    }
+
+    
+}
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/StandardBaseEntity.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/StandardBaseEntity.java
index 192a2e5..1c37c23 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/StandardBaseEntity.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/StandardBaseEntity.java
@@ -7,6 +7,8 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.mendmix.mybatis.core.BaseEntity;
 import com.mendmix.mybatis.plugin.autofield.annotation.CreatedAt;
 import com.mendmix.mybatis.plugin.autofield.annotation.CreatedBy;
@@ -78,6 +80,7 @@ public class StandardBaseEntity extends BaseEntity{
     }
 
     public Date getUpdatedAt() {
+    	if(updatedAt == null)return createdAt;
         return updatedAt;
     }
 
@@ -86,7 +89,7 @@ public class StandardBaseEntity extends BaseEntity{
     }
 
     public String getUpdatedBy() {
-        return updatedBy;
+        return StringUtils.defaultString(updatedBy, createdBy);
     }
 
     public void setUpdatedBy(String updatedBy) {
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/entity/ApiResourceEntity.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/entity/ApiResourceEntity.java
index 69928a8..5b5aa53 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/entity/ApiResourceEntity.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/entity/ApiResourceEntity.java
@@ -29,8 +29,8 @@ public class ApiResourceEntity extends StandardBaseEntity {
     /**
      * 授权类型
      */
-    @Column(name = "grant_type")
-    private String grantType;
+    @Column(name = "permission_level")
+    private String permissionLevel;
 
 
 
@@ -92,22 +92,14 @@ public class ApiResourceEntity extends StandardBaseEntity {
         this.httpMethod = httpMethod;
     }
 
-    /**
-     * 获取授权类型
-     *
-     * @return grant_type - 授权类型
-     */
-    public String getGrantType() {
-        return grantType;
-    }
+	public String getPermissionLevel() {
+		return permissionLevel;
+	}
 
-    /**
-     * 设置授权类型
-     *
-     * @param grantType 授权类型
-     */
-    public void setGrantType(String grantType) {
-        this.grantType = grantType;
-    }
+	public void setPermissionLevel(String permissionLevel) {
+		this.permissionLevel = permissionLevel;
+	}
+
+    
 
 }
\ No newline at end of file
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/entity/BizSystemPortalEntity.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/entity/BizSystemPortalEntity.java
index fe9cfb3..5e339a6 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/entity/BizSystemPortalEntity.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dao/entity/BizSystemPortalEntity.java
@@ -8,14 +8,14 @@ import com.oneplatform.permission.dao.StandardBaseEntity;
 @Table(name = "system_portal")
 public class BizSystemPortalEntity extends StandardBaseEntity {
 
-	 @Column(name = "index_path")
-    private String indexPath;
-    
-    @Column(name = "tenant_id",updatable = false)
-    private String tenantId;
-    
-    @Column(name = "client_type",updatable = false)
-    private String clientType;
+	@Column(name = "index_path")
+	private String indexPath;
+
+	@Column(name = "tenant_id", updatable = false)
+	private String tenantId;
+
+	@Column(name = "client_type", updatable = false)
+	private String clientType;
 
 	public String getIndexPath() {
 		return indexPath;
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/ApiResource.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/ApiResource.java
index a9e42c3..ed12179 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/ApiResource.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/ApiResource.java
@@ -1,15 +1,6 @@
 package com.oneplatform.permission.dto;
 
-import java.util.Date;
-
-public class ApiResource {
-
-    private Integer id;
-
-    /**
-     * 对应应用id
-     */
-    private String appId;
+public class ApiResource  extends BaseDto{
 
     /**
      * 资源名称
@@ -29,243 +20,69 @@ public class ApiResource {
     /**
      * 授权类型
      */
-    private String grantType;
+    private String permissionLevel;;
 
     /**
      * 网关转发路径
      */
     private String routePath;
+    
+    private Integer moduleId;
+    private String moduleName;
 
-    /**
-     * 可用状态(0:不可用;1:可用)
-     */
-    private Boolean enabled;
-
-    /**
-     * 创建时间
-     */
-    private Date createdAt;
-
-    /**
-     * 创建人姓名
-     */
-    private String createdBy;
-
-    /**
-     * 更新时间
-     */
-    private Date updatedAt;
-
-    /**
-     * 更新人姓名
-     */
-    private String updatedBy;
-
-    /**
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取对应应用id
-     *
-     * @return app_id - 对应应用id
-     */
-    public String getAppId() {
-        return appId;
-    }
-
-    /**
-     * 设置对应应用id
-     *
-     * @param appId 对应应用id
-     */
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    /**
-     * 获取资源名称
-     *
-     * @return name - 资源名称
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置资源名称
-     *
-     * @param name 资源名称
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取uri
-     *
-     * @return uri - uri
-     */
-    public String getUri() {
-        return uri;
-    }
-
-    /**
-     * 设置uri
-     *
-     * @param uri uri
-     */
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * @return http_method
-     */
-    public String getHttpMethod() {
-        return httpMethod;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    /**
-     * @param httpMethod
-     */
-    public void setHttpMethod(String httpMethod) {
-        this.httpMethod = httpMethod;
-    }
+	public String getUri() {
+		return uri;
+	}
 
-    /**
-     * 获取授权类型
-     *
-     * @return grant_type - 授权类型
-     */
-    public String getGrantType() {
-        return grantType;
-    }
+	public void setUri(String uri) {
+		this.uri = uri;
+	}
 
-    /**
-     * 设置授权类型
-     *
-     * @param grantType 授权类型
-     */
-    public void setGrantType(String grantType) {
-        this.grantType = grantType;
-    }
+	public String getHttpMethod() {
+		return httpMethod;
+	}
 
-    /**
-     * 获取网关转发路径
-     *
-     * @return route_path - 网关转发路径
-     */
-    public String getRoutePath() {
-        return routePath;
-    }
+	public void setHttpMethod(String httpMethod) {
+		this.httpMethod = httpMethod;
+	}
 
-    /**
-     * 设置网关转发路径
-     *
-     * @param routePath 网关转发路径
-     */
-    public void setRoutePath(String routePath) {
-        this.routePath = routePath;
-    }
+	public String getPermissionLevel() {
+		return permissionLevel;
+	}
 
-    /**
-     * 获取可用状态(0:不可用;1:可用)
-     *
-     * @return enabled - 可用状态(0:不可用;1:可用)
-     */
-    public Boolean getEnabled() {
-        return enabled;
-    }
+	public void setPermissionLevel(String permissionLevel) {
+		this.permissionLevel = permissionLevel;
+	}
 
-    /**
-     * 设置可用状态(0:不可用;1:可用)
-     *
-     * @param enabled 可用状态(0:不可用;1:可用)
-     */
-    public void setEnabled(Boolean enabled) {
-        this.enabled = enabled;
-    }
+	public String getRoutePath() {
+		return routePath;
+	}
 
-    /**
-     * 获取创建时间
-     *
-     * @return created_at - 创建时间
-     */
-    public Date getCreatedAt() {
-        return createdAt;
-    }
+	public void setRoutePath(String routePath) {
+		this.routePath = routePath;
+	}
 
-    /**
-     * 设置创建时间
-     *
-     * @param createdAt 创建时间
-     */
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
+	public Integer getModuleId() {
+		return moduleId;
+	}
 
-    /**
-     * 获取创建人姓名
-     *
-     * @return created_by - 创建人姓名
-     */
-    public String getCreatedBy() {
-        return createdBy;
-    }
+	public void setModuleId(Integer moduleId) {
+		this.moduleId = moduleId;
+	}
 
-    /**
-     * 设置创建人姓名
-     *
-     * @param createdBy 创建人姓名
-     */
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
+	public String getModuleName() {
+		return moduleName;
+	}
 
-    /**
-     * 获取更新时间
-     *
-     * @return updated_at - 更新时间
-     */
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    /**
-     * 设置更新时间
-     *
-     * @param updatedAt 更新时间
-     */
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    /**
-     * 获取更新人姓名
-     *
-     * @return updated_by - 更新人姓名
-     */
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    /**
-     * 设置更新人姓名
-     *
-     * @param updatedBy 更新人姓名
-     */
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
+	public void setModuleName(String moduleName) {
+		this.moduleName = moduleName;
+	}
 }
\ No newline at end of file
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BaseDto.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BaseDto.java
index 03a689d..c98d94c 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BaseDto.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BaseDto.java
@@ -4,7 +4,7 @@ import java.util.Date;
 
 public class BaseDto {
 
-	private String id;
+	private Integer id;
 	private Boolean enabled;
 	private Date createdAt;
 	private String createdBy;
@@ -12,10 +12,10 @@ public class BaseDto {
 	private Date updatedAt;
 	private String updatedBy;
 	
-	public String getId() {
+	public Integer getId() {
 		return id;
 	}
-	public void setId(String id) {
+	public void setId(Integer id) {
 		this.id = id;
 	}
 	public Boolean getEnabled() {
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystem.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystem.java
deleted file mode 100644
index 18d9220..0000000
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystem.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.oneplatform.permission.dto;
-
-import java.util.Date;
-import java.util.List;
-
-
-public class BizSystem {
-
-	private Integer id;
-
-	/**
-	 * 系统标识
-	 */
-	private String code;
-
-	/**
-	 * 系统名称
-	 */
-	private String name;
-
-	/**
-	 * 系统说明
-	 */
-	private String description;
-
-	/**
-	 * 系统等级
-	 */
-	private String level;
-
-	/**
-	 * 系统类型
-	 */
-	private String systemType;
-
-	/**
-	 * 管理部门编码
-	 */
-	private String chargeDepartmentId;
-
-	/**
-	 * 管理部门名称
-	 */
-	private String chargeDepartmentName;
-
-	/**
-	 * 系统负责人编码
-	 */
-	private String chargeUserId;
-
-	/**
-	 * 系统负责人名称
-	 */
-	private String chargeUserName;
-
-	/**
-	 * 业务需求部门编码
-	 */
-	private String bizDepartmentId;
-
-	/**
-	 * 业务需求部门
-	 */
-	private String bizDepartmentName;
-
-	/**
-	 * 系统状态
-	 */
-	private Integer status;
-
-	/**
-	 * 上线时间
-	 */
-	private Date serviceStartTime;
-	
-	private List<BizSystemDomain> domains;
-	
-	private List<BizSystemModule> modules;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getLevel() {
-		return level;
-	}
-
-	public void setLevel(String level) {
-		this.level = level;
-	}
-
-	public String getSystemType() {
-		return systemType;
-	}
-
-	public void setSystemType(String systemType) {
-		this.systemType = systemType;
-	}
-
-	public String getChargeDepartmentId() {
-		return chargeDepartmentId;
-	}
-
-	public void setChargeDepartmentId(String chargeDepartmentId) {
-		this.chargeDepartmentId = chargeDepartmentId;
-	}
-
-	public String getChargeDepartmentName() {
-		return chargeDepartmentName;
-	}
-
-	public void setChargeDepartmentName(String chargeDepartmentName) {
-		this.chargeDepartmentName = chargeDepartmentName;
-	}
-
-	public String getChargeUserId() {
-		return chargeUserId;
-	}
-
-	public void setChargeUserId(String chargeUserId) {
-		this.chargeUserId = chargeUserId;
-	}
-
-	public String getChargeUserName() {
-		return chargeUserName;
-	}
-
-	public void setChargeUserName(String chargeUserName) {
-		this.chargeUserName = chargeUserName;
-	}
-
-	public String getBizDepartmentId() {
-		return bizDepartmentId;
-	}
-
-	public void setBizDepartmentId(String bizDepartmentId) {
-		this.bizDepartmentId = bizDepartmentId;
-	}
-
-	public String getBizDepartmentName() {
-		return bizDepartmentName;
-	}
-
-	public void setBizDepartmentName(String bizDepartmentName) {
-		this.bizDepartmentName = bizDepartmentName;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public Date getServiceStartTime() {
-		return serviceStartTime;
-	}
-
-	public void setServiceStartTime(Date serviceStartTime) {
-		this.serviceStartTime = serviceStartTime;
-	}
-
-	public List<BizSystemDomain> getDomains() {
-		return domains;
-	}
-
-	public void setDomains(List<BizSystemDomain> domains) {
-		this.domains = domains;
-	}
-
-	public List<BizSystemModule> getModules() {
-		return modules;
-	}
-
-	public void setModules(List<BizSystemModule> modules) {
-		this.modules = modules;
-	}
-	
-	
-}
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemModule.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemModule.java
index 153e8d4..31e833b 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemModule.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemModule.java
@@ -1,33 +1,17 @@
 package com.oneplatform.permission.dto;
 
-public class BizSystemModule {
-
-    private Integer id;
+public class BizSystemModule extends BaseDto{
 
     private String name;
     
-    private String appId;
-
-    /**
-     * 关联系统
-     */
-    private Integer systemId;
-    
     private String serviceId;
 
     private String routeName;
+    
+    private String proxyUrl;
 
     private String anonymousUris;
 
-    private Boolean enabled;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 
 	public String getName() {
 		return name;
@@ -37,22 +21,6 @@ public class BizSystemModule {
 		this.name = name;
 	}
 	
-	public String getAppId() {
-		return appId;
-	}
-
-	public void setAppId(String appId) {
-		this.appId = appId;
-	}
-
-	public Integer getSystemId() {
-		return systemId;
-	}
-
-	public void setSystemId(Integer systemId) {
-		this.systemId = systemId;
-	}
-	
 	public String getServiceId() {
 		return serviceId;
 	}
@@ -68,22 +36,22 @@ public class BizSystemModule {
 	public void setRouteName(String routeName) {
 		this.routeName = routeName;
 	}
+	
 
-	public String getAnonymousUris() {
-		return anonymousUris;
+	public String getProxyUrl() {
+		return proxyUrl;
 	}
 
-	public void setAnonymousUris(String anonymousUris) {
-		this.anonymousUris = anonymousUris;
+	public void setProxyUrl(String proxyUrl) {
+		this.proxyUrl = proxyUrl;
 	}
 
-	public Boolean getEnabled() {
-		return enabled;
+	public String getAnonymousUris() {
+		return anonymousUris;
 	}
 
-	public void setEnabled(Boolean enabled) {
-		this.enabled = enabled;
+	public void setAnonymousUris(String anonymousUris) {
+		this.anonymousUris = anonymousUris;
 	}
-
     
 }
\ No newline at end of file
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemDomain.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemPortal.java
similarity index 32%
rename from oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemDomain.java
rename to oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemPortal.java
index 57f994b..3c665db 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemDomain.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/BizSystemPortal.java
@@ -1,67 +1,39 @@
 package com.oneplatform.permission.dto;
 
-public class BizSystemDomain {
+import org.apache.commons.lang3.StringUtils;
 
-    private Integer id;
+import com.mendmix.common.GlobalConstants;
 
-    private Integer systemId;
+public class BizSystemPortal extends BaseDto{
 
-    private String domain;
-    
-    private String tenantId;
-    
     private String clientType;
+    private String indexPath;
+	private String tenantId;
 
-    private Boolean enabled;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-	public Boolean getEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(Boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public Integer getSystemId() {
-        return systemId;
-    }
-
-    public void setSystemId(Integer systemId) {
-        this.systemId = systemId;
-    }
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
+	public String getClientType() {
+		return clientType;
+	}
+	public void setClientType(String clientType) {
+		this.clientType = clientType;
+	}
+	public String getIndexPath() {
+		return indexPath;
+	}
+	public void setIndexPath(String indexPath) {
+		this.indexPath = indexPath;
+	}
 	public String getTenantId() {
 		return tenantId;
 	}
-
 	public void setTenantId(String tenantId) {
 		this.tenantId = tenantId;
 	}
 
-	public String getClientType() {
-		return clientType;
-	}
-
-	public void setClientType(String clientType) {
-		this.clientType = clientType;
-	}
-    
-    
+	public String getDomain() {
+		if(indexPath != null && indexPath.startsWith("http")) {
+			return StringUtils.split(indexPath, GlobalConstants.PATH_SEPARATOR)[1];
+		}
+        return null;
+    }
 
 }
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/param/SystemModuleParam.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/param/SystemModuleParam.java
new file mode 100644
index 0000000..7c7c14f
--- /dev/null
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/dto/param/SystemModuleParam.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2016-2022 www.mendmix.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.oneplatform.permission.dto.param;
+
+/**
+ * @description <br>
+ * @author <a href="mailto:vakinge@gmail.com">vakinge</a>
+ * @date Jul 17, 2022
+ */
+public class SystemModuleParam {
+
+	private Integer id;
+	private String name;
+
+	private String serviceId;
+
+	private String proxyUrl;
+
+	private String routeName;
+
+	private String anonymousUris;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public String getProxyUrl() {
+		return proxyUrl;
+	}
+
+	public void setProxyUrl(String proxyUrl) {
+		this.proxyUrl = proxyUrl;
+	}
+
+	public String getRouteName() {
+		return routeName;
+	}
+
+	public void setRouteName(String routeName) {
+		this.routeName = routeName;
+	}
+
+	public String getAnonymousUris() {
+		return anonymousUris;
+	}
+
+	public void setAnonymousUris(String anonymousUris) {
+		this.anonymousUris = anonymousUris;
+	}
+	
+	
+}
diff --git a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/service/BizSystemService.java b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/service/BizSystemService.java
index be31523..ebd7b20 100644
--- a/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/service/BizSystemService.java
+++ b/oneplatform-services/permission-service/src/main/java/com/oneplatform/permission/service/BizSystemService.java
@@ -5,7 +5,11 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.mendmix.common.model.Page;
+import com.mendmix.common.model.PageParams;
 import com.mendmix.common.util.BeanUtils;
+import com.mendmix.mybatis.plugin.pagination.PageExecutor;
+import com.mendmix.mybatis.plugin.pagination.PageExecutor.ConvertPageDataLoader;
 import com.oneplatform.permission.dao.entity.BizSystemModuleEntity;
 import com.oneplatform.permission.dao.mapper.BizSystemModuleEntityMapper;
 import com.oneplatform.permission.dto.BizSystemModule;
@@ -22,5 +26,36 @@ public class BizSystemService {
 		List<BizSystemModuleEntity> list = systemModuleMapper.selectByExample(example);
 		return BeanUtils.copy(list, BizSystemModule.class);
 	}
+	
+	public Integer addSystemModule(BizSystemModuleEntity entity) {
+		systemModuleMapper.insertSelective(entity);
+		return entity.getId();
+	}
+	
+	public void updateSystemModule(BizSystemModuleEntity entity) {
+		systemModuleMapper.updateByPrimaryKey(entity);
+	}
+	
+	public BizSystemModuleEntity findSystemModuleById(Integer id) {
+		return systemModuleMapper.selectByPrimaryKey(id);
+	}
+	
+	public Page<BizSystemModule> pageQuerySystemModules(PageParams param){
+		return PageExecutor.pagination(param, new ConvertPageDataLoader<BizSystemModuleEntity,BizSystemModule>() {
+
+			@Override
+			public List<BizSystemModuleEntity> load() {
+				BizSystemModuleEntity example = new BizSystemModuleEntity();
+				example.setEnabled(true);
+				List<BizSystemModuleEntity> list = systemModuleMapper.selectByExample(example);
+				return list;
+			}
+
+			@Override
+			public BizSystemModule convert(BizSystemModuleEntity e) {
+				return BeanUtils.copy(e, BizSystemModule.class);
+			}
+		});
+	}
 
 }
diff --git a/oneplatform-services/permission-service/src/main/resources/mapper/ApiResourceEntityMapper.xml b/oneplatform-services/permission-service/src/main/resources/mapper/ApiResourceEntityMapper.xml
index 2d56fee..432c9f9 100644
--- a/oneplatform-services/permission-service/src/main/resources/mapper/ApiResourceEntityMapper.xml
+++ b/oneplatform-services/permission-service/src/main/resources/mapper/ApiResourceEntityMapper.xml
@@ -10,7 +10,7 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="uri" jdbcType="VARCHAR" property="uri" />
     <result column="http_method" jdbcType="CHAR" property="httpMethod" />
-    <result column="grant_type" jdbcType="CHAR" property="grantType" />
+    <result column="permission_level" jdbcType="CHAR" property="permissionLevel" />
     <result column="system_id" jdbcType="VARCHAR" property="systemId" />
     <result column="enabled" jdbcType="BIT" property="enabled" />
     <result column="deleted" jdbcType="BIT" property="deleted" />
diff --git a/oneplatform-services/service-all-buildin/src/main/resources/application.properties b/oneplatform-services/service-all-buildin/src/main/resources/application.properties
index 7c5dbb9..73d48e4 100644
--- a/oneplatform-services/service-all-buildin/src/main/resources/application.properties
+++ b/oneplatform-services/service-all-buildin/src/main/resources/application.properties
@@ -25,6 +25,11 @@ mybatis.type-aliases-package=com.oneplatform.*.dao.entity
 mybatis.mapper-locations=classpath*:mapper/*Mapper.xml
 mybatis.mapper-package=com.oneplatform.*.dao.mapper
 
+
+mendmix.mybatis.createBy.columnName=created_by
+mendmix.mybatis.softDelete.columnName= deleted
+mendmix.mybatis.softDelete.falseValue=0
+
 mendmix.request.pathPrefix.mapping[com.oneplatform.permission.controller]=perm
 mendmix.request.pathPrefix.mapping[com.oneplatform.organization.controller]=org
 mendmix.request.pathPrefix.mapping[com.oneplatform.system.controller]=sys
diff --git a/oneplatform/src/main/resources/application-local.properties b/oneplatform/src/main/resources/application-local.properties
index 35d44ea..6a43a04 100644
--- a/oneplatform/src/main/resources/application-local.properties
+++ b/oneplatform/src/main/resources/application-local.properties
@@ -39,11 +39,6 @@ spring.cloud.gateway.routes[3].uri=lb://oneplatform-service
 spring.cloud.gateway.routes[3].predicates[0]=Path=/api/perm/**
 spring.cloud.gateway.routes[3].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[4].id=weixin-service
-spring.cloud.gateway.routes[4].uri=lb://oneplatform-service
-spring.cloud.gateway.routes[4].predicates[0]=Path=/api/weixin/**
-spring.cloud.gateway.routes[4].filters[0]=StripPrefix=1
-
 mendmix.actionlog.enabled=true
 
 user.service.baseUrl=http://oneplatform-service/user
-- 
Gitee