@kne/fastify-account 1.0.0-alpha.19 → 1.0.0-alpha.20

package/README.md

@@ -22,7 +22,7 @@ npm i --save @kne/fastify-account
 ### API
 
 ---
-title: "@kne/fastify-account v1.0.0-alpha.17"
+title: "@kne/fastify-account v1.0.0-alpha.18"
 language_tabs:
   - shell: Shell
   - http: HTTP
@@ -42,7 +42,7 @@ headingLevel: 2
 
 <!-- Generator: Widdershins v4.0.1 -->
 
-<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.17</h1>
+<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.18</h1>
 
 > Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.
 
@@ -667,7 +667,7 @@ This operation does not require authentication
 
 |Name|In|Type|Required|Description|
 |---|---|---|---|---|
-|tenantId|query|string|false|none|
+|tenantId|query|string|true|none|
 |filter|query|object|false|none|
 |currentPage|query|number|false|none|
 |perPage|query|number|false|none|
@@ -2124,51 +2124,21 @@ This operation does not require authentication
 
 ```json
 {
-  "oneOf": [
-    {
-      "type": "object",
-      "required": [
-        "email",
-        "newPwd",
-        "token"
-      ],
-      "properties": {
-        "email": {
-          "type": "string",
-          "description": "邮箱"
-        },
-        "newPwd": {
-          "type": "string",
-          "description": "新密码"
-        },
-        "token": {
-          "type": "string",
-          "description": "验证token"
-        }
-      }
+  "type": "object",
+  "required": [
+    "newPwd",
+    "token"
+  ],
+  "properties": {
+    "newPwd": {
+      "type": "string",
+      "description": "新密码"
     },
-    {
-      "type": "object",
-      "required": [
-        "phone",
-        "newPwd"
-      ],
-      "properties": {
-        "phone": {
-          "type": "string",
-          "description": "手机号"
-        },
-        "newPwd": {
-          "type": "string",
-          "description": "新密码"
-        },
-        "token": {
-          "type": "string",
-          "description": "验证token"
-        }
-      }
+    "token": {
+      "type": "string",
+      "description": "验证token"
     }
-  ]
+  }
 }
 ```
 
@@ -2176,7 +2146,9 @@ This operation does not require authentication
 
 |Name|In|Type|Required|Description|
 |---|---|---|---|---|
-|body|body|any|false|none|
+|body|body|object|true|none|
+|» newPwd|body|string|true|新密码|
+|» token|body|string|true|验证token|
 
 <h3 id="post__api_v1_account_resetpassword-responses">Responses</h3>
 
@@ -2670,6 +2642,186 @@ This operation does not require authentication
 This operation does not require authentication
 </aside>
 
