@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
|
@@ -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.TagService = 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");
|
|
@@ -26,7 +25,7 @@ let TagService = class TagService {
|
|
|
26
25
|
const { label } = tag;
|
|
27
26
|
const existTag = await this.tagRepository.findOne({ where: { label } });
|
|
28
27
|
if (existTag) {
|
|
29
|
-
throw new common_1.HttpException(
|
|
28
|
+
throw new common_1.HttpException('标签已存在', common_1.HttpStatus.BAD_REQUEST);
|
|
30
29
|
}
|
|
31
30
|
const newTag = await this.tagRepository.create(tag);
|
|
32
31
|
await this.tagRepository.save(newTag);
|
|
@@ -91,7 +90,7 @@ let TagService = class TagService {
|
|
|
91
90
|
return true;
|
|
92
91
|
}
|
|
93
92
|
catch (e) {
|
|
94
|
-
throw new common_1.HttpException(
|
|
93
|
+
throw new common_1.HttpException('删除失败，可能存在关联文章', common_1.HttpStatus.BAD_REQUEST);
|
|
95
94
|
}
|
|
96
95
|
}
|
|
97
96
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.service.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"tag.service.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -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.UserController = void 0;
|
|
16
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
17
16
|
const common_1 = require("@nestjs/common");
|
|
18
17
|
const jwt_1 = require("@nestjs/jwt");
|
|
19
18
|
const swagger_1 = require("@nestjs/swagger");
|
|
@@ -36,7 +35,7 @@ let UserController = class UserController {
|
|
|
36
35
|
async checkPermission(req, user) {
|
|
37
36
|
let token = req.headers.authorization;
|
|
38
37
|
if (!token) {
|
|
39
|
-
throw new common_1.HttpException(
|
|
38
|
+
throw new common_1.HttpException('未认证', common_1.HttpStatus.UNAUTHORIZED);
|
|
40
39
|
}
|
|
41
40
|
if (/Bearer/.test(token)) {
|
|
42
41
|
token = token.split(' ').pop();
|
|
@@ -44,11 +43,11 @@ let UserController = class UserController {
|
|
|
44
43
|
const tokenUser = this.jwtService.decode(token);
|
|
45
44
|
const id = tokenUser.id;
|
|
46
45
|
if (!id) {
|
|
47
|
-
throw new common_1.HttpException(
|
|
46
|
+
throw new common_1.HttpException('未认证', common_1.HttpStatus.UNAUTHORIZED);
|
|
48
47
|
}
|
|
49
48
|
const exist = await this.userService.findById(id);
|
|
50
49
|
if (exist.id !== user.id && exist.role !== 'admin') {
|
|
51
|
-
throw new common_1.HttpException(
|
|
50
|
+
throw new common_1.HttpException('无权处理', common_1.HttpStatus.FORBIDDEN);
|
|
52
51
|
}
|
|
53
52
|
req.user = tokenUser;
|
|
54
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../../src/modules/user/user.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../../src/modules/user/user.controller.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.UserService = void 0;
|
|
27
|
-
const api_messages_1 = require("../../common/api-messages");
|
|
28
27
|
const common_1 = require("@nestjs/common");
|
|
29
28
|
const config_1 = require("@nestjs/config");
|
|
30
29
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
@@ -73,15 +72,15 @@ let UserService = class UserService {
|
|
|
73
72
|
const { name, password } = user;
|
|
74
73
|
if (!ignoreValidator) {
|
|
75
74
|
if (!name || !password) {
|
|
76
|
-
throw new common_1.HttpException(
|
|
75
|
+
throw new common_1.HttpException('请输入用户名和密码', common_1.HttpStatus.BAD_REQUEST);
|
|
77
76
|
}
|
|
78
77
|
if (!user_util_1.isValidUsername(name)) {
|
|
79
|
-
throw new common_1.HttpException(
|
|
78
|
+
throw new common_1.HttpException('用户名不能包含空格和非法字符', common_1.HttpStatus.BAD_REQUEST);
|
|
80
79
|
}
|
|
81
80
|
}
|
|
82
81
|
const existUser = await this.userRepository.findOne({ where: { name } });
|
|
83
82
|
if (existUser) {
|
|
84
|
-
throw new common_1.HttpException(
|
|
83
|
+
throw new common_1.HttpException('用户已存在', common_1.HttpStatus.BAD_REQUEST);
|
|
85
84
|
}
|
|
86
85
|
const newUser = await this.userRepository.create(user);
|
|
87
86
|
await this.userRepository.save(newUser);
|
|
@@ -91,10 +90,10 @@ let UserService = class UserService {
|
|
|
91
90
|
const { name, password } = user;
|
|
92
91
|
const existUser = await this.userRepository.findOne({ where: { name } });
|
|
93
92
|
if (!existUser || !(await user_entity_1.User.comparePassword(password, existUser.password))) {
|
|
94
|
-
throw new common_1.HttpException(
|
|
93
|
+
throw new common_1.HttpException('用户名或密码错误', common_1.HttpStatus.BAD_REQUEST);
|
|
95
94
|
}
|
|
96
95
|
if (existUser.status === 'locked') {
|
|
97
|
-
throw new common_1.HttpException(
|
|
96
|
+
throw new common_1.HttpException('用户已锁定，无法登录', common_1.HttpStatus.BAD_REQUEST);
|
|
98
97
|
}
|
|
99
98
|
delete existUser.password;
|
|
100
99
|
return existUser;
|
|
@@ -103,7 +102,7 @@ let UserService = class UserService {
|
|
|
103
102
|
const { name } = user;
|
|
104
103
|
const existUser = await this.userRepository.findOne({ where: { name } });
|
|
105
104
|
if (existUser.status === 'locked') {
|
|
106
|
-
throw new common_1.HttpException(
|
|
105
|
+
throw new common_1.HttpException('用户已锁定，无法登录', common_1.HttpStatus.BAD_REQUEST);
|
|
107
106
|
}
|
|
108
107
|
delete existUser.password;
|
|
109
108
|
return existUser;
|
|
@@ -114,7 +113,7 @@ let UserService = class UserService {
|
|
|
114
113
|
async updateById(currentUser, id, user) {
|
|
115
114
|
if (user.role === 'admin') {
|
|
116
115
|
if (!currentUser || currentUser.role !== 'admin') {
|
|
117
|
-
throw new common_1.HttpException(
|
|
116
|
+
throw new common_1.HttpException('您无权操作', common_1.HttpStatus.FORBIDDEN);
|
|
118
117
|
}
|
|
119
118
|
}
|
|
120
119
|
const oldUser = await this.userRepository.findOne(id);
|
|
@@ -122,7 +121,7 @@ let UserService = class UserService {
|
|
|
122
121
|
if (user.name && user.name !== oldUser.name) {
|
|
123
122
|
const existUser = await this.userRepository.findOne({ where: { name: user.name } });
|
|
124
123
|
if (existUser) {
|
|
125
|
-
throw new common_1.HttpException(
|
|
124
|
+
throw new common_1.HttpException('用户已存在', common_1.HttpStatus.BAD_REQUEST);
|
|
126
125
|
}
|
|
127
126
|
}
|
|
128
127
|
const newUser = await this.userRepository.merge(oldUser, user);
|
|
@@ -132,7 +131,7 @@ let UserService = class UserService {
|
|
|
132
131
|
const existUser = await this.userRepository.findOne(id);
|
|
133
132
|
const { oldPassword, newPassword } = user;
|
|
134
133
|
if (!existUser || !(await user_entity_1.User.comparePassword(oldPassword, existUser.password))) {
|
|
135
|
-
throw new common_1.HttpException(
|
|
134
|
+
throw new common_1.HttpException('用户名或密码错误', common_1.HttpStatus.BAD_REQUEST);
|
|
136
135
|
}
|
|
137
136
|
const hashNewPassword = user_entity_1.User.encryptPassword(newPassword);
|
|
138
137
|
const newUser = await this.userRepository.merge(existUser, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/modules/user/user.service.ts"],"names":[],"mappings":"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"}
|
package/server/dist/starter.js
CHANGED
|
@@ -34,7 +34,7 @@ async function bootstrap() {
|
|
|
34
34
|
const swaggerConfig = new swagger_1.DocumentBuilder()
|
|
35
35
|
.setTitle('ReactPress API Documentation')
|
|
36
36
|
.setDescription('Comprehensive API documentation for ReactPress - A modern content management system built with NestJS')
|
|
37
|
-
.setVersion('
|
|
37
|
+
.setVersion('2.0')
|
|
38
38
|
.setContact('ReactPress Team', 'https://github.com/fecommunity/reactpress', 'admin@gaoredu.com')
|
|
39
39
|
.setLicense('MIT', 'https://github.com/fecommunity/reactpress/blob/main/LICENSE')
|
|
40
40
|
.addServer(configService.get('SERVER_SITE_URL', 'http://localhost:3002'), 'API Server')
|