Skip to content

Commit d1d85d4

Browse files
vanoneangvanoneang
authored
Merge pull request #89 from TaleLin/fix/logger
fix: 修复 logger 第二次模板解析错误的问题
2 parents a7f5ba7 + e57361f commit d1d85d4

5 files changed

Lines changed: 112 additions & 33 deletions

File tree

‎README.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ Lin-CMS 是林间有风团队经过大量项目实践所提炼出的一套**内
3333

3434
### 当前最新版本
3535

36-
lin-cms-koa(当前示例工程)：0.3.8
36+
lin-cms-koa(当前示例工程)：0.3.9
3737

38-
lin-mizar(核心库) ：0.3.5
38+
lin-mizar(核心库) ：0.3.8
3939

4040
### 文档地址
4141

@@ -63,7 +63,12 @@ QQ 群号：643205479 / 814597236
6363

6464
## 版本日志
6565

66-
最新版本 `0.3.8`
66+
最新版本 `0.3.9`
67+
68+
### 0.3.9
69+
70+
1. `F` 修复 logger 第二次模板解析错误的问题
71+
2. `U` 更新 lin-mizar 到 0.3.8
6772

6873
### 0.3.8
6974

‎app/middleware/logger.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,15 @@ function findAuthAndModule (ctx) {
7474
return routeMetaInfo.get(endpoint);
7575
}
7676

