Merge branch 'master' into develop

vanoneang · web-flow · commit 8550be2130db · 2020-10-19T21:22:24.000+08:00
diff --git a/README.md b/README.md
@@ -33,9 +33,9 @@ Lin-CMS 是林间有风团队经过大量项目实践所提炼出的一套**内
 
 ### 当前最新版本
 
-lin-cms-koa(当前示例工程)：0.3.6
+lin-cms-koa(当前示例工程)：0.3.9
 
-lin-mizar(核心库) ：0.3.5
+lin-mizar(核心库) ：0.3.8
 
 ### 文档地址
 
@@ -63,7 +63,20 @@ QQ 群号：643205479 / 814597236
 
 ## 版本日志
 
-最新版本 `0.3.6`
+最新版本 `0.3.9`
+
+### 0.3.9
+
+1. `F` 修复 logger 第二次模板解析错误的问题
+2. `U` 更新 lin-mizar 到 0.3.8
+
+### 0.3.8
+
+1. `F` 修复 缺少 mysql2
+
+### 0.3.7
+
+1. `U` 优化 编辑用户至少选择一个分组
 
 ### 0.3.6
 
diff --git a/app/api/v1/book.js b/app/api/v1/book.js
@@ -10,8 +10,6 @@ import { getSafeParamId } from '../../lib/util';
 import { BookNotFound } from '../../lib/exception';
 import { BookDao } from '../../dao/book';
 
