From 591fc20e6f536e4d7203b201898499d75be65528 Mon Sep 17 00:00:00 2001 From: ap <951984189@qq.com> Date: Fri, 12 Mar 2021 23:46:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 166 +++++++++--------- src/app/modules/base/middleware/authority.ts | 2 +- .../modules/demo/controller/admin/goods.ts | 28 +-- src/app/modules/demo/controller/app/goods.ts | 2 +- src/app/modules/demo/entity/goods.ts | 2 +- src/app/modules/demo/service/goods.ts | 22 +-- 6 files changed, 112 insertions(+), 110 deletions(-) diff --git a/package.json b/package.json index af761e5..764467d 100755 --- a/package.json +++ b/package.json @@ -1,84 +1,84 @@ { - "name": "cool-admin", - "version": "3.0.0", - "description": "", - "private": true, - "dependencies": { - "@midwayjs/decorator": "^2.7.5", - "@midwayjs/orm": "^1.3.0", - "@midwayjs/web": "^2.7.7", - "egg": "^2.29.3", - "egg-scripts": "^2.13.0", - "egg-view-nunjucks": "^2.3.0", - "ipip-ipdb": "^0.3.0", - "jsonwebtoken": "^8.5.1", - "lodash": "^4.17.21", - "md5": "^2.3.0", - "midwayjs-cool-alipay": "^1.0.3", - "midwayjs-cool-core": "^3.1.2", - "midwayjs-cool-oss": "^1.0.12", - "midwayjs-cool-queue": "^1.0.6", - "midwayjs-cool-redis": "^1.0.9", - "midwayjs-cool-wxpay": "^1.0.12", - "mysql2": "^2.2.5", - "svg-captcha": "^1.4.0", - "svg-to-dataurl": "^1.0.0" - }, - "devDependencies": { - "@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", - "@types/jsonwebtoken": "^8.5.0", - "@types/node": "14", - "cross-env": "^7.0.3", - "jest": "^26.6.3", - "mwts": "^1.1.2", - "ts-jest": "^26.5.2", - "typescript": "^4.2.2" - }, - "engines": { - "node": ">=12.0.0" - }, - "scripts": { - "start": "egg-scripts start --daemon --title=cool-admin-midway --framework=@midwayjs/web --port=8001 --sticky", - "stop": "egg-scripts stop --title=cool-admin-midway", - "start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev", - "docker": "egg-scripts start --title=cool-admin-midway --framework=@midwayjs/web", - "dev": "cross-env ets && cross-env NODE_ENV=local TS_NODE_TYPE_CHECK=false TS_NODE_TRANSPILE_ONLY=true midway-bin dev --ts --port=8001 --sticky", - "test": "midway-bin test", - "cov": "midway-bin cov", - "lint": "mwts check", - "lint:fix": "mwts fix", - "ci": "npm run cov", - "build": "midway-bin build -c", - "check": "luckyeye", - "deploy": "midway-bin deploy" - }, - "midway-bin-clean": [ - ".vscode/.tsbuildinfo", - "dist" - ], - "midway-luckyeye": { - "packages": [ - "midway_v2" - ] - }, - "midway-integration": { - "lifecycle": { - "before:package:cleanup": "npm run build" - } - }, - "egg": { - "framework": "@midwayjs/web" - }, - "repository": { - "type": "git", - "url": "" - }, - "author": "cool-js.com", - "license": "MIT" -} + "name": "cool-admin", + "version": "3.0.0", + "description": "", + "private": true, + "dependencies": { + "@midwayjs/decorator": "^2.7.5", + "@midwayjs/orm": "^1.3.0", + "@midwayjs/web": "^2.7.7", + "egg": "^2.29.3", + "egg-scripts": "^2.13.0", + "egg-view-nunjucks": "^2.3.0", + "ipip-ipdb": "^0.3.0", + "jsonwebtoken": "^8.5.1", + "lodash": "^4.17.21", + "md5": "^2.3.0", + "midwayjs-cool-alipay": "^1.0.3", + "midwayjs-cool-core": "^3.1.2", + "midwayjs-cool-oss": "^1.0.12", + "midwayjs-cool-queue": "^1.0.6", + "midwayjs-cool-redis": "^1.0.9", + "midwayjs-cool-wxpay": "^1.0.12", + "mysql2": "^2.2.5", + "svg-captcha": "^1.4.0", + "svg-to-dataurl": "^1.0.0" + }, + "devDependencies": { + "@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", + "@types/jsonwebtoken": "^8.5.0", + "@types/node": "14", + "cross-env": "^7.0.3", + "jest": "^26.6.3", + "mwts": "^1.1.2", + "ts-jest": "^26.5.2", + "typescript": "^4.2.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "scripts": { + "start": "egg-scripts start --daemon --title=cool-admin-midway --framework=@midwayjs/web --port=8001 --sticky", + "stop": "egg-scripts stop --title=cool-admin-midway", + "start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev", + "docker": "egg-scripts start --title=cool-admin-midway --framework=@midwayjs/web", + "dev": "cross-env ets && cross-env NODE_ENV=local TS_NODE_TYPE_CHECK=false TS_NODE_TRANSPILE_ONLY=true midway-bin dev --ts --port=8001 --sticky", + "test": "midway-bin test", + "cov": "midway-bin cov", + "lint": "mwts check", + "lint:fix": "mwts fix", + "ci": "npm run cov", + "build": "midway-bin build -c", + "check": "luckyeye", + "deploy": "midway-bin deploy" + }, + "midway-bin-clean": [ + ".vscode/.tsbuildinfo", + "dist" + ], + "midway-luckyeye": { + "packages": [ + "midway_v2" + ] + }, + "midway-integration": { + "lifecycle": { + "before:package:cleanup": "npm run build" + } + }, + "egg": { + "framework": "@midwayjs/web" + }, + "repository": { + "type": "git", + "url": "" + }, + "author": "cool-js.com", + "license": "MIT" +} \ No newline at end of file diff --git a/src/app/modules/base/middleware/authority.ts b/src/app/modules/base/middleware/authority.ts index 21cc495..88004cf 100644 --- a/src/app/modules/base/middleware/authority.ts +++ b/src/app/modules/base/middleware/authority.ts @@ -35,7 +35,7 @@ export class BaseAuthorityMiddleware implements IWebMiddleware { try { ctx.admin = jwt.verify(token, this.coolConfig.jwt.secret); // 超管拥有所有权限 - if(ctx.admin.username == 'admin' && !ctx.admin.isRefresh){ + if (ctx.admin.username == 'admin' && !ctx.admin.isRefresh) { await next(); return; } diff --git a/src/app/modules/demo/controller/admin/goods.ts b/src/app/modules/demo/controller/admin/goods.ts index a6e4941..1476329 100644 --- a/src/app/modules/demo/controller/admin/goods.ts +++ b/src/app/modules/demo/controller/admin/goods.ts @@ -30,27 +30,29 @@ import { DemoAppGoodsEntity } from '../../entity/goods'; // 指定返回字段 select: ['a.*', 'b.name'], // 关联表用户表 - leftJoin: [{ - // 管理的表 - entity: BaseSysUserEntity, - // 别名 - alias: 'b', - // 关联条件 - condition: 'a.userId = b.id' - }], + leftJoin: [ + { + // 管理的表 + entity: BaseSysUserEntity, + // 别名 + alias: 'b', + // 关联条件 + condition: 'a.userId = b.id', + }, + ], // 增加其他条件 where: async (ctx: Context) => { return [ // 价格大于90 - ['a.price > :price', { price: 90.00 }] - ] + ['a.price > :price', { price: 90.0 }], + ]; }, // 添加排序 addOrderBy: { // 排序字段及排序方式 - price: 'desc' - } - } + price: 'desc', + }, + }, }) export class DemoAdminGoodsController extends BaseController { /** diff --git a/src/app/modules/demo/controller/app/goods.ts b/src/app/modules/demo/controller/app/goods.ts index 247ba87..c42a5ac 100644 --- a/src/app/modules/demo/controller/app/goods.ts +++ b/src/app/modules/demo/controller/app/goods.ts @@ -17,7 +17,7 @@ export class DemoAppGoodsController extends BaseController { /** * 请求所有数据 - * @returns + * @returns */ @Get('/all') async all() { diff --git a/src/app/modules/demo/entity/goods.ts b/src/app/modules/demo/entity/goods.ts index 48bf61d..2f78897 100644 --- a/src/app/modules/demo/entity/goods.ts +++ b/src/app/modules/demo/entity/goods.ts @@ -20,5 +20,5 @@ export class DemoAppGoodsEntity extends BaseEntity { price: number; @Column({ comment: '分类', type: 'tinyint' }) - type: number + type: number; } diff --git a/src/app/modules/demo/service/goods.ts b/src/app/modules/demo/service/goods.ts index 7bf0925..7537bba 100644 --- a/src/app/modules/demo/service/goods.ts +++ b/src/app/modules/demo/service/goods.ts @@ -10,17 +10,17 @@ import { ICoolCache } from 'midwayjs-cool-core'; */ @Provide() export class DemoGoodsService extends BaseService { - @InjectEntityModel(DemoAppGoodsEntity) - demoAppGoodsEntity: Repository; + @InjectEntityModel(DemoAppGoodsEntity) + demoAppGoodsEntity: Repository; - @Inject('cool:cache') - coolCache: ICoolCache; + @Inject('cool:cache') + coolCache: ICoolCache; - /** - * 返回所有数据 - */ - @Cache(5) - async all() { - return this.demoAppGoodsEntity.find(); - } + /** + * 返回所有数据 + */ + @Cache(5) + async all() { + return this.demoAppGoodsEntity.find(); + } }