77-
/** f
77+
/**
7878
* 解析模板
7979
* @param template 消息模板
8080
* @param user 用户
8181
* @param response
8282
* @param request
8383
*/
8484
function parseTemplate (template, user, response, request) {
85+
REG_XP.lastIndex = 0;
8586
const res = REG_XP.exec(template);
8687
if (res) {
8788
res.forEach(item => {

‎app/validator/admin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AdminUsersValidator extends PaginateValidator {
1414
}
1515

1616
class ResetPasswordValidator extends PositiveIdValidator {
17-
constructor () {
17+
constructor () {
1818
super();
1919
this.new_password = new Rule(
2020
'matches',

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"koa-bodyparser": "^4.2.1",
5353
"koa-mount": "^4.0.0",
5454
"koa-static": "^5.0.0",
55-
"lin-mizar": "^0.3.5",
55+
"lin-mizar": "^0.3.8",
5656
"mysql2": "^2.1.0",
5757
"sequelize": "^5.21.13",
5858
"validator": "^13.1.1"

‎test/api/cms/admin.test.js‎

Lines changed: 100 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,29 @@ describe('/cms/admin', () => {
2020

2121
let token;
2222

23-
beforeAll(async (done) => {
23+
beforeAll(async done => {
2424
console.log('start admin');
2525
// 初始化 app
2626
app = await createApp();
2727
done();
2828
});
2929

30-
afterAll(async (done) => {
30+
afterAll(async done => {
3131
setTimeout(async () => {
3232
await sequelize.close();
3333
done();
3434
}, 500);
3535
});
3636

37-
beforeEach(async (done) => {
37+
beforeEach(async done => {
3838
await sequelize.sync({ force: true });
3939
await UserModel.create({ username: 'root', nickname: 'root' });
40-
await UserIdentityModel.create({ user_id: 1, identity_type: IdentityType.Password, identifier: 'root', credential: 'sha1$c419e500$1$84869e5560ebf3de26b6690386484929456d6c07' });
40+
await UserIdentityModel.create({
41+
user_id: 1,
42+
identity_type: IdentityType.Password,
43+
identifier: 'root',
44+
credential: 'sha1$c419e500$1$84869e5560ebf3de26b6690386484929456d6c07'
45+
});
4146
await GroupModel.create({ name: 'root', info: '超级用户组', level: 1 });
4247
await GroupModel.create({ name: 'guest', info: '游客组', level: 2 });
4348
await UserGroupModel.create({ user_id: 1, group_id: 1 });
@@ -85,12 +90,21 @@ describe('/cms/admin', () => {
8590
});
8691

8792
it('插入用户信息、分组、权限，查询所有用户', async () => {
88-
const user = await UserModel.create({ username: 'shirmy', email: 'shirmy@gmail.com' });
93+
const user = await UserModel.create({
94+
username: 'shirmy',
95+
email: 'shirmy@gmail.com'
96+
});
8997
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
9098
await UserGroupModel.create({ group_id: group.id, user_id: user.id });
9199

92-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
93-
await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
100+
const permission = await PermissionModel.create({
101+
name: '查看信息',
102+
module: '信息'
103+
});
104+
await GroupPermissionModel.create({
105+
group_id: group.id,
106+
permission_id: permission.id
107+
});
94108

95109
const response = await request(app.callback())
96110
.get('/cms/admin/users')
@@ -108,7 +122,10 @@ describe('/cms/admin', () => {
108122
});
109123

110124
it('修改用户密码', async () => {
111-
const user = await UserModel.create({ username: 'shirmy', email: 'shirmy@gmail.com' });
125+
const user = await UserModel.create({
126+
username: 'shirmy',
127+
email: 'shirmy@gmail.com'
128+
});
112129
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
113130
await UserGroupModel.create({ group_id: group.id, user_id: user.id });
114131
await UserIdentityModel.create({
@@ -136,7 +153,10 @@ describe('/cms/admin', () => {
136153
});
137154

138155
it('删除用户', async () => {
139-
const user = await UserModel.create({ username: 'shirmy', email: 'shirmy@gmail.com' });
156+
const user = await UserModel.create({
157+
username: 'shirmy',
158+
email: 'shirmy@gmail.com'
159+
});
140160
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
141161
await UserGroupModel.create({ group_id: group.id, user_id: user.id });
142162

@@ -152,7 +172,10 @@ describe('/cms/admin', () => {
152172
});
153173

154174
it('更新用户', async () => {
155-
const user = await UserModel.create({ username: 'shirmy', email: 'shirmy@gmail.com' });
175+
const user = await UserModel.create({
176+
username: 'shirmy',
177+
email: 'shirmy@gmail.com'
178+
});
156179
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
157180
await UserGroupModel.create({ group_id: group.id, user_id: user.id });
158181

@@ -170,8 +193,14 @@ describe('/cms/admin', () => {
170193

171194
it('查询所有权限组及其权限', async () => {
172195
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
173-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
174-
await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
196+
const permission = await PermissionModel.create({
197+
name: '查看信息',
198+
module: '信息'
199+
});
200+
await GroupPermissionModel.create({
201+
group_id: group.id,
202+
permission_id: permission.id
203+
});
175204

176205
const response = await request(app.callback())
177206
.get('/cms/admin/group')
@@ -186,8 +215,14 @@ describe('/cms/admin', () => {
186215

187216
it('查询所有权限组', async () => {
188217
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
189-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
190-
await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
218+
const permission = await PermissionModel.create({
219+
name: '查看信息',
220+
module: '信息'
221+
});
222+
await GroupPermissionModel.create({
223+
group_id: group.id,
224+
permission_id: permission.id
225+
});
191226

192227
const response = await request(app.callback())
193228
.get('/cms/admin/group/all')
@@ -201,8 +236,14 @@ describe('/cms/admin', () => {
201236

202237
it('查询一个权限组及其权限', async () => {
203238
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
204-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
205-
await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
239+
const permission = await PermissionModel.create({
240+
name: '查看信息',
241+
module: '信息'
242+
});
243+
await GroupPermissionModel.create({
244+
group_id: group.id,
245+
permission_id: permission.id
246+
});
206247

207248
const response = await request(app.callback())
208249
.get(`/cms/admin/group/${group.id}`)
@@ -211,12 +252,17 @@ describe('/cms/admin', () => {
211252
expect(response.status).toBe(200);
212253
expect(response.type).toMatch(/json/);
213254
expect(get(response, 'body.name')).toBe(group.name);
214-
const hasPermission = !!get(response, 'body.permissions').find(v => v.id === permission.id);
255+
const hasPermission = !!get(response, 'body.permissions').find(
256+
v => v.id === permission.id
257+
);
215258
expect(hasPermission).toBeTruthy();
216259
});
217260

218261
it('新建权限组', async () => {
219-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
262+
const permission = await PermissionModel.create({
263+
name: '查看信息',
264+
module: '信息'
265+
});
220266

221267
const response = await request(app.callback())
222268
.post('/cms/admin/group')
@@ -234,8 +280,14 @@ describe('/cms/admin', () => {
234280

235281
it('更新一个权限组', async () => {
236282
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
237-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
238-
await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
283+
const permission = await PermissionModel.create({
284+
name: '查看信息',
285+
module: '信息'
286+
});
287+
await GroupPermissionModel.create({
288+
group_id: group.id,
289+
permission_id: permission.id
290+
});
239291

240292
const response = await request(app.callback())
241293
.put(`/cms/admin/group/${group.id}`)
@@ -267,7 +319,10 @@ describe('/cms/admin', () => {
267319

268320
it('分配单个权限', async () => {
269321
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
270-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
322+
const permission = await PermissionModel.create({
323+
name: '查看信息',
324+
module: '信息'
325+
});
271326

272327
const response = await request(app.callback())
273328
.post('/cms/admin/permission/dispatch')
@@ -285,8 +340,14 @@ describe('/cms/admin', () => {
285340

286341
it('分配多个权限', async () => {
287342
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
288-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
289-
const permission1 = await PermissionModel.create({ name: '查看研发组的信息', module: '信息' });
343+
const permission = await PermissionModel.create({
344+
name: '查看信息',
345+
module: '信息'
346+
});
347+
const permission1 = await PermissionModel.create({
348+
name: '查看研发组的信息',
349+
module: '信息'
350+
});
290351

291352
const response = await request(app.callback())
292353
.post('/cms/admin/permission/dispatch/batch')
@@ -304,10 +365,22 @@ describe('/cms/admin', () => {
304365

305366
it('删除多个权限', async () => {
306367
const group = await GroupModel.create({ name: '研发组', info: '研发大佬' });
307-
const permission = await PermissionModel.create({ name: '查看信息', module: '信息' });
308-
const permission1 = await PermissionModel.create({ name: '查看研发组的信息', module: '信息' });
309-
await GroupPermissionModel.create({ group_id: group.id, permission_id: permission.id });
310-
await GroupPermissionModel.create({ group_id: group.id, permission_id: permission1.id });
368+
const permission = await PermissionModel.create({
369+
name: '查看信息',
370+
module: '信息'
371+
});
372+
const permission1 = await PermissionModel.create({
373+
name: '查看研发组的信息',
374+
module: '信息'
375+
});
376+
await GroupPermissionModel.create({
377+
group_id: group.id,
378+
permission_id: permission.id
379+
});
380+
await GroupPermissionModel.create({
381+
group_id: group.id,
382+
permission_id: permission1.id
383+
});
311384

312385
const response = await request(app.callback())
313386
.post('/cms/admin/permission/remove')

0 commit comments

Comments
 (0)