diff --git a/.gitignore b/.gitignore index e73d493..fb49516 100755 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ run/ src/app/public/uploads/ typings/ .cache +.serverless/ diff --git a/package.json b/package.json index ae00a58..0dbb4c5 100755 --- a/package.json +++ b/package.json @@ -14,11 +14,11 @@ "jsonwebtoken": "^8.5.1", "md5": "^2.3.0", "midwayjs-cool-alipay": "^1.0.1", - "midwayjs-cool-core": "^3.0.15", + "midwayjs-cool-core": "^3.0.16", "midwayjs-cool-oss": "^1.0.10", "midwayjs-cool-queue": "^1.0.3", "midwayjs-cool-redis": "^1.0.6", - "midwayjs-cool-wxpay": "^1.0.5", + "midwayjs-cool-wxpay": "^1.0.7", "mysql2": "^2.2.5", "svg-captcha": "^1.4.0", "svg-to-dataurl": "^1.0.0" @@ -27,6 +27,7 @@ "@midwayjs/cli": "^1.2.41", "@midwayjs/cli-plugin-faas": "^1.2.49", "@midwayjs/egg-ts-helper": "^1.0.5", + "@midwayjs/fcli-plugin-fc": "^1.2.49", "@midwayjs/luckyeye": "^1.0.2", "@midwayjs/mock": "^2.7.7", "@types/jest": "^26.0.20", diff --git a/src/app/modules/base/entity/sys/menu.ts b/src/app/modules/base/entity/sys/menu.ts index 8e8d20f..0712501 100644 --- a/src/app/modules/base/entity/sys/menu.ts +++ b/src/app/modules/base/entity/sys/menu.ts @@ -44,6 +44,4 @@ export class BaseSysMenuEntity extends BaseEntity { @Column({ comment: '父菜单名称', default: true }) isShow: boolean; - @Column({ comment: '模块名', nullable: true }) - moduleName: string; } diff --git a/src/app/modules/demo/controller/app/pay.ts b/src/app/modules/demo/controller/app/pay.ts index d555514..ee5d1d8 100644 --- a/src/app/modules/demo/controller/app/pay.ts +++ b/src/app/modules/demo/controller/app/pay.ts @@ -11,7 +11,7 @@ import { parseString } from 'xml2js'; @CoolController() export class DemoPayController extends BaseController { // 微信支付 - @Inject('cool:wxpay') + @Inject() wxpay: ICoolWxPay; @Inject()