Merge branch 'master' of http://gitlab.fjmaimaimai.com/allied-creation/document

+version: v1
+kind: Attribute
+metadata:
+  name: usersBaseId
+  description: 用户基础数据id
+  type: 
+    primitive: int64

@@ -2,23 +2,51 @@ version: v1
 kind: Schema
 metadata:
   name: users
-  description: 用户（base)
+  description: 用户
   attributes:
     - ref: usersId
       required: true
-    - name: usersInfo
-      description: 用户信息
+    - ref: companyId
+      required: true
+    - ref: usersBaseId
+      required: true
+    - ref: usersType
+      required: true
+    - ref: usersCode
+      required: true
+    - name: organizationId
+      description: 组织机构
+      type:
+        primitive: int64
+    - name: departmentId
+      description: 所属部门
       type:
-        schema: usersInfo
-    - name: phoneAuth
-      description: 手机认证
+        primitive: int64
+    - name: usersOrg
+      description: 用户关联的组织
       type:
-        schemal: phoneAuth
-    - name: im
-      description: IM信息
+        array: org
+    - name: usersRole
+      description: 用户关联的角色
       type:
-        schemal: im
+        array: role
+    - name: favoriteMenus
+      description: 收藏的菜单(工作台)(菜单编码列表)
+      type:
+        array: string
+    - name: cooperationInfo
+      description: 共创信息 （共创用户有效）
+      type:
+        schema: cooperationInfo
+    - name: enableStatus
+      description: 启用状态(启用:1 禁用:2)
+      type:
+        primitive: int
+    - name: ext
+      description: 扩展数据
+      type:
+        schema: ext
     - ref: createAt
       required: true
     - ref: updateAt
-      required: true
\ No newline at end of file
+      required: true

 version: v1
-kind: Method
+kind: Schema
 metadata:
-  name: createUsers
-  type: command
-  description: 创建用户信息
-  payload:
-  - ref: usersId
-    required: true
-  - name: usersInfo
-    description: 用户信息
-    type:
-      schema: usersInfo
-  - name: phoneAuth
-    description: 手机认证
-    type:
-      schemal: phoneAuth
-  - name: im
-    description: IM信息
-    type:
-      schemal: im
-  result:
-  - name: users
-    type: 
-      schema: users
-    required: true
+  name: usersBase
+  description: 用户（base)
+  attributes:
+    - ref: usersBaseId
+      required: true
+    - name: usersInfo
+      description: 用户信息
+      type:
+        schema: usersInfo
+    - name: phoneAuth
+      description: 手机认证
+      type:
+        schemal: phoneAuth
+    - name: im
+      description: IM信息
+      type:
+        schemal: im
+    - name: relatedUsers
+      description: 关联的用户 (冗余)
+      type:
+        array: int64
+    - ref: createAt
+      required: true
+    - ref: updateAt
+      required: true
\ No newline at end of file

-version: v1
-kind: Schema
-metadata:
-  name: usersCompany
-  description: 用户 （base)
-  attributes:
-    - ref: usersCompanyId
-      required: true
-    - ref: companyId
-      required: true
-    - ref: usersId
-      required: true
-    - ref: usersType
-      required: true
-    - ref: usersCode
-      required: true
-    - name: organizationId
-      description: 组织机构
-      type:
-        primitive: int64
-    - name: departmentId
-      description: 所属部门
-      type:
-        primitive: int64
-    - name: usersOrg
-      description: 用户关联的组织
-      type:
-        array: int64
-    - name: usersRole
-      description: 用户关联的角色
-      type:
-        array: int64
-    - name: favoriteMenus
-      description: 收藏的菜单(工作台)(菜单编码列表)
-      type:
-        array: string
-    - name: cooperationInfo
-      description: 共创信息 （共创用户有效）
-      type:
-        schema: cooperationInfo
-    - name: enableStatus
-      description: 启用状态(启用:1 禁用:2)
-      type:
-        primitive: int
-    - name: ext
-      description: 扩展数据
-      type:
-        schema: ext
-    - ref: createAt
-      required: true
-    - ref: updateAt
-      required: true

@@ -10,9 +10,13 @@ metadata:
   - name: users
     description: 用户列表
     type: 
-      array: usersCompany
+      array: users
   result:
-  - name: count
+  - name: code
     type: 
       primitive: int
     required: true
+  - name: msg
+    type:
+      primitive: string
+    required: true

@@ -5,14 +5,18 @@ metadata:
   type: command
   description: 批量修改启用状态
   payload:
-  - name: usersCompanyIds
+  - name: usersIds
     type:
       array: int64
     required: true
   - ref: enableStatus
     required: true
   result:
-  - name: usersCompany
-    type: 
-      schema: usersCompany
+  - name: code
+    type:
+      primitive: int
+    required: true
+  - name: msg
+    type:
+      primitive: string
     required: true

@@ -5,14 +5,18 @@ metadata:
   type: command
   description: 批量重置密码
   payload:
-  - name: usersCompanyIds
+  - name: usersIds
     type:
       array: int64
     required: true
   - ref: password
     required: true
   result:
-  - name: usersCompany
-    type: 
-      schema: usersCompany
+  - name: code
+    type:
+      primitive: int
+    required: true
+  - name: msg
+    type:
+      primitive: string
     required: true

@@ -5,14 +5,16 @@ metadata:
   type: command
   description: 密码检查
   payload:
-  - ref: usersId
-    required: true
   - ref: phone
     required: true
   - ref: password
     required: true
   result:
-  - name: users
-    type: 
-      schema: users
+  - name: code
+    type:
+      primitive: int
+    required: true
+  - name: msg
+    type:
+      primitive: string
     required: true

-version: v1
-kind: Method
-metadata:
-  name: getUsers
-  type: query
-  description: 返回用户信息
-  payload:
-  - ref: usersId
-    required: true
-  result:
-  - name: users
-    type: 
-      schema: users
-    required: true

-version: v1
-kind: Method
-metadata:
-  name: listUsers
-  type: query
-  description: 返回用户信息列表
-  payload:
-  - ref: offset
-    required: true
-  - ref: limit
-    required: true
-  result:
-  - ref: count
-    required: true 
-  - name: users
-    type: 
-      array: users
-    required: true

@@ -12,7 +12,11 @@ metadata:
   - ref: password
     required: true
   result:
-  - name: users
+  - name: code
     type:
-      schema: users
+      primitive: int
+    required: true
+  - name: msg
+    type:
+      primitive: string
     required: true

-version: v1
-kind: Method
-metadata:
-  name: removeUsers
-  type: command
-  description: 移除用户信息
-  payload:
-  - ref: usersId
-    required: true
-  result:
-  - name: users
-    type: 
-      schema: users
-    required: true

-version: v1
-kind: Method
-metadata:
-  name: updateUsers
-  type: command
-  description: 更新用户信息
-  payload:
-  - ref: usersId
-    required: true
-  - name: usersInfo
-    description: 用户信息
-    type:
-      schema: usersInfo
-  - name: phoneAuth
-    description: 手机认证
-    type:
-      schemal: phoneAuth
-  - name: im
-    description: IM信息
-    type:
-      schemal: im
-  result:
-  - name: users
-    type: 
-      schema: users
-    required: true

@@ -2,4 +2,4 @@ version: v1
 kind: Service
 metadata:
   name: users
-  description: 用户信息
+  description: 用户管理

-version: v1
-kind: Method
-metadata:
-  name: createUsersCompany
-  type: command
-  description: 创建企业用户管理
-  payload:
-  - ref: companyId
-    required: true
-  - ref: usersType
-    required: true
-  - ref: usersCode
-    required: true
-  - name: organizationId
-    description: 组织机构
-    type:
-      primitive: int64
-    required: true
-  - name: departmentId
-    description: 所属部门
-    type:
-      primitive: int64
-    required: true
-  - name: usersOrg
-    description: 用户关联的组织
-    type:
-      array: int64
-    required: false
-  - name: usersRole
-    description: 用户关联的角色
-    type:
-      array: int64
-    required: false
-  - name: cooperationInfo
-    description: 共创信息 （共创用户有效）
-    type:
-      schema: cooperationInfo
-    required: false
-  - ref: enableStatus
-    required: true
-  - ref: usersName
-    required: true
-  - ref: phone
-    required: true
-  - ref: avator
-    required: false
-  - ref: email
-    required: false
-  result:
-  - name: usersCompany
-    type: 
-      schema: usersCompany
-    required: true

-version: v1
-kind: Method
-metadata:
-  name: getUsersCompany
-  type: query
-  description: 返回企业用户管理
-  payload:
-  - ref: usersCompanyId
-    required: true
-  result:
-  - name: usersCompany
-    type: 
-      schema: usersCompany
-    required: true

-version: v1
-kind: Method
-metadata:
-  name: listUsersCompany
-  type: query
-  description: 返回企业用户管理列表
-  payload:
-  - ref: offset
-    required: true
-  - ref: limit
-    required: true
-  - ref: userName
-    required: false
-  - ref: depName
-    required: false
-  - name: cooperationCompany
-    type:
-      primitive: string
-    required: false
-  result:
-  - ref: count
-    required: true 
-  - name: usersCompanys
-    type: 
-      array: usersCompany
-    required: true

-version: v1
-kind: Method
-metadata:
-  name: removeUsersCompany
-  type: command
-  description: 移除企业用户管理
-  payload:
-  - ref: usersCompanyId
-    required: true
-  result:
-  - name: usersCompany
-    type: 
-      schema: usersCompany
-    required: true

-version: v1
-kind: Method
-metadata:
-  name: updateUsersCompany
-  type: command
-  description: 更新企业用户管理
-  payload:
-  - ref: usersCompanyId
-    required: true
-  - name: organizationId
-    description: 组织机构
-    type:
-      primitive: int64
-    required: true
-  - name: departmentId
-    description: 所属部门
-    type:
-      primitive: int64
-    required: true
-  - name: usersOrg
-    description: 用户关联的组织
-    type:
-      array: int64
-    required: false
-  - name: usersRole
-    description: 用户关联的角色
-    type:
-      array: int64
-    required: false
-  - name: cooperationInfo
-    description: 共创信息 （共创用户有效）
-    type:
-      schema: cooperationInfo
-    required: false
-  - ref: enableStatus
-    required: true
-  - ref: usersName
-    required: true
-  - ref: phone
-    required: true
-  - ref: avator
-    required: false
-  - ref: email
-    required: false
-  result:
-  - name: usersCompany
-    type: 
-      schema: usersCompany
-    required: true

-version: v1
-kind: Service
-metadata:
-  name: usersCompany
-  description: 企业用户管理