+## get__api_v1_account_admin_getCompanyInfo
+
+`GET /api/v1/account/admin/getCompanyInfo`
+
+*获取租户管理的公司信息*
+
+<h3 id="get__api_v1_account_admin_getcompanyinfo-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|tenantId|query|string|false|none|
+
+<h3 id="get__api_v1_account_admin_getcompanyinfo-responses">Responses</h3>
+
+|Status|Meaning|Description|Schema|
+|---|---|---|---|
+|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
+
+<aside class="success">
+This operation does not require authentication
+</aside>
+
+## post__api_v1_account_admin_saveCompanyInfo
+
+`POST /api/v1/account/admin/saveCompanyInfo`
+
+*修改租户管理的公司信息*
+
+> Body parameter
+
+```json
+{
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "number"
+    },
+    "tenantId": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "shortName": {
+      "type": "string"
+    },
+    "themeColor": {
+      "type": "string"
+    },
+    "logo": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    }
+  }
+}
+```
+
+<h3 id="post__api_v1_account_admin_savecompanyinfo-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|body|body|object|false|none|
+|» id|body|number|false|none|
+|» tenantId|body|string|false|none|
+|» name|body|string|false|none|
+|» shortName|body|string|false|none|
+|» themeColor|body|string|false|none|
+|» logo|body|string|false|none|
+|» description|body|string|false|none|
+
+<h3 id="post__api_v1_account_admin_savecompanyinfo-responses">Responses</h3>
+
+|Status|Meaning|Description|Schema|
+|---|---|---|---|
+|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
+
+<aside class="success">
+This operation does not require authentication
+</aside>
+
+## post__api_v1_account_admin_getAllOperationLogList
+
+`POST /api/v1/account/admin/getAllOperationLogList`
+
+*获取所有操作日志列表*
+
+> Body parameter
+
+```json
+{
+  "type": "object",
+  "required": [],
+  "properties": {
+    "filter": {
+      "type": "object"
+    },
+    "type": {
+      "type": "string"
+    },
+    "perPage": {
+      "type": "number"
+    },
+    "currentPage": {
+      "type": "number"
+    }
+  }
+}
+```
+
+<h3 id="post__api_v1_account_admin_getalloperationloglist-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|body|body|object|false|none|
+|» filter|body|object|false|none|
+|» type|body|string|false|none|
+|» perPage|body|number|false|none|
+|» currentPage|body|number|false|none|
+
+<h3 id="post__api_v1_account_admin_getalloperationloglist-responses">Responses</h3>
+
+|Status|Meaning|Description|Schema|
+|---|---|---|---|
+|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
+
+<aside class="success">
+This operation does not require authentication
+</aside>
+
+## post__api_v1_account_admin_getTenantOperationLogList
+
+`POST /api/v1/account/admin/getTenantOperationLogList`
+
+*获取租户操作日志列表*
+
+> Body parameter
+
+```json
+{
+  "type": "object",
+  "required": [],
+  "properties": {
+    "filter": {
+      "type": "object"
+    },
+    "type": {
+      "type": "string"
+    },
+    "perPage": {
+      "type": "number"
+    },
+    "currentPage": {
+      "type": "number"
+    }
+  }
+}
+```
+
+<h3 id="post__api_v1_account_admin_gettenantoperationloglist-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|body|body|object|false|none|
+|» filter|body|object|false|none|
+|» type|body|string|false|none|
+|» perPage|body|number|false|none|
+|» currentPage|body|number|false|none|
+
+<h3 id="post__api_v1_account_admin_gettenantoperationloglist-responses">Responses</h3>
+
+|Status|Meaning|Description|Schema|
+|---|---|---|---|
+|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
+
+<aside class="success">
+This operation does not require authentication
+</aside>
+
 <h1 id="-kne-fastify-account--">管理后台-权限</h1>
 
 ## post__api_v1_account_admin_addApplication
@@ -3323,6 +3475,134 @@ This operation does not require authentication
 This operation does not require authentication
 </aside>
 
