restruct dsl

@@ -2,7 +2,7 @@ version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
   name: access
   name: access
-  description: 权限 （base)
+  description: 权限 （base) (停用)
   attributes:
   attributes:
     - name: accessId
     - name: accessId
       description: 权限Id
       description: 权限Id

 version: v1
 version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
-  name: credentialAuth （base)
+  name: credentialAuth （base) (停用)
   description: 凭证认证
   description: 凭证认证
   attributes:
   attributes:
-  - name: credential
-    description: 凭证
-    type: 
-      primitive: string
-  - name: deviceType
-    description: 设备类型
-    type: 
-      primitive: string
-  - name: expire
-    description: 过期时间蹉（unix）
-    type: 
-      primitive: int64
+    - name: credential
+      description: 凭证
+      type:
+        primitive: string
+    - name: deviceType
+      description: 设备类型
+      type:
+        primitive: string
+    - name: expire
+      description: 过期时间蹉（unix）
+      type:
+        primitive: int64

@@ -16,22 +16,14 @@ metadata:
       description: 菜单名称
       description: 菜单名称
       type:
       type:
         primitive: string
         primitive: string
-    - name: module
-      description: 模块 （首页 INDEX、业务BISINESS、管理MANAGER、报表REPORT）
-      type:
-        primitive: string
     - name: code
     - name: code
-      description: 菜单编码
+      description: 菜单编码 SYSTEM_USER_EDIT (权限编码)
       type:
       type:
         primitive: string
         primitive: string
     - name: menuType
     - name: menuType
-      description: 菜单类型 （模块module、子模块submodule、菜单menu、按钮button）
+      description: 菜单类型 （目录catalog、菜单menu、按钮button）
       type:
       type:
         primitive: string
         primitive: string
-    - name: access
-      description: 关联权限
-      type:
-        schema: access
     - name: icon
     - name: icon
       description: 菜单图标
       description: 菜单图标
       type:
       type:
@@ -44,8 +36,8 @@ metadata:
       description: 菜单说明
       description: 菜单说明
       type:
       type:
         primitive: string
         primitive: string
-    - name: tag
-      description: 菜单标签 （web、app）
+    - name: category
+      description: 菜单类别 （web:1、app:2）
       type:
       type:
         primitive: string
         primitive: string
     - name: parentPath
     - name: parentPath
@@ -53,6 +45,6 @@ metadata:
       type:
       type:
         primitive: string
         primitive: string
     - name: isPublish
     - name: isPublish
-      description: 状态是否是公开的菜单，[0:否],[1:是],默认否
+      description: 状态是否是公开的菜单，[0:隐藏],[1:显示],默认显示
       type:
       type:
         primitive: int
         primitive: int

-version: v1
-kind: Schema
-metadata:
-  name: menuAccess
-  description: 菜单权限
-  attributes:
-    - name: web
-      description: web菜单权限
-      type:
-        array: int64
-    - name: app
-      description: app菜单权限
-      type:
-        array: int64

-version: v1
-kind: Schema
-metadata:
-  name: organizationRole
-  description: 组织权限
-  attributes:
-  - ref: organizationId
-    required: true
-  - name: roles
-    description: 角色列表
-    type: 
-      array: int64

@@ -17,7 +17,7 @@ metadata:
     - name: menuAccess
     - name: menuAccess
       description: 菜单权限列表
       description: 菜单权限列表
       type:
       type:
-        schema: menuAccess
+        array: int64
     - name: desc
     - name: desc
       description: 角色描述
       description: 角色描述
       type:
       type:

@@ -52,5 +52,3 @@ metadata:
       required: true
       required: true
     - ref: updateAt
     - ref: updateAt
       required: true
       required: true
-    - ref: deleteAt
-      required: true

@@ -2,17 +2,17 @@ version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
   name: usersInfo
   name: usersInfo
-  description: 用户信息
+  description: 用户信息 (base)
   attributes:
   attributes:
-  - ref: usersName
-    required: true
-  - ref: usersCode
-    required: true
-  - name: phone
-    description: 手机号码
-    type: 
-      primitive: string
-  - name: email
-    description: 邮箱
-    type: 
-      primitive: string
+    - ref: usersName
+      required: true
+    - ref: usersCode
+      required: true
+    - name: phone
+      description: 手机号码
+      type:
+        primitive: string
+    - name: email
+      description: 邮箱
+      type:
+        primitive: string