-console.log(disableLoading)
-
 // book 的红图实例
 const bookApi = new LinRouter({
   prefix: '/v1/book',
diff --git a/app/middleware/logger.js b/app/middleware/logger.js
@@ -74,7 +74,7 @@ function findAuthAndModule (ctx) {
   return routeMetaInfo.get(endpoint);
 }
 
-/** f
+/**
  * 解析模板
  * @param template 消息模板
  * @param user 用户
diff --git a/app/validator/admin.js b/app/validator/admin.js
@@ -40,11 +40,8 @@ class ResetPasswordValidator extends PositiveIdValidator {
 class UpdateUserInfoValidator extends PositiveIdValidator {
   validateGroupIds (data) {
     const ids = data.body.group_ids;
-    if (isOptional(ids)) {
-      return true;
-    }
-    if (!Array.isArray(ids)) {
-      return [false, '每个id值必须为正整数'];
+    if (!Array.isArray(ids) || ids.length < 1) {
+      return [false, '至少选择一个分组'];
     }
     for (let id of ids) {
       if (typeof id === 'number') {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lin-cms-koa",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "simple and practical CMS implememted by koa",
   "main": "app/starter.js",
   "scripts": {
@@ -52,7 +52,8 @@
     "koa-bodyparser": "^4.2.1",
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0",
-    "lin-mizar": "^0.3.5",
+    "lin-mizar": "^0.3.8",
+    "mysql2": "^2.1.0",
     "sequelize": "^5.21.13",
     "validator": "^13.1.1"
   }
diff --git a/test/api/cms/admin.test.js b/test/api/cms/admin.test.js
@@ -20,24 +20,29 @@ describe('/cms/admin', () => {
 
   let token;
 
-  beforeAll(async (done) => {
+  beforeAll(async done => {
     console.log('start admin');
     // 初始化 app
     app = await createApp();
     done();
   });
 
-  afterAll(async (done) => {
+  afterAll(async done => {
     setTimeout(async () => {
       await sequelize.close();
       done();
     }, 500);
   });
 
-  beforeEach(async (done) => {
+  beforeEach(async done => {
     await sequelize.sync({ force: true });
     await UserModel.create({ username: 'root', nickname: 'root' });
-    await UserIdentityModel.create({ user_id: 1, identity_type: IdentityType.Password, identifier: 'root', credential: 'sha1$c419e500$1$84869e5560ebf3de26b6690386484929456d6c07' });
+    await UserIdentityModel.create({
+      user_id: 1,
+      identity_type: IdentityType.Password,
+      identifier: 'root',
+      credential: 'sha1$c419e500$1$84869e5560ebf3de26b6690386484929456d6c07'
+    });
     await GroupModel.create({ name: 'root', info: '超级用户组', level: 1 });
     await GroupModel.create({ name: 'guest', info: '游客组', level: 2 });
     await UserGroupModel.create({ user_id: 1, group_id: 1 });
@@ -85,12 +90,21 @@ describe('/cms/admin', () => {
   });
 
   it('插入用户信息、分组、权限，查询所有用户', async () => {
-    const user = await UserModel.create({ username: 'shirmy', email: 'shirmy@gmail.com' });
+    const user = await UserModel.create({
+      username: 'shirmy',
+      email: 'shirmy@gmail.com'
+    });
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
     await UserGroupModel.create({ group_id: group.id, user_id: user.id });
 
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
-    await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
+    await GroupPermissionModel.create({
+      group_id: group.id,
+      permission_id: permission.id
+    });
 
     const response = await request(app.callback())
       .get('/cms/admin/users')
@@ -108,7 +122,10 @@ describe('/cms/admin', () => {
   });
 
   it('修改用户密码', async () => {
-    const user = await UserModel.create({ username: 'shirmy', email: 'shirmy@gmail.com' });
+    const user = await UserModel.create({
+      username: 'shirmy',
+      email: 'shirmy@gmail.com'
+    });
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
     await UserGroupModel.create({ group_id: group.id, user_id: user.id });
     await UserIdentityModel.create({
@@ -136,7 +153,10 @@ describe('/cms/admin', () => {
   });
 
   it('删除用户', async () => {
-    const user = await UserModel.create({ username: 'shirmy', email: 'shirmy@gmail.com' });
+    const user = await UserModel.create({
+      username: 'shirmy',
+      email: 'shirmy@gmail.com'
+    });
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
     await UserGroupModel.create({ group_id: group.id, user_id: user.id });
 
@@ -152,7 +172,10 @@ describe('/cms/admin', () => {
   });
 
   it('更新用户', async () => {
-    const user = await UserModel.create({ username: 'shirmy', email: 'shirmy@gmail.com' });
+    const user = await UserModel.create({
+      username: 'shirmy',
+      email: 'shirmy@gmail.com'
+    });
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
     await UserGroupModel.create({ group_id: group.id, user_id: user.id });
 
@@ -170,8 +193,14 @@ describe('/cms/admin', () => {
 
   it('查询所有权限组及其权限', async () => {
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
-    await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
+    await GroupPermissionModel.create({
+      group_id: group.id,
+      permission_id: permission.id
+    });
 
     const response = await request(app.callback())
       .get('/cms/admin/group')
@@ -186,8 +215,14 @@ describe('/cms/admin', () => {
 
   it('查询所有权限组', async () => {
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
-    await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
+    await GroupPermissionModel.create({
+      group_id: group.id,
+      permission_id: permission.id
+    });
 
     const response = await request(app.callback())
       .get('/cms/admin/group/all')
@@ -201,8 +236,14 @@ describe('/cms/admin', () => {
 
   it('查询一个权限组及其权限', async () => {
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
-    await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
+    await GroupPermissionModel.create({
+      group_id: group.id,
+      permission_id: permission.id
+    });
 
     const response = await request(app.callback())
       .get(`/cms/admin/group/${group.id}`)
@@ -211,12 +252,17 @@ describe('/cms/admin', () => {
     expect(response.status).toBe(200);
     expect(response.type).toMatch(/json/);
     expect(get(response, 'body.name')).toBe(group.name);
-    const hasPermission = !!get(response, 'body.permissions').find(v => v.id === permission.id);
+    const hasPermission = !!get(response, 'body.permissions').find(
+      v => v.id === permission.id
+    );
     expect(hasPermission).toBeTruthy();
   });
 
   it('新建权限组', async () => {
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
 
     const response = await request(app.callback())
       .post('/cms/admin/group')
@@ -234,8 +280,14 @@ describe('/cms/admin', () => {
 
   it('更新一个权限组', async () => {
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
-    await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
+    await GroupPermissionModel.create({
+      group_id: group.id,
+      permission_id: permission.id
+    });
 
     const response = await request(app.callback())
       .put(`/cms/admin/group/${group.id}`)
@@ -267,7 +319,10 @@ describe('/cms/admin', () => {
 
   it('分配单个权限', async () => {
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
 
     const response = await request(app.callback())
       .post('/cms/admin/permission/dispatch')
@@ -285,8 +340,14 @@ describe('/cms/admin', () => {
 
   it('分配多个权限', async () => {
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
-    const permission1 = await PermissionModel.create({ name: '查看研发组的信息', module: '信息' });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
+    const permission1 = await PermissionModel.create({
+      name: '查看研发组的信息',
+      module: '信息'
+    });
 
     const response = await request(app.callback())
       .post('/cms/admin/permission/dispatch/batch')
@@ -304,10 +365,22 @@ describe('/cms/admin', () => {
 
   it('删除多个权限', async () => {
     const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
-    const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
-    const permission1 = await PermissionModel.create({ name: '查看研发组的信息', module: '信息' });
-    await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
-    await GroupPermissionModel.create({ group_id: group.id, permission_id: permission1.id });
+    const permission = await PermissionModel.create({
+      name: '查看信息',
+      module: '信息'
+    });
+    const permission1 = await PermissionModel.create({
+      name: '查看研发组的信息',
+      module: '信息'
+    });
+    await GroupPermissionModel.create({
+      group_id: group.id,
+      permission_id: permission.id
+    });
+    await GroupPermissionModel.create({
+      group_id: group.id,
+      permission_id: permission1.id
+    });
 
     const response = await request(app.callback())
       .post('/cms/admin/permission/remove')
diff --git a/yarn.lock b/yarn.lock
@@ -900,6 +900,11 @@ ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved "http://192.168.199.38:8081/nexus/content/groups/npm_all/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
+
 any-promise@^1.0.0, any-promise@^1.1.0, any-promise@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -1769,6 +1774,14 @@ capture-stack-trace@^1.0.0:
   resolved "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
   integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
+cardinal@^2.1.1:
+  version "2.1.1"
+  resolved "http://192.168.199.38:8081/nexus/content/groups/npm_all/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505"
+  integrity sha1-fMEFXYItISlU0HsIXeolHMe8VQU=
+  dependencies:
+    ansicolors "~0.3.2"
+    redeyed "~2.1.0"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -2535,7 +2548,7 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4581,6 +4594,21 @@ mysql2@^1.6.5:
     seq-queue "^0.0.5"
     sqlstring "^2.3.1"
 
+mysql2@^2.1.0:
+  version "2.1.0"
+  resolved "http://192.168.199.38:8081/nexus/content/groups/npm_all/mysql2/-/mysql2-2.1.0.tgz#55ecfd4353114c148cc4c253192dbbfd000e6642"
+  integrity sha1-Vez9Q1MRTBSMxMJTGS27/QAOZkI=
+  dependencies:
+    cardinal "^2.1.1"
+    denque "^1.4.1"
+    generate-function "^2.3.1"
+    iconv-lite "^0.5.0"
+    long "^4.0.0"
+    lru-cache "^5.1.1"
+    named-placeholders "^1.1.2"
+    seq-queue "^0.0.5"
+    sqlstring "^2.3.1"
+
 mz-modules@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/mz-modules/-/mz-modules-2.1.0.tgz#7f529877afd0d42f409a7463b96986d61cfbcf96"
@@ -5242,6 +5270,13 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
+redeyed@~2.1.0:
+  version "2.1.1"
+  resolved "http://192.168.199.38:8081/nexus/content/groups/npm_all/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b"
+  integrity sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=
+  dependencies:
+    esprima "~4.0.0"
+
 regenerate@^1.2.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ function findAuthAndModule (ctx) {`
`74`	`74`	`return routeMetaInfo.get(endpoint);`
`75`	`75`	`}`
`76`	`76`
`77`		`-/** f`
	`77`	`+/**`
`78`	`78`	`* 解析模板`
`79`	`79`	`* @param template 消息模板`
`80`	`80`	`* @param user 用户`