allied-creation / document · 提交

转到一个项目

作者 yangfu
提交 06836c5a24b212dafeba685221e8277dee12f2c7 2 个父辈 702e37b3 44fd0d65

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

内嵌 并排对比
正在显示 61 个修改的文件 包含 482 行增加 和 34 行删除
@@ -13,9 +13,6 @@ metadata: @@ -13,9 +13,6 @@ metadata:
13 - method: getDictionary 13 - method: getDictionary
14 route: 14 route:
15 get: /{Id} 15 get: /{Id}
16 - - method: removeDictionary  
17 - route:  
18 - delete: /{Id}  
19 - method: listDictionary 16 - method: listDictionary
20 route: 17 route:
21 get: / 18 get: /
  1 +version: v1
  2 +kind: HttpApi
  3 +metadata:
  4 + service: noticeSetting
  5 + path: /notice-setting
  6 + endpoints:
  7 + - method: updateNoticeSetting
  8 + route:
  9 + put: /{Id}
  10 + - method: getNoticeSetting
  11 + route:
  12 + get: /{Id}
  13 + - method: listNoticeSetting
  14 + route:
  15 + get: /
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: companyId
  5 + description: 公司id
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: content
  5 + description: 内容模板
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: isPush
  5 + description: 是否推送 【是：1】【否：2】
  6 + type:
  7 + primitive: int
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: module
  5 + description: 消息对应的业务模块
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: moduleAction
  5 + description: 业务环节
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: noticeSettingId
  5 + description: 消息id
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: organizationId
  5 + description: 组织id
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: sysCode
  5 + description: 消息对应的编码
  6 + type:
  7 + primitive: string
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: loginAccess 4 service: loginAccess
5 - path: /v1/web/auth 5 + path: /auth
6 endpoints: 6 endpoints:
7 - method: loginByAccount 7 - method: loginByAccount
8 route: 8 route:
@@ -16,6 +16,6 @@ metadata: @@ -16,6 +16,6 @@ metadata:
16 - method: getQrcodeForLogin 16 - method: getQrcodeForLogin
17 route: 17 route:
18 get: /get-qrcode 18 get: /get-qrcode
19 - - method: loginInfoByAuthCode 19 + - method: AuthCodeToAccessToken
20 route: 20 route:
21 - get: /profile 21 + get: /access-token
  1 +version: v1
  2 +kind: HttpApi
  3 +metadata:
  4 + service: menu
  5 + path: /menus
  6 + endpoints:
  7 + - method: menuList
  8 + route:
  9 + get: /
  10 + - method: menuUpdate
  11 + route:
  12 + put: /{Id}
  1 +version: v1
  2 +kind: HttpApi
  3 +metadata:
  4 + service: noticeSetting
  5 + path: /notice-setting
  6 + endpoints:
  7 + - method: noticeSettingList
  8 + route:
  9 + get: /
  10 + - method: noticeSettingProfile
  11 + route:
  12 + get: /profile
  13 + - method: noticeSettingUpdate
  14 + route:
  15 + put: /
  1 +version: v1
  2 +kind: HttpApi
  3 +metadata:
  4 + service: orgs
  5 + path: /orgs
  6 + endpoints:
  7 + - method: orgAdd
  8 + route:
  9 + post: /
  10 + - method: orgUpdate
  11 + route:
  12 + put: /{Id}
  13 + - method: orgList
  14 + route:
  15 + post: /search
  16 + - method: orgGet
  17 + route:
  18 + get: /{Id}
  19 + - method: orgRemove
  20 + route:
  21 + delete: /{Id}
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: menuAlias
  5 + description: 菜单别名
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: companyId
  5 + description: 公司id
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: content
  5 + description: 内容模板
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: isPush
  5 + description: 是否推送 【是：1】【否：2】
  6 + type:
  7 + primitive: int
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: module
  5 + description: 消息对应的业务模块
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: moduleAction
  5 + description: 业务环节
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: noticeSettingId
  5 + description: 消息id
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: organizationId
  5 + description: 组织id
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: sysCode
  5 + description: 消息对应的编码
  6 + type:
  7 + primitive: string
