Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b340903

Browse files
unknownunknown
unknown
authored and
unknown
committed
style(*): prettier 格式化代码
1 parent 11d3009 commit b340903

File tree

11 files changed

+93
-86
lines changed

11 files changed

+93
-86
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ suspect/
1414
dist
1515
learn
1616
tokens.json
17-
app/assets
17+
assets

‎app/api/cms/user.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,16 @@ user.linPost(
3434
const v = await new RegisterValidator().validate(ctx);
3535
await userDao.createUser(v);
3636
if (config.getItem('socket.enable')) {
37-
const username = v.get('body.username')
38-
ctx.websocket.broadCast(JSON.stringify({
39-
name: username,
40-
content: `管理员${ctx.currentUser.getDataValue('username')}新建了一个用户${username}`,
41-
time: new Date()
42-
}))
37+
const username = v.get('body.username');
38+
ctx.websocket.broadCast(
39+
JSON.stringify({
40+
name: username,
41+
content: `管理员${ctx.currentUser.getDataValue(
42+
'username'
43+
)}新建了一个用户${username}`,
44+
time: new Date()
45+
})
46+
);
4347
}
4448
ctx.success({
4549
code: 11

‎app/app.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import mount from 'koa-mount';
55
import serve from 'koa-static';
66
import { config, json, logging, success, jwt, Loader } from 'lin-mizar';
77
import { PermissionModel } from './model/permission';
8-
import WebSocket from './extension/socket/socket'
8+
import WebSocket from './extension/socket/socket';
99

1010
/**
1111
* 首页
@@ -64,10 +64,10 @@ function applyDefaultExtends (app) {
6464
*/
6565
function applyWebSocket (app) {
6666
if (config.getItem('socket.enable')) {
67-
const server = new WebSocket(app)
68-
return server.init()
67+
const server = new WebSocket(app);
68+
return server.init();
6969
}
70-
return app
70+
return app;
7171
}
7272

7373
/**

‎app/config/secure.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
timezone: '+08:00',
1313
define: {
1414
charset: 'utf8mb4'
15-
},
15+
}
1616
},
1717
secret:
1818
'\x88W\xf09\x91\x07\x98\x89\x87\x96\xa0A\xc68\xf9\xecJJU\x17\xc5V\xbe\x8b\xef\xd7\xd8\xd3\xe6\x95*4' // 发布生产环境前,请务必修改此默认秘钥

‎app/dao/admin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ class AdminDao {
107107
group_id: GroupLevel.Root,
108108
user_id: id
109109
}
110-
})
110+
});
111111
if (root) {
112112
throw new Forbidden({
113113
code: 10079
114-
})
114+
});
115115
}
116116
let transaction;
117117
try {

‎app/extension/socket/config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ module.exports = {
44
socket: {
55
path: '/ws/message',
66
enable: false, // 是否开启 websocket 模块
7-
intercept: false, // 是否开启 websocket 的鉴权拦截器
7+
intercept: false // 是否开启 websocket 的鉴权拦截器
88
}
9-
};
9+
};

‎app/extension/socket/socket.js‎

Lines changed: 66 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,82 @@
1-
import http from 'http'
2-
import Ws from 'ws'
1+
import http from 'http';
2+
import Ws from 'ws';
33
import { config, jwt } from 'lin-mizar';
4-
import { URLSearchParams } from 'url'
5-
import { set, get } from 'lodash'
4+
import { URLSearchParams } from 'url';
5+
import { set, get } from 'lodash';
66
import { UserGroupModel } from '../../model/user-group';
77

8-
const USER_KEY = Symbol('user')
8+
const USER_KEY = Symbol('user');
99

10-
const INTERCEPTORS = Symbol('WebSocket#interceptors')
10+
const INTERCEPTORS = Symbol('WebSocket#interceptors');
1111

12-
const HANDLE_CLOSE = Symbol('WebSocket#close')
12+
const HANDLE_CLOSE = Symbol('WebSocket#close');
1313

14-
const HANDLE_ERROR = Symbol('WebSocket#error')
14+
const HANDLE_ERROR = Symbol('WebSocket#error');
1515

1616
class WebSocket {
17-
constructor(app) {
18-
this.app = app
19-
this.wss = null
20-
this.sessions = new Set()
17+
constructor(app) {
18+
this.app = app;
19+
this.wss = null;
20+
this.sessions = new Set();
2121
}
2222

2323
/**
2424
* 初始化,挂载 socket
2525
*/
26-
init() {
27-
const server = http.createServer(this.app.callback())
26+
init() {
27+
const server = http.createServer(this.app.callback());
2828
this.wss = new Ws.Server({
2929
path: config.getItem('socket.path', '/ws/message'),
3030
noServer: true
31-
})
31+
});
3232

3333
server.on('upgrade', this[INTERCEPTORS].bind(this));
3434

35-
this.wss.on('connection', (socket) => {
36-
socket.on('close', this[HANDLE_CLOSE].bind(this))
37-
socket.on('error', this[HANDLE_ERROR].bind(this))
38-
})
35+
this.wss.on('connection', socket => {
36+
socket.on('close', this[HANDLE_CLOSE].bind(this));
37+
socket.on('error', this[HANDLE_ERROR].bind(this));
38+
});
3939

40-
this.app.context.websocket = this
41-
return server
40+
this.app.context.websocket = this;
41+
return server;
4242
}
4343

44-
[INTERCEPTORS](request, socket, head) {
44+
[INTERCEPTORS](request, socket, head) {
4545
// 是否开启 websocket 的鉴权拦截器
4646
if (config.getItem('socket.intercept')) {
47-
const params = new URLSearchParams(request.url.slice(request.url.indexOf('?')))
48-
const token = params.get('token')
47+
const params = new URLSearchParams(
48+
request.url.slice(request.url.indexOf('?'))
49+
);
50+
const token = params.get('token');
4951
try {
50-
const { identity } = jwt.verifyToken(token)
51-
this.wss.handleUpgrade(request, socket, head, (ws) => {
52-
set(ws, USER_KEY, identity)
53-
this.sessions.add(ws)
52+
const { identity } = jwt.verifyToken(token);
53+
this.wss.handleUpgrade(request, socket, head, ws => {
54+
set(ws, USER_KEY, identity);
55+
this.sessions.add(ws);
5456
this.wss.emit('connection', ws, request);
55-
})
57+
});
5658
} catch (error) {
57-
console.log(error.message)
58-
socket.destroy()
59+
console.log(error.message);
60+
socket.destroy();
5961
}
60-
return
62+
return;
6163
}
62-
this.wss.handleUpgrade(request, socket, head, (ws) => {
63-
this.sessions.add(ws)
64+
this.wss.handleUpgrade(request, socket, head, ws => {
65+
this.sessions.add(ws);
6466
this.wss.emit('connection', ws, request);
65-
})
67+
});
6668
}
6769

68-
[HANDLE_CLOSE]() {
70+
[HANDLE_CLOSE]() {
6971
for (const session of this.sessions) {
7072
if (session.readyState === Ws.CLOSED) {
71-
this.sessions.delete(session)
73+
this.sessions.delete(session);
7274
}
7375
}
7476
}
7577

76-
[HANDLE_ERROR](session, error) {
77-
console.log(error)
78+
[HANDLE_ERROR](session, error) {
79+
console.log(error);
7880
}
7981

8082
/**
@@ -83,14 +85,14 @@ class WebSocket {
8385
* @param {number} userId 用户id
8486
* @param {string} message 消息
8587
*/
86-
sendMessage(userId, message) {
88+
sendMessage(userId, message) {
8789
for (const session of this.sessions) {
8890
if (session.readyState === Ws.OPEN) {
89-
continue
91+
continue;
9092
}
9193
if (get(session, USER_KEY) === userId) {
92-
session.send(message)
93-
break
94+
session.send(message);
95+
break;
9496
}
9597
}
9698
}
@@ -100,64 +102,64 @@ class WebSocket {
100102
*
101103
* @param {WebSocket} session 当前会话
102104
* @param {string} message 消息
103-
*/
104-
sendMessageToSession(session, message) {
105-
session.send(message)
105+
*/
106+
sendMessageToSession(session, message) {
107+
session.send(message);
106108
}
107109

108110
/**
109111
* 广播
110-
*
111-
* @param {string} message 消息
112+
*
113+
* @param {string} message 消息
112114
*/
113-
broadCast(message) {
115+
broadCast(message) {
114116
this.sessions.forEach(session => {
115117
if (session.readyState === Ws.OPEN) {
116-
session.send(message)
118+
session.send(message);
117119
}
118-
})
120+
});
119121
}
120122

121123
/**
122124
* 对某个分组广播
123-
*
125+
*
124126
* @param {number} 分组id
125127
* @param {string} 消息
126128
*/
127-
async broadCastToGroup(groupId, message) {
129+
async broadCastToGroup(groupId, message) {
128130
const userGroup = await UserGroupModel.findAll({
129131
where: {
130132
group_id: groupId
131133
}
132-
})
133-
const userIds = userGroup.map(v => v.getDataValue('user_id'))
134+
});
135+
const userIds = userGroup.map(v => v.getDataValue('user_id'));
134136
for (const session of this.sessions) {
135137
if (session.readyState !== Ws.OPEN) {
136-
continue
138+
continue;
137139
}
138-
const userId = get(session, USER_KEY)
140+
const userId = get(session, USER_KEY);
139141
if (!userId) {
140-
continue
142+
continue;
141143
}
142144
if (userIds.includes(userId)) {
143-
session.send(message)
145+
session.send(message);
144146
}
145147
}
146148
}
147149

148150
/**
149151
* 获取所有会话
150152
*/
151-
getSessions() {
152-
return this.sessions
153+
getSessions() {
154+
return this.sessions;
153155
}
154156

155157
/**
156158
* 获得当前连接数
157159
*/
158-
getConnectionCount() {
159-
return this.sessions.size
160+
getConnectionCount() {
161+
return this.sessions.size;
160162
}
161163
}
162164

163-
export default WebSocket
165+
export default WebSocket;

‎app/middleware/logger.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,3 @@ function parseTemplate (template, user, response, request) {
113113
}
114114
return template;
115115
}
116-

‎app/model/user.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,11 @@ class User extends Model {
113113
username: this.username,
114114
nickname: this.nickname,
115115
email: this.email,
116-
avatar: this.avatar ? `${config.getItem('siteDomain', 'http://localhost')}/assets/${
117-
this.avatar
118-
}` : ''
116+
avatar: this.avatar
117+
? `${config.getItem('siteDomain', 'http://localhost')}/assets/${
118+
this.avatar
119+
}`
120+
: ''
119121
};
120122
if (has(this, 'groups')) {
121123
return { ...origin, groups: get(this, 'groups', []) };

‎app/starter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const { config } = require('lin-mizar/lin/config');
1111
// if (files.length < 1) {
1212
// throw new Error('未找到符合条件的文件资源');
1313
// }
14-
// const uploader = new LocalUploader('app/assets');
14+
// const uploader = new LocalUploader('assets');
1515
// const arr = await uploader.upload(files);
1616
// });
1717

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /