@fecommunity/reactpress 4.0.0-beta.1 → 4.0.0-beta.11

package/server/dist/modules/smtp/smtp.service.js

@@ -27,6 +27,7 @@ exports.SMTPService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
+const api_messages_1 = require("../../common/api-messages");
 const setting_service_1 = require("../setting/setting.service");
 const mail_util_1 = require("./mail.util");
 const smtp_entity_1 = require("./smtp.entity");
@@ -35,19 +36,46 @@ let SMTPService = class SMTPService {
         this.smtpRepository = smtpRepository;
         this.settingService = settingService;
     }
-    async create(data) {
+    async resolveSmtpConfig(override = {}) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const setting = await this.settingService.findAll(true);
-        const { smtpHost, smtpPort, smtpUser, smtpPass, smtpFromUser } = setting;
+        const host = ((_b = (_a = override.smtpHost) !== null && _a !== void 0 ? _a : setting.smtpHost) !== null && _b !== void 0 ? _b : '').trim();
+        const port = ((_d = (_c = override.smtpPort) !== null && _c !== void 0 ? _c : setting.smtpPort) !== null && _d !== void 0 ? _d : '').trim();
+        const user = ((_f = (_e = override.smtpUser) !== null && _e !== void 0 ? _e : setting.smtpUser) !== null && _f !== void 0 ? _f : '').trim();
+        const pass = ((_h = (_g = override.smtpPass) !== null && _g !== void 0 ? _g : setting.smtpPass) !== null && _h !== void 0 ? _h : '').trim();
+        const from = ((_k = (_j = override.smtpFromUser) !== null && _j !== void 0 ? _j : setting.smtpFromUser) !== null && _k !== void 0 ? _k : user).trim();
+        if (!host || !port || !user || !pass || !from) {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_CONFIG_INCOMPLETE, common_1.HttpStatus.BAD_REQUEST);
+        }
+        return {
+            transport: { host, port, user, pass },
+            from,
+        };
+    }
+    async testSend(payload) {
+        var _a;
+        const to = ((_a = payload.to) !== null && _a !== void 0 ? _a : '').trim();
+        if (!to) {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_REQUIRED, common_1.HttpStatus.BAD_REQUEST);
+        }
+        const { transport, from } = await this.resolveSmtpConfig(payload);
+        await (0, mail_util_1.sendEmail)({
+            from,
+            to,
+            subject: api_messages_1.ApiMsg.EMAIL_TEST_SUBJECT,
+            html: api_messages_1.ApiMsg.EMAIL_TEST_HTML,
+        }, transport).catch(() => {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_SEND_FAILED, common_1.HttpStatus.BAD_REQUEST);
+        });
+        return { ok: true };
+    }
+    async create(data) {
+        const { transport, from } = await this.resolveSmtpConfig();
         Object.assign(data, {
-            from: smtpFromUser,
+            from,
         });
-        await mail_util_1.sendEmail(data, {
-            host: smtpHost,
-            port: smtpPort,
-            user: smtpUser,
-            pass: smtpPass,
-        }).catch(() => {
-            throw new common_1.HttpException('邮件发送失败', common_1.HttpStatus.BAD_REQUEST);
+        await (0, mail_util_1.sendEmail)(data, transport).catch(() => {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_SEND_FAILED, common_1.HttpStatus.BAD_REQUEST);
         });
         const newSMTP = await this.smtpRepository.create(data);
         await this.smtpRepository.save(newSMTP);
@@ -73,8 +101,8 @@ let SMTPService = class SMTPService {
     }
 };
 SMTPService = __decorate([
-    common_1.Injectable(),
-    __param(0, typeorm_1.InjectRepository(smtp_entity_1.SMTP)),
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_1.InjectRepository)(smtp_entity_1.SMTP)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
         setting_service_1.SettingService])
 ], SMTPService);

package/server/dist/modules/tag/tag.controller.js

@@ -43,58 +43,60 @@ let TagController = class TagController {
     }
 };
 __decorate([
-    swagger_1.ApiResponse({ status: 200, description: '创建标签', type: [tag_entity_1.Tag] }),
-    common_1.Post(),
-    roles_guard_1.Roles('admin'),
-    common_1.UseGuards(jwt_auth_guard_1.JwtAuthGuard),
-    __param(0, common_1.Body()),
+    (0, swagger_1.ApiResponse)({ status: 200, description: '创建标签', type: [tag_entity_1.Tag] }),
+    (0, common_1.Post)(),
+    (0, roles_guard_1.Roles)('admin'),
+    (0, common_1.UseGuards)(jwt_auth_guard_1.JwtAuthGuard),
+    __param(0, (0, common_1.Body)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], TagController.prototype, "create", null);
 __decorate([
-    common_1.Get(),
-    __param(0, common_1.Query()),
+    (0, common_1.Get)(),
+    __param(0, (0, common_1.Query)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], TagController.prototype, "findAll", null);
 __decorate([
-    common_1.Get(':id'),
-    __param(0, common_1.Param('id')),
+    (0, common_1.Get)(':id'),
+    __param(0, (0, common_1.Param)('id')),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], TagController.prototype, "findById", null);
 __decorate([
-    common_1.Get(':id/article'),
-    __param(0, common_1.Param('id')), __param(1, common_1.Query('status')),
+    (0, common_1.Get)(':id/article'),
+    __param(0, (0, common_1.Param)('id')),
+    __param(1, (0, common_1.Query)('status')),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
 ], TagController.prototype, "getArticleById", null);
 __decorate([
-    common_1.Patch(':id'),
-    roles_guard_1.Roles('admin'),
-    common_1.UseGuards(jwt_auth_guard_1.JwtAuthGuard),
-    __param(0, common_1.Param('id')), __param(1, common_1.Body()),
+    (0, common_1.Patch)(':id'),
+    (0, roles_guard_1.Roles)('admin'),
+    (0, common_1.UseGuards)(jwt_auth_guard_1.JwtAuthGuard),
+    __param(0, (0, common_1.Param)('id')),
+    __param(1, (0, common_1.Body)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
 ], TagController.prototype, "updateById", null);
 __decorate([
-    common_1.Delete(':id'),
-    roles_guard_1.Roles('admin'),
-    common_1.UseGuards(jwt_auth_guard_1.JwtAuthGuard),
-    __param(0, common_1.Param('id')),
+    (0, common_1.Delete)(':id'),
+    (0, roles_guard_1.Roles)('admin'),
+    (0, common_1.UseGuards)(jwt_auth_guard_1.JwtAuthGuard),
+    __param(0, (0, common_1.Param)('id')),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], TagController.prototype, "deleteById", null);
 TagController = __decorate([
-    swagger_1.ApiTags('Tag'),
-    common_1.Controller('tag'),
-    common_1.UseGuards(roles_guard_1.RolesGuard),
+    (0, swagger_1.ApiTags)('Tag'),
+    (0, common_1.Controller)('tag'),
+    (0, common_1.UseGuards)(roles_guard_1.RolesGuard),
     __metadata("design:paramtypes", [tag_service_1.TagService])
 ], TagController);
 exports.TagController = TagController;

package/server/dist/modules/tag/tag.entity.js

@@ -16,27 +16,27 @@ const article_entity_1 = require("../article/article.entity");
 let Tag = class Tag {
 };
 __decorate([
-    typeorm_1.PrimaryGeneratedColumn('uuid'),
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
     __metadata("design:type", String)
 ], Tag.prototype, "id", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column(),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)(),
     __metadata("design:type", String)
 ], Tag.prototype, "label", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column(),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)(),
     __metadata("design:type", String)
 ], Tag.prototype, "value", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.ManyToMany(() => article_entity_1.Article, (article) => article.tags),
+    (0, swagger_1.ApiProperty)({ type: () => article_entity_1.Article, isArray: true }),
+    (0, typeorm_1.ManyToMany)(() => article_entity_1.Article, (article) => article.tags),
     __metadata("design:type", Array)
 ], Tag.prototype, "articles", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.CreateDateColumn({
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.CreateDateColumn)({
         type: 'datetime',
         comment: '创建时间',
         name: 'create_at',
@@ -44,8 +44,8 @@ __decorate([
     __metadata("design:type", Date)
 ], Tag.prototype, "createAt", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.UpdateDateColumn({
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.UpdateDateColumn)({
         type: 'datetime',
         comment: '更新时间',
         name: 'update_at',
@@ -53,7 +53,7 @@ __decorate([
     __metadata("design:type", Date)
 ], Tag.prototype, "updateAt", void 0);
 Tag = __decorate([
-    typeorm_1.Entity()
+    (0, typeorm_1.Entity)()
 ], Tag);
 exports.Tag = Tag;
 //# sourceMappingURL=tag.entity.js.map

package/server/dist/modules/tag/tag.module.js

@@ -16,7 +16,7 @@ const tag_service_1 = require("./tag.service");
 let TagModule = class TagModule {
 };
 TagModule = __decorate([
-    common_1.Module({
+    (0, common_1.Module)({
         imports: [typeorm_1.TypeOrmModule.forFeature([tag_entity_1.Tag]), auth_module_1.AuthModule],
         exports: [tag_service_1.TagService],
         providers: [tag_service_1.TagService],

package/server/dist/modules/tag/tag.service.js

@@ -16,6 +16,7 @@ exports.TagService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
+const api_messages_1 = require("../../common/api-messages");
 const tag_entity_1 = require("./tag.entity");
 let TagService = class TagService {
     constructor(tagRepository) {
@@ -25,7 +26,7 @@ let TagService = class TagService {
         const { label } = tag;
         const existTag = await this.tagRepository.findOne({ where: { label } });
         if (existTag) {
-            throw new common_1.HttpException('标签已存在', common_1.HttpStatus.BAD_REQUEST);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.TAG_EXISTS, common_1.HttpStatus.BAD_REQUEST);
         }
         const newTag = await this.tagRepository.create(tag);
         await this.tagRepository.save(newTag);
@@ -90,13 +91,13 @@ let TagService = class TagService {
             return true;
         }
         catch (e) {
-            throw new common_1.HttpException('删除失败，可能存在关联文章', common_1.HttpStatus.BAD_REQUEST);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.DELETE_HAS_ARTICLES, common_1.HttpStatus.BAD_REQUEST);
         }
     }
 };
 TagService = __decorate([
-    common_1.Injectable(),
-    __param(0, typeorm_1.InjectRepository(tag_entity_1.Tag)),
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_1.InjectRepository)(tag_entity_1.Tag)),
     __metadata("design:paramtypes", [typeorm_2.Repository])
 ], TagService);
 exports.TagService = TagService;

package/server/dist/modules/user/user.controller.js

@@ -16,6 +16,8 @@ exports.UserController = void 0;
 const common_1 = require("@nestjs/common");
 const jwt_1 = require("@nestjs/jwt");
 const swagger_1 = require("@nestjs/swagger");
+const api_messages_1 = require("../../common/api-messages");
+const user_util_1 = require("../../utils/user.util");
 const jwt_auth_guard_1 = require("../auth/jwt-auth.guard");
 const roles_guard_1 = require("../auth/roles.guard");
 const user_entity_1 = require("./user.entity");
@@ -29,13 +31,20 @@ let UserController = class UserController {
         return this.userService.findAll(query);
     }
     async register(user) {
+        const email = typeof user.email === 'string' ? user.email.trim() : '';
+        if (!email) {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_REQUIRED, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (!(0, user_util_1.isValidEmail)(email)) {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_INVALID, common_1.HttpStatus.BAD_REQUEST);
+        }
         const d = await this.userService.createUser(user);
         return d;
     }
     async checkPermission(req, user) {
         let token = req.headers.authorization;
         if (!token) {
-            throw new common_1.HttpException('未认证', common_1.HttpStatus.UNAUTHORIZED);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.UNAUTHORIZED, common_1.HttpStatus.UNAUTHORIZED);
         }
         if (/Bearer/.test(token)) {
             token = token.split(' ').pop();
@@ -43,11 +52,11 @@ let UserController = class UserController {
         const tokenUser = this.jwtService.decode(token);
         const id = tokenUser.id;
         if (!id) {
-            throw new common_1.HttpException('未认证', common_1.HttpStatus.UNAUTHORIZED);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.UNAUTHORIZED, common_1.HttpStatus.UNAUTHORIZED);
         }
         const exist = await this.userService.findById(id);
         if (exist.id !== user.id && exist.role !== 'admin') {
-            throw new common_1.HttpException('无权处理', common_1.HttpStatus.FORBIDDEN);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.FORBIDDEN_ACTION, common_1.HttpStatus.FORBIDDEN);
         }
         req.user = tokenUser;
     }
@@ -63,51 +72,53 @@ let UserController = class UserController {
     }
 };
 __decorate([
-    swagger_1.ApiResponse({ status: 200, description: '获取用户列表', type: [user_entity_1.User] }),
-    swagger_1.ApiResponse({ status: 403, description: '无权获取用户列表' }),
-    common_1.UseInterceptors(common_1.ClassSerializerInterceptor),
-    common_1.Get(),
-    roles_guard_1.Roles('admin'),
-    common_1.UseGuards(jwt_auth_guard_1.JwtAuthGuard),
-    __param(0, common_1.Query()),
+    (0, swagger_1.ApiResponse)({ status: 200, description: '获取用户列表', type: [user_entity_1.User] }),
+    (0, swagger_1.ApiResponse)({ status: 403, description: '无权获取用户列表' }),
+    (0, common_1.UseInterceptors)(common_1.ClassSerializerInterceptor),
+    (0, common_1.Get)(),
+    (0, roles_guard_1.Roles)('admin'),
+    (0, common_1.UseGuards)(jwt_auth_guard_1.JwtAuthGuard),
+    __param(0, (0, common_1.Query)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], UserController.prototype, "findAll", null);
 __decorate([
-    swagger_1.ApiResponse({ status: 201, description: '创建用户', type: [user_entity_1.User] }),
-    common_1.UseInterceptors(common_1.ClassSerializerInterceptor),
-    common_1.Post('register'),
-    common_1.HttpCode(common_1.HttpStatus.CREATED),
-    __param(0, common_1.Body()),
+    (0, swagger_1.ApiResponse)({ status: 201, description: '创建用户', type: [user_entity_1.User] }),
+    (0, common_1.UseInterceptors)(common_1.ClassSerializerInterceptor),
+    (0, common_1.Post)('register'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.CREATED),
+    __param(0, (0, common_1.Body)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], UserController.prototype, "register", null);
 __decorate([
-    swagger_1.ApiResponse({ status: 200, description: '更新用户成功', type: [user_entity_1.User] }),
-    common_1.UseInterceptors(common_1.ClassSerializerInterceptor),
-    common_1.Post('update'),
-    common_1.HttpCode(common_1.HttpStatus.CREATED),
-    __param(0, common_1.Request()), __param(1, common_1.Body()),
+    (0, swagger_1.ApiResponse)({ status: 200, description: '更新用户成功', type: [user_entity_1.User] }),
+    (0, common_1.UseInterceptors)(common_1.ClassSerializerInterceptor),
+    (0, common_1.Post)('update'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.CREATED),
+    __param(0, (0, common_1.Request)()),
+    __param(1, (0, common_1.Body)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], UserController.prototype, "update", null);
 __decorate([
-    swagger_1.ApiResponse({ status: 201, description: '更新密码成功', type: [user_entity_1.User] }),
-    common_1.UseInterceptors(common_1.ClassSerializerInterceptor),
-    common_1.Post('password'),
-    common_1.HttpCode(common_1.HttpStatus.CREATED),
-    __param(0, common_1.Request()), __param(1, common_1.Body()),
+    (0, swagger_1.ApiResponse)({ status: 201, description: '更新密码成功', type: [user_entity_1.User] }),
+    (0, common_1.UseInterceptors)(common_1.ClassSerializerInterceptor),
+    (0, common_1.Post)('password'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.CREATED),
+    __param(0, (0, common_1.Request)()),
+    __param(1, (0, common_1.Body)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], UserController.prototype, "updatePassword", null);
 UserController = __decorate([
-    swagger_1.ApiTags('User'),
-    common_1.Controller('user'),
-    common_1.UseGuards(roles_guard_1.RolesGuard),
+    (0, swagger_1.ApiTags)('User'),
+    (0, common_1.Controller)('user'),
+    (0, common_1.UseGuards)(roles_guard_1.RolesGuard),
     __metadata("design:paramtypes", [user_service_1.UserService, jwt_1.JwtService])
 ], UserController);
 exports.UserController = UserController;

package/server/dist/modules/user/user.entity.js

@@ -26,48 +26,48 @@ let User = class User {
     }
 };
 __decorate([
-    typeorm_1.PrimaryGeneratedColumn('uuid'),
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
     __metadata("design:type", Number)
 ], User.prototype, "id", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ length: 500 }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ length: 500 }),
     __metadata("design:type", String)
 ], User.prototype, "name", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    class_transformer_1.Exclude(),
-    typeorm_1.Column({ length: 500 }),
+    (0, swagger_1.ApiProperty)(),
+    (0, class_transformer_1.Exclude)(),
+    (0, typeorm_1.Column)({ length: 500 }),
     __metadata("design:type", String)
 ], User.prototype, "password", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ length: 500, default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ length: 500, default: null }),
     __metadata("design:type", String)
 ], User.prototype, "avatar", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ length: 500, default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ length: 500, default: null }),
     __metadata("design:type", String)
 ], User.prototype, "email", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column('simple-enum', { enum: ['admin', 'visitor'], default: 'visitor' }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'simple-enum', enum: ['admin', 'visitor'], default: 'visitor' }),
     __metadata("design:type", String)
 ], User.prototype, "role", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column('simple-enum', { enum: ['locked', 'active'], default: 'active' }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'simple-enum', enum: ['locked', 'active'], default: 'active' }),
     __metadata("design:type", String)
 ], User.prototype, "status", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ default: 'normal' }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ default: 'normal' }),
     __metadata("design:type", String)
 ], User.prototype, "type", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.CreateDateColumn({
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.CreateDateColumn)({
         type: 'datetime',
         comment: '创建时间',
         name: 'create_at',
@@ -75,8 +75,8 @@ __decorate([
     __metadata("design:type", Date)
 ], User.prototype, "createAt", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.UpdateDateColumn({
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.UpdateDateColumn)({
         type: 'datetime',
         comment: '更新时间',
         name: 'update_at',
@@ -84,13 +84,13 @@ __decorate([
     __metadata("design:type", Date)
 ], User.prototype, "updateAt", void 0);
 __decorate([
-    typeorm_1.BeforeInsert(),
+    (0, typeorm_1.BeforeInsert)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], User.prototype, "encrypt", null);
 User = __decorate([
-    typeorm_1.Entity()
+    (0, typeorm_1.Entity)()
 ], User);
 exports.User = User;
 //# sourceMappingURL=user.entity.js.map

package/server/dist/modules/user/user.module.js

@@ -17,8 +17,8 @@ const user_service_1 = require("./user.service");
 let UserModule = class UserModule {
 };
 UserModule = __decorate([
-    common_1.Module({
-        imports: [typeorm_1.TypeOrmModule.forFeature([user_entity_1.User]), config_1.ConfigModule, common_1.forwardRef(() => auth_module_1.AuthModule)],
+    (0, common_1.Module)({
+        imports: [typeorm_1.TypeOrmModule.forFeature([user_entity_1.User]), config_1.ConfigModule, (0, common_1.forwardRef)(() => auth_module_1.AuthModule)],
         providers: [user_service_1.UserService],
         exports: [user_service_1.UserService],
         controllers: [user_controller_1.UserController],

package/server/dist/modules/user/user.service.js

@@ -28,6 +28,7 @@ const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
+const api_messages_1 = require("../../common/api-messages");
 const user_util_1 = require("../../utils/user.util");
 const user_entity_1 = require("./user.entity");
 let UserService = class UserService {
@@ -72,15 +73,15 @@ let UserService = class UserService {
         const { name, password } = user;
         if (!ignoreValidator) {
             if (!name || !password) {
-                throw new common_1.HttpException('请输入用户名和密码', common_1.HttpStatus.BAD_REQUEST);
+                throw new common_1.HttpException(api_messages_1.ApiMsg.USERNAME_PASSWORD_REQUIRED, common_1.HttpStatus.BAD_REQUEST);
             }
-            if (!user_util_1.isValidUsername(name)) {
-                throw new common_1.HttpException('用户名不能包含空格和非法字符', common_1.HttpStatus.BAD_REQUEST);
+            if (!(0, user_util_1.isValidUsername)(name)) {
+                throw new common_1.HttpException(api_messages_1.ApiMsg.USERNAME_INVALID, common_1.HttpStatus.BAD_REQUEST);
             }
         }
         const existUser = await this.userRepository.findOne({ where: { name } });
         if (existUser) {
-            throw new common_1.HttpException('用户已存在', common_1.HttpStatus.BAD_REQUEST);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.USER_EXISTS, common_1.HttpStatus.BAD_REQUEST);
         }
         const newUser = await this.userRepository.create(user);
         await this.userRepository.save(newUser);
@@ -90,10 +91,13 @@ let UserService = class UserService {
         const { name, password } = user;
         const existUser = await this.userRepository.findOne({ where: { name } });
         if (!existUser || !(await user_entity_1.User.comparePassword(password, existUser.password))) {
-            throw new common_1.HttpException('用户名或密码错误', common_1.HttpStatus.BAD_REQUEST);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.INVALID_CREDENTIALS, common_1.HttpStatus.BAD_REQUEST);
         }
         if (existUser.status === 'locked') {
-            throw new common_1.HttpException('用户已锁定，无法登录', common_1.HttpStatus.BAD_REQUEST);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.USER_LOCKED, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (existUser.role !== 'admin') {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.ADMIN_CONSOLE_ACCESS_REQUIRED, common_1.HttpStatus.FORBIDDEN);
         }
         delete existUser.password;
         return existUser;
@@ -102,7 +106,7 @@ let UserService = class UserService {
         const { name } = user;
         const existUser = await this.userRepository.findOne({ where: { name } });
         if (existUser.status === 'locked') {
-            throw new common_1.HttpException('用户已锁定，无法登录', common_1.HttpStatus.BAD_REQUEST);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.USER_LOCKED, common_1.HttpStatus.BAD_REQUEST);
         }
         delete existUser.password;
         return existUser;
@@ -113,7 +117,7 @@ let UserService = class UserService {
     async updateById(currentUser, id, user) {
         if (user.role === 'admin') {
             if (!currentUser || currentUser.role !== 'admin') {
-                throw new common_1.HttpException('您无权操作', common_1.HttpStatus.FORBIDDEN);
+                throw new common_1.HttpException(api_messages_1.ApiMsg.FORBIDDEN, common_1.HttpStatus.FORBIDDEN);
             }
         }
         const oldUser = await this.userRepository.findOne(id);
@@ -121,7 +125,7 @@ let UserService = class UserService {
         if (user.name && user.name !== oldUser.name) {
             const existUser = await this.userRepository.findOne({ where: { name: user.name } });
             if (existUser) {
-                throw new common_1.HttpException('用户已存在', common_1.HttpStatus.BAD_REQUEST);
+                throw new common_1.HttpException(api_messages_1.ApiMsg.USER_EXISTS, common_1.HttpStatus.BAD_REQUEST);
             }
         }
         const newUser = await this.userRepository.merge(oldUser, user);
@@ -131,7 +135,7 @@ let UserService = class UserService {
         const existUser = await this.userRepository.findOne(id);
         const { oldPassword, newPassword } = user;
         if (!existUser || !(await user_entity_1.User.comparePassword(oldPassword, existUser.password))) {
-            throw new common_1.HttpException('用户名或密码错误', common_1.HttpStatus.BAD_REQUEST);
+            throw new common_1.HttpException(api_messages_1.ApiMsg.INVALID_CREDENTIALS, common_1.HttpStatus.BAD_REQUEST);
         }
         const hashNewPassword = user_entity_1.User.encryptPassword(newPassword);
         const newUser = await this.userRepository.merge(existUser, {
@@ -142,8 +146,8 @@ let UserService = class UserService {
     }
 };
 UserService = __decorate([
-    common_1.Injectable(),
-    __param(0, typeorm_1.InjectRepository(user_entity_1.User)),
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_1.InjectRepository)(user_entity_1.User)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
         config_1.ConfigService])
 ], UserService);