整理代码

This commit is contained in:
ap 2021-03-12 23:46:56 +08:00
parent a66d67cf64
commit 591fc20e6f
6 changed files with 112 additions and 110 deletions

View File

@ -1,84 +1,84 @@
{ {
"name": "cool-admin", "name": "cool-admin",
"version": "3.0.0", "version": "3.0.0",
"description": "", "description": "",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@midwayjs/decorator": "^2.7.5", "@midwayjs/decorator": "^2.7.5",
"@midwayjs/orm": "^1.3.0", "@midwayjs/orm": "^1.3.0",
"@midwayjs/web": "^2.7.7", "@midwayjs/web": "^2.7.7",
"egg": "^2.29.3", "egg": "^2.29.3",
"egg-scripts": "^2.13.0", "egg-scripts": "^2.13.0",
"egg-view-nunjucks": "^2.3.0", "egg-view-nunjucks": "^2.3.0",
"ipip-ipdb": "^0.3.0", "ipip-ipdb": "^0.3.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"md5": "^2.3.0", "md5": "^2.3.0",
"midwayjs-cool-alipay": "^1.0.3", "midwayjs-cool-alipay": "^1.0.3",
"midwayjs-cool-core": "^3.1.2", "midwayjs-cool-core": "^3.1.2",
"midwayjs-cool-oss": "^1.0.12", "midwayjs-cool-oss": "^1.0.12",
"midwayjs-cool-queue": "^1.0.6", "midwayjs-cool-queue": "^1.0.6",
"midwayjs-cool-redis": "^1.0.9", "midwayjs-cool-redis": "^1.0.9",
"midwayjs-cool-wxpay": "^1.0.12", "midwayjs-cool-wxpay": "^1.0.12",
"mysql2": "^2.2.5", "mysql2": "^2.2.5",
"svg-captcha": "^1.4.0", "svg-captcha": "^1.4.0",
"svg-to-dataurl": "^1.0.0" "svg-to-dataurl": "^1.0.0"
}, },
"devDependencies": { "devDependencies": {
"@midwayjs/cli": "^1.2.41", "@midwayjs/cli": "^1.2.41",
"@midwayjs/cli-plugin-faas": "^1.2.49", "@midwayjs/cli-plugin-faas": "^1.2.49",
"@midwayjs/egg-ts-helper": "^1.0.5", "@midwayjs/egg-ts-helper": "^1.0.5",
"@midwayjs/fcli-plugin-fc": "^1.2.49", "@midwayjs/fcli-plugin-fc": "^1.2.49",
"@midwayjs/luckyeye": "^1.0.2", "@midwayjs/luckyeye": "^1.0.2",
"@midwayjs/mock": "^2.7.7", "@midwayjs/mock": "^2.7.7",
"@types/jest": "^26.0.20", "@types/jest": "^26.0.20",
"@types/jsonwebtoken": "^8.5.0", "@types/jsonwebtoken": "^8.5.0",
"@types/node": "14", "@types/node": "14",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"jest": "^26.6.3", "jest": "^26.6.3",
"mwts": "^1.1.2", "mwts": "^1.1.2",
"ts-jest": "^26.5.2", "ts-jest": "^26.5.2",
"typescript": "^4.2.2" "typescript": "^4.2.2"
}, },
"engines": { "engines": {
"node": ">=12.0.0" "node": ">=12.0.0"
}, },
"scripts": { "scripts": {
"start": "egg-scripts start --daemon --title=cool-admin-midway --framework=@midwayjs/web --port=8001 --sticky", "start": "egg-scripts start --daemon --title=cool-admin-midway --framework=@midwayjs/web --port=8001 --sticky",
"stop": "egg-scripts stop --title=cool-admin-midway", "stop": "egg-scripts stop --title=cool-admin-midway",
"start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev", "start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev",
"docker": "egg-scripts start --title=cool-admin-midway --framework=@midwayjs/web", "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", "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", "test": "midway-bin test",
"cov": "midway-bin cov", "cov": "midway-bin cov",
"lint": "mwts check", "lint": "mwts check",
"lint:fix": "mwts fix", "lint:fix": "mwts fix",
"ci": "npm run cov", "ci": "npm run cov",
"build": "midway-bin build -c", "build": "midway-bin build -c",
"check": "luckyeye", "check": "luckyeye",
"deploy": "midway-bin deploy" "deploy": "midway-bin deploy"
}, },
"midway-bin-clean": [ "midway-bin-clean": [
".vscode/.tsbuildinfo", ".vscode/.tsbuildinfo",
"dist" "dist"
], ],
"midway-luckyeye": { "midway-luckyeye": {
"packages": [ "packages": [
"midway_v2" "midway_v2"
] ]
}, },
"midway-integration": { "midway-integration": {
"lifecycle": { "lifecycle": {
"before:package:cleanup": "npm run build" "before:package:cleanup": "npm run build"
} }
}, },
"egg": { "egg": {
"framework": "@midwayjs/web" "framework": "@midwayjs/web"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "" "url": ""
}, },
"author": "cool-js.com", "author": "cool-js.com",
"license": "MIT" "license": "MIT"
} }

View File

@ -35,7 +35,7 @@ export class BaseAuthorityMiddleware implements IWebMiddleware {
try { try {
ctx.admin = jwt.verify(token, this.coolConfig.jwt.secret); 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(); await next();
return; return;
} }

View File

@ -30,27 +30,29 @@ import { DemoAppGoodsEntity } from '../../entity/goods';
// 指定返回字段 // 指定返回字段
select: ['a.*', 'b.name'], select: ['a.*', 'b.name'],
// 关联表用户表 // 关联表用户表
leftJoin: [{ leftJoin: [
// 管理的表 {
entity: BaseSysUserEntity, // 管理的表
// 别名 entity: BaseSysUserEntity,
alias: 'b', // 别名
// 关联条件 alias: 'b',
condition: 'a.userId = b.id' // 关联条件
}], condition: 'a.userId = b.id',
},
],
// 增加其他条件 // 增加其他条件
where: async (ctx: Context) => { where: async (ctx: Context) => {
return [ return [
// 价格大于90 // 价格大于90
['a.price > :price', { price: 90.00 }] ['a.price > :price', { price: 90.0 }],
] ];
}, },
// 添加排序 // 添加排序
addOrderBy: { addOrderBy: {
// 排序字段及排序方式 // 排序字段及排序方式
price: 'desc' price: 'desc',
} },
} },
}) })
export class DemoAdminGoodsController extends BaseController { export class DemoAdminGoodsController extends BaseController {
/** /**

View File

@ -20,5 +20,5 @@ export class DemoAppGoodsEntity extends BaseEntity {
price: number; price: number;
@Column({ comment: '分类', type: 'tinyint' }) @Column({ comment: '分类', type: 'tinyint' })
type: number type: number;
} }

View File

@ -10,17 +10,17 @@ import { ICoolCache } from 'midwayjs-cool-core';
*/ */
@Provide() @Provide()
export class DemoGoodsService extends BaseService { export class DemoGoodsService extends BaseService {
@InjectEntityModel(DemoAppGoodsEntity) @InjectEntityModel(DemoAppGoodsEntity)
demoAppGoodsEntity: Repository<DemoAppGoodsEntity>; demoAppGoodsEntity: Repository<DemoAppGoodsEntity>;
@Inject('cool:cache') @Inject('cool:cache')
coolCache: ICoolCache; coolCache: ICoolCache;
/** /**
* *
*/ */
@Cache(5) @Cache(5)
async all() { async all() {
return this.demoAppGoodsEntity.find(); return this.demoAppGoodsEntity.find();
} }
} }