@@ -39,11 +39,11 @@ metadata: @@ -39,11 +39,11 @@ metadata:
39 - name: usersOrg 39 - name: usersOrg
40 description: 关联的组织机构 40 description: 关联的组织机构
41 type: 41 type:
42 - array: org 42 + array: orgs
43 - name: usersRole 43 - name: usersRole
44 description: 关联的组织结构 44 description: 关联的组织结构
45 type: 45 type:
46 - array: role 46 + array: roles
47 - name: avator 47 - name: avator
48 description: 头像 48 description: 头像
49 type: 49 type:
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: noticeSetting
  5 + description: 编排消息通知内容
  6 + attributes:
  7 + - ref: companyId
  8 + required: true
  9 + - ref: content
  10 + required: true
  11 + - ref: isPush
  12 + required: true
  13 + - ref: module
  14 + required: true
  15 + - ref: moduleAction
  16 + required: true
  17 + - ref: noticeSettingId
  18 + required: true
  19 + - ref: organizationId
  20 + required: true
  21 + - ref: sysCode
  22 + required: true
  23 + - ref: createdAt
  24 + required: true
  25 + - ref: deletedAt
  26 + required: true
  27 + - ref: updatedAt
  28 + required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: noticeSettingModule
  5 + description: 编排消息模块列表
  6 + attributes:
  7 + - ref: module
  8 + required: true
  9 + - name: moduleAction
  10 + description: 模块环节
  11 + type:
  12 + array: string
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: noticeSettingParam
  5 + description: 编排消息需要的变量
  6 + attributes:
  7 + - name: paramCode
  8 + description: 变量的代码标识
  9 + type:
  10 + primitive: string
  11 + - name: paramName
  12 + description: 变量名称描述
  13 + - ref: moduleAction
  14 + required: true
  15 + - ref: module
  16 + required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: noticeSettingProfile
  5 + description: 编排消息需要的候选参数
  6 + attributes:
  7 + - name: paramList
  8 + description: 可选变量列表
  9 + type:
  10 + array: noticeSettingParam
  11 + - name: moduleList
  12 + description: 业务模块列表
  13 + type:
  14 + schema: noticeSettingModule
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: org 4 + name: orgs
5 description: 组织organization 5 description: 组织organization
6 attributes: 6 attributes:
7 - ref: orgId 7 - ref: orgId
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: role  
5 - description: 角色 （base) 4 + name: roleListItem
  5 + description: 角色列表
6 attributes: 6 attributes:
7 - ref: roleId 7 - ref: roleId
8 required: true 8 required: true
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: role 4 + name: roles
5 description: 角色 （base) 5 description: 角色 （base)
6 attributes: 6 attributes:
7 - ref: roleId 7 - ref: roleId
@@ -25,11 +25,11 @@ metadata: @@ -25,11 +25,11 @@ metadata:
25 - name: usersOrg 25 - name: usersOrg
26 description: 用户关联的组织 26 description: 用户关联的组织
27 type: 27 type:
28 - array: org 28 + array: orgs
29 - name: usersRole 29 - name: usersRole
30 description: 用户关联的角色 30 description: 用户关联的角色
31 type: 31 type:
32 - array: role 32 + array: roles
33 - name: favoriteMenus 33 - name: favoriteMenus
34 description: 收藏的菜单(工作台)(菜单编码列表) 34 description: 收藏的菜单(工作台)(菜单编码列表)
35 type: 35 type:
1 version: v1 1 version: v1
2 kind: Method 2 kind: Method
3 metadata: 3 metadata:
4 - name: loginInfoByAuthCode 4 + name: AuthCodeToAccessToken
5 type: query 5 type: query
6 description: 获取具体的进入系统的凭证 6 description: 获取具体的进入系统的凭证
7 payload: 7 payload:
@@ -2,4 +2,4 @@ version: v1 @@ -2,4 +2,4 @@ version: v1
2 kind: Service 2 kind: Service
3 metadata: 3 metadata:
4 name: loginAccess 4 name: loginAccess
5 - description: 登录访问 5 + description: web端登录访问
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: menuList
  5 + type: query
  6 + description: 返回菜单列表
  7 + result:
  8 + - name: menus
  9 + type:
  10 + array: menu
  11 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: menuUpdate
  5 + type: query
  6 + description: 更新菜单
  7 + payload:
  8 + - ref: companyId
  9 + required: true
  10 + - ref: menuId
  11 + required: true
  12 + - ref: menuName
  13 + required: true
  14 + - ref: sort
  15 + required: true
  16 + result:
  17 + - name: menus
  18 + type:
  19 + schema: menu
  20 + required: true
  1 +version: v1
  2 +kind: Service
  3 +metadata:
  4 + name: menu
  5 + description: 用户菜单维护
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: roleList
  5 + type: query
  6 + description: 返回role列表
  7 + payload:
  8 + - ref: offset
  9 + required: true
  10 + - ref: limit
  11 + required: true
  12 + result:
  13 + - ref: count
  14 + required: true
  15 + - name: roles
  16 + type:
  17 + array: roles
  18 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: noticeSettingList
  5 + type: command
  6 + description: 推送消息配置列表
  7 + payload:
  8 + - ref: limit
  9 + required: true
  10 + - ref: offset
  11 + required: true
  12 + result:
  13 + - name: count
  14 + type:
  15 + primitive: int
  16 + - name: noticeSetting
  17 + type:
  18 + schema: noticeSetting
  19 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: noticeSettingProfile
  5 + type: query
  6 + description: 推送消息配置需求的参数候选项
  7 + result:
  8 + - name: profile
  9 + type:
  10 + schema: noticeSettingProfile
  11 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: noticeSettingUpdate
  5 + type: query
  6 + description: 推送消息配置需求的参数候选项
  7 + payload:
  8 + - ref: module
  9 + required: true
  10 + - ref: moduleAction
  11 + required: true
  12 + - ref: isPush
  13 + required: true
  14 + - ref: content
  15 + required: true
  16 + result:
  17 + - name: profile
  18 + type:
  19 + schema: noticeSettingProfile
  20 + required: true
  1 +version: v1
  2 +kind: Service
  3 +metadata:
  4 + name: noticeSetting
  5 + description: 推送消息配置
@@ -18,5 +18,5 @@ metadata: @@ -18,5 +18,5 @@ metadata:
18 result: 18 result:
19 - name: org 19 - name: org
20 type: 20 type:
21 - schema: org 21 + schema: orgs
22 required: true 22 required: true
@@ -10,5 +10,5 @@ metadata: @@ -10,5 +10,5 @@ metadata:
10 result: 10 result:
11 - name: org 11 - name: org
12 type: 12 type:
13 - schema: org 13 + schema: orgs
14 required: true 14 required: true
@@ -20,5 +20,5 @@ metadata: @@ -20,5 +20,5 @@ metadata:
20 required: true 20 required: true
21 - name: orgs 21 - name: orgs
22 type: 22 type:
23 - array: org 23 + array: orgs
24 required: true 24 required: true
@@ -10,5 +10,5 @@ metadata: @@ -10,5 +10,5 @@ metadata:
10 result: 10 result:
11 - name: org 11 - name: org
12 type: 12 type:
13 - schema: org 13 + schema: orgs
14 required: true 14 required: true
@@ -18,5 +18,5 @@ metadata: @@ -18,5 +18,5 @@ metadata:
18 result: 18 result:
19 - name: org 19 - name: org
20 type: 20 type:
21 - schema: org 21 + schema: orgs
22 required: true 22 required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: orgAdd
  5 + type: command
  6 + description: 创建组织管理
  7 + payload:
  8 + - ref: companyId
  9 + required: true
  10 + - ref: orgCode
  11 + required: true
  12 + - ref: orgName
  13 + required: true
  14 + - name: isOrg
  15 + required: true
  16 + - ref: parentId
  17 + required: true
  18 + result:
  19 + - name: org
  20 + type:
  21 + schema: orgs
  22 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: orgGet
  5 + type: query
  6 + description: 返回组织管理
  7 + payload:
  8 + - ref: orgId
  9 + required: true
  10 + result:
  11 + - name: org
  12 + type:
  13 + schema: orgs
  14 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: orgList
  5 + type: query
  6 + description: 返回组织管理列表
  7 + result:
  8 + - ref: count
  9 + required: true
  10 + - name: orgs
  11 + type:
  12 + array: orgs
  13 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: orgRemove
  5 + type: command
  6 + description: 移除组织管理
  7 + payload:
  8 + - ref: orgId
  9 + required: true
  10 + result:
  11 + - name: org
  12 + type:
  13 + schema: orgs
  14 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: orgUpdate
  5 + type: command
  6 + description: 更新组织管理
  7 + payload:
  8 + - ref: orgId
  9 + required: true
  10 + - ref: orgCode
  11 + required: true
  12 + - ref: orgName
  13 + required: true
  14 + - name: isOrg
  15 + required: true
  16 + - ref: parentId
  17 + required: true
  18 + result:
  19 + - name: org
  20 + type:
  21 + schema: orgs
  22 + required: true
  1 +version: v1
  2 +kind: Service
  3 +metadata:
  4 + name: orgs
  5 + description: 组织管理
