@fecommunity/reactpress 3.0.0 → 3.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/reactpress.js +2 -1
- package/dist/index.js +0 -0
- package/lib/build.js +59 -13
- package/lib/dev.js +2 -14
- package/lib/i18n/strings.js +30 -2
- package/lib/root.js +10 -2
- package/lib/spawn.js +1 -0
- package/package.json +7 -4
- package/server/dist/app.module.js +1 -26
- package/server/dist/app.module.js.map +1 -1
- package/server/dist/modules/article/article.controller.d.ts +1 -6
- package/server/dist/modules/article/article.controller.js +1 -45
- package/server/dist/modules/article/article.controller.js.map +1 -1
- package/server/dist/modules/article/article.entity.d.ts +0 -1
- package/server/dist/modules/article/article.entity.js +0 -5
- package/server/dist/modules/article/article.entity.js.map +1 -1
- package/server/dist/modules/article/article.module.js +2 -14
- package/server/dist/modules/article/article.module.js.map +1 -1
- package/server/dist/modules/article/article.service.d.ts +1 -9
- package/server/dist/modules/article/article.service.js +5 -59
- package/server/dist/modules/article/article.service.js.map +1 -1
- package/server/dist/modules/auth/auth.service.js +3 -4
- package/server/dist/modules/auth/auth.service.js.map +1 -1
- package/server/dist/modules/auth/jwt-auth.guard.js +1 -2
- package/server/dist/modules/auth/jwt-auth.guard.js.map +1 -1
- package/server/dist/modules/auth/jwt.strategy.js +1 -2
- package/server/dist/modules/auth/jwt.strategy.js.map +1 -1
- package/server/dist/modules/category/category.service.js +2 -3
- package/server/dist/modules/category/category.service.js.map +1 -1
- package/server/dist/modules/comment/comment.module.js +1 -10
- package/server/dist/modules/comment/comment.module.js.map +1 -1
- package/server/dist/modules/comment/comment.service.d.ts +1 -3
- package/server/dist/modules/comment/comment.service.js +5 -15
- package/server/dist/modules/comment/comment.service.js.map +1 -1
- package/server/dist/modules/knowledge/knowledge.service.js +2 -3
- package/server/dist/modules/knowledge/knowledge.service.js.map +1 -1
- package/server/dist/modules/page/page.service.js +1 -2
- package/server/dist/modules/page/page.service.js.map +1 -1
- package/server/dist/modules/smtp/smtp.service.js +1 -2
- package/server/dist/modules/smtp/smtp.service.js.map +1 -1
- package/server/dist/modules/tag/tag.service.js +2 -3
- package/server/dist/modules/tag/tag.service.js.map +1 -1
- package/server/dist/modules/user/user.controller.js +3 -4
- package/server/dist/modules/user/user.controller.js.map +1 -1
- package/server/dist/modules/user/user.service.js +9 -10
- package/server/dist/modules/user/user.service.js.map +1 -1
- package/server/dist/starter.js +1 -1
- package/server/dist/tsconfig.build.tsbuildinfo +11335 -11537
- package/server/dist/utils/oss.util.js +1 -2
- package/server/dist/utils/oss.util.js.map +1 -1
- package/ui/interactive.js +19 -3
|
@@ -24,49 +24,28 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.ArticleService = void 0;
|
|
27
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
28
27
|
const common_1 = require("@nestjs/common");
|
|
29
28
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
30
29
|
const typeorm_2 = require("typeorm");
|
|
31
30
|
const date_util_1 = require("../../utils/date.util");
|
|
32
31
|
const category_service_1 = require("../category/category.service");
|
|
33
32
|
const tag_service_1 = require("../tag/tag.service");
|
|
34
|
-
const webhook_service_1 = require("../webhook/webhook.service");
|
|
35
|
-
const article_revision_entity_1 = require("./article-revision.entity");
|
|
36
33
|
const article_entity_1 = require("./article.entity");
|
|
37
34
|
const article_util_1 = require("./article.util");
|
|
38
35
|
const Segment = require('segment');
|
|
39
36
|
const segment = new Segment();
|
|
40
37
|
segment.useDefault();
|
|
41
38
|
let ArticleService = class ArticleService {
|
|
42
|
-
constructor(articleRepository,
|
|
39
|
+
constructor(articleRepository, tagService, categoryService) {
|
|
43
40
|
this.articleRepository = articleRepository;
|
|
44
|
-
this.revisionRepository = revisionRepository;
|
|
45
41
|
this.tagService = tagService;
|
|
46
42
|
this.categoryService = categoryService;
|
|
47
|
-
this.webhookService = webhookService;
|
|
48
|
-
}
|
|
49
|
-
async saveRevision(article) {
|
|
50
|
-
const revision = this.revisionRepository.create({
|
|
51
|
-
articleId: article.id,
|
|
52
|
-
article,
|
|
53
|
-
title: article.title,
|
|
54
|
-
content: article.content,
|
|
55
|
-
html: article.html,
|
|
56
|
-
status: article.status,
|
|
57
|
-
});
|
|
58
|
-
await this.revisionRepository.save(revision);
|
|
59
|
-
}
|
|
60
|
-
async notifyPublished(article, extra = {}) {
|
|
61
|
-
if (article.status !== 'publish')
|
|
62
|
-
return;
|
|
63
|
-
await this.webhookService.dispatch('article.published', Object.assign({ id: article.id, title: article.title, status: article.status, publishAt: article.publishAt }, extra));
|
|
64
43
|
}
|
|
65
44
|
async create(article) {
|
|
66
45
|
const { title } = article;
|
|
67
46
|
const exist = await this.articleRepository.findOne({ where: { title } });
|
|
68
47
|
if (exist) {
|
|
69
|
-
throw new common_1.HttpException(
|
|
48
|
+
throw new common_1.HttpException('文章标题已存在', common_1.HttpStatus.BAD_REQUEST);
|
|
70
49
|
}
|
|
71
50
|
let { tags, category, status } = article;
|
|
72
51
|
if (status === 'publish') {
|
|
@@ -78,7 +57,6 @@ let ArticleService = class ArticleService {
|
|
|
78
57
|
const existCategory = await this.categoryService.findById(category);
|
|
79
58
|
const newArticle = await this.articleRepository.create(Object.assign(Object.assign({}, article), { category: existCategory, tags, needPassword: !!article.password }));
|
|
80
59
|
await this.articleRepository.save(newArticle);
|
|
81
|
-
await this.notifyPublished(newArticle);
|
|
82
60
|
return newArticle;
|
|
83
61
|
}
|
|
84
62
|
async findAll(queryParams) {
|
|
@@ -220,47 +198,18 @@ let ArticleService = class ArticleService {
|
|
|
220
198
|
return data;
|
|
221
199
|
}
|
|
222
200
|
async updateById(id, article) {
|
|
223
|
-
var _a;
|
|
224
201
|
const oldArticle = await this.articleRepository.findOne(id);
|
|
225
|
-
await this.saveRevision(oldArticle);
|
|
226
202
|
let { tags, category, status } = article;
|
|
227
203
|
if (tags) {
|
|
228
204
|
tags = await this.tagService.findByIds(('' + tags).split(','));
|
|
229
205
|
}
|
|
230
206
|
const existCategory = await this.categoryService.findById(category);
|
|
231
|
-
const
|
|
232
|
-
const newArticle = Object.assign(Object.assign({}, article), { views: oldArticle.views, category: existCategory, needPassword: !!article.password, publishAt: becomingPublish ? date_util_1.dateFormat() : oldArticle.publishAt, scheduledPublishAt: status === 'publish' ? null : (_a = article.scheduledPublishAt) !== null && _a !== void 0 ? _a : oldArticle.scheduledPublishAt });
|
|
207
|
+
const newArticle = Object.assign(Object.assign({}, article), { views: oldArticle.views, category: existCategory, needPassword: !!article.password, publishAt: oldArticle.status === 'draft' && status === 'publish' ? date_util_1.dateFormat() : oldArticle.publishAt });
|
|
233
208
|
if (tags) {
|
|
234
209
|
Object.assign(newArticle, { tags });
|
|
235
210
|
}
|
|
236
211
|
const updatedArticle = await this.articleRepository.merge(oldArticle, newArticle);
|
|
237
|
-
|
|
238
|
-
if (becomingPublish) {
|
|
239
|
-
await this.notifyPublished(saved);
|
|
240
|
-
}
|
|
241
|
-
return saved;
|
|
242
|
-
}
|
|
243
|
-
async listRevisions(articleId) {
|
|
244
|
-
return this.revisionRepository.find({
|
|
245
|
-
where: { articleId },
|
|
246
|
-
order: { createAt: 'DESC' },
|
|
247
|
-
take: 50,
|
|
248
|
-
});
|
|
249
|
-
}
|
|
250
|
-
async restoreRevision(articleId, revisionId) {
|
|
251
|
-
const revision = await this.revisionRepository.findOne(revisionId);
|
|
252
|
-
if (!revision || revision.articleId !== articleId) {
|
|
253
|
-
throw new common_1.HttpException(api_messages_1.ApiMsg.REVISION_NOT_FOUND, common_1.HttpStatus.NOT_FOUND);
|
|
254
|
-
}
|
|
255
|
-
const article = await this.articleRepository.findOne(articleId);
|
|
256
|
-
await this.saveRevision(article);
|
|
257
|
-
const restored = await this.articleRepository.merge(article, {
|
|
258
|
-
title: revision.title,
|
|
259
|
-
content: revision.content,
|
|
260
|
-
html: revision.html,
|
|
261
|
-
status: revision.status,
|
|
262
|
-
});
|
|
263
|
-
return this.articleRepository.save(restored);
|
|
212
|
+
return this.articleRepository.save(updatedArticle);
|
|
264
213
|
}
|
|
265
214
|
async updateViewsById(id) {
|
|
266
215
|
const oldArticle = await this.articleRepository.findOne(id);
|
|
@@ -346,12 +295,9 @@ let ArticleService = class ArticleService {
|
|
|
346
295
|
ArticleService = __decorate([
|
|
347
296
|
common_1.Injectable(),
|
|
348
297
|
__param(0, typeorm_1.InjectRepository(article_entity_1.Article)),
|
|
349
|
-
__param(1, typeorm_1.InjectRepository(article_revision_entity_1.ArticleRevision)),
|
|
350
298
|
__metadata("design:paramtypes", [typeorm_2.Repository,
|
|
351
|
-
typeorm_2.Repository,
|
|
352
299
|
tag_service_1.TagService,
|
|
353
|
-
category_service_1.CategoryService
|
|
354
|
-
webhook_service_1.WebhookService])
|
|
300
|
+
category_service_1.CategoryService])
|
|
355
301
|
], ArticleService);
|
|
356
302
|
exports.ArticleService = ArticleService;
|
|
357
303
|
//# sourceMappingURL=article.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"article.service.js","sourceRoot":"","sources":["../../../src/modules/article/article.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"article.service.js","sourceRoot":"","sources":["../../../src/modules/article/article.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.AuthService = void 0;
|
|
13
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
14
13
|
const common_1 = require("@nestjs/common");
|
|
15
14
|
const config_1 = require("@nestjs/config");
|
|
16
15
|
const jwt_1 = require("@nestjs/jwt");
|
|
@@ -60,7 +59,7 @@ let AuthService = class AuthService {
|
|
|
60
59
|
}
|
|
61
60
|
async loginWithGithub(code) {
|
|
62
61
|
if (!code) {
|
|
63
|
-
throw new common_1.HttpException(
|
|
62
|
+
throw new common_1.HttpException('请输入Gitub授权码', common_1.HttpStatus.BAD_REQUEST);
|
|
64
63
|
}
|
|
65
64
|
try {
|
|
66
65
|
const tokenResponse = (await axios_1.default({
|
|
@@ -97,7 +96,7 @@ let AuthService = class AuthService {
|
|
|
97
96
|
const emailMessage = {
|
|
98
97
|
from: setting.smtpFromUser,
|
|
99
98
|
to: result.data.email,
|
|
100
|
-
subject:
|
|
99
|
+
subject: 'Github 用户登录通知',
|
|
101
100
|
html: `您好,您使用了 Github 登录了 reactpress。reactpress 已为您创建用户,用户名称:${result.data.name}, 用户密码:${password},请及时登录系统修改密码`,
|
|
102
101
|
};
|
|
103
102
|
this.smtpService.create(emailMessage).catch(() => {
|
|
@@ -108,7 +107,7 @@ let AuthService = class AuthService {
|
|
|
108
107
|
return res;
|
|
109
108
|
}
|
|
110
109
|
else {
|
|
111
|
-
throw new common_1.HttpException(
|
|
110
|
+
throw new common_1.HttpException('未获取到您的公开邮件地址,无法使用Github登录', common_1.HttpStatus.BAD_REQUEST);
|
|
112
111
|
}
|
|
113
112
|
}
|
|
114
113
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.JwtAuthGuard = void 0;
|
|
10
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
11
10
|
const common_1 = require("@nestjs/common");
|
|
12
11
|
const passport_1 = require("@nestjs/passport");
|
|
13
12
|
let JwtAuthGuard = class JwtAuthGuard extends passport_1.AuthGuard('jwt') {
|
|
@@ -18,7 +17,7 @@ let JwtAuthGuard = class JwtAuthGuard extends passport_1.AuthGuard('jwt') {
|
|
|
18
17
|
}
|
|
19
18
|
handleRequest(err, user) {
|
|
20
19
|
if (err || !user) {
|
|
21
|
-
throw new common_1.UnauthorizedException(
|
|
20
|
+
throw new common_1.UnauthorizedException('身份验证失败');
|
|
22
21
|
}
|
|
23
22
|
return user;
|
|
24
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt-auth.guard.js","sourceRoot":"","sources":["../../../src/modules/auth/jwt-auth.guard.ts"],"names":[],"mappings":";;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"jwt-auth.guard.js","sourceRoot":"","sources":["../../../src/modules/auth/jwt-auth.guard.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAqF;AACrF,+CAA6C;AAG7C,IAAa,YAAY,GAAzB,MAAa,YAAa,SAAQ,oBAAS,CAAC,KAAK,CAAC;IAChD,UAAU,CAAC,OAAyB;QAClC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,aAAa,CAAO,GAAG,EAAE,IAAU;QACjC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE;YAChB,MAAM,IAAI,8BAAqB,CAAC,QAAQ,CAAC,CAAC;SAC3C;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAbY,YAAY;IADxB,mBAAU,EAAE;GACA,YAAY,CAaxB;AAbY,oCAAY"}
|
|
@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.JwtStrategy = void 0;
|
|
13
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
14
13
|
const common_1 = require("@nestjs/common");
|
|
15
14
|
const passport_1 = require("@nestjs/passport");
|
|
16
15
|
const passport_jwt_1 = require("passport-jwt");
|
|
@@ -26,7 +25,7 @@ let JwtStrategy = class JwtStrategy extends passport_1.PassportStrategy(passport
|
|
|
26
25
|
async validate(payload) {
|
|
27
26
|
const user = await this.authService.validateUser(payload);
|
|
28
27
|
if (!user) {
|
|
29
|
-
throw new common_1.UnauthorizedException(
|
|
28
|
+
throw new common_1.UnauthorizedException('身份验证失败');
|
|
30
29
|
}
|
|
31
30
|
return user;
|
|
32
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.strategy.js","sourceRoot":"","sources":["../../../src/modules/auth/jwt.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"jwt.strategy.js","sourceRoot":"","sources":["../../../src/modules/auth/jwt.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmE;AACnE,+CAAoD;AACpD,+CAAoD;AAGpD,iDAA6C;AAG7C,IAAa,WAAW,GAAxB,MAAa,WAAY,SAAQ,2BAAgB,CAAC,uBAAQ,CAAC;IACzD,YAA6B,WAAwB;QACnD,KAAK,CAAC;YACJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,WAAW,EAAE,YAAY;SAC1B,CAAC,CAAC;QAJwB,gBAAW,GAAX,WAAW,CAAa;IAKrD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAa;QAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,8BAAqB,CAAC,QAAQ,CAAC,CAAC;SAC3C;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAhBY,WAAW;IADvB,mBAAU,EAAE;qCAE+B,0BAAW;GAD1C,WAAW,CAgBvB;AAhBY,kCAAW"}
|
|
@@ -13,7 +13,6 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.CategoryService = void 0;
|
|
16
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
17
16
|
const common_1 = require("@nestjs/common");
|
|
18
17
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
19
18
|
const typeorm_2 = require("typeorm");
|
|
@@ -28,7 +27,7 @@ let CategoryService = class CategoryService {
|
|
|
28
27
|
where: { label },
|
|
29
28
|
});
|
|
30
29
|
if (existCategory) {
|
|
31
|
-
throw new common_1.HttpException(
|
|
30
|
+
throw new common_1.HttpException('分类已存在', common_1.HttpStatus.BAD_REQUEST);
|
|
32
31
|
}
|
|
33
32
|
const newCategory = await this.categoryRepository.create(Category);
|
|
34
33
|
await this.categoryRepository.save(newCategory);
|
|
@@ -77,7 +76,7 @@ let CategoryService = class CategoryService {
|
|
|
77
76
|
return true;
|
|
78
77
|
}
|
|
79
78
|
catch (e) {
|
|
80
|
-
throw new common_1.HttpException(
|
|
79
|
+
throw new common_1.HttpException('删除失败,可能存在关联文章', common_1.HttpStatus.BAD_REQUEST);
|
|
81
80
|
}
|
|
82
81
|
}
|
|
83
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"category.service.js","sourceRoot":"","sources":["../../../src/modules/category/category.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"category.service.js","sourceRoot":"","sources":["../../../src/modules/category/category.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ const common_1 = require("@nestjs/common");
|
|
|
11
11
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
12
12
|
const article_module_1 = require("../article/article.module");
|
|
13
13
|
const auth_module_1 = require("../auth/auth.module");
|
|
14
|
-
const webhook_module_1 = require("../webhook/webhook.module");
|
|
15
14
|
const setting_module_1 = require("../setting/setting.module");
|
|
16
15
|
const smtp_module_1 = require("../smtp/smtp.module");
|
|
17
16
|
const user_module_1 = require("../user/user.module");
|
|
@@ -22,15 +21,7 @@ let CommentModule = class CommentModule {
|
|
|
22
21
|
};
|
|
23
22
|
CommentModule = __decorate([
|
|
24
23
|
common_1.Module({
|
|
25
|
-
imports: [
|
|
26
|
-
typeorm_1.TypeOrmModule.forFeature([comment_entity_1.Comment]),
|
|
27
|
-
auth_module_1.AuthModule,
|
|
28
|
-
article_module_1.ArticleModule,
|
|
29
|
-
setting_module_1.SettingModule,
|
|
30
|
-
smtp_module_1.SMTPModule,
|
|
31
|
-
user_module_1.UserModule,
|
|
32
|
-
webhook_module_1.WebhookModule,
|
|
33
|
-
],
|
|
24
|
+
imports: [typeorm_1.TypeOrmModule.forFeature([comment_entity_1.Comment]), auth_module_1.AuthModule, article_module_1.ArticleModule, setting_module_1.SettingModule, smtp_module_1.SMTPModule, user_module_1.UserModule],
|
|
34
25
|
providers: [comment_service_1.CommentService],
|
|
35
26
|
controllers: [comment_controller_1.CommentController],
|
|
36
27
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment.module.js","sourceRoot":"","sources":["../../../src/modules/comment/comment.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAEhD,8DAA0D;AAC1D,qDAAiD;AACjD,8DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"comment.module.js","sourceRoot":"","sources":["../../../src/modules/comment/comment.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAEhD,8DAA0D;AAC1D,qDAAiD;AACjD,8DAA0D;AAC1D,qDAAiD;AACjD,qDAAiD;AACjD,6DAAyD;AACzD,qDAA2C;AAC3C,uDAAmD;AAOnD,IAAa,aAAa,GAA1B,MAAa,aAAa;CAAG,CAAA;AAAhB,aAAa;IALzB,eAAM,CAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,wBAAO,CAAC,CAAC,EAAE,wBAAU,EAAE,8BAAa,EAAE,8BAAa,EAAE,wBAAU,EAAE,wBAAU,CAAC;QAChH,SAAS,EAAE,CAAC,gCAAc,CAAC;QAC3B,WAAW,EAAE,CAAC,sCAAiB,CAAC;KACjC,CAAC;GACW,aAAa,CAAG;AAAhB,sCAAa"}
|
|
@@ -3,7 +3,6 @@ import { ArticleService } from '../article/article.service';
|
|
|
3
3
|
import { SettingService } from '../setting/setting.service';
|
|
4
4
|
import { SMTPService } from '../smtp/smtp.service';
|
|
5
5
|
import { UserService } from '../user/user.service';
|
|
6
|
-
import { WebhookService } from '../webhook/webhook.service';
|
|
7
6
|
import { Comment } from './comment.entity';
|
|
8
7
|
export declare class CommentService {
|
|
9
8
|
private readonly commentRepository;
|
|
@@ -11,8 +10,7 @@ export declare class CommentService {
|
|
|
11
10
|
private readonly smtpService;
|
|
12
11
|
private readonly settingService;
|
|
13
12
|
private readonly userService;
|
|
14
|
-
|
|
15
|
-
constructor(commentRepository: Repository<Comment>, articleService: ArticleService, smtpService: SMTPService, settingService: SettingService, userService: UserService, webhookService: WebhookService);
|
|
13
|
+
constructor(commentRepository: Repository<Comment>, articleService: ArticleService, smtpService: SMTPService, settingService: SettingService, userService: UserService);
|
|
16
14
|
create(userAgent: any, comment: Partial<Comment> & {
|
|
17
15
|
reply?: string;
|
|
18
16
|
createByAdmin?: boolean;
|
|
@@ -24,7 +24,6 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.CommentService = void 0;
|
|
27
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
28
27
|
const common_1 = require("@nestjs/common");
|
|
29
28
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
30
29
|
const typeorm_2 = require("typeorm");
|
|
@@ -34,23 +33,21 @@ const article_service_1 = require("../article/article.service");
|
|
|
34
33
|
const setting_service_1 = require("../setting/setting.service");
|
|
35
34
|
const smtp_service_1 = require("../smtp/smtp.service");
|
|
36
35
|
const user_service_1 = require("../user/user.service");
|
|
37
|
-
const webhook_service_1 = require("../webhook/webhook.service");
|
|
38
36
|
const comment_entity_1 = require("./comment.entity");
|
|
39
37
|
const html_1 = require("./html");
|
|
40
38
|
const url = require('url');
|
|
41
39
|
let CommentService = class CommentService {
|
|
42
|
-
constructor(commentRepository, articleService, smtpService, settingService, userService
|
|
40
|
+
constructor(commentRepository, articleService, smtpService, settingService, userService) {
|
|
43
41
|
this.commentRepository = commentRepository;
|
|
44
42
|
this.articleService = articleService;
|
|
45
43
|
this.smtpService = smtpService;
|
|
46
44
|
this.settingService = settingService;
|
|
47
45
|
this.userService = userService;
|
|
48
|
-
this.webhookService = webhookService;
|
|
49
46
|
}
|
|
50
47
|
async create(userAgent, comment) {
|
|
51
48
|
const { hostId, name, email, content, createByAdmin = false } = comment;
|
|
52
49
|
if (!hostId || !name || !email || !content) {
|
|
53
|
-
throw new common_1.HttpException(
|
|
50
|
+
throw new common_1.HttpException('缺失参数', common_1.HttpStatus.BAD_REQUEST);
|
|
54
51
|
}
|
|
55
52
|
comment.pass = false;
|
|
56
53
|
const { text: uaText } = ua_util_1.parseUserAgent(userAgent);
|
|
@@ -64,7 +61,7 @@ let CommentService = class CommentService {
|
|
|
64
61
|
const emailMessage = {
|
|
65
62
|
from: setting.smtpFromUser,
|
|
66
63
|
to: adminEmail,
|
|
67
|
-
subject:
|
|
64
|
+
subject: '新评论通知',
|
|
68
65
|
html: html_1.getNewCommentHTML(Object.assign(Object.assign({}, setting), { adminName, comment })),
|
|
69
66
|
};
|
|
70
67
|
this.smtpService.create(emailMessage).catch(() => {
|
|
@@ -83,12 +80,6 @@ let CommentService = class CommentService {
|
|
|
83
80
|
console.log(e);
|
|
84
81
|
}
|
|
85
82
|
}
|
|
86
|
-
await this.webhookService.dispatch('comment.created', {
|
|
87
|
-
id: newComment.id,
|
|
88
|
-
hostId: newComment.hostId,
|
|
89
|
-
name: newComment.name,
|
|
90
|
-
email: newComment.email,
|
|
91
|
-
});
|
|
92
83
|
return newComment;
|
|
93
84
|
}
|
|
94
85
|
async findAll(queryParams) {
|
|
@@ -151,7 +142,7 @@ let CommentService = class CommentService {
|
|
|
151
142
|
const emailMessage = {
|
|
152
143
|
from: setting.smtpFromUser,
|
|
153
144
|
to: replyUserEmail,
|
|
154
|
-
subject:
|
|
145
|
+
subject: '评论回复通知',
|
|
155
146
|
html: html_1.getReplyCommentHTML(Object.assign(Object.assign({}, setting), { replyUserName, commentHostUrl: url.resolve(setting.systemUrl, link) })),
|
|
156
147
|
};
|
|
157
148
|
this.smtpService.create(emailMessage).catch(() => {
|
|
@@ -175,8 +166,7 @@ CommentService = __decorate([
|
|
|
175
166
|
article_service_1.ArticleService,
|
|
176
167
|
smtp_service_1.SMTPService,
|
|
177
168
|
setting_service_1.SettingService,
|
|
178
|
-
user_service_1.UserService
|
|
179
|
-
webhook_service_1.WebhookService])
|
|
169
|
+
user_service_1.UserService])
|
|
180
170
|
], CommentService);
|
|
181
171
|
exports.CommentService = CommentService;
|
|
182
172
|
//# sourceMappingURL=comment.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment.service.js","sourceRoot":"","sources":["../../../src/modules/comment/comment.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"comment.service.js","sourceRoot":"","sources":["../../../src/modules/comment/comment.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,6 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.KnowledgeService = void 0;
|
|
27
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
28
27
|
const common_1 = require("@nestjs/common");
|
|
29
28
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
30
29
|
const typeorm_2 = require("typeorm");
|
|
@@ -38,7 +37,7 @@ let KnowledgeService = class KnowledgeService {
|
|
|
38
37
|
const { title, status, parentId } = knowledge;
|
|
39
38
|
const exist = await this.repository.findOne({ where: { title } });
|
|
40
39
|
if (exist && !parentId) {
|
|
41
|
-
throw new common_1.HttpException(
|
|
40
|
+
throw new common_1.HttpException('知识库已存在', common_1.HttpStatus.BAD_REQUEST);
|
|
42
41
|
}
|
|
43
42
|
if (status === 'publish') {
|
|
44
43
|
Object.assign(knowledge, { publishAt: date_util_1.dateFormat() });
|
|
@@ -52,7 +51,7 @@ let KnowledgeService = class KnowledgeService {
|
|
|
52
51
|
knowledges = [knowledges];
|
|
53
52
|
}
|
|
54
53
|
if (knowledges.some((knowledge) => !knowledge.parentId)) {
|
|
55
|
-
throw new common_1.HttpException(
|
|
54
|
+
throw new common_1.HttpException('无效的知识库章节', common_1.HttpStatus.BAD_REQUEST);
|
|
56
55
|
}
|
|
57
56
|
const result = [];
|
|
58
57
|
for (const knowledge of knowledges) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knowledge.service.js","sourceRoot":"","sources":["../../../src/modules/knowledge/knowledge.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"knowledge.service.js","sourceRoot":"","sources":["../../../src/modules/knowledge/knowledge.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,6 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.PageService = void 0;
|
|
27
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
28
27
|
const common_1 = require("@nestjs/common");
|
|
29
28
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
30
29
|
const typeorm_2 = require("typeorm");
|
|
@@ -38,7 +37,7 @@ let PageService = class PageService {
|
|
|
38
37
|
const { path } = page;
|
|
39
38
|
const exist = await this.pageRepository.findOne({ where: { path } });
|
|
40
39
|
if (exist) {
|
|
41
|
-
throw new common_1.HttpException(
|
|
40
|
+
throw new common_1.HttpException('页面已存在', common_1.HttpStatus.BAD_REQUEST);
|
|
42
41
|
}
|
|
43
42
|
const newPage = await this.pageRepository.create(Object.assign({}, page));
|
|
44
43
|
await this.pageRepository.save(newPage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.service.js","sourceRoot":"","sources":["../../../src/modules/page/page.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"page.service.js","sourceRoot":"","sources":["../../../src/modules/page/page.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,6 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.SMTPService = void 0;
|
|
27
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
28
27
|
const common_1 = require("@nestjs/common");
|
|
29
28
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
30
29
|
const typeorm_2 = require("typeorm");
|
|
@@ -48,7 +47,7 @@ let SMTPService = class SMTPService {
|
|
|
48
47
|
user: smtpUser,
|
|
49
48
|
pass: smtpPass,
|
|
50
49
|
}).catch(() => {
|
|
51
|
-
throw new common_1.HttpException(
|
|
50
|
+
throw new common_1.HttpException('邮件发送失败', common_1.HttpStatus.BAD_REQUEST);
|
|
52
51
|
});
|
|
53
52
|
const newSMTP = await this.smtpRepository.create(data);
|
|
54
53
|
await this.smtpRepository.save(newSMTP);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smtp.service.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"smtp.service.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAuE;AACvE,6CAAmD;AACnD,qCAAqC;AAErC,gEAA4D;AAC5D,2CAAwC;AACxC,+CAAqC;AAGrC,IAAa,WAAW,GAAxB,MAAa,WAAW;IACtB,YAEmB,cAAgC,EAChC,cAA8B;QAD9B,mBAAc,GAAd,cAAc,CAAkB;QAChC,mBAAc,GAAd,cAAc,CAAgB;IAC9C,CAAC;IAMJ,KAAK,CAAC,MAAM,CAAC,IAAmB;QAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC;QACH,MAAM,qBAAS,CAAC,IAAI,EAAE;YACpB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACZ,MAAM,IAAI,sBAAa,CAAC,QAAQ,EAAE,mBAAU,CAAC,WAAW,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC;IACjB,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,WAAW;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAE9F,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,MAAM,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,GAAG,EAAE,KAAqB,WAAW,EAA3B,WAAW,UAAK,WAAW,EAAzD,oBAA2C,CAAc,CAAC;YAChE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;YAEtB,IAAI,WAAW,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACvC,KAAK,CAAC,QAAQ,CAAC,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,GAAG,EAAE,EAAE,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC7F,CAAC,CAAC,CAAC;aACJ;SACF;QAED,OAAO,KAAK,CAAC,eAAe,EAAE,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,UAAU,CAAC,EAAE;QACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AA3DY,WAAW;IADvB,mBAAU,EAAE;IAGR,WAAA,0BAAgB,CAAC,kBAAI,CAAC,CAAA;qCACU,oBAAU;QACV,gCAAc;GAJtC,WAAW,CA2DvB;AA3DY,kCAAW"}
|