From 7899663e990488d376031aaaf77f88541389fbcb Mon Sep 17 00:00:00 2001 From: ap <951984189@qq.com> Date: Mon, 29 Nov 2021 18:36:16 +0800 Subject: [PATCH] =?UTF-8?q?4.x=20=E5=B0=B1=E7=BB=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/config.code-snippets | 2 +- .vscode/controller.code-snippets | 2 +- .vscode/entity.code-snippets | 2 +- .vscode/event.code-snippets | 2 +- .vscode/queue.code-snippets | 2 +- .vscode/service.code-snippets | 2 +- README.md | 4 ++-- package.json | 19 ++++++++++--------- src/app/modules/base/config.ts | 2 +- src/app/modules/base/controller/admin/comm.ts | 2 +- src/app/modules/base/controller/admin/open.ts | 2 +- .../base/controller/admin/plugin/info.ts | 2 +- .../base/controller/admin/sys/department.ts | 2 +- .../modules/base/controller/admin/sys/log.ts | 2 +- .../modules/base/controller/admin/sys/menu.ts | 2 +- .../base/controller/admin/sys/param.ts | 2 +- .../modules/base/controller/admin/sys/role.ts | 2 +- .../modules/base/controller/admin/sys/user.ts | 2 +- src/app/modules/base/entity/app/space/info.ts | 2 +- src/app/modules/base/entity/app/space/type.ts | 2 +- src/app/modules/base/entity/sys/conf.ts | 2 +- src/app/modules/base/entity/sys/department.ts | 2 +- src/app/modules/base/entity/sys/log.ts | 2 +- src/app/modules/base/entity/sys/menu.ts | 2 +- src/app/modules/base/entity/sys/param.ts | 2 +- src/app/modules/base/entity/sys/role.ts | 2 +- .../base/entity/sys/role_department.ts | 2 +- src/app/modules/base/entity/sys/role_menu.ts | 2 +- src/app/modules/base/entity/sys/user.ts | 2 +- src/app/modules/base/entity/sys/user_role.ts | 2 +- src/app/modules/base/middleware/authority.ts | 2 +- src/app/modules/base/service/plugin/info.ts | 2 +- src/app/modules/base/service/sys/conf.ts | 2 +- .../modules/base/service/sys/department.ts | 2 +- src/app/modules/base/service/sys/log.ts | 2 +- src/app/modules/base/service/sys/login.ts | 2 +- src/app/modules/base/service/sys/menu.ts | 2 +- src/app/modules/base/service/sys/param.ts | 2 +- src/app/modules/base/service/sys/perms.ts | 2 +- src/app/modules/base/service/sys/role.ts | 2 +- src/app/modules/base/service/sys/user.ts | 2 +- src/app/modules/demo/config.ts | 2 +- src/app/modules/demo/controller/admin/crud.ts | 2 +- .../modules/demo/controller/admin/goods.ts | 2 +- src/app/modules/demo/controller/app/event.ts | 2 +- src/app/modules/demo/controller/app/goods.ts | 4 ++-- src/app/modules/demo/controller/app/pay.ts | 4 ++-- src/app/modules/demo/entity/crud.ts | 2 +- src/app/modules/demo/entity/goods.ts | 2 +- src/app/modules/demo/event/test.ts | 2 +- src/app/modules/demo/queue/demo.ts | 2 +- src/app/modules/demo/service/goods.ts | 4 ++-- src/app/modules/demo/service/task.ts | 2 +- src/app/modules/demo/socket/handler.ts | 2 +- src/app/modules/space/config.ts | 2 +- .../modules/space/controller/admin/info.ts | 2 +- .../modules/space/controller/admin/type.ts | 2 +- src/app/modules/space/entity/info.ts | 2 +- src/app/modules/space/entity/type.ts | 2 +- src/app/modules/task/config.ts | 2 +- src/app/modules/task/controller/admin/info.ts | 2 +- src/app/modules/task/entity/info.ts | 2 +- src/app/modules/task/entity/log.ts | 2 +- src/app/modules/task/queue/task.ts | 2 +- src/app/modules/task/service/demo.ts | 2 +- src/app/modules/task/service/info.ts | 4 ++-- src/config/config.default.ts | 2 +- src/configuration.ts | 14 +++++++------- src/welcome.ts | 2 +- 69 files changed, 89 insertions(+), 88 deletions(-) diff --git a/.vscode/config.code-snippets b/.vscode/config.code-snippets index 40a6a59..139787b 100644 --- a/.vscode/config.code-snippets +++ b/.vscode/config.code-snippets @@ -3,7 +3,7 @@ "prefix": "config", "body": [ "import { Application } from 'egg';", - "import { ModuleConfig } from 'midwayjs-cool-core';", + "import { ModuleConfig } from '@cool-midway/core';", "", "/**", " * 模块配置", diff --git a/.vscode/controller.code-snippets b/.vscode/controller.code-snippets index 62bb411..3a7c846 100644 --- a/.vscode/controller.code-snippets +++ b/.vscode/controller.code-snippets @@ -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';", "", "/**", " * 描述", diff --git a/.vscode/entity.code-snippets b/.vscode/entity.code-snippets index 2c0f00a..fa44c76 100644 --- a/.vscode/entity.code-snippets +++ b/.vscode/entity.code-snippets @@ -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';", "", "/**", diff --git a/.vscode/event.code-snippets b/.vscode/event.code-snippets index 0dbfe1c..2f4c569 100644 --- a/.vscode/event.code-snippets +++ b/.vscode/event.code-snippets @@ -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';", "", "/**", " * 接收事件", diff --git a/.vscode/queue.code-snippets b/.vscode/queue.code-snippets index 093259a..d5186d4 100644 --- a/.vscode/queue.code-snippets +++ b/.vscode/queue.code-snippets @@ -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';", "", "/**", " * 队列", diff --git a/.vscode/service.code-snippets b/.vscode/service.code-snippets index 58b1907..5722f72 100644 --- a/.vscode/service.code-snippets +++ b/.vscode/service.code-snippets @@ -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';", "", diff --git a/README.md b/README.md index a9c7985..1441194 100755 --- a/README.md +++ b/README.md @@ -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'; /** diff --git a/package.json b/package.json index 90938c3..74af9f4 100755 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/src/app/modules/base/config.ts b/src/app/modules/base/config.ts index 0107576..ccd4b7f 100644 --- a/src/app/modules/base/config.ts +++ b/src/app/modules/base/config.ts @@ -1,5 +1,5 @@ import { Application } from 'egg'; -import { ModuleConfig } from 'midwayjs-cool-core'; +import { ModuleConfig } from '@cool-midway/core'; /** * 模块的配置 diff --git a/src/app/modules/base/controller/admin/comm.ts b/src/app/modules/base/controller/admin/comm.ts index 777185b..d32f906 100644 --- a/src/app/modules/base/controller/admin/comm.ts +++ b/src/app/modules/base/controller/admin/comm.ts @@ -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'; diff --git a/src/app/modules/base/controller/admin/open.ts b/src/app/modules/base/controller/admin/open.ts index 920eba3..9a48f98 100644 --- a/src/app/modules/base/controller/admin/open.ts +++ b/src/app/modules/base/controller/admin/open.ts @@ -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'; diff --git a/src/app/modules/base/controller/admin/plugin/info.ts b/src/app/modules/base/controller/admin/plugin/info.ts index 305f374..b7a1f2d 100644 --- a/src/app/modules/base/controller/admin/plugin/info.ts +++ b/src/app/modules/base/controller/admin/plugin/info.ts @@ -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'; /** diff --git a/src/app/modules/base/controller/admin/sys/department.ts b/src/app/modules/base/controller/admin/sys/department.ts index 488437e..9281761 100644 --- a/src/app/modules/base/controller/admin/sys/department.ts +++ b/src/app/modules/base/controller/admin/sys/department.ts @@ -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'; diff --git a/src/app/modules/base/controller/admin/sys/log.ts b/src/app/modules/base/controller/admin/sys/log.ts index 3ba85aa..fe95f57 100644 --- a/src/app/modules/base/controller/admin/sys/log.ts +++ b/src/app/modules/base/controller/admin/sys/log.ts @@ -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'; diff --git a/src/app/modules/base/controller/admin/sys/menu.ts b/src/app/modules/base/controller/admin/sys/menu.ts index 7a4b438..1c9d843 100644 --- a/src/app/modules/base/controller/admin/sys/menu.ts +++ b/src/app/modules/base/controller/admin/sys/menu.ts @@ -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'; diff --git a/src/app/modules/base/controller/admin/sys/param.ts b/src/app/modules/base/controller/admin/sys/param.ts index 07ba439..a17d26f 100644 --- a/src/app/modules/base/controller/admin/sys/param.ts +++ b/src/app/modules/base/controller/admin/sys/param.ts @@ -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'; diff --git a/src/app/modules/base/controller/admin/sys/role.ts b/src/app/modules/base/controller/admin/sys/role.ts index 00dbe4f..c7f25e2 100644 --- a/src/app/modules/base/controller/admin/sys/role.ts +++ b/src/app/modules/base/controller/admin/sys/role.ts @@ -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'; diff --git a/src/app/modules/base/controller/admin/sys/user.ts b/src/app/modules/base/controller/admin/sys/user.ts index 4e3c8b5..5814873 100644 --- a/src/app/modules/base/controller/admin/sys/user.ts +++ b/src/app/modules/base/controller/admin/sys/user.ts @@ -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'; diff --git a/src/app/modules/base/entity/app/space/info.ts b/src/app/modules/base/entity/app/space/info.ts index 4852358..cbc668d 100644 --- a/src/app/modules/base/entity/app/space/info.ts +++ b/src/app/modules/base/entity/app/space/info.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/app/space/type.ts b/src/app/modules/base/entity/app/space/type.ts index 6a076d6..4b6c7af 100644 --- a/src/app/modules/base/entity/app/space/type.ts +++ b/src/app/modules/base/entity/app/space/type.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/conf.ts b/src/app/modules/base/entity/sys/conf.ts index 145ec99..cada1ef 100644 --- a/src/app/modules/base/entity/sys/conf.ts +++ b/src/app/modules/base/entity/sys/conf.ts @@ -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'; /** * 系统配置 diff --git a/src/app/modules/base/entity/sys/department.ts b/src/app/modules/base/entity/sys/department.ts index 08d707d..edd688c 100644 --- a/src/app/modules/base/entity/sys/department.ts +++ b/src/app/modules/base/entity/sys/department.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/log.ts b/src/app/modules/base/entity/sys/log.ts index 11b435c..b0ca6d3 100644 --- a/src/app/modules/base/entity/sys/log.ts +++ b/src/app/modules/base/entity/sys/log.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/menu.ts b/src/app/modules/base/entity/sys/menu.ts index 1549aae..18b5c53 100644 --- a/src/app/modules/base/entity/sys/menu.ts +++ b/src/app/modules/base/entity/sys/menu.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/param.ts b/src/app/modules/base/entity/sys/param.ts index 96628b3..4110230 100644 --- a/src/app/modules/base/entity/sys/param.ts +++ b/src/app/modules/base/entity/sys/param.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/role.ts b/src/app/modules/base/entity/sys/role.ts index 91bed4d..ad64ae9 100644 --- a/src/app/modules/base/entity/sys/role.ts +++ b/src/app/modules/base/entity/sys/role.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/role_department.ts b/src/app/modules/base/entity/sys/role_department.ts index d6cc303..a923231 100644 --- a/src/app/modules/base/entity/sys/role_department.ts +++ b/src/app/modules/base/entity/sys/role_department.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/role_menu.ts b/src/app/modules/base/entity/sys/role_menu.ts index 131b328..5c3873b 100644 --- a/src/app/modules/base/entity/sys/role_menu.ts +++ b/src/app/modules/base/entity/sys/role_menu.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/user.ts b/src/app/modules/base/entity/sys/user.ts index 048ffac..a407e0a 100644 --- a/src/app/modules/base/entity/sys/user.ts +++ b/src/app/modules/base/entity/sys/user.ts @@ -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'; /** diff --git a/src/app/modules/base/entity/sys/user_role.ts b/src/app/modules/base/entity/sys/user_role.ts index 865762f..382dcd1 100644 --- a/src/app/modules/base/entity/sys/user_role.ts +++ b/src/app/modules/base/entity/sys/user_role.ts @@ -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'; /** diff --git a/src/app/modules/base/middleware/authority.ts b/src/app/modules/base/middleware/authority.ts index 8da456e..2de76cd 100644 --- a/src/app/modules/base/middleware/authority.ts +++ b/src/app/modules/base/middleware/authority.ts @@ -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'; diff --git a/src/app/modules/base/service/plugin/info.ts b/src/app/modules/base/service/plugin/info.ts index 050a063..bfb4057 100644 --- a/src/app/modules/base/service/plugin/info.ts +++ b/src/app/modules/base/service/plugin/info.ts @@ -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'; /** * 插件 diff --git a/src/app/modules/base/service/sys/conf.ts b/src/app/modules/base/service/sys/conf.ts index 2db94cd..0db684a 100644 --- a/src/app/modules/base/service/sys/conf.ts +++ b/src/app/modules/base/service/sys/conf.ts @@ -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'; diff --git a/src/app/modules/base/service/sys/department.ts b/src/app/modules/base/service/sys/department.ts index b83aea2..301bc7a 100644 --- a/src/app/modules/base/service/sys/department.ts +++ b/src/app/modules/base/service/sys/department.ts @@ -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'; diff --git a/src/app/modules/base/service/sys/log.ts b/src/app/modules/base/service/sys/log.ts index 50c127a..4e09cbf 100644 --- a/src/app/modules/base/service/sys/log.ts +++ b/src/app/modules/base/service/sys/log.ts @@ -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'; diff --git a/src/app/modules/base/service/sys/login.ts b/src/app/modules/base/service/sys/login.ts index 9dff6e5..4c316b5 100644 --- a/src/app/modules/base/service/sys/login.ts +++ b/src/app/modules/base/service/sys/login.ts @@ -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'; diff --git a/src/app/modules/base/service/sys/menu.ts b/src/app/modules/base/service/sys/menu.ts index f71390c..5492fc6 100644 --- a/src/app/modules/base/service/sys/menu.ts +++ b/src/app/modules/base/service/sys/menu.ts @@ -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'; diff --git a/src/app/modules/base/service/sys/param.ts b/src/app/modules/base/service/sys/param.ts index 79aa98d..9b8b20f 100644 --- a/src/app/modules/base/service/sys/param.ts +++ b/src/app/modules/base/service/sys/param.ts @@ -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'; diff --git a/src/app/modules/base/service/sys/perms.ts b/src/app/modules/base/service/sys/perms.ts index 8b4292a..01bd78b 100644 --- a/src/app/modules/base/service/sys/perms.ts +++ b/src/app/modules/base/service/sys/perms.ts @@ -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'; diff --git a/src/app/modules/base/service/sys/role.ts b/src/app/modules/base/service/sys/role.ts index 34353bb..90603f4 100644 --- a/src/app/modules/base/service/sys/role.ts +++ b/src/app/modules/base/service/sys/role.ts @@ -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'; diff --git a/src/app/modules/base/service/sys/user.ts b/src/app/modules/base/service/sys/user.ts index 9df597f..2f0c2b6 100644 --- a/src/app/modules/base/service/sys/user.ts +++ b/src/app/modules/base/service/sys/user.ts @@ -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'; diff --git a/src/app/modules/demo/config.ts b/src/app/modules/demo/config.ts index 11856f2..2535cb9 100644 --- a/src/app/modules/demo/config.ts +++ b/src/app/modules/demo/config.ts @@ -1,5 +1,5 @@ import { Application } from 'egg'; -import { ModuleConfig } from 'midwayjs-cool-core'; +import { ModuleConfig } from '@cool-midway/core'; /** * 示例 diff --git a/src/app/modules/demo/controller/admin/crud.ts b/src/app/modules/demo/controller/admin/crud.ts index c3922f9..a591d8e 100644 --- a/src/app/modules/demo/controller/admin/crud.ts +++ b/src/app/modules/demo/controller/admin/crud.ts @@ -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'; // /** diff --git a/src/app/modules/demo/controller/admin/goods.ts b/src/app/modules/demo/controller/admin/goods.ts index a41ebe4..ab55b31 100644 --- a/src/app/modules/demo/controller/admin/goods.ts +++ b/src/app/modules/demo/controller/admin/goods.ts @@ -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'; diff --git a/src/app/modules/demo/controller/app/event.ts b/src/app/modules/demo/controller/app/event.ts index 0afc498..24abfd7 100644 --- a/src/app/modules/demo/controller/app/event.ts +++ b/src/app/modules/demo/controller/app/event.ts @@ -3,7 +3,7 @@ import { CoolController, BaseController, CoolEventManager, -} from 'midwayjs-cool-core'; +} from '@cool-midway/core'; /** * 事件 diff --git a/src/app/modules/demo/controller/app/goods.ts b/src/app/modules/demo/controller/app/goods.ts index 2833981..5d3522c 100644 --- a/src/app/modules/demo/controller/app/goods.ts +++ b/src/app/modules/demo/controller/app/goods.ts @@ -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'; diff --git a/src/app/modules/demo/controller/app/pay.ts b/src/app/modules/demo/controller/app/pay.ts index 2a4d7b3..d3b36b5 100644 --- a/src/app/modules/demo/controller/app/pay.ts +++ b/src/app/modules/demo/controller/app/pay.ts @@ -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'; /** diff --git a/src/app/modules/demo/entity/crud.ts b/src/app/modules/demo/entity/crud.ts index 8005a88..cbf5e6d 100644 --- a/src/app/modules/demo/entity/crud.ts +++ b/src/app/modules/demo/entity/crud.ts @@ -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'; diff --git a/src/app/modules/demo/entity/goods.ts b/src/app/modules/demo/entity/goods.ts index ed8a412..862102a 100644 --- a/src/app/modules/demo/entity/goods.ts +++ b/src/app/modules/demo/entity/goods.ts @@ -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'; /** diff --git a/src/app/modules/demo/event/test.ts b/src/app/modules/demo/event/test.ts index af6fca5..2fcda6f 100644 --- a/src/app/modules/demo/event/test.ts +++ b/src/app/modules/demo/event/test.ts @@ -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'; /** * 接收事件 diff --git a/src/app/modules/demo/queue/demo.ts b/src/app/modules/demo/queue/demo.ts index 199ded0..d683acf 100644 --- a/src/app/modules/demo/queue/demo.ts +++ b/src/app/modules/demo/queue/demo.ts @@ -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'; /** * 任务 diff --git a/src/app/modules/demo/service/goods.ts b/src/app/modules/demo/service/goods.ts index 9e59d82..0b9076a 100644 --- a/src/app/modules/demo/service/goods.ts +++ b/src/app/modules/demo/service/goods.ts @@ -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'; /** * 商品 diff --git a/src/app/modules/demo/service/task.ts b/src/app/modules/demo/service/task.ts index ec64cc4..cd79470 100644 --- a/src/app/modules/demo/service/task.ts +++ b/src/app/modules/demo/service/task.ts @@ -1,5 +1,5 @@ import { Provide } from '@midwayjs/decorator'; -import { BaseService } from 'midwayjs-cool-core'; +import { BaseService } from '@cool-midway/core'; /** * 任务执行的demo示例 */ diff --git a/src/app/modules/demo/socket/handler.ts b/src/app/modules/demo/socket/handler.ts index 6c3ac75..1ad5484 100644 --- a/src/app/modules/demo/socket/handler.ts +++ b/src/app/modules/demo/socket/handler.ts @@ -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'; /** diff --git a/src/app/modules/space/config.ts b/src/app/modules/space/config.ts index 9b24b94..5187ce4 100644 --- a/src/app/modules/space/config.ts +++ b/src/app/modules/space/config.ts @@ -1,5 +1,5 @@ import { Application } from 'egg'; -import { ModuleConfig } from 'midwayjs-cool-core'; +import { ModuleConfig } from '@cool-midway/core'; /** * 模块的配置 diff --git a/src/app/modules/space/controller/admin/info.ts b/src/app/modules/space/controller/admin/info.ts index 1194681..fd2092a 100644 --- a/src/app/modules/space/controller/admin/info.ts +++ b/src/app/modules/space/controller/admin/info.ts @@ -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'; /** diff --git a/src/app/modules/space/controller/admin/type.ts b/src/app/modules/space/controller/admin/type.ts index 3b955de..a9a961c 100644 --- a/src/app/modules/space/controller/admin/type.ts +++ b/src/app/modules/space/controller/admin/type.ts @@ -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'; /** diff --git a/src/app/modules/space/entity/info.ts b/src/app/modules/space/entity/info.ts index 4852358..cbc668d 100644 --- a/src/app/modules/space/entity/info.ts +++ b/src/app/modules/space/entity/info.ts @@ -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'; /** diff --git a/src/app/modules/space/entity/type.ts b/src/app/modules/space/entity/type.ts index 6a076d6..4b6c7af 100644 --- a/src/app/modules/space/entity/type.ts +++ b/src/app/modules/space/entity/type.ts @@ -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'; /** diff --git a/src/app/modules/task/config.ts b/src/app/modules/task/config.ts index ef68592..5ce48f4 100644 --- a/src/app/modules/task/config.ts +++ b/src/app/modules/task/config.ts @@ -1,5 +1,5 @@ import { Application } from 'egg'; -import { ModuleConfig } from 'midwayjs-cool-core'; +import { ModuleConfig } from '@cool-midway/core'; /** * 模块配置 diff --git a/src/app/modules/task/controller/admin/info.ts b/src/app/modules/task/controller/admin/info.ts index c4ae591..3a439a3 100644 --- a/src/app/modules/task/controller/admin/info.ts +++ b/src/app/modules/task/controller/admin/info.ts @@ -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'; diff --git a/src/app/modules/task/entity/info.ts b/src/app/modules/task/entity/info.ts index b8f0687..5efaca3 100644 --- a/src/app/modules/task/entity/info.ts +++ b/src/app/modules/task/entity/info.ts @@ -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'; /** diff --git a/src/app/modules/task/entity/log.ts b/src/app/modules/task/entity/log.ts index fc296ce..94ba97b 100644 --- a/src/app/modules/task/entity/log.ts +++ b/src/app/modules/task/entity/log.ts @@ -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'; /** diff --git a/src/app/modules/task/queue/task.ts b/src/app/modules/task/queue/task.ts index 2ce7740..25c9857 100644 --- a/src/app/modules/task/queue/task.ts +++ b/src/app/modules/task/queue/task.ts @@ -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'; /** diff --git a/src/app/modules/task/service/demo.ts b/src/app/modules/task/service/demo.ts index 2d057fa..9cc5bed 100644 --- a/src/app/modules/task/service/demo.ts +++ b/src/app/modules/task/service/demo.ts @@ -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'; /** diff --git a/src/app/modules/task/service/info.ts b/src/app/modules/task/service/info.ts index 9b569c4..c084e92 100644 --- a/src/app/modules/task/service/info.ts +++ b/src/app/modules/task/service/info.ts @@ -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'; diff --git a/src/config/config.default.ts b/src/config/config.default.ts index eabaae7..a72b3db 100644 --- a/src/config/config.default.ts +++ b/src/config/config.default.ts @@ -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; diff --git a/src/configuration.ts b/src/configuration.ts index d4120b6..e5f8372 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -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 核心组件之后 diff --git a/src/welcome.ts b/src/welcome.ts index 98e53ba..dd63f21 100644 --- a/src/welcome.ts +++ b/src/welcome.ts @@ -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'; /** * 欢迎界面