@@ -7,10 +7,10 @@ metadata: @@ -7,10 +7,10 @@ metadata:
7 payload: 7 payload:
8 - name: role 8 - name: role
9 type: 9 type:
10 - schema: role 10 + schema: roles
11 required: true 11 required: true
12 result: 12 result:
13 - name: role 13 - name: role
14 type: 14 type:
15 - schema: role 15 + schema: roles
16 required: true 16 required: true
@@ -14,5 +14,5 @@ metadata: @@ -14,5 +14,5 @@ metadata:
14 required: true 14 required: true
15 - name: roles 15 - name: roles
16 type: 16 type:
17 - array: role 17 + array: roles
18 required: true 18 required: true
@@ -10,7 +10,7 @@ metadata: @@ -10,7 +10,7 @@ metadata:
10 result: 10 result:
11 - name: roles 11 - name: roles
12 type: 12 type:
13 - array: role 13 + array: roles
14 required: true 14 required: true
15 - name: menus 15 - name: menus
16 type: 16 type:
@@ -10,5 +10,5 @@ metadata: @@ -10,5 +10,5 @@ metadata:
10 result: 10 result:
11 - name: role 11 - name: role
12 type: 12 type:
13 - schema: role 13 + schema: roles
14 required: true 14 required: true
@@ -7,10 +7,10 @@ metadata: @@ -7,10 +7,10 @@ metadata:
7 payload: 7 payload:
8 - name: role 8 - name: role
9 type: 9 type:
10 - schema: role 10 + schema: roles
11 required: true 11 required: true
12 result: 12 result:
13 - name: role 13 - name: role
14 type: 14 type:
15 - schema: role 15 + schema: roles
16 required: true 16 required: true
@@ -7,8 +7,8 @@ metadata: @@ -7,8 +7,8 @@ metadata:
7 result: 7 result:
8 - name: roles 8 - name: roles
9 type: 9 type:
10 - array: role 10 + array: roles
11 required: true 11 required: true
12 - name: orgs 12 - name: orgs
13 type: 13 type:
14 - array: org 14 + array: orgs
@@ -51,11 +51,11 @@ metadata: @@ -51,11 +51,11 @@ metadata:
51 - name: usersOrg 51 - name: usersOrg
52 description: 关联的组织机构 52 description: 关联的组织机构
53 type: 53 type:
54 - array: org 54 + array: orgs
55 - name: usersRole 55 - name: usersRole
56 description: 关联的角色 56 description: 关联的角色
57 type: 57 type:
58 - array: role 58 + array: roles
59 - name: avator 59 - name: avator
60 description: 头像 60 description: 头像
61 type: 61 type:
@@ -36,11 +36,11 @@ metadata: @@ -36,11 +36,11 @@ metadata:
36 - name: usersOrg 36 - name: usersOrg
37 description: 关联的组织机构 37 description: 关联的组织机构
38 type: 38 type:
39 - array: org 39 + array: orgs
40 - name: usersRole 40 - name: usersRole
41 description: 关联的组织结构 41 description: 关联的组织结构
42 type: 42 type:
43 - array: role 43 + array: roles
44 - name: avator 44 - name: avator
45 description: 头像 45 description: 头像
46 type: 46 type: