空字符串校验;框架更新

package.json

@@ -23,7 +23,7 @@
     "amqplib": "^0.10.3",
     "crypto-js": "^4.1.1",
     "decimal.js": "^10.4.2",
-    "free-midway-component": "^1.0.46",
+    "free-midway-component": "^1.0.48",
     "moment": "^2.29.4",
     "mongoose": "^6.0.7",
     "swagger-ui-dist": "^4.15.2"

src/controller/home.controller.ts

@@ -2,6 +2,7 @@ import { App, Controller, Get, Inject } from '@midwayjs/decorator';
 import { WxPayService } from '../util/wxpay';
 import { Application } from '@midwayjs/koa';
 import { MqSender } from '../service/mq/mqSender.service';
+import { FrameworkErrorEnum, ServiceError } from 'free-midway-component';
 @Controller('/')
 export class HomeController {
   @Inject()
@@ -15,7 +16,11 @@ export class HomeController {
 
   @Get('/')
   async home(): Promise<string> {
-    await this.mqService.groupMsg({ order_id: '638fec34a4ec0bad05bc2c54' }, 5000);
+    // await this.mqService.groupMsg({ order_id: '638fec34a4ec0bad05bc2c54' }, 5000);
     return 'Hello Midwayjs!';
   }
+  @Get('/test')
+  async test(){
+    throw new ServiceError(FrameworkErrorEnum.NOT_FOUND_DATA)
+  }
 }

src/interface/goodsConfig.interface.ts

@@ -47,33 +47,33 @@ export class QueryVO_goodsConfig extends FetchVO_goodsConfig {}
 
 export class CreateDTO_goodsConfig {
   @ApiProperty({ description: 'shop', example: '6333d71d32c5f69745f9bd32' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'shop': string = undefined;
   @ApiProperty({ description: 'goods', example: '635b89c042e87c7a2880b484' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'goods': string = undefined;
   @ApiProperty({ description: 'spec', example: '635b89d742e87c7a2880b4bb' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'spec': string = undefined;
   @ApiProperty({ description: 'leader_price', example: 0.04 })
-  @Rule(RuleType['number']().empty())
+  @Rule(RuleType['number']().empty(''))
   'leader_price': number = undefined;
   @ApiProperty({ description: 'price', example: 0.08 })
-  @Rule(RuleType['number']().empty())
+  @Rule(RuleType['number']().empty(''))
   'price': number = undefined;
   @ApiProperty({ description: 'leader_get', example: 0.02 })
-  @Rule(RuleType['number']().empty())
+  @Rule(RuleType['number']().empty(''))
   'leader_get': number = undefined;
   @ApiProperty({ description: 'freight', example: 0.02 })
-  @Rule(RuleType['number']().empty())
+  @Rule(RuleType['number']().empty(''))
   'freight': number = undefined;
 
   @ApiProperty({ description: '购买限制', example: '1' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'buy_limit': string = undefined;
 
   @ApiProperty({ description: '购买数量界限', example: 2 })
-  @Rule(RuleType['number']().empty())
+  @Rule(RuleType['number']().empty(''))
   'limit_num': number = undefined;
 }
 
@@ -81,7 +81,7 @@ export class CreateVO_goodsConfig extends FetchVO_goodsConfig {}
 
 export class UpdateDTO_goodsConfig extends CreateDTO_goodsConfig {
   @ApiProperty({ description: '数据id' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   '_id': string = undefined;
 }
 

src/interface/group.interface.ts

@@ -57,22 +57,22 @@ export class CreateDTO_group {
   @Rule(RuleType['string']().required().error(new ServiceError('缺少商品id', FrameworkErrorEnum.NEED_BODY)))
   'goods': string = undefined;
   @ApiProperty({ description: '团长' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'leader': string = undefined;
   @ApiProperty({ description: '人数限制' })
   @Rule(RuleType['number']().required().error(new ServiceError('缺少人数限制', FrameworkErrorEnum.NEED_BODY)))
   'person_limit': number = undefined;
   @ApiProperty({ description: '团购设置' })
-  @Rule(RuleType['array']().empty())
+  @Rule(RuleType['array']().empty(''))
   'group_config': Array<any> = undefined;
   @ApiProperty({ description: '开始时间' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'start_time': string = undefined;
   @ApiProperty({ description: '结束时间' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'end_time': string = undefined;
   @ApiProperty({ description: '团状态' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'status': string = undefined;
 }
 
@@ -80,31 +80,31 @@ export class CreateVO_group extends FetchVO_group {}
 
 export class UpdateDTO_group {
   @ApiProperty({ description: '数据id' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   '_id'?: string = undefined;
   @ApiProperty({ description: '商店id' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'shop'?: string = undefined;
   @ApiProperty({ description: '商品id' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'goods'?: string = undefined;
   @ApiProperty({ description: '团长' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'leader'?: string = undefined;
   @ApiProperty({ description: '人数限制' })
-  @Rule(RuleType['number']().empty())
+  @Rule(RuleType['number']().empty(''))
   'person_limit'?: number = undefined;
   @ApiProperty({ description: '团购设置' })
-  @Rule(RuleType['array']().empty())
+  @Rule(RuleType['array']().empty(''))
   'group_config'?: Array<any> = undefined;
   @ApiProperty({ description: '开始时间' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'start_time'?: string = undefined;
   @ApiProperty({ description: '结束时间' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'end_time'?: string = undefined;
   @ApiProperty({ description: '团状态' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'status'?: string = undefined;
 }
 

src/interface/groupAfterSale.interface.ts

@@ -72,31 +72,31 @@ export class CreateDTO_groupAfterSale {
   @Rule(RuleType['string']().required().error(new ServiceError('缺少订单信息', FrameworkErrorEnum.NEED_BODY)))
   'type': string = undefined;
   @ApiProperty({ description: '申请理由' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'reason': string = undefined;
   @ApiProperty({ description: '申请售后描述' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'desc': string = undefined;
   @ApiProperty({ description: '凭证图片' })
-  @Rule(RuleType['array']().empty())
+  @Rule(RuleType['array']().empty(''))
   'file': Array<any> = undefined;
   @ApiProperty({ description: '快递信息' })
-  @Rule(RuleType['object']().empty())
+  @Rule(RuleType['object']().empty(''))
   'transport': object = undefined;
   @ApiProperty({ description: '售后申请时间' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'apply_time': string = undefined;
   @ApiProperty({ description: '售后结束时间' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'end_time': string = undefined;
   @ApiProperty({ description: '售后状态' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'status': string = undefined;
   @ApiProperty({ description: '退款金额' })
-  @Rule(RuleType['number']().empty())
+  @Rule(RuleType['number']().empty(''))
   'money': number = undefined;
   @ApiProperty({ description: '处理人' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'deal_person': string = undefined;
 }
 
@@ -104,10 +104,10 @@ export class CreateVO_groupAfterSale extends FetchVO_groupAfterSale {}
 
 export class UpdateDTO_groupAfterSale extends CreateDTO_groupAfterSale {
   @ApiProperty({ description: '数据id' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   '_id': string = undefined;
   @ApiProperty({ description: '团长建议' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   leader_suggest: boolean = undefined;
 }
 

src/interface/groupOrder.interface.ts

@@ -100,7 +100,7 @@ export class QueryVO_groupOrder extends FetchVO_groupOrder {}
 
 export class CreateDTO_groupOrder {
   // @ApiProperty({ description: 'customer' })
-  // @Rule(RuleType['string']().empty())
+  // @Rule(RuleType['string']().empty(''))
   // 'customer': string = undefined;
 
   @ApiProperty({ description: 'address' })
@@ -127,23 +127,23 @@ export class CreateDTO_groupOrder {
   @Rule(RuleType['string']().required().error(new ServiceError('缺少团信息', FrameworkErrorEnum.NEED_BODY)))
   'group': string = undefined;
   @ApiProperty({ description: '备注' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'remarks': string = undefined;
   // @ApiProperty({ description: 'buy_time' })
-  // @Rule(RuleType['string']().empty())
+  // @Rule(RuleType['string']().empty(''))
   // 'buy_time': string = undefined;
   // @ApiProperty({ description: 'no' })
-  // @Rule(RuleType['string']().empty())
+  // @Rule(RuleType['string']().empty(''))
   // 'no': string = undefined;
   // @ApiProperty({ description: 'status' })
-  // @Rule(RuleType['string']().empty())
+  // @Rule(RuleType['string']().empty(''))
   // 'status': string = undefined;
   // @ApiProperty({ description: 'pay' })
-  // @Rule(RuleType['object']().empty())
+  // @Rule(RuleType['object']().empty(''))
   // 'pay': object = undefined;
 
   // @ApiProperty({ description: 'config' })
-  // @Rule(RuleType['object']().empty())
+  // @Rule(RuleType['object']().empty(''))
   // 'config': object = undefined;
 }
 
@@ -151,18 +151,18 @@ export class CreateVO_groupOrder extends FetchVO_groupOrder {}
 
 export class UpdateDTO_groupOrder extends CreateDTO_groupOrder {
   @ApiProperty({ description: '状态', example: '2' })
-  @Rule(RuleType.string().empty())
+  @Rule(RuleType.string().empty(''))
   status: string;
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   'transport_type': string = undefined;
   @ApiProperty({ description: '快递信息' })
-  @Rule(RuleType['array']().empty())
+  @Rule(RuleType['array']().empty(''))
   'transport': Array<any> = undefined;
 }
 
 export class UpdateVO_groupOrder extends FetchVO_groupOrder {
   @ApiProperty({ description: '数据id' })
-  @Rule(RuleType['string']().empty())
+  @Rule(RuleType['string']().empty(''))
   '_id': string = undefined;
 }