+## post__api_v1_account_admin_copyPermissions
+
+`POST /api/v1/account/admin/copyPermissions`
+
+*复制应用权限到目标应用*
+
+> Body parameter
+
+```json
+{
+  "type": "object",
+  "required": [
+    "applicationId",
+    "originApplicationId"
+  ],
+  "properties": {
+    "applicationId": {
+      "type": "string"
+    },
+    "originApplicationId": {
+      "type": "string"
+    }
+  }
+}
+```
+
+<h3 id="post__api_v1_account_admin_copypermissions-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|body|body|object|true|none|
+|» applicationId|body|string|true|none|
+|» originApplicationId|body|string|true|none|
+
+<h3 id="post__api_v1_account_admin_copypermissions-responses">Responses</h3>
+
+|Status|Meaning|Description|Schema|
+|---|---|---|---|
+|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
+
+<aside class="success">
+This operation does not require authentication
+</aside>
+
+<h1 id="-kne-fastify-account--">租户平台</h1>
+
+## get__api_v1_account_tenant_getCompanyInfo
+
+`GET /api/v1/account/tenant/getCompanyInfo`
+
+*获取租户的公司信息*
+
+<h3 id="get__api_v1_account_tenant_getcompanyinfo-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|currentPage|query|number|false|none|
+|perPage|query|number|false|none|
+
+<h3 id="get__api_v1_account_tenant_getcompanyinfo-responses">Responses</h3>
+
+|Status|Meaning|Description|Schema|
+|---|---|---|---|
+|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
+
+<aside class="success">
+This operation does not require authentication
+</aside>
+
+## post__api_v1_account_tenant_saveCompanyInfo
+
+`POST /api/v1/account/tenant/saveCompanyInfo`
+
+*修改租户的公司信息*
+
+> Body parameter
+
+```json
+{
+  "type": "object",
+  "required": [
+    "id"
+  ],
+  "properties": {
+    "id": {
+      "type": "number"
+    },
+    "name": {
+      "type": "string"
+    },
+    "shortName": {
+      "type": "string"
+    },
+    "themeColor": {
+      "type": "string"
+    },
+    "logo": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    }
+  }
+}
+```
+
+<h3 id="post__api_v1_account_tenant_savecompanyinfo-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|body|body|object|true|none|
+|» id|body|number|true|none|
+|» name|body|string|false|none|
+|» shortName|body|string|false|none|
+|» themeColor|body|string|false|none|
+|» logo|body|string|false|none|
+|» description|body|string|false|none|
+
+<h3 id="post__api_v1_account_tenant_savecompanyinfo-responses">Responses</h3>
+
+|Status|Meaning|Description|Schema|
+|---|---|---|---|
+|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
+
+<aside class="success">
+This operation does not require authentication
+</aside>
+
 <h1 id="-kne-fastify-account--">租户管理-权限</h1>
 
 ## get__api_v1_account_tenant_getApplicationList

package/index.js

