+
+
+
diff --git a/src/client/view/adminComment.vue b/src/client/view/adminComment.vue
index 19e9a36..eeeee27 100644
--- a/src/client/view/adminComment.vue
+++ b/src/client/view/adminComment.vue
@@ -71,11 +71,7 @@
Init Discuss
+ Initialize administrator identity
+
+
+ -
+
- + + +
- + + +
- + + +
- + + +
- + + +
+
+
-
+
@@ -103,7 +99,7 @@
-
+
![]()
@@ -366,7 +362,7 @@ export default {
onCheckedAll() {
// 全选/反选/单选/多选
if (this.checked) {
- this.comments.forEach((item) => this.checkedAll.push(item._id))
+ this.comments.forEach((item) => this.checkedAll.push(item.id))
} else {
this.checkedAll = []
}
@@ -422,7 +418,7 @@ export default {
type: 'OPERATE_COMMENT',
token: this.token,
exec: editStr,
- id: [comment._id],
+ id: [comment.id],
comment: {
nick: comment.editNick,
mail: comment.editMail,
diff --git a/src/client/view/adminConfig.vue b/src/client/view/adminConfig.vue
index 0d241b7..ec20100 100644
--- a/src/client/view/adminConfig.vue
+++ b/src/client/view/adminConfig.vue
@@ -121,7 +121,7 @@ export default {
icon: iconComment,
items: [
{
- key: 'comment',
+ key: 'commentCount',
title: translate(commentHandleStr + 'count' + title),
desc: translate(commentHandleStr + 'count' + desc),
ph: translate(commentHandleStr + 'count' + ph)
diff --git a/src/client/view/comment.vue b/src/client/view/comment.vue
index 754a300..f3fe093 100644
--- a/src/client/view/comment.vue
+++ b/src/client/view/comment.vue
@@ -2,8 +2,8 @@
![]()
{
+ try {
+ const db = process.env.DISCUSS_DB_TYPE
+ switch (db) {
+ case 'mongodb':
+ return base(db, require('./storage/mongodb'))
+ case 'mysql':
+ return base(db, require('./storage/mysql'))
+ case 'cloudbase':
+ return base(db, require('./storage/mysql'))
+ case 'deta':
+ return base(db, require('./storage/deta'))
+ case 'github':
+ return base(db, require('./storage/mysql'))
+ case 'inspirecloud':
+ return base(db, require('./storage/inspirecloud'))
+ case 'leancloud':
+ return base(db, require('./storage/leancloud'))
+ case 'postgresql':
+ return base(db, require('./storage/postgresql'))
+ case 'sqlite':
+ return base(db, require('./storage/sqlite'))
+ default:
+ throw new Error('No matching database found')
+ }
+ } catch (error) {
+ /* eslint-disable no-console */
+ console.error('Discuss: Database connect fault')
+ console.error(error)
+ /* eslint-enable */
+ }
+}
diff --git a/src/server/database/mongoose/index.js b/src/server/database/mongoose/index.js
deleted file mode 100644
index 43c4f52..0000000
--- a/src/server/database/mongoose/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const mongoose = require('mongoose')
-
-module.exports = () => {
- mongoose.connect(process.env.DISCUSS_MONGODB, {
- useUnifiedTopology: true,
- useNewUrlParser: true
- })
-}
diff --git a/src/server/database/mongoose/model/Admin.js b/src/server/database/mongoose/model/Admin.js
deleted file mode 100644
index 99e2031..0000000
--- a/src/server/database/mongoose/model/Admin.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const mongoose = require('mongoose')
-
-const { model, Schema } = mongoose
-
-const AdminSchema = new Schema(
- {
- username: { type: String, default: '', require: true },
- password: { type: String, default: '', require: true },
- mail: { type: String, default: '', require: true },
- domain: { type: String, default: '', require: true },
- requestHeaders: { type: String, default: '', require: true },
-
- // 评论处理
- commentCount: { type: Number, default: 6, require: true },
- wordNumber: { type: String, default: 0, require: true },
- limit: { type: Number, default: 0, require: true },
- limitAll: { type: Number, default: 0, require: true },
- akismet: { type: String, default: '', require: true },
- avatarCdn: {
- type: String,
- default: 'https://cravatar.cn/avatar/',
- require: true
- },
-
- // 邮件提醒
- siteUrl: { type: String, default: '', require: true },
- serverURLs: { type: String, default: '', require: true },
- mailHost: { type: String, default: '', require: true },
- mailPort: { type: String, default: '', require: true },
- mailFrom: { type: String, default: '', require: true },
- mailAccept: { type: String, default: '', require: true },
- masterSubject: { type: String, default: '', require: true },
- masterTemplate: { type: String, default: '', require: true },
- replySubject: { type: String, default: '', require: true },
- replyTemplate: { type: String, default: '', require: true }
- },
- { versionKey: false } // 禁用__v字段
-)
-const admin = model('D_Admin', AdminSchema, 'D_admin')
-
-module.exports = admin
diff --git a/src/server/database/mongoose/model/Comment.js b/src/server/database/mongoose/model/Comment.js
deleted file mode 100644
index d74c4f1..0000000
--- a/src/server/database/mongoose/model/Comment.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const mongoose = require('mongoose')
-
-const { model, Schema } = mongoose
-
-const CommentSchema = new Schema(
- {
- nick: { type: String, require: true },
- mail: { type: String, require: true },
- site: { type: String, require: true },
- content: { type: String, require: true },
- pid: { type: String, require: true },
- rid: { type: String, require: true },
- ip: { type: String, require: true },
- stick: { type: Boolean, require: true, default: false },
- status: { type: String, require: true, default: 'accept' },
- path: { type: String, require: true },
- created: { type: Number, require: true },
- updated: { type: Number, require: true },
- ua: { type: String, require: true },
- avatar: { type: String, require: true }
- },
- { versionKey: false }
-)
-const Comment = model('D_Comment', CommentSchema, 'D_comment')
-
-module.exports = Comment
diff --git a/src/server/database/mongoose/model/Counter.js b/src/server/database/mongoose/model/Counter.js
deleted file mode 100644
index afc91e1..0000000
--- a/src/server/database/mongoose/model/Counter.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const mongoose = require('mongoose')
-
-const { model, Schema } = mongoose
-
-const CounterSchema = new Schema(
- {
- time: { type: Number, default: 1, require: true },
- path: { type: String, default: '/', require: true },
- created: { type: Number, default: Date.now(), require: true },
- updated: { type: Number, default: Date.now(), require: true }
- },
- { versionKey: false }
-)
-const Counter = model('D_Counter', CounterSchema, 'D_counter')
-
-module.exports = Counter
diff --git a/src/server/database/storage/base.js b/src/server/database/storage/base.js
new file mode 100644
index 0000000..a0db76c
--- /dev/null
+++ b/src/server/database/storage/base.js
@@ -0,0 +1,7 @@
+module.exports = (type, options) => {
+ const Model = require('dittorm')(type)
+ const Admin = new Model('D_admin', options)
+ const Comment = new Model('D_comment', options)
+ const Counter = new Model('D_counter', options)
+ return { Admin, Comment, Counter }
+}
diff --git a/src/server/database/storage/cloudbase.js b/src/server/database/storage/cloudbase.js
new file mode 100644
index 0000000..6392cd0
--- /dev/null
+++ b/src/server/database/storage/cloudbase.js
@@ -0,0 +1,7 @@
+const { D_TCB_ENV, D_TCB_ID, D_TCB_KEY } = process.env
+
+module.exports = {
+ env: D_TCB_ENV,
+ secretId: D_TCB_ID,
+ secretKey: D_TCB_KEY
+}
diff --git a/src/server/database/storage/deta.js b/src/server/database/storage/deta.js
new file mode 100644
index 0000000..729a25a
--- /dev/null
+++ b/src/server/database/storage/deta.js
@@ -0,0 +1,3 @@
+const { D_DETA_KEY } = process.env
+
+module.exports = { token: D_DETA_KEY }
diff --git a/src/server/database/storage/github.js b/src/server/database/storage/github.js
new file mode 100644
index 0000000..a49fcc3
--- /dev/null
+++ b/src/server/database/storage/github.js
@@ -0,0 +1,7 @@
+const { D_GH_TOKEN, D_GH_REPO, D_GH_PATH } = process.env
+
+module.exports = {
+ token: D_GH_TOKEN,
+ repo: D_GH_REPO,
+ path: D_GH_PATH
+}
diff --git a/src/server/database/storage/inspirecloud.js b/src/server/database/storage/inspirecloud.js
new file mode 100644
index 0000000..7d60660
--- /dev/null
+++ b/src/server/database/storage/inspirecloud.js
@@ -0,0 +1,6 @@
+const { D_IC_ID, D_IC_KEY } = process.env
+
+module.exports = {
+ serviceId: D_IC_ID,
+ serviceSecret: D_IC_KEY
+}
diff --git a/src/server/database/storage/leancloud.js b/src/server/database/storage/leancloud.js
new file mode 100644
index 0000000..aac7f01
--- /dev/null
+++ b/src/server/database/storage/leancloud.js
@@ -0,0 +1,7 @@
+const { D_LC_ID, D_LC_KEY, D_LC_MKEY } = process.env
+
+module.exports = {
+ appId: D_LC_ID,
+ appKey: D_LC_KEY,
+ masterKey: D_LC_MKEY
+}
diff --git a/src/server/database/storage/mongodb.js b/src/server/database/storage/mongodb.js
new file mode 100644
index 0000000..b22e6e4
--- /dev/null
+++ b/src/server/database/storage/mongodb.js
@@ -0,0 +1,32 @@
+const {
+ D_MONGO_HOST,
+ D_MONGO_PORT,
+ D_MONGO_DB,
+ D_MONGO_USER,
+ D_MONGO_PASSWORD,
+ D_MONGO_REPLICASET,
+ D_MONGO_AUTHSOURCE,
+ D_MONGO_SSL
+} = process.env
+
+const dbOptions = {}
+if (D_MONGO_REPLICASET) dbOptions.replicaset = D_MONGO_REPLICASET
+if (D_MONGO_AUTHSOURCE) dbOptions.authSource = D_MONGO_AUTHSOURCE
+if (D_MONGO_SSL) dbOptions.ssl = D_MONGO_SSL
+
+module.exports = {
+ host: D_MONGO_HOST
+ ? D_MONGO_HOST.startsWith('[')
+ ? JSON.parse(D_MONGO_HOST) // 如果是 [xxx, xxx] 数组格式则解析为数组，否则不解析
+ : D_MONGO_HOST
+ : '127.0.0.1', // 如果 D_MONGO_HOST 为 null 或 undefined 则使用 127.0.0.1
+ port: D_MONGO_PORT
+ ? D_MONGO_PORT.startsWith('[')
+ ? JSON.parse(D_MONGO_PORT)
+ : D_MONGO_PORT
+ : 27017,
+ database: D_MONGO_DB || 'Discuss',
+ user: D_MONGO_USER,
+ password: D_MONGO_PASSWORD,
+ options: dbOptions
+}
diff --git a/src/server/database/storage/mysql.js b/src/server/database/storage/mysql.js
new file mode 100644
index 0000000..3b7b54e
--- /dev/null
+++ b/src/server/database/storage/mysql.js
@@ -0,0 +1,17 @@
+const {
+ D_MYSQL_HOST,
+ D_MYSQL_PORT,
+ D_MYSQL_DB,
+ D_MYSQL_USER,
+ D_MYSQL_PASSWORD,
+ D_MYSQL_CHARSET
+} = process.env
+
+module.exports = {
+ host: D_MYSQL_HOST || '127.0.0.1',
+ port: D_MYSQL_PORT || 3306,
+ database: D_MYSQL_DB || 'Discuss',
+ user: D_MYSQL_USER,
+ password: D_MYSQL_PASSWORD,
+ charset: D_MYSQL_CHARSET || 'utf8mb4'
+}
diff --git a/src/server/database/storage/postgresql.js b/src/server/database/storage/postgresql.js
new file mode 100644
index 0000000..5a95153
--- /dev/null
+++ b/src/server/database/storage/postgresql.js
@@ -0,0 +1,9 @@
+const { D_PG_DB, D_PG_HOST, D_PG_PASSWORD, D_PG_PORT, D_PG_USER } = process.env
+
+module.exports = {
+ host: D_PG_HOST || '127.0.0.1',
+ port: D_PG_PORT || 5432,
+ database: D_PG_DB || 'Discuss',
+ user: D_PG_USER,
+ password: D_PG_PASSWORD
+}
diff --git a/src/server/database/storage/sqlite.js b/src/server/database/storage/sqlite.js
new file mode 100644
index 0000000..0fbfca3
--- /dev/null
+++ b/src/server/database/storage/sqlite.js
@@ -0,0 +1,6 @@
+const { D_SQLITE_PATH, D_SQLITE_DB } = process.env
+
+module.exports = {
+ path: D_SQLITE_PATH,
+ database: D_SQLITE_DB || 'Discuss'
+}
diff --git a/src/server/main.js b/src/server/main.js
index 9fd70a4..c96fb74 100644
--- a/src/server/main.js
+++ b/src/server/main.js
@@ -1,12 +1,16 @@
const Router = require('./router/router')
-const { init } = require('./router/admin')
const { SetFavicon, Discussjs } = require('./utils')
-// 连接数据库
-require('./database/mongoose')()
+require('output-line')()
+/* eslint-disable */
module.exports = async (req, res) => {
- // 将配置信息锁定到全局
- if (!global.Dconfig) await init()
+ // 将数据库信息锁定到全局
+ if (!global.DiscussDB) {
+ const result = require('./database/adapter')()
+ // 如果未返回信息，则表示连接错误，直接结束请求
+ if (!result) return
+ global.DiscussDB = result
+ }
res.setHeader('Access-Control-Allow-Headers', 'Content-Type')
res.setHeader('Access-Control-Allow-Origin', '*')
diff --git a/src/server/router/admin.js b/src/server/router/admin.js
index fbe943d..052e3b6 100644
--- a/src/server/router/admin.js
+++ b/src/server/router/admin.js
@@ -1,7 +1,5 @@
const bcrypt = require('bcryptjs')
const { jwtSign, DeepColne, GetAvatar } = require('../utils')
-const Admin = require('../database/mongoose/model/Admin')
-const Comment = require('../database/mongoose/model/Comment')
const { SECRET, VerifyToken } = require('../utils/adminUtils')
const {
@@ -15,13 +13,41 @@ const { VerifyParams, IndexHandler } = require('../utils')
/**
* 初始化管理员，并将信息发送到全局
*/
-async function init() {
- global.Dconfig = await Admin.findOne().lean()
+async function init(body) {
+ const { Admin } = global.DiscussDB
+ global.Dconfig = (await Admin.select({}))[0]
// 如果已有则直接退出
if (global.Dconfig) return
- const password = bcrypt.hashSync('111111', 10)
- await new Admin({ username: 'admin', password }).save()
- global.Dconfig = await Admin.findOne().lean()
+ const { username, password, mail } = body
+ VerifyParams(body, ['username', 'password', 'mail'])
+ const options = {
+ username,
+ password: bcrypt.hashSync(password, 10),
+ mail,
+ domain: '',
+ requestHeaders: '',
+
+ // 评论处理
+ commentCount: 6,
+ wordNumber: '0',
+ limit: 0,
+ limitAll: 0,
+ akismet: '',
+ avatarCdn: 'https://cravatar.cn/avatar/',
+
+ // 邮件提醒
+ siteUrl: '',
+ serverURLs: '',
+ mailHost: '',
+ mailPort: '',
+ mailFrom: '',
+ mailAccept: '',
+ masterSubject: '',
+ masterTemplate: '',
+ replySubject: '',
+ replyTemplate: ''
+ }
+ global.Dconfig = await Admin.add(options)
}
/**
@@ -53,7 +79,7 @@ async function Login(params) {
// 用户名密码是否正确
if (!isUsername || !isPassword) throw new Error('User name or password error')
- result.token = jwtSign({ id: config._id }, SECRET, { expiresIn: '7d' })
+ result.token = jwtSign({ id: config.id }, SECRET, { expiresIn: '7d' })
return result
}
@@ -66,19 +92,18 @@ async function Login(params) {
*/
function FuzzyQueries(options, keyword, searchType) {
if (!keyword) return
- const reg = new RegExp(keyword, 'i')
- if (searchType !== 'all') {
- options[searchType] = reg
+
+ // 默认查询全部字段
+ if (searchType === 'all') {
+ delete options.path
+ options._complex = { _logic: 'OR' }
+ const arr = ['nick', 'mail', 'site', 'ip', 'content', 'path']
+ for (const i of arr) {
+ options._complex[i] = ['LIKE', `%${keyword}%`]
+ }
} else {
- options.$or = [
- //多条件，数组
- { nick: { $regex: reg } },
- { mail: { $regex: reg } },
- { site: { $regex: reg } },
- { ip: { $regex: reg } },
- { content: { $regex: reg } },
- { path: { $regex: reg } }
- ]
+ // 指定字段
+ options[searchType] = ['LIKE', `%${keyword}%`]
}
}
@@ -89,6 +114,7 @@ function FuzzyQueries(options, keyword, searchType) {
* @returns
*/
async function AdminGetComments(params) {
+ const { Comment } = global.DiscussDB
const config = global.Dconfig
const token = await VerifyToken(params.token)
@@ -119,11 +145,12 @@ async function AdminGetComments(params) {
// 限制页码
const { page, pageCount } = await limitPageNo(pageNo, pageSize, options)
- const comments = await Comment.find(options)
- .skip((page - 1) * pageSize)
- .limit(pageSize)
- .sort({ created: -1 })
- .lean()
+ // 分页查询
+ const comments = await Comment.select(options, {
+ offset: (page - 1) * pageSize,
+ limit: pageSize,
+ desc: 'created'
+ })
for (const item of comments) {
// 处理头像
@@ -169,13 +196,15 @@ async function GetConfig({ token }) {
if (!isToken) throw new Error('Token exception')
const config = DeepColne(global.Dconfig)
- delete config._id
+ delete config.id
delete config.password
return config
}
// 保存配置信息
async function SaveConfig(params) {
+ const { Admin } = global.DiscussDB
+
const { data, token } = params
const isToken = await VerifyToken(token)
@@ -192,9 +221,8 @@ async function SaveConfig(params) {
const siteUrl = data.siteUrl === null || data.siteUrl === void 0
data.siteUrl = siteUrl ? void 0 : data.siteUrl.replace(/\/$/, '')
- const { _id } = global.Dconfig
- await Admin.updateOne({ _id }, data)
- global.Dconfig = await Admin.findOne().lean()
+ const { id } = global.Dconfig
+ global.Dconfig = (await Admin.update(data, { id }))[0]
}
module.exports = {
diff --git a/src/server/router/comment.js b/src/server/router/comment.js
index cec0561..1bef713 100644
--- a/src/server/router/comment.js
+++ b/src/server/router/comment.js
@@ -1,4 +1,3 @@
-const Comment = require('../database/mongoose/model/Comment')
const { VerifyToken } = require('../utils/adminUtils')
const {
WordNumberLimit,
@@ -17,6 +16,7 @@ const { IndexHandler, DeepColne, VerifyParams, akismet } = require('../utils')
/* eslint-disable max-statements */
// 获取评论
async function GetComment(params) {
+ const { Comment } = global.DiscussDB
const config = global.Dconfig
const commentCount = config.commentCount
// 处理index.html
@@ -28,7 +28,7 @@ async function GetComment(params) {
pid: '',
path,
status: 'accept',
- stick: { $ne: true }
+ stick: ['!=', true]
}
/*
@@ -40,7 +40,7 @@ async function GetComment(params) {
if (pageNo === 1) {
const optionsTop = DeepColne(options)
optionsTop.stick = true
- commentsTop = await Comment.find(optionsTop).sort({ created: -1 }).lean()
+ commentsTop = await Comment.select(optionsTop, { desc: 'created' })
}
// 获取通过审核的评论数
@@ -51,11 +51,12 @@ async function GetComment(params) {
// 限制页码
const { page, pageCount } = await limitPageNo(pageNo, commentCount, options)
- const comments = await Comment.find(options)
- .skip((page - 1) * commentCount)
- .limit(commentCount)
- .sort({ created: -1 })
- .lean()
+ // 分页查询
+ const comments = await Comment.select(options, {
+ offset: (page - 1) * commentCount,
+ limit: commentCount,
+ desc: 'created'
+ })
// 合并置顶评论和普通评论
const newComments = [...commentsTop, ...comments]
@@ -77,13 +78,14 @@ async function GetComment(params) {
// 提交评论
async function CommitComment(params) {
+ const { Comment } = global.DiscussDB
// 验证评论信息是否合法
VerifyParams(params, ['nick', 'mail', 'content', 'ua', 'path'])
// 验证邮箱和网址是否正确
VerufyMailANDSite(params.mail, params.site)
// 查询rid是否存在
- const RplayComment = await Comment.findById(params.rid)
+ const RplayComment = (await Comment.select({ id: params.rid }))[0]
const config = global.Dconfig
@@ -118,7 +120,7 @@ async function CommitComment(params) {
if (RplayComment) data.rnick = RplayComment.nick
// 保存评论
- const result = await new Comment(data).save()
+ const result = await Comment.add(data)
await SendMailHandler(config, data)
@@ -132,43 +134,39 @@ async function CommitComment(params) {
// 获取最新评论
async function RecentComment(params) {
+ const { Comment } = global.DiscussDB
const config = global.Dconfig
let query = { status: 'accept' }
if (params.reply === false) query.pid = ''
- const comments = await Comment.find(query)
- .sort({ created: -1 })
- .limit(config.commentCount || 10)
- .lean()
+ const comments = await Comment.select(query, {
+ limit: config.commentCount || 10,
+ desc: 'created'
+ })
return CommentHandler(comments)
}
// 获取评论数
async function CommentCount(params) {
+ const { Comment } = global.DiscussDB
+
VerifyParams(params, ['paths'])
+
+ // 判断是否是数组
if (!Array.isArray(params.paths)) throw new Error('"paths" is not an array')
// 处理index.html
const paths = params.paths.map((item) => IndexHandler(item))
- // 处理查询项
- const options = { path: { $in: paths } }
- if (params.reply === false) options.pid = ''
-
- const query = [
- { $match: options },
- { $group: { _id: '$path', count: { $sum: 1 } } }
- ]
- const resultArr = await Comment.aggregate(query)
-
// 格式化
const result = []
- for (const item in paths) {
- result.push({
- path: paths[item],
- count: resultArr[item] ? resultArr[item].count : 0
- })
+ for (const path of paths) {
+ const options = { path }
+ // 是否查询回复评论，默认查询所有评论
+ if (params.reply === false) options.pid = ''
+ const count = await Comment.count(options)
+ result.push({ path, count })
}
return result
diff --git a/src/server/router/counter.js b/src/server/router/counter.js
index 5edfd10..bc8df7d 100644
--- a/src/server/router/counter.js
+++ b/src/server/router/counter.js
@@ -1,31 +1,27 @@
-const Counter = require('../database/mongoose/model/Counter')
const { VerifyParams, IndexHandler } = require('../utils')
-// 递增
-async function Increasing(path) {
- const result = await Counter.updateOne(
- { path },
- {
- $inc: { time: 1 },
- $set: { updated: Date.now() }
- }
- )
- if (result.matchedCount) return true
-
- return false
-}
-
module.exports = async (params) => {
+ const { Counter } = global.DiscussDB
+
+ // 验证 path 是否存在
VerifyParams(params, ['path'])
- const path = IndexHandler(params.path)
- // 递归+1
- const isInc = await Increasing(path)
+ // 处理/index.html
+ const path = IndexHandler(params.path)
- // 新增
- if (!isInc) await new Counter({ path }).save()
+ // 查询
+ let result = (await Counter.select({ path }))[0]
- const record = await Counter.findOne({ path })
+ // 判断是否有统计记录
+ // 有: 自增1
+ // 没有: 新增记录
+ if (result) {
+ const options = { time: ++result.time, updated: Date.now() }
+ await Counter.update(options, { path })
+ } else {
+ const options = { path, time: 1, created: Date.now(), updated: Date.now() }
+ await Counter.add(options)
+ }
- return record.time || 1
+ return result.time || 1
}
diff --git a/src/server/router/router.js b/src/server/router/router.js
index af5a9c0..fac4a62 100644
--- a/src/server/router/router.js
+++ b/src/server/router/router.js
@@ -1,7 +1,9 @@
+const { join } = require('path')
const bodyData = require('body-data')
const SendMail = require('../utils/Mail')
const {
+ init,
Login,
AdminGetComments,
GetConfig,
@@ -15,7 +17,7 @@ const {
CommentCount
} = require('./comment')
const GetCounter = require('./counter')
-const { GetUserIP, CORS } = require('../utils')
+const { GetUserIP, CORS, HtmlMinify } = require('../utils')
const NotFound = { msg: 'Not Found' }
@@ -25,11 +27,29 @@ async function Router(req, res) {
let result = { msg: 'success' }
try {
+ // 将配置信息放置到全局
+ if (!global.Dconfig) {
+ const { Admin } = global.DiscussDB
+ global.Dconfig = (await Admin.select({}))[0]
+ }
+
+ // 获取请求参数
body = await bodyData(req)
+ // 获取 UA
body.ua = req.headers['user-agent']
+ // 获取 IP
body.ip = GetUserIP(req)
console.log('body', body)
+ // 返回初始化页面
+ if (!global.Dconfig && body.type !== 'INIT') {
+ const path = join(__dirname, '../../../public/init.html')
+ const html = HtmlMinify(path)
+ res.setHeader('Content-Type', 'text/html; charset=utf-8')
+ res.end(html)
+ return
+ }
+
// 邮件通知
if (body.type === 'PUSH_MAIL') {
result.data = await SendMail(body)
@@ -47,6 +67,9 @@ async function Router(req, res) {
}
switch (body.type) {
+ case 'INIT':
+ result.data = await init(body)
+ break
case 'GET_COMMENT':
result.data = await GetComment(body)
break
diff --git a/src/server/utils/CORS.js b/src/server/utils/CORS.js
index 52d95f5..89cd2c2 100644
--- a/src/server/utils/CORS.js
+++ b/src/server/utils/CORS.js
@@ -2,7 +2,7 @@
async function CORSHandler(req) {
// 设置安全域名
- const { domain } = global.Dconfig
+ const { domain } = global.Dconfig || {}
if (!domain) return false
diff --git a/src/server/utils/Mail.js b/src/server/utils/Mail.js
index a5d9d6d..402db2f 100644
--- a/src/server/utils/Mail.js
+++ b/src/server/utils/Mail.js
@@ -1,6 +1,5 @@
const nodemailer = require('nodemailer')
const bcrypt = require('bcryptjs')
-const Comment = require('../database/mongoose/model/Comment')
const { join } = require('path')
const HtmlMinify = require('./minify')
const { GetAvatar } = require('./avatar')
@@ -69,6 +68,8 @@ async function Send(options) {
// 查询(父|回复)评论信息
async function PRComment(comment) {
+ const { Comment } = global.DiscussDB
+
let ids = []
let pComment = {}
let rComment = {}
@@ -78,7 +79,7 @@ async function PRComment(comment) {
if (comment.pid === comment.rid) ids.push(comment.pid)
else ids = [comment.rid, comment.pid]
- const comments = await Comment.find({ _id: { $in: ids } })
+ const comments = await Comment.select({ id: ['IN', ids] })
for (const item of comments) {
pComment = item.id === comment.pid ? parse(item) : pComment
rComment = item.id === comment.rid ? parse(item) : rComment
@@ -101,7 +102,7 @@ async function noticeMaster(comment, { pComment, rComment }) {
// 楼主评论通知处理
async function noticeLandlord(comment, { pComment, rComment }) {
- if (!pComment._id || !rComment._id) return
+ if (!pComment.id || !rComment.id) return
// (根)自己回复自己，取消通知
if (comment.mail === pComment.mail) return
// (子)如果自己是自己的子评论，当被回复时，取消楼主通知(将通知转让给Reply处理)
@@ -112,7 +113,7 @@ async function noticeLandlord(comment, { pComment, rComment }) {
// 回复评论通知处理
async function noticeReply(comment, { pComment, rComment }) {
- if (!pComment._id || !rComment._id) return
+ if (!pComment.id || !rComment.id) return
// (根)自己回复自己，取消通知
if (comment.mail === pComment.mail) return
// (子)自己回复自己，取消通知
diff --git a/src/server/utils/adminUtils.js b/src/server/utils/adminUtils.js
index 47f112f..3c871e2 100644
--- a/src/server/utils/adminUtils.js
+++ b/src/server/utils/adminUtils.js
@@ -8,10 +8,10 @@ const SECRET = process.env.DISCUSS_SECRET || 'Discuss'
* @returns
*/
async function VerifyToken(token) {
- const { msg, id } = jwtVerify(token, SECRET)
- if (msg) return false
- if (id) {
- const condition = id === global.Dconfig._id.toString()
+ const data = jwtVerify(token, SECRET)
+ if (data.msg) return false
+ if (data.id) {
+ const condition = data.id === global.Dconfig.id.toString()
if (condition) return true
return false
}
diff --git a/src/server/utils/commentUtils.js b/src/server/utils/commentUtils.js
index 8539192..854ad0c 100644
--- a/src/server/utils/commentUtils.js
+++ b/src/server/utils/commentUtils.js
@@ -1,6 +1,5 @@
const bcrypt = require('bcryptjs')
const axios = require('axios')
-const Comment = require('../database/mongoose/model/Comment')
const {
XSS,
SetAvatar,
@@ -121,7 +120,7 @@ async function SendMailHandler(config, data) {
method: 'post',
headers: { origin: config.siteUrl }
}),
- new Promise((resolve) => setTimeout(resolve, 500)) // 延迟0.5s后继续向下执行，不在等待
+ new Promise((resolve) => setTimeout(resolve, 1000)) // 延迟1s后继续向下执行，不再等待
])
}
} catch (error) {
@@ -142,6 +141,7 @@ async function SendMailHandler(config, data) {
* @returns
*/
async function UpdateComment(arr, exec, comment) {
+ const { Comment } = global.DiscussDB
let data = { status: exec }
// 修改为置顶
@@ -150,19 +150,21 @@ async function UpdateComment(arr, exec, comment) {
// 判断是否为编辑的评论
if (comment) data = comment
- return await Comment.updateMany({ _id: { $in: arr } }, data)
+ return await Comment.update(data, { id: ['IN', arr] })
}
// 删除评论
async function DeleteComment(arr) {
- return await Comment.deleteMany({ _id: { $in: arr } })
+ const { Comment } = global.DiscussDB
+ return await Comment.delete({ id: ['IN', arr] })
}
// token 正确则不查询回复评论了
async function GetReplyComment(comments) {
+ const { Comment } = global.DiscussDB
for (const item of comments) {
- const id = item._id.toString() // toString 将 new ObjectId() 转换为 id
- const replys = await Comment.find({ pid: id }).lean()
+ const id = item.id.toString() // toString 将 new ObjectId() 转换为 id
+ const replys = await Comment.select({ pid: id })
// 处理回复评论
item.replys = CommentHandler(replys)
}
@@ -176,19 +178,21 @@ async function GetReplyComment(comments) {
* @returns {Number}
*/
async function GetCommentCounts(options, isClone = true) {
+ const { Comment } = global.DiscussDB
const newOptions = isClone ? DeepColne(options) : options
delete newOptions.pid
// 查询path的所有评论(包含：父评论、子评论、置顶评论)
- const counts = await Comment.find(newOptions).countDocuments().lean()
+ const counts = await Comment.count(newOptions)
return counts
}
// 限制页码
async function limitPageNo(page, pageSize, options) {
+ const { Comment } = global.DiscussDB
// 根据父评论数量进行分页
- const counts = await Comment.find(options).countDocuments().lean()
+ const counts = await Comment.count(options)
let pageCount = Math.ceil(counts / pageSize)
if (pageCount < 1) pageCount = 1
@@ -221,9 +225,9 @@ function CommentHandler(comments) {
comment.avatar = GetAvatar(comment.avatar)
if (comment.replys) {
- obj[comment._id] = comment
+ obj[comment.id] = comment
for (const reply of comment.replys) {
- obj[reply._id] = reply
+ obj[reply.id] = reply
reply.rnick = obj[reply.rid].nick
}
}
@@ -287,15 +291,16 @@ function VerufyMailANDSite(mail, site) {
// 限流
async function limitFilter(ip) {
+ const { Comment } = global.DiscussDB
const tenmin = 600000 // 10分钟
const { limit, limitAll } = global.Dconfig
// 10分钟内，相同的ip能评论多少条(默认10)
if (parseInt(limit)) {
- const count = await Comment.find().countDocuments({
+ const count = await Comment.count({
ip,
- created: { $gt: Date.now() - tenmin }
+ created: ['>', Date.now() - tenmin]
})
if (count >= limit) {
throw new Error('Commenting too frequently')
@@ -303,8 +308,8 @@ async function limitFilter(ip) {
}
// 10分钟内，所有的ip能评论多少条
if (parseInt(limitAll)) {
- const count = await Comment.find().countDocuments({
- created: { $gt: Date.now() - tenmin }
+ const count = await Comment.count({
+ created: ['>', Date.now() - tenmin]
})
if (count >= limitAll) {
throw new Error('Server is busy, please try again later...')