diff --git a/app/common/adapter/binary/AbstractBinary.ts b/app/common/adapter/binary/AbstractBinary.ts index 9e0a5f67..ff35d307 100644 --- a/app/common/adapter/binary/AbstractBinary.ts +++ b/app/common/adapter/binary/AbstractBinary.ts @@ -1,5 +1,5 @@ import { ImplDecorator, Inject, QualifierImplDecoratorUtil } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import { EggHttpClient, EggLogger } from 'egg'; import { BinaryTaskConfig } from '../../../../config/binaries'; diff --git a/app/common/adapter/binary/ApiBinary.ts b/app/common/adapter/binary/ApiBinary.ts index 12b4328b..f5ca6d10 100644 --- a/app/common/adapter/binary/ApiBinary.ts +++ b/app/common/adapter/binary/ApiBinary.ts @@ -1,6 +1,6 @@ import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; import { Inject, SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import { EggAppConfig } from 'egg'; @SingletonProto() diff --git a/app/common/adapter/binary/BucketBinary.ts b/app/common/adapter/binary/BucketBinary.ts index 3f0e9769..e7a8244b 100644 --- a/app/common/adapter/binary/BucketBinary.ts +++ b/app/common/adapter/binary/BucketBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import binaries, { BinaryTaskConfig } from 'config/binaries'; import path from 'path'; import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; diff --git a/app/common/adapter/binary/CypressBinary.ts b/app/common/adapter/binary/CypressBinary.ts index fb8cb751..d18944e9 100644 --- a/app/common/adapter/binary/CypressBinary.ts +++ b/app/common/adapter/binary/CypressBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; @SingletonProto() diff --git a/app/common/adapter/binary/ElectronBinary.ts b/app/common/adapter/binary/ElectronBinary.ts index 8ba67606..72ede5bf 100644 --- a/app/common/adapter/binary/ElectronBinary.ts +++ b/app/common/adapter/binary/ElectronBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import binaries from 'config/binaries'; import { BinaryAdapter, BinaryItem, FetchResult } from './AbstractBinary'; import { GithubBinary } from './GithubBinary'; diff --git a/app/common/adapter/binary/GithubBinary.ts b/app/common/adapter/binary/GithubBinary.ts index 49eda044..e682eddf 100644 --- a/app/common/adapter/binary/GithubBinary.ts +++ b/app/common/adapter/binary/GithubBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import binaries, { BinaryTaskConfig } from 'config/binaries'; import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; diff --git a/app/common/adapter/binary/ImageminBinary.ts b/app/common/adapter/binary/ImageminBinary.ts index 07b0bc63..d7826e99 100644 --- a/app/common/adapter/binary/ImageminBinary.ts +++ b/app/common/adapter/binary/ImageminBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import binaries from 'config/binaries'; import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; diff --git a/app/common/adapter/binary/NodeBinary.ts b/app/common/adapter/binary/NodeBinary.ts index bed11c2e..54910663 100644 --- a/app/common/adapter/binary/NodeBinary.ts +++ b/app/common/adapter/binary/NodeBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import binaries from 'config/binaries'; import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; diff --git a/app/common/adapter/binary/NodePreGypBinary.ts b/app/common/adapter/binary/NodePreGypBinary.ts index 95ed1e87..7d38ea01 100644 --- a/app/common/adapter/binary/NodePreGypBinary.ts +++ b/app/common/adapter/binary/NodePreGypBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import binaries from 'config/binaries'; import { join } from 'path'; import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; diff --git a/app/common/adapter/binary/NwjsBinary.ts b/app/common/adapter/binary/NwjsBinary.ts index dec16d30..11f91a75 100644 --- a/app/common/adapter/binary/NwjsBinary.ts +++ b/app/common/adapter/binary/NwjsBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import binaries from 'config/binaries'; import { FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; import { BucketBinary } from './BucketBinary'; diff --git a/app/common/adapter/binary/PlaywrightBinary.ts b/app/common/adapter/binary/PlaywrightBinary.ts index 9b77252d..1a48cef0 100644 --- a/app/common/adapter/binary/PlaywrightBinary.ts +++ b/app/common/adapter/binary/PlaywrightBinary.ts @@ -3,7 +3,7 @@ import { AbstractBinary, BinaryAdapter, BinaryItem, FetchResult } from './Abstra import util from 'util'; import path from 'path'; import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; const PACKAGE_URL = 'https://registry.npmjs.com/playwright-core'; const DOWNLOAD_HOST = 'https://playwright.azureedge.net/'; diff --git a/app/common/adapter/binary/PuppeteerBinary.ts b/app/common/adapter/binary/PuppeteerBinary.ts index 6ae20efd..bc3afd73 100644 --- a/app/common/adapter/binary/PuppeteerBinary.ts +++ b/app/common/adapter/binary/PuppeteerBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; @SingletonProto() diff --git a/app/common/adapter/binary/SqlcipherBinary.ts b/app/common/adapter/binary/SqlcipherBinary.ts index a00961c7..27ae2b60 100644 --- a/app/common/adapter/binary/SqlcipherBinary.ts +++ b/app/common/adapter/binary/SqlcipherBinary.ts @@ -1,5 +1,5 @@ import { SingletonProto } from '@eggjs/tegg'; -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../../enum/Binary'; import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary'; @SingletonProto() diff --git a/app/core/service/BinarySyncerService.ts b/app/core/service/BinarySyncerService.ts index 5ac100e2..51c7b29d 100644 --- a/app/core/service/BinarySyncerService.ts +++ b/app/core/service/BinarySyncerService.ts @@ -19,8 +19,8 @@ import { Binary } from '../entity/Binary'; import { TaskService } from './TaskService'; import { AbstractBinary, BinaryItem } from '../../common/adapter/binary/AbstractBinary'; import { AbstractService } from '../../common/AbstractService'; -import { TaskRepository } from 'app/repository/TaskRepository'; -import { BinaryType } from 'app/common/enum/Binary'; +import { TaskRepository } from '../../repository/TaskRepository'; +import { BinaryType } from '../../common/enum/Binary'; function isoNow() { return new Date().toISOString(); diff --git a/config/binaries.ts b/config/binaries.ts index 8f57b591..488fea28 100644 --- a/config/binaries.ts +++ b/config/binaries.ts @@ -1,4 +1,4 @@ -import { BinaryType } from 'app/common/enum/Binary'; +import { BinaryType } from '../app/common/enum/Binary'; export type BinaryTaskConfig = { category: string; // 默认 category 为 binaryName,但是有些 binary 会有不同的 category,比如 canvas,包含 canvas 和 node-canvas-prebuilt 两个