@@ -56,10 +56,14 @@ module.exports = fp(
               });
             },
             tenant: async request => {
+              request.appName = request.headers['x-app-name'];
               request.tenantInfo = await fastify.account.services.tenantUser.getTenantUserByUserId({
                 userInfo: request.userInfo,
                 appName: request.appName
               });
+              request.tenantInfo.companyInfo = await fastify.account.services.tenantCompany.getTenantCompanyInfo({
+                tenantId: request.tenantInfo.tenant.id
+              });
               await fastify.account.services.requestLog.addRequestLog({
                 userInfo: request.userInfo,
                 tenantId: request.tenantInfo.tenant.id,
@@ -73,6 +77,7 @@ module.exports = fp(
               if (!(await fastify.account.services.admin.checkIsSuperAdmin(request.userInfo))) {
                 throw Unauthorized('不能执行该操作，需要超级管理员权限');
               }
+              request.appName = request.headers['x-app-name'];
               await fastify.account.services.requestLog.addRequestLog({
                 userInfo: request.userInfo,
                 appName: request.appName,

package/libs/controllers/adminPermission.js

@@ -1,4 +1,5 @@
 const fp = require('fastify-plugin');
+const { Readable } = require('stream');
 
 module.exports = fp(async (fastify, options) => {
   const { authenticate, services } = fastify.account;

package/libs/controllers/adminTenantCompany.js

@@ -0,0 +1,53 @@
+const fp = require('fastify-plugin');
+
+module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
+
+  fastify.get(
+    `${options.prefix}/admin/getCompanyInfo`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        tags: ['管理后台'],
+        summary: '获取租户管理的公司信息',
+        required: ['tenantId'],
+        query: {
+          type: 'object',
+          properties: {
+            tenantId: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      return await services.tenantCompany.getTenantCompanyInfo(request.query);
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/saveCompanyInfo`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        tags: ['管理后台'],
+        summary: '修改租户管理的公司信息',
+        required: ['tenantId', 'id'],
+        body: {
+          type: 'object',
+          properties: {
+            id: { type: 'number' },
+            tenantId: { type: 'string' },
+            name: { type: 'string' },
+            shortName: { type: 'string' },
+            themeColor: { type: 'string' },
+            logo: { type: 'string' },
+            description: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      return await services.tenantCompany.saveTenantCompanyInfo(request.body);
+    }
+  );
+});

package/libs/controllers/adminTenantUser.js

@@ -9,6 +9,7 @@ module.exports = fp(async (fastify, options) => {
       schema: {
         query: {
           type: 'object',
+          required: ['tenantId'],
           properties: {
             tenantId: { type: 'string' },
             filter: {

package/libs/controllers/requestLog.js

@@ -0,0 +1,77 @@
+const fp = require('fastify-plugin');
+
+module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
+
+  fastify.post(
+    `${options.prefix}/admin/getAllOperationLogList`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        tags: ['管理后台'],
+        summary: '获取所有操作日志列表',
+        body: {
+          type: 'object',
+          required: [],
+          properties: {
+            filter: { type: 'object' },
+            type: { type: 'string' },
+            perPage: { type: 'number' },
+            currentPage: { type: 'number' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { filter, type, perPage, currentPage } = Object.assign(
+        {
+          perPage: 20,
+          currentPage: 1
+        },
+        request.body
+      );
+      return await services.requestLog.getRequestLogList({
+        filter,
+        type,
+        perPage,
+        currentPage
+      });
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/getTenantOperationLogList`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        tags: ['管理后台'],
+        summary: '获取租户操作日志列表',
+        body: {
+          type: 'object',
+          required: [],
+          properties: {
+            filter: { type: 'object' },
+            type: { type: 'string' },
+            perPage: { type: 'number' },
+            currentPage: { type: 'number' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { filter, type, perPage, currentPage } = Object.assign(
+        {
+          perPage: 20,
+          currentPage: 1
+        },
+        request.body
+      );
+      return await services.requestLog.getRequestLogList({
+        filter,
+        type,
+        perPage,
+        currentPage
+      });
+    }
+  );
+});

package/libs/controllers/tenantCompany.js

@@ -0,0 +1,54 @@
+const fp = require('fastify-plugin');
+
+module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
+
+  fastify.get(
+    `${options.prefix}/tenant/getCompanyInfo`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        tags: ['租户平台'],
+        summary: '获取租户的公司信息',
+        query: {
+          type: 'object',
+          properties: {
+            currentPage: { type: 'number' },
+            perPage: { type: 'number' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      return await services.tenantCompany.getTenantCompanyInfo({ tenantId });
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/tenant/saveCompanyInfo`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        tags: ['租户平台'],
+        summary: '修改租户的公司信息',
+        body: {
+          type: 'object',
+          required: ['id'],
+          properties: {
+            id: { type: 'number' },
+            name: { type: 'string' },
+            shortName: { type: 'string' },
+            themeColor: { type: 'string' },
+            logo: { type: 'string' },
+            description: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      return await services.tenantCompany.saveTenantCompanyInfo(Object.assign({}, request.body, { tenantId }));
+    }
+  );
+});

package/libs/models/request-log.js

@@ -34,6 +34,10 @@ module.exports = ({ DataTypes }) => {
           fields: ['action', 'type']
         }
       ]
+    },
+    associate: ({ requestLog, application, user }) => {
+      requestLog.belongsTo(application, { targetKey: 'uuid', constraints: false });
+      requestLog.belongsTo(user, { targetKey: 'uuid', constraints: false });
     }
   };
 };

package/libs/services/request-log.js

@@ -1,4 +1,5 @@
 const fp = require('fastify-plugin');
+
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.account;
 
@@ -15,5 +16,22 @@ module.exports = fp(async (fastify, options) => {
     return {};
   };
 
-  services.requestLog = { addRequestLog };
+  const getRequestLogList = async ({ filter, type, perPage, currentPage }) => {
+    const { count, rows } = await models.requestLog.findAndCountAll({
+      include: [models.application, models.user],
+      order: [['createdAt', 'DESC']],
+      where: Object.assign({}, filter, { type }),
+      offset: perPage * (currentPage - 1),
+      limit: perPage
+    });
+    return {
+      pageData: rows,
+      totalCount: count
+    };
+  };
+
+  services.requestLog = {
+    addRequestLog,
+    getRequestLogList
+  };
 });

package/libs/services/tenant-company.js

@@ -0,0 +1,54 @@
+const fp = require('fastify-plugin');
+const isNil = require('lodash/isNil');
+
+module.exports = fp(async (fastify, options) => {
+  const { models, services } = fastify.account;
+
+  const addCompanyInfo = async companyInfo => {
+    const currentCompanyInfo = await models.companyInfo.create(companyInfo);
+    return Object.assign({}, currentCompanyInfo.get({ plain: true }), {
+      id: currentCompanyInfo.uuid
+    });
+  };
+
+  const getTenantCompanyInfoInstance = async ({ tenantId }) => {
+    const currentTenantCompanyInfo = await models.companyInfo.findOne({
+      where: {
+        tenantId
+      }
+    });
+    if (!currentTenantCompanyInfo) {
+      return await addCompanyInfo({ tenantId });
+    }
+
+    return currentTenantCompanyInfo;
+  };
+
+  const getTenantCompanyInfo = async ({ tenantId }) => {
+    return await getTenantCompanyInfoInstance({ tenantId });
+  };
+
+  const saveTenantCompanyInfo = async ({ tenantId, id, ...others }) => {
+    const tenantCompanyInfo = await models.companyInfo.findOne({
+      where: {
+        id
+      }
+    });
+    if (tenantId !== tenantCompanyInfo.tenantId) {
+      throw new Error('租户Id和当前租户用户的租户Id不一致');
+    }
+    ['name', 'shortName', 'themeColor', 'logo', 'description'].forEach(name => {
+      if (!isNil(others[name])) {
+        tenantCompanyInfo[name] = others[name];
+      }
+    });
+
+    await tenantCompanyInfo.save();
+    return tenantCompanyInfo;
+  };
+
+  services.tenantCompany = {
+    getTenantCompanyInfo,
+    saveTenantCompanyInfo
+  };
+});

package/libs/services/tenant-user.js

@@ -480,8 +480,8 @@ module.exports = fp(async (fastify, options) => {
       }
     });
 
-    const { count, rows } = await fastify.account.models.tenantUser.findAndCountAll({
-      include: [fastify.account.models.tenantRole, fastify.account.models.tenantOrg, fastify.account.models.user],
+    const { count, rows } = await models.tenantUser.findAndCountAll({
+      include: [models.tenantRole, models.tenantOrg, models.user],
       where: Object.assign({}, queryFilter, { tenantId }),
       offset: perPage * (currentPage - 1),
       limit: perPage

package/libs/services/user.js

@@ -10,6 +10,7 @@ function userNameIsEmail(username) {
 
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.account;
+  const { Op } = fastify.sequelize.Sequelize;
 
   const getUserInstance = async ({ id }) => {
     const user = await models.user.findOne({
@@ -141,6 +142,15 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const getAllUserList = async ({ filter, perPage, currentPage }) => {
+    const queryFilter = {};
+
+    ['nickname'].forEach(key => {
+      if (filter && filter[key]) {
+        queryFilter[key] = {
+          [Op.like]: `%${filter[key]}%`
+        };
+      }
+    });
     const { count, rows } = await models.user.findAndCountAll({
       include: [
         {
@@ -150,7 +160,10 @@ module.exports = fp(async (fastify, options) => {
         {
           model: models.tenant
         }
-      ]
+      ],
+      where: queryFilter,
+      offset: perPage * (currentPage - 1),
+      limit: perPage
     });
     return {
       pageData: rows.map(item => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-account",
-  "version": "1.0.0-alpha.19",
+  "version": "1.0.0-alpha.20",
   "description": "fastify的用户管理账号等实现",
   "main": "index.js",
   "scripts": {