Skip to content

Commit 6a0bc7b

Browse files
committed
feat: update mongo version
1 parent 43bc831 commit 6a0bc7b

File tree

6 files changed

+132
-122
lines changed

6 files changed

+132
-122
lines changed

server/controllers/message.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ module.exports = class MessageRouter {
2020
})
2121
@tag
2222
static async getMessages(ctx, next) {
23-
var page = ctx.query.page || 0;
24-
var size = ctx.query.size || 10;
25-
var user = ctx.state.user.data;
23+
let page = ctx.query.page || 0;
24+
let size = ctx.query.size || 10;
25+
let user = ctx.state.user.data;
2626

27-
var result = await Message.find({ receiver: user._id })
27+
let result = await Message.find({ receiver: user._id })
2828
.limit(size)
2929
.skip(page * size);
3030
ctx.body = responseWrapper(result);
@@ -34,18 +34,18 @@ module.exports = class MessageRouter {
3434
@summary("获取消息总条数和未读条数")
3535
@tag
3636
static async getMessageCount(ctx, next) {
37-
var user = ctx.state.user.data;
38-
var count = await Message.count({ receiver: user._id });
39-
var unread = await Message.count({ receiver: user._id, status: "unread" });
37+
let user = ctx.state.user.data;
38+
let count = await Message.countDocuments({ receiver: user._id });
39+
let unread = await Message.countDocuments({ receiver: user._id, status: "unread" });
4040
ctx.body = responseWrapper({ total: count, unread: unread });
4141
}
4242

4343
@request("get", "/api/messages/markread")
4444
@summary("把消息全部标记为已读")
4545
@tag
4646
static async markMessageRead(ctx, next) {
47-
var user = ctx.state.user.data;
48-
var result = await Message.update({ receiver: user._id ,status:'unread'},{
47+
let user = ctx.state.user.data;
48+
let result = await Message.update({ receiver: user._id ,status:'unread'},{
4949
status: "hasread"
5050
});
5151
ctx.body = responseWrapper(true,'所有消息已标记已读');
@@ -59,9 +59,9 @@ module.exports = class MessageRouter {
5959
})
6060
@tag
6161
static async clearMessages(ctx, next) {
62-
var page = ctx.query.page || 0;
63-
var size = ctx.query.size || 10;
64-
var user = ctx.state.user.data;
62+
let page = ctx.query.page || 0;
63+
let size = ctx.query.size || 10;
64+
let user = ctx.state.user.data;
6565
await Message.deleteMany({ receiver: user._id });
6666
ctx.body = responseWrapper(true, "消息已清空");
6767
}

server/helper/db.js

+10-12
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,22 @@ const Fawn = require("fawn");
33
import config from '../config';
44

55
let dbUrl = `mongodb://${ config.dbHost }:${ config.dbPort }/${ config.dbName }`;
6-
if (config.dbUser) {
7-
dbUrl = `mongodb://${config.dbUser}:${config.dbPass}@${config.dbHost}:${config.dbPort}/${config.dbName}`;
6+
if ( config.dbUser ) {
7+
dbUrl = `mongodb://${ config.dbUser }:${ config.dbPass }@${ config.dbHost }:${ config.dbPort }/${ config.dbName }`;
88
}
99

1010
console.log(dbUrl)
11-
mongoose.connect(dbUrl, { useNewUrlParser: true, useUnifiedTopology: true }, (err) => {
12-
if (err) {
13-
console.log('Mongoose connection error: ' + err.message)
14-
} else {
15-
console.log('数据库连接成功')
16-
}
11+
mongoose.connect(dbUrl).then((result) => {
12+
console.log('数据库连接成功')
13+
}).catch((e) => {
14+
console.log('Mongoose connection error: ' + e)
1715
})
1816

1917
mongoose
20-
.connection
21-
.on('disconnected', function () {
22-
console.log('Mongoose connection disconnected')
23-
})
18+
.connection
19+
.on('disconnected', function () {
20+
console.log('Mongoose connection disconnected')
21+
})
2422
Fawn.init(dbUrl);
2523

2624
module.exports = mongoose

server/model/app_model.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var appSchema = new Schema({
4141
default: false
4242
},
4343
installWithPwd: {
44-
Boolean,
44+
type: Boolean,
4545
default: false
4646
},
4747
installPwd: {

server/model/message.js

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
const mongoose = require('../helper/db')
22
const Schema = mongoose.Schema
33

4-
var messageSchema = new Schema({
4+
const messageSchema = new Schema({
55
category: {
6-
type:String,
7-
required:true //消息类型 //INVITE 邀请
6+
type: String,
7+
required: true //消息类型 //INVITE 邀请
88
},
9-
content:{
10-
type:String,
11-
required:true //消息内容
9+
content: {
10+
type: String,
11+
required: true //消息内容
1212
},
13-
sender:String, //发送者的id
14-
receiver:{
15-
type:String, //接受者的id 必填
16-
required:true
13+
sender: String, //发送者的id
14+
receiver: {
15+
type: String, //接受者的id 必填
16+
required: true
1717
},
18-
sendAt:{
19-
type:Date,
20-
default:Date.now()
18+
sendAt: {
19+
type: Date,
20+
default: Date.now()
2121
},
22-
status:{
23-
type:String,
24-
default:'unread',
25-
enum:['unread','hasread']
22+
status: {
23+
type: String,
24+
default: 'unread',
25+
enum: [ 'unread', 'hasread' ]
2626
},
27-
data:String //消息中带有的data字段
27+
data: String //消息中带有的data字段
2828

29-
})
29+
});
3030

3131
module.exports = mongoose.model('Message', messageSchema);

server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"ldapjs": "^3.0.7",
3939
"lodash": "^4.17.21",
4040
"mkdirp": "^3.0.1",
41-
"mongoose": "^6.0.4",
41+
"mongoose": "^8.9.0",
4242
"mustache": "^4.2.0",
4343
"nodemailer": "^6.9.16",
4444
"text2png": "^2.3.0",

0 commit comments

Comments
 (0)