管理员添加角色,打包修改

ecosystem.config.js

@@ -0,0 +1,20 @@
+'use strict';
+// 开发服务设置
+const app = '基础动态管理平台-服务';
+module.exports = {
+  apps: [
+    {
+      name: app, // 应用名称
+      script: './bootstrap.js', // 实际启动脚本
+      out: `./logs/${app}.log`,
+      error: `./logs/${app}.err`,
+      watch: [
+        // 监控变化的目录，一旦变化，自动重启
+        'dist',
+      ],
+      env: {
+        NODE_ENV: 'production', // 环境参数，当前指定为生产环境
+      },
+    },
+  ],
+};

src/controller/system/config.controller.ts

@@ -1,7 +1,7 @@
-import { Body, Controller, Del, Get, Inject, Param, Post, Query } from '@midwayjs/decorator';
+import { Body, Controller, Del, Get, Inject, Param, Post } from '@midwayjs/decorator';
 import { BaseController, FrameworkErrorEnum, ServiceError } from 'free-midway-component';
 import { ConfigService } from '../../service/system/config.service';
-import { CDTO_config, CVO_config, FVO_config, QDTO_config, QVO_config, UDTO_config, UVAO_config } from '../../interface/system/config.interface';
+import { CDTO_config, CVO_config, FVO_config, UDTO_config, UVAO_config } from '../../interface/system/config.interface';
 import { ApiResponse, ApiTags, ApiQuery } from '@midwayjs/swagger';
 import { Validate } from '@midwayjs/validate';
 @ApiTags(['设置表'])

src/controller/system/menus.controller.ts

@@ -1,7 +1,7 @@
-import { Body, Controller, Del, Get, Inject, Param, Post, Query } from '@midwayjs/decorator';
+import { Body, Controller, Del, Get, Inject, Param, Post } from '@midwayjs/decorator';
 import { BaseController } from 'free-midway-component';
 import { MenusService } from '../../service/system/menus.service';
-import { CDTO_menus, CVO_menus, FVO_menus, QDTO_menus, QVO_menus, UDTO_menus, UVAO_menus } from '../../interface/system/menus.interface';
+import { CDTO_menus, CVO_menus, FVO_menus, QVO_menus, UDTO_menus, UVAO_menus } from '../../interface/system/menus.interface';
 import { ApiResponse, ApiTags, ApiQuery } from '@midwayjs/swagger';
 import { Validate } from '@midwayjs/validate';
 @ApiTags(['菜单表'])

src/controller/weixin.controller.ts

@@ -1,6 +1,5 @@
 import { Controller, Get, Inject, Post } from '@midwayjs/core';
 import { WeixinService } from '../service/weixin.service';
-import get = require('lodash/get');
 @Controller('/weixin')
 export class WeixinController {
   @Inject()

src/entity/system/admin.entity.ts

@@ -25,6 +25,8 @@ export class Admin extends BaseModel {
   password: object;
   @prop({ required: false, index: false, zh: '是否是超级管理员', remark: '0:超级管理员;1普通用户', default: '1' })
   is_super: string;
+  @prop({ required: false, index: false, zh: '角色' })
+  role: string;
   @prop({ required: false, index: false, zh: '是否启用', default: '0' })
   is_use: string;
 }

src/interface/system/admin.interface.ts

@@ -22,6 +22,8 @@ export class FVO_admin {
   'password': string = undefined;
   @ApiProperty({ description: '是否是超级管理员' })
   'is_super': string = undefined;
+  @ApiProperty({ description: '角色' })
+  'role': string = undefined;
   @ApiProperty({ description: '是否启用' })
   'is_use': string = undefined;
 }
@@ -57,6 +59,9 @@ export class CDTO_admin {
   @ApiProperty({ description: '是否是超级管理员' })
   @Rule(RuleType['string']().empty(''))
   'is_super': string = undefined;
+  @ApiProperty({ description: '角色' })
+  @Rule(RuleType['string']().empty(''))
+  'role': string = undefined;
   @ApiProperty({ description: '是否启用' })
   @Rule(RuleType['string']().empty(''))
   'is_use': string = undefined;

src/service/dining/order.service.ts

@@ -68,7 +68,7 @@ export class OrderService extends BaseService<modelType> {
      *  7.晚饭结束时间后: 显示明天早饭
      * */
     /**早餐开始时间 */
-    const b_s = `${date} ${b_time[0]}`;
+    // const b_s = `${date} ${b_time[0]}`;
     /**早餐结束时间 */
     const b_e = `${date} ${b_time[1]}`;
     /**午餐开始时间 */

src/service/weixin.service.ts

@@ -42,8 +42,12 @@ export class WeixinService {
     const base64_iv = CryptoJs.enc.Base64.parse(iv);
     let decoded;
     try {
-      CryptoJs.AES.decrypt(encryptedData, base64_sk, { iv: base64_iv });
+      decoded = CryptoJs.AES.decrypt(encryptedData, base64_sk, { iv: base64_iv });
       // const decipher = CryptoJs.createDecipheriv('aes-128-cbc', session_key, iv);
-    } catch (e) {}
+      return decoded;
+    } catch (e) {
+      console.log(e);
+      throw new ServiceError('解密失败', FrameworkErrorEnum.SERVICE_FAULT);
+    }
   }
 }