4.x 就绪

This commit is contained in:
ap 2021-11-29 18:36:16 +08:00
parent 7b458f8303
commit 7899663e99
69 changed files with 89 additions and 88 deletions

View File

@ -3,7 +3,7 @@
"prefix": "config",
"body": [
"import { Application } from 'egg';",
"import { ModuleConfig } from 'midwayjs-cool-core';",
"import { ModuleConfig } from '@cool-midway/core';",
"",
"/**",
" * 模块配置",

View File

@ -3,7 +3,7 @@
"prefix": "controller",
"body": [
"import { Provide } from '@midwayjs/decorator';",
"import { CoolController, BaseController } from 'midwayjs-cool-core';",
"import { CoolController, BaseController } from '@cool-midway/core';",
"",
"/**",
" * 描述",

View File

@ -3,7 +3,7 @@
"prefix": "entity",
"body": [
"import { EntityModel } from '@midwayjs/orm';",
"import { BaseEntity } from 'midwayjs-cool-core';",
"import { BaseEntity } from '@cool-midway/core';",
"import { Column } from 'typeorm';",
"",
"/**",

View File

@ -3,7 +3,7 @@
"prefix": "event",
"body": [
"import { Provide, Scope, ScopeEnum } from '@midwayjs/decorator';",
"import { CoolEvent, Event } from 'midwayjs-cool-core';",
"import { CoolEvent, Event } from '@cool-midway/core';",
"",
"/**",
" * 接收事件",

View File

@ -3,7 +3,7 @@
"prefix": "queue",
"body": [
"import { Provide } from '@midwayjs/decorator';",
"import { ICoolQueue, Queue } from 'midwayjs-cool-queue';",
"import { ICoolQueue, Queue } from '@cool-midway/queue';",
"",
"/**",
" * 队列",

View File

@ -3,7 +3,7 @@
"prefix": "service",
"body": [
"import { Provide } from '@midwayjs/decorator';",
"import { BaseService } from 'midwayjs-cool-core';",
"import { BaseService } from '@cool-midway/core';",
"import { InjectEntityModel } from '@midwayjs/orm';",
"import { Repository } from 'typeorm';",
"",

View File

@ -82,7 +82,7 @@ $ open http://localhost:8001/
```ts
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**
@ -110,7 +110,7 @@ export class DemoAppGoodsEntity extends BaseEntity {
```ts
import { Provide } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { DemoAppGoodsEntity } from '../../entity/goods';
/**

View File

@ -1,9 +1,17 @@
{
"name": "cool-admin",
"version": "4.0.0",
"description": "",
"description": "cool-admin 一个很酷的通用后台管理系统",
"private": true,
"dependencies": {
"@cool-midway/alipay": "^4.0.3",
"@cool-midway/core": "^4.0.4",
"@cool-midway/es": "^4.0.2",
"@cool-midway/oss": "^4.0.2",
"@cool-midway/queue": "^4.0.2",
"@cool-midway/redis": "^4.0.2",
"@cool-midway/socket": "^4.0.2",
"@cool-midway/wxpay": "^4.0.3",
"@midwayjs/bootstrap": "^2.13.4",
"@midwayjs/core": "^2.13.4",
"@midwayjs/decorator": "^2.13.2",
@ -16,13 +24,6 @@
"jsonwebtoken": "^8.5.1",
"lodash": "^4.17.21",
"md5": "^2.3.0",
"midwayjs-cool-alipay": "^1.0.8",
"midwayjs-cool-core": "D:\\src\\cool\\admin\\midway-core\\core\\dist",
"midwayjs-cool-oss": "^1.0.12",
"midwayjs-cool-queue": "^1.0.8",
"midwayjs-cool-redis": "^1.1.6",
"midwayjs-cool-socket": "^1.0.8",
"midwayjs-cool-wxpay": "^1.0.12",
"mini-svg-data-uri": "^1.4.3",
"mysql2": "^2.3.3",
"svg-captcha": "^1.4.0",
@ -38,7 +39,7 @@
"@types/node": "16",
"cross-env": "^7.0.3",
"jest": "^27.3.1",
"mwts": "^1.2.2",
"mwts": "^1.3.0",
"ts-jest": "^27.0.7",
"typescript": "^4.5.2"
},

View File

@ -1,5 +1,5 @@
import { Application } from 'egg';
import { ModuleConfig } from 'midwayjs-cool-core';
import { ModuleConfig } from '@cool-midway/core';
/**
*

View File

@ -1,6 +1,6 @@
import { Provide, Inject, Get, Post, Body, ALL } from '@midwayjs/decorator';
import { Context } from 'egg';
import { CoolController, BaseController, ICoolFile } from 'midwayjs-cool-core';
import { CoolController, BaseController, ICoolFile } from '@cool-midway/core';
import { BaseSysUserEntity } from '../../entity/sys/user';
import { BaseSysLoginService } from '../../service/sys/login';
import { BaseSysPermsService } from '../../service/sys/perms';

View File

@ -8,7 +8,7 @@ import {
Query,
} from '@midwayjs/decorator';
import { Context } from 'egg';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { LoginDTO } from '../../dto/login';
import { BaseSysLoginService } from '../../service/sys/login';
import { BaseSysParamService } from '../../service/sys/param';

View File

@ -1,5 +1,5 @@
import { Body, Get, Inject, Post, Provide, Query } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BasePluginInfoService } from '../../../service/plugin/info';
/**

View File

@ -1,5 +1,5 @@
import { ALL, Body, Inject, Post, Provide } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BaseSysDepartmentEntity } from '../../../entity/sys/department';
import { BaseSysDepartmentService } from '../../../service/sys/department';

View File

@ -1,5 +1,5 @@
import { Provide, Post, Inject, Body, Get } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BaseSysLogEntity } from '../../../entity/sys/log';
import { BaseSysUserEntity } from '../../../entity/sys/user';
import { BaseSysConfService } from '../../../service/sys/conf';

View File

@ -1,5 +1,5 @@
import { Get, Inject, Provide } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BaseSysMenuEntity } from '../../../entity/sys/menu';
import { BaseSysMenuService } from '../../../service/sys/menu';

View File

@ -1,6 +1,6 @@
import { Get, Inject, Provide, Query } from '@midwayjs/decorator';
import { Context } from 'egg';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BaseSysParamEntity } from '../../../entity/sys/param';
import { BaseSysParamService } from '../../../service/sys/param';

View File

@ -1,5 +1,5 @@
import { Provide } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { Context } from 'vm';
import { BaseSysRoleEntity } from '../../../entity/sys/role';
import { BaseSysRoleService } from '../../../service/sys/role';

View File

@ -1,5 +1,5 @@
import { Body, Inject, Post, Provide } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BaseSysUserEntity } from '../../../entity/sys/user';
import { BaseSysUserService } from '../../../service/sys/user';

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,6 +1,6 @@
import { Column, Index } from 'typeorm';
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
/**
*

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column, Index } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column, Index } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column, Index } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column, Index } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -5,7 +5,7 @@ import {
IMidwayWebApplication,
} from '@midwayjs/web';
import * as _ from 'lodash';
import { CoolConfig, RESCODE } from 'midwayjs-cool-core';
import { CoolConfig, RESCODE } from '@cool-midway/core';
import * as jwt from 'jsonwebtoken';
import { Context } from 'egg';

View File

@ -1,5 +1,5 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService, ICoolCache, CoolPlugin } from 'midwayjs-cool-core';
import { BaseService, ICoolCache, CoolPlugin } from '@cool-midway/core';
/**
*

View File

@ -1,5 +1,5 @@
import { Provide } from '@midwayjs/decorator';
import { BaseService } from 'midwayjs-cool-core';
import { BaseService } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository } from 'typeorm';
import { BaseSysConfEntity } from '../../entity/sys/conf';

View File

@ -1,5 +1,5 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService } from 'midwayjs-cool-core';
import { BaseService } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository } from 'typeorm';
import { BaseSysDepartmentEntity } from '../../entity/sys/department';

View File

@ -1,5 +1,5 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService } from 'midwayjs-cool-core';
import { BaseService } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository } from 'typeorm';
import { Context } from 'egg';

View File

@ -5,7 +5,7 @@ import {
CoolCommException,
CoolConfig,
RESCODE,
} from 'midwayjs-cool-core';
} from '@cool-midway/core';
import { LoginDTO } from '../../dto/login';
import * as svgCaptcha from 'svg-captcha';
import { v1 as uuid } from 'uuid';

View File

@ -1,5 +1,5 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService } from 'midwayjs-cool-core';
import { BaseService } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository } from 'typeorm';
import { BaseSysMenuEntity } from '../../entity/sys/menu';

View File

@ -1,5 +1,5 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService, ICoolCache } from 'midwayjs-cool-core';
import { BaseService, ICoolCache } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository } from 'typeorm';
import { BaseSysParamEntity } from '../../entity/sys/param';

View File

@ -1,5 +1,5 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService, ICoolCache } from 'midwayjs-cool-core';
import { BaseService, ICoolCache } from '@cool-midway/core';
import { BaseSysMenuService } from './menu';
import { BaseSysRoleService } from './role';
import { BaseSysDepartmentService } from './department';

View File

@ -1,5 +1,5 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService } from 'midwayjs-cool-core';
import { BaseService } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository } from 'typeorm';
import { BaseSysRoleEntity } from '../../entity/sys/role';

View File

@ -1,5 +1,5 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService, ICoolCache, CoolCommException } from 'midwayjs-cool-core';
import { BaseService, ICoolCache, CoolCommException } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository } from 'typeorm';
import { BaseSysUserEntity } from '../../entity/sys/user';

View File

@ -1,5 +1,5 @@
import { Application } from 'egg';
import { ModuleConfig } from 'midwayjs-cool-core';
import { ModuleConfig } from '@cool-midway/core';
/**
*

View File

@ -1,5 +1,5 @@
// import { Provide } from '@midwayjs/decorator';
// import { CoolController, BaseController } from 'midwayjs-cool-core';
// import { CoolController, BaseController } from '@cool-midway/core';
// import { DemoCrudEntity } from '../../entity/crud';
// /**

View File

@ -1,6 +1,6 @@
import { Get, Provide } from '@midwayjs/decorator';
import { Context } from 'egg';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BaseSysUserEntity } from '../../../base/entity/sys/user';
import { DemoGoodsEntity } from '../../entity/goods';

View File

@ -3,7 +3,7 @@ import {
CoolController,
BaseController,
CoolEventManager,
} from 'midwayjs-cool-core';
} from '@cool-midway/core';
/**
*

View File

@ -1,6 +1,6 @@
import { Get, Inject, Post, Provide } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { IQueue } from 'midwayjs-cool-queue';
import { CoolController, BaseController } from '@cool-midway/core';
import { IQueue } from '@cool-midway/queue';
import { DemoGoodsEntity } from '../../entity/goods';
import { DemoGoodsService } from '../../service/goods';

View File

@ -1,8 +1,8 @@
import { App, Inject, Post, Provide } from '@midwayjs/decorator';
import { IMidwayWebApplication } from '@midwayjs/web';
import { Context } from 'egg';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { ICoolWxPay } from 'midwayjs-cool-wxpay';
import { CoolController, BaseController } from '@cool-midway/core';
import { ICoolWxPay } from '@cool-midway/wxpay';
import { parseString } from 'xml2js';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity, CoolEntityCrud } from 'midwayjs-cool-core';
import { BaseEntity, CoolEntityCrud } from '@cool-midway/core';
import { Column, SelectQueryBuilder } from 'typeorm';
import { DemoGoodsEntity } from './goods';

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { Provide, Scope, ScopeEnum } from '@midwayjs/decorator';
import { CoolEvent, Event } from 'midwayjs-cool-core';
import { CoolEvent, Event } from '@cool-midway/core';
/**
*

View File

@ -1,6 +1,6 @@
import { App, Provide } from '@midwayjs/decorator';
import { IMidwayWebApplication } from '@midwayjs/web';
import { ICoolQueue, Queue } from 'midwayjs-cool-queue';
import { ICoolQueue, Queue } from '@cool-midway/queue';
/**
*

View File

@ -1,9 +1,9 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService, Cache, CoolTransaction } from 'midwayjs-cool-core';
import { BaseService, Cache, CoolTransaction } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository, QueryRunner } from 'typeorm';
import { DemoGoodsEntity } from '../entity/goods';
import { ICoolCache } from 'midwayjs-cool-core';
import { ICoolCache } from '@cool-midway/core';
/**
*

View File

@ -1,5 +1,5 @@
import { Provide } from '@midwayjs/decorator';
import { BaseService } from 'midwayjs-cool-core';
import { BaseService } from '@cool-midway/core';
/**
* demo示例
*/

View File

@ -1,5 +1,5 @@
import { Provide } from '@midwayjs/decorator';
import { CoolSocket, SocketEnvent } from 'midwayjs-cool-socket';
import { CoolSocket, SocketEnvent } from '@cool-midway/socket';
import { Socket } from 'socket.io';
/**

View File

@ -1,5 +1,5 @@
import { Application } from 'egg';
import { ModuleConfig } from 'midwayjs-cool-core';
import { ModuleConfig } from '@cool-midway/core';
/**
*

View File

@ -1,5 +1,5 @@
import { Provide } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BaseAppSpaceInfoEntity } from '../../../base/entity/app/space/info';
/**

View File

@ -1,5 +1,5 @@
import { Provide } from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { BaseAppSpaceTypeEntity } from '../../../base/entity/app/space/type';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { Application } from 'egg';
import { ModuleConfig } from 'midwayjs-cool-core';
import { ModuleConfig } from '@cool-midway/core';
/**
*

View File

@ -7,7 +7,7 @@ import {
Provide,
Query,
} from '@midwayjs/decorator';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
import { TaskInfoEntity } from '../../entity/info';
import { TaskInfoService } from '../../service/info';

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column } from 'typeorm';
/**

View File

@ -1,5 +1,5 @@
import { EntityModel } from '@midwayjs/orm';
import { BaseEntity } from 'midwayjs-cool-core';
import { BaseEntity } from '@cool-midway/core';
import { Column, Index } from 'typeorm';
/**

View File

@ -1,6 +1,6 @@
import { App, Inject, Provide } from '@midwayjs/decorator';
import { IMidwayWebApplication } from '@midwayjs/web';
import { ICoolQueue, Queue } from 'midwayjs-cool-queue';
import { ICoolQueue, Queue } from '@cool-midway/queue';
import { TaskInfoService } from '../service/info';
/**

View File

@ -1,5 +1,5 @@
import { Logger, Provide } from '@midwayjs/decorator';
import { BaseService } from 'midwayjs-cool-core';
import { BaseService } from '@cool-midway/core';
import { ILogger } from '@midwayjs/logger';
/**

View File

@ -1,10 +1,10 @@
import { App, Inject, Logger, Provide } from '@midwayjs/decorator';
import { BaseService } from 'midwayjs-cool-core';
import { BaseService } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/orm';
import { Repository } from 'typeorm';
import { TaskInfoEntity } from '../entity/info';
import { TaskLogEntity } from '../entity/log';
import { IQueue } from 'midwayjs-cool-queue';
import { IQueue } from '@cool-midway/queue';
import { ILogger } from '@midwayjs/logger';
import { IMidwayWebApplication } from '@midwayjs/web';
import * as _ from 'lodash';

View File

@ -1,5 +1,5 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
import { CoolConfig } from 'midwayjs-cool-core';
import { CoolConfig } from '@cool-midway/core';
import * as path from 'path';
export type DefaultConfig = PowerPartial<EggAppConfig>;

View File

@ -3,13 +3,13 @@ import { ILifeCycle, IMidwayContainer } from '@midwayjs/core';
import { Application } from 'egg';
import * as view from '@midwayjs/view-nunjucks';
import * as orm from '@midwayjs/orm';
import * as cool from 'midwayjs-cool-core';
// import * as wxpay from 'midwayjs-cool-wxpay';
import * as oss from 'midwayjs-cool-oss';
// import * as redis from 'midwayjs-cool-redis';
// import * as queue from 'midwayjs-cool-queue';
// import * as alipay from 'midwayjs-cool-alipay';
// import * as socket from 'midwayjs-cool-socket';
import * as cool from '@cool-midway/core';
// import * as wxpay from '@cool-midway/wxpay';
import * as oss from '@cool-midway/oss';
// import * as redis from '@cool-midway/redis';
// import * as queue from '@cool-midway/queue';
// import * as alipay from '@cool-midway/alipay';
// import * as socket from '@cool-midway/socket';
@Configuration({
// 注意组件顺序 cool 有依赖orm组件 所以必须放在orm组件之后 cool的其他组件必须放在cool 核心组件之后

View File

@ -1,6 +1,6 @@
import { Get, Inject, Provide } from '@midwayjs/decorator';
import { Context } from 'egg';
import { CoolController, BaseController } from 'midwayjs-cool-core';
import { CoolController, BaseController } from '@cool-midway/core';
/**
*