From 442f73be1ddc06c33516d846b034809928d3d7dc Mon Sep 17 00:00:00 2001 From: "Xc@centOs" Date: Wed, 8 Jun 2022 11:28:39 +0800 Subject: [PATCH] general-app-domain --- .gitignore | 4 ++-- lib/RuntimeContext.d.ts | 4 ++-- lib/aspects/extraFile.d.ts | 2 +- lib/aspects/token.d.ts | 4 ++-- lib/aspects/token.js | 4 ++-- lib/aspects/wechatQrCode.d.ts | 8 ++++---- lib/checkers/address.d.ts | 2 +- lib/checkers/index.d.ts | 2 +- lib/checkers/token.d.ts | 2 +- lib/checkers/user.d.ts | 2 +- lib/checkers/userEntityGrant.d.ts | 2 +- lib/checkers/wechatQrCode.d.ts | 2 +- lib/data/index.d.ts | 4 ++-- lib/data/userRole.d.ts | 4 ++-- lib/features/application.d.ts | 2 +- lib/features/extraFile.d.ts | 2 +- lib/features/index.d.ts | 2 +- lib/features/token.d.ts | 2 +- lib/triggers/address.d.ts | 2 +- lib/triggers/index.d.ts | 2 +- lib/triggers/user.d.ts | 2 +- lib/triggers/userEntityGrant.d.ts | 2 +- lib/triggers/userEntityGrant.js | 4 ++-- lib/triggers/wechatQrCode.d.ts | 2 +- lib/triggers/wechatQrCode.js | 4 ++-- lib/utils/check.d.ts | 2 +- lib/utils/extraFile.d.ts | 4 ++-- lib/watchers/index.d.ts | 2 +- scripts/buildBaseEntityDict.ts | 2 +- scripts/make.ts | 12 ++++++------ src/RuntimeContext.ts | 2 +- src/aspects/extraFile.ts | 4 ++-- src/aspects/token.ts | 12 ++++++------ src/aspects/wechatQrCode.ts | 6 +++--- src/checkers/address.ts | 2 +- src/checkers/token.ts | 2 +- src/checkers/user.ts | 2 +- src/checkers/userEntityGrant.ts | 2 +- src/checkers/wechatQrCode.ts | 2 +- src/data/userRole.ts | 6 +++--- src/features/application.ts | 4 ++-- src/features/extraFile.ts | 2 +- src/features/index.ts | 2 +- src/features/token.ts | 4 ++-- src/triggers/address.ts | 2 +- src/triggers/index.ts | 2 +- src/triggers/user.ts | 6 +++--- src/triggers/userEntityGrant.ts | 4 ++-- src/triggers/wechatQrCode.ts | 4 ++-- src/typings/polyfill.d.ts | 2 +- src/utils/check.ts | 2 +- src/utils/extraFile.ts | 4 ++-- src/watchers/index.ts | 2 +- 53 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.gitignore b/.gitignore index 428e25235..c6aa6dbda 100644 --- a/.gitignore +++ b/.gitignore @@ -65,5 +65,5 @@ jspm_packages/ build package-lock.json dist -src/base-app-domain -lib/base-app-domain \ No newline at end of file +src/general-app-domain +lib/general-app-domain \ No newline at end of file diff --git a/lib/RuntimeContext.d.ts b/lib/RuntimeContext.d.ts index 146c412c3..996319c91 100644 --- a/lib/RuntimeContext.d.ts +++ b/lib/RuntimeContext.d.ts @@ -1,5 +1,5 @@ import { UniversalContext } from 'oak-domain/lib/store/UniversalContext'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { RowStore } from 'oak-domain/lib/types'; export declare abstract class GeneralRuntimeContext extends UniversalContext { private applicationId; @@ -7,7 +7,7 @@ export declare abstract class GeneralRuntimeContext exten private scene; constructor(store: RowStore>, appId: string, getToken: () => Promise, scene: string); getApplicationId(): string; - getApplication(): Promise>(params: { origin: string; fileName: string; diff --git a/lib/aspects/token.d.ts b/lib/aspects/token.d.ts index fd328f355..177b652cd 100644 --- a/lib/aspects/token.d.ts +++ b/lib/aspects/token.d.ts @@ -1,6 +1,6 @@ import { GeneralRuntimeContext } from '../RuntimeContext'; -import { EntityDict } from 'oak-app-domain'; -import { WechatMpEnv } from 'oak-app-domain/Token/Schema'; +import { EntityDict } from 'general-app-domain'; +import { WechatMpEnv } from 'general-app-domain/Token/Schema'; export declare function loginMp>(params: { code: string; }, context: Cxt): Promise; diff --git a/lib/aspects/token.js b/lib/aspects/token.js index 6d2b4cde7..03e4be302 100644 --- a/lib/aspects/token.js +++ b/lib/aspects/token.js @@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.syncUserInfoWechatMp = exports.loginWechatMp = exports.loginByPassword = exports.loginMp = void 0; -const oak_wechat_sdk_1 = require("oak-wechat-sdk"); +const oak_external_sdk_1 = require("oak-external-sdk"); const assert_1 = __importDefault(require("assert")); const lodash_1 = require("lodash"); const extraFile_1 = require("../utils/extraFile"); @@ -32,7 +32,7 @@ async function loginWechatMp({ code, env }, context) { (0, assert_1.default)(type === 'wechatMp' || config.type === 'wechatMp'); const config2 = config; const { appId, appSecret } = config2; - const wechatInstance = oak_wechat_sdk_1.WechatSDK.getInstance(appId, appSecret, 'wechatMp'); + const wechatInstance = oak_external_sdk_1.WechatSDK.getInstance(appId, appSecret, 'wechatMp'); const { sessionKey, openId, unionId } = await wechatInstance.code2Session(code); const { result: [wechatUser] } = await rowStore.select('wechatUser', { data: { diff --git a/lib/aspects/wechatQrCode.d.ts b/lib/aspects/wechatQrCode.d.ts index 2648ed373..09119f67c 100644 --- a/lib/aspects/wechatQrCode.d.ts +++ b/lib/aspects/wechatQrCode.d.ts @@ -1,5 +1,5 @@ -import { EntityDict } from "oak-app-domain"; -import { WechatQrCodeProps } from 'oak-app-domain/WechatQrCode/Schema'; +import { EntityDict } from "general-app-domain"; +import { WechatQrCodeProps } from 'general-app-domain/WechatQrCode/Schema'; import { GeneralRuntimeContext } from "../RuntimeContext"; export declare function createWechatQrCode>(options: { entity: T; @@ -9,11 +9,11 @@ export declare function createWechatQrCode, import("oak-domain/lib/types").InstinctiveAttributes> & { +}, context: Cxt): Promise, import("oak-domain/lib/types").InstinctiveAttributes> & { id: string; } & { applicationId: string; - application?: import("oak-app-domain/Application/Schema").UpdateOperation | undefined; + application?: import("general-app-domain/Application/Schema").UpdateOperation | undefined; } & { [K: string]: any; } & { diff --git a/lib/checkers/address.d.ts b/lib/checkers/address.d.ts index 48a41a3b0..6da16a59d 100644 --- a/lib/checkers/address.d.ts +++ b/lib/checkers/address.d.ts @@ -1,5 +1,5 @@ import { Checker } from "oak-domain/lib/types"; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const checkers: Checker>[]; export default checkers; diff --git a/lib/checkers/index.d.ts b/lib/checkers/index.d.ts index 48a97f498..3f8555b0c 100644 --- a/lib/checkers/index.d.ts +++ b/lib/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; +declare const _default: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; export default _default; diff --git a/lib/checkers/token.d.ts b/lib/checkers/token.d.ts index 421fe8d50..ccb424b11 100644 --- a/lib/checkers/token.d.ts +++ b/lib/checkers/token.d.ts @@ -1,5 +1,5 @@ import { Checker } from "oak-domain/lib/types"; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const checkers: Checker>[]; export default checkers; diff --git a/lib/checkers/user.d.ts b/lib/checkers/user.d.ts index 0234fe3bf..cf6ee829b 100644 --- a/lib/checkers/user.d.ts +++ b/lib/checkers/user.d.ts @@ -1,5 +1,5 @@ import { Checker } from "oak-domain/lib/types"; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const checkers: Checker>[]; export default checkers; diff --git a/lib/checkers/userEntityGrant.d.ts b/lib/checkers/userEntityGrant.d.ts index 90c826453..3592429d7 100644 --- a/lib/checkers/userEntityGrant.d.ts +++ b/lib/checkers/userEntityGrant.d.ts @@ -1,5 +1,5 @@ import { Checker } from 'oak-domain/lib/types'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const checkers: Checker>[]; export default checkers; diff --git a/lib/checkers/wechatQrCode.d.ts b/lib/checkers/wechatQrCode.d.ts index 04c10f13e..48d232fa7 100644 --- a/lib/checkers/wechatQrCode.d.ts +++ b/lib/checkers/wechatQrCode.d.ts @@ -1,5 +1,5 @@ import { Checker } from 'oak-domain/lib/types'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const checkers: Checker>[]; export default checkers; diff --git a/lib/data/index.d.ts b/lib/data/index.d.ts index 40b39e34f..e7e042ce0 100644 --- a/lib/data/index.d.ts +++ b/lib/data/index.d.ts @@ -1,6 +1,6 @@ declare const _default: { - user: import("oak-app-domain/User/Schema").CreateOperationData[]; - role: import("oak-app-domain/Role/Schema").CreateOperationData[]; + user: import("general-app-domain/User/Schema").CreateOperationData[]; + role: import("general-app-domain/Role/Schema").CreateOperationData[]; area: ({ code: string; level: string; diff --git a/lib/data/userRole.d.ts b/lib/data/userRole.d.ts index 72dfa3f56..5b1a066fd 100644 --- a/lib/data/userRole.d.ts +++ b/lib/data/userRole.d.ts @@ -1,4 +1,4 @@ -import { CreateOperationData as UserCreate } from 'oak-app-domain/User/Schema'; -import { CreateOperationData as RoleCreate } from 'oak-app-domain/Role/Schema'; +import { CreateOperationData as UserCreate } from 'general-app-domain/User/Schema'; +import { CreateOperationData as RoleCreate } from 'general-app-domain/Role/Schema'; export declare const users: Array; export declare const roles: Array; diff --git a/lib/features/application.d.ts b/lib/features/application.d.ts index 8b9428520..651559900 100644 --- a/lib/features/application.d.ts +++ b/lib/features/application.d.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Feature } from 'oak-frontend-base'; import { Aspect, Context, SelectRowShape } from 'oak-domain/lib/types'; import { Cache } from 'oak-frontend-base'; diff --git a/lib/features/extraFile.d.ts b/lib/features/extraFile.d.ts index 84f56d15b..5d80c4fb9 100644 --- a/lib/features/extraFile.d.ts +++ b/lib/features/extraFile.d.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Feature } from 'oak-frontend-base'; import { Aspect, Context, DeduceCreateOperationData } from 'oak-domain/lib/types'; export declare class ExtraFile, AD extends Record>> extends Feature { diff --git a/lib/features/index.d.ts b/lib/features/index.d.ts index 0ddaf0914..591ebca64 100644 --- a/lib/features/index.d.ts +++ b/lib/features/index.d.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Aspect, Context } from 'oak-domain/lib/types'; import { Token } from './token'; import { ExtraFile } from './extraFile'; diff --git a/lib/features/token.d.ts b/lib/features/token.d.ts index 859e3fd9f..053556dda 100644 --- a/lib/features/token.d.ts +++ b/lib/features/token.d.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Feature } from 'oak-frontend-base'; import { Aspect, Context } from 'oak-domain/lib/types'; import { Cache } from 'oak-frontend-base'; diff --git a/lib/triggers/address.d.ts b/lib/triggers/address.d.ts index 7a60aa096..221ed6124 100644 --- a/lib/triggers/address.d.ts +++ b/lib/triggers/address.d.ts @@ -1,5 +1,5 @@ import { Trigger } from 'oak-domain/lib/types/Trigger'; -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict } from 'general-app-domain/EntityDict'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const triggers: Trigger>[]; export default triggers; diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index 0e7338e27..42bf74614 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,4 +1,4 @@ -import { EntityDict as BaseEntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict as BaseEntityDict } from 'general-app-domain/EntityDict'; import { Trigger } from 'oak-domain/lib/types'; declare const _default: (Trigger> | Trigger> | Trigger> | Trigger>)[]; export default _default; diff --git a/lib/triggers/user.d.ts b/lib/triggers/user.d.ts index 286ea7664..251e108e2 100644 --- a/lib/triggers/user.d.ts +++ b/lib/triggers/user.d.ts @@ -1,5 +1,5 @@ import { Trigger } from 'oak-domain/lib/types/Trigger'; -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict } from 'general-app-domain/EntityDict'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const triggers: Trigger>[]; export default triggers; diff --git a/lib/triggers/userEntityGrant.d.ts b/lib/triggers/userEntityGrant.d.ts index a48b04980..24f70bbe2 100644 --- a/lib/triggers/userEntityGrant.d.ts +++ b/lib/triggers/userEntityGrant.d.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict } from 'general-app-domain/EntityDict'; import { Trigger } from 'oak-domain/lib/types/Trigger'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const triggers: Trigger>[]; diff --git a/lib/triggers/userEntityGrant.js b/lib/triggers/userEntityGrant.js index e758d5db7..d9ce77545 100644 --- a/lib/triggers/userEntityGrant.js +++ b/lib/triggers/userEntityGrant.js @@ -61,11 +61,11 @@ const triggers = [ entityId: id, applicationId, props: { - pathname: 'pages/userEntityGrant/confirm', + pathname: 'pages/userEntityGrant/confirm/index', props: { oakId: id, }, - } + }, }, context); } }; diff --git a/lib/triggers/wechatQrCode.d.ts b/lib/triggers/wechatQrCode.d.ts index ae82a1572..a8838f600 100644 --- a/lib/triggers/wechatQrCode.d.ts +++ b/lib/triggers/wechatQrCode.d.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict } from 'general-app-domain/EntityDict'; import { Trigger } from 'oak-domain/lib/types/Trigger'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const triggers: Trigger>[]; diff --git a/lib/triggers/wechatQrCode.js b/lib/triggers/wechatQrCode.js index 4656b68bb..dd6705d35 100644 --- a/lib/triggers/wechatQrCode.js +++ b/lib/triggers/wechatQrCode.js @@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); const assert_1 = __importDefault(require("assert")); -const oak_wechat_sdk_1 = require("oak-wechat-sdk"); +const oak_external_sdk_1 = require("oak-external-sdk"); const uuid_1 = require("oak-domain/lib/utils/uuid"); const lodash_1 = require("lodash"); const triggers = [ @@ -25,7 +25,7 @@ const triggers = [ console.log('code', code); if (type === 'wechatMpWxaCode') { // 小程序码去实时获取（暂时不考虑缓存） - const wechatInstance = oak_wechat_sdk_1.WechatSDK.getInstance(appId, appSecret, 'wechatMp'); + const wechatInstance = oak_external_sdk_1.WechatSDK.getInstance(appId, appSecret, 'wechatMp'); const buffer = await wechatInstance.getMpUnlimitWxaCode({ scene: (0, uuid_1.shrinkUuidTo32Bytes)(id), page: 'pages/index/index', // todo，这里用其它的页面微信服务器拒绝，因为没发布。应该是 pages/wechatQrCode/scan/index diff --git a/lib/utils/check.d.ts b/lib/utils/check.d.ts index a0e015bcc..85fb1dc8f 100644 --- a/lib/utils/check.d.ts +++ b/lib/utils/check.d.ts @@ -1,3 +1,3 @@ -import { EntityDict } from "oak-app-domain"; +import { EntityDict } from "general-app-domain"; import { GeneralRuntimeContext } from "../RuntimeContext"; export declare function checkIsRoot(context: GeneralRuntimeContext): Promise; diff --git a/lib/utils/extraFile.d.ts b/lib/utils/extraFile.d.ts index 3518b49cb..daef0d625 100644 --- a/lib/utils/extraFile.d.ts +++ b/lib/utils/extraFile.d.ts @@ -1,4 +1,4 @@ -import { OpSchema as ExtraFile } from 'oak-app-domain/ExtraFile/Schema'; -import { SystemConfig } from 'oak-app-domain/System/Schema'; +import { OpSchema as ExtraFile } from 'general-app-domain/ExtraFile/Schema'; +import { SystemConfig } from 'general-app-domain/System/Schema'; export declare function composeFileUrl(extraFile: Pick, systemConfig?: SystemConfig): string; export declare function decomposeFileUrl(url: string): Pick; diff --git a/lib/watchers/index.d.ts b/lib/watchers/index.d.ts index 019664962..8759d037a 100644 --- a/lib/watchers/index.d.ts +++ b/lib/watchers/index.d.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Watcher } from 'oak-domain/lib/types'; import { GeneralRuntimeContext } from '../RuntimeContext'; declare const _default: Watcher>[]; diff --git a/scripts/buildBaseEntityDict.ts b/scripts/buildBaseEntityDict.ts index 6af323d71..0ca3cf10e 100644 --- a/scripts/buildBaseEntityDict.ts +++ b/scripts/buildBaseEntityDict.ts @@ -4,5 +4,5 @@ import { buildSchema, analyzeEntities } from 'oak-domain/src/compiler/schemalBui process.env.NODE_ENV = 'development'; process.env.COMPLING_AS_LIB = 'yes'; analyzeEntities('src/entities'); -buildSchema('src/base-app-domain/'); +buildSchema('src/general-app-domain/'); unset(process.env, 'COMPLING_AS_LIB'); diff --git a/scripts/make.ts b/scripts/make.ts index c14751441..4097312bc 100644 --- a/scripts/make.ts +++ b/scripts/make.ts @@ -2,7 +2,7 @@ import chalk from 'chalk'; import spawn from 'cross-spawn'; // ts-node scripts/build-app-domain & npm link ./app-domain - console.log(`${chalk.greenBright(`build oak-app-domain`)}`); + console.log(`${chalk.greenBright(`build general-app-domain`)}`); const result = spawn.sync( 'ts-node', @@ -21,19 +21,19 @@ import spawn from 'cross-spawn'; process.exit(1); } - console.log(`${chalk.greenBright(`npm link oak-app-domain`)}`); + console.log(`${chalk.greenBright(`npm link general-app-domain`)}`); - const isMac = process.platform === 'darwin'; - const result2 = isMac? spawn.sync( + const isWin = process.platform === 'win32'; + const result2 = !isWin ? spawn.sync( 'sudo', - [`npm link ${process.cwd()}/src/base-app-domain`], + [`npm link ${process.cwd()}/src/general-app-domain`], { stdio: 'inherit', shell: true, } ) : spawn.sync( 'npm', - [`link ${process.cwd()}/src/base-app-domain`], + [`link ${process.cwd()}/src/general-app-domain`], { stdio: 'inherit', shell: true, diff --git a/src/RuntimeContext.ts b/src/RuntimeContext.ts index b14ac50a2..1969a36c8 100644 --- a/src/RuntimeContext.ts +++ b/src/RuntimeContext.ts @@ -1,7 +1,7 @@ import { SelectionResult } from 'oak-domain/lib/types'; import { UniversalContext } from 'oak-domain/lib/store/UniversalContext'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { RowStore } from 'oak-domain/lib/types'; diff --git a/src/aspects/extraFile.ts b/src/aspects/extraFile.ts index 44f67ecd9..11a1d9ed7 100644 --- a/src/aspects/extraFile.ts +++ b/src/aspects/extraFile.ts @@ -1,6 +1,6 @@ import { GeneralRuntimeContext } from '../RuntimeContext'; -import { EntityDict } from 'oak-app-domain'; -import { SystemConfig } from 'oak-app-domain/System/Schema'; +import { EntityDict } from 'general-app-domain'; +import { SystemConfig } from 'general-app-domain/System/Schema'; import qiniuInstance from '../utils/externalUpload/qiniu'; const ExternalUploadClazz = { diff --git a/src/aspects/token.ts b/src/aspects/token.ts index 97a690dfe..ca214c5dc 100644 --- a/src/aspects/token.ts +++ b/src/aspects/token.ts @@ -1,12 +1,12 @@ import { GeneralRuntimeContext } from '../RuntimeContext'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { WechatSDK } from 'oak-external-sdk'; import assert from 'assert'; -import { WechatMpConfig } from 'oak-app-domain/Application/Schema'; -import { CreateOperationData as CreateToken, WechatMpEnv } from 'oak-app-domain/Token/Schema'; -import { CreateOperationData as CreateWechatUser } from 'oak-app-domain/WechatUser/Schema'; -import { CreateOperationData as CreateUser, Schema as User } from 'oak-app-domain/User/Schema'; -import { Operation as ExtraFileOperation } from 'oak-app-domain/ExtraFile/Schema'; +import { WechatMpConfig } from 'general-app-domain/Application/Schema'; +import { CreateOperationData as CreateToken, WechatMpEnv } from 'general-app-domain/Token/Schema'; +import { CreateOperationData as CreateWechatUser } from 'general-app-domain/WechatUser/Schema'; +import { CreateOperationData as CreateUser, Schema as User } from 'general-app-domain/User/Schema'; +import { Operation as ExtraFileOperation } from 'general-app-domain/ExtraFile/Schema'; import { assign, isEqual, keys } from 'lodash'; import { SelectRowShape } from 'oak-domain/lib/types'; import { composeFileUrl, decomposeFileUrl } from '../utils/extraFile'; diff --git a/src/aspects/wechatQrCode.ts b/src/aspects/wechatQrCode.ts index 751b25f97..e8e9bea65 100644 --- a/src/aspects/wechatQrCode.ts +++ b/src/aspects/wechatQrCode.ts @@ -1,7 +1,7 @@ import assert from "assert"; -import { EntityDict } from "oak-app-domain"; -import { WechatMpConfig } from "oak-app-domain/Application/Schema"; -import { CreateOperationData as CreateWechatQrcodeData, WechatQrCodeProps } from 'oak-app-domain/WechatQrCode/Schema'; +import { EntityDict } from "general-app-domain"; +import { WechatMpConfig } from "general-app-domain/Application/Schema"; +import { CreateOperationData as CreateWechatQrcodeData, WechatQrCodeProps } from 'general-app-domain/WechatQrCode/Schema'; import { GeneralRuntimeContext } from "../RuntimeContext"; export async function createWechatQrCode>(options: { diff --git a/src/checkers/address.ts b/src/checkers/address.ts index c3babc682..87fae1bc1 100644 --- a/src/checkers/address.ts +++ b/src/checkers/address.ts @@ -1,6 +1,6 @@ import { isMobile } from 'oak-domain/lib/utils/validator'; import { OakInputIllegalException, Checker } from "oak-domain/lib/types"; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { checkAttributesNotNull } from 'oak-domain/lib/utils/validator'; import { GeneralRuntimeContext } from '../RuntimeContext'; diff --git a/src/checkers/token.ts b/src/checkers/token.ts index c59b7fb40..37ffedc51 100644 --- a/src/checkers/token.ts +++ b/src/checkers/token.ts @@ -1,5 +1,5 @@ import { Checker, OakUserUnpermittedException } from "oak-domain/lib/types"; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; import { OakUnloggedInException } from "../types/Exceptions"; import { assign } from "lodash"; diff --git a/src/checkers/user.ts b/src/checkers/user.ts index c7d4eecda..4ab5a6614 100644 --- a/src/checkers/user.ts +++ b/src/checkers/user.ts @@ -1,6 +1,6 @@ import { checkFilterContains } from 'oak-domain/lib/store/actionDef'; import { OakInputIllegalException, Checker, OakUserUnpermittedException, OakRowInconsistencyException } from "oak-domain/lib/types"; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; import { ROOT_ROLE_ID } from '../constants'; import { assign } from 'lodash'; diff --git a/src/checkers/userEntityGrant.ts b/src/checkers/userEntityGrant.ts index 5ed251944..eb61cd058 100644 --- a/src/checkers/userEntityGrant.ts +++ b/src/checkers/userEntityGrant.ts @@ -1,7 +1,7 @@ import { Checker, OakInputIllegalException, } from 'oak-domain/lib/types'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; import { checkAttributesNotNull } from 'oak-domain/lib/utils/validator'; import { assign } from 'lodash'; diff --git a/src/checkers/wechatQrCode.ts b/src/checkers/wechatQrCode.ts index e87fe934b..a5fd6edbb 100644 --- a/src/checkers/wechatQrCode.ts +++ b/src/checkers/wechatQrCode.ts @@ -2,7 +2,7 @@ import { checkFilterContains } from 'oak-domain/lib/store/actionDef'; import { Checker, } from 'oak-domain/lib/types'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; const checkers: Checker< diff --git a/src/data/userRole.ts b/src/data/userRole.ts index 7363ea4f3..b60be71c6 100644 --- a/src/data/userRole.ts +++ b/src/data/userRole.ts @@ -1,6 +1,6 @@ -import { CreateOperationData as UserCreate } from 'oak-app-domain/User/Schema'; -import { CreateOperationData as RoleCreate } from 'oak-app-domain/Role/Schema'; -import { CreateOperationData as UserRoleCreate } from 'oak-app-domain/UserRole/Schema'; +import { CreateOperationData as UserCreate } from 'general-app-domain/User/Schema'; +import { CreateOperationData as RoleCreate } from 'general-app-domain/Role/Schema'; +import { CreateOperationData as UserRoleCreate } from 'general-app-domain/UserRole/Schema'; import { ROOT_ROLE_ID, ROOT_USER_ID } from '../constants'; export const users: Array = [ { diff --git a/src/features/application.ts b/src/features/application.ts index 453053b7e..5161753c9 100644 --- a/src/features/application.ts +++ b/src/features/application.ts @@ -1,9 +1,9 @@ import { pick } from 'lodash'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Action, Feature } from 'oak-frontend-base'; import { Aspect, Context, SelectRowShape } from 'oak-domain/lib/types'; import { RWLock } from 'oak-domain/lib/utils/concurrent'; -import { WechatMpEnv } from 'oak-app-domain/Token/Schema'; +import { WechatMpEnv } from 'general-app-domain/Token/Schema'; import { Cache } from 'oak-frontend-base'; import assert from 'assert'; diff --git a/src/features/extraFile.ts b/src/features/extraFile.ts index 9a064655c..85380b534 100644 --- a/src/features/extraFile.ts +++ b/src/features/extraFile.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Action, Feature } from 'oak-frontend-base'; import { Aspect, Context, DeduceCreateOperationData } from 'oak-domain/lib/types'; import { RWLock } from 'oak-domain/lib/utils/concurrent'; diff --git a/src/features/index.ts b/src/features/index.ts index d5aab7abe..f0fc02b4c 100644 --- a/src/features/index.ts +++ b/src/features/index.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Aspect, Context } from 'oak-domain/lib/types'; import { Token } from './token'; import { ExtraFile } from './extraFile'; diff --git a/src/features/token.ts b/src/features/token.ts index 03f0ee6b3..e7957b82b 100644 --- a/src/features/token.ts +++ b/src/features/token.ts @@ -1,9 +1,9 @@ import { pick } from 'lodash'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Action, Feature } from 'oak-frontend-base'; import { Aspect, Context } from 'oak-domain/lib/types'; import { RWLock } from 'oak-domain/lib/utils/concurrent'; -import { WechatMpEnv } from 'oak-app-domain/Token/Schema'; +import { WechatMpEnv } from 'general-app-domain/Token/Schema'; import { Cache } from 'oak-frontend-base'; export class Token, AD extends Record>> extends Feature { diff --git a/src/triggers/address.ts b/src/triggers/address.ts index b054832fa..74c73dbd9 100644 --- a/src/triggers/address.ts +++ b/src/triggers/address.ts @@ -1,5 +1,5 @@ import { CreateTriggerInTxn, Trigger } from 'oak-domain/lib/types/Trigger'; -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict } from 'general-app-domain/EntityDict'; import { GeneralRuntimeContext } from '../RuntimeContext'; diff --git a/src/triggers/index.ts b/src/triggers/index.ts index f24a4cb55..a47263106 100644 --- a/src/triggers/index.ts +++ b/src/triggers/index.ts @@ -1,5 +1,5 @@ import { EntityDict } from 'oak-domain/lib/types/Entity'; -import { EntityDict as BaseEntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict as BaseEntityDict } from 'general-app-domain/EntityDict'; import { Trigger } from 'oak-domain/lib/types'; import addressTriggers from './address'; import userTriggers from './user'; diff --git a/src/triggers/user.ts b/src/triggers/user.ts index b1ab887b9..9f56c95f9 100644 --- a/src/triggers/user.ts +++ b/src/triggers/user.ts @@ -1,8 +1,8 @@ import { CreateTriggerInTxn, Trigger } from 'oak-domain/lib/types/Trigger'; -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict } from 'general-app-domain/EntityDict'; import { GeneralRuntimeContext } from '../RuntimeContext'; -import { CreateOperationData as CreateUserRoleData } from 'oak-app-domain/UserRole/Schema'; -import { CreateOperationData as CreateUserData } from 'oak-app-domain/User/Schema'; +import { CreateOperationData as CreateUserRoleData } from 'general-app-domain/UserRole/Schema'; +import { CreateOperationData as CreateUserData } from 'general-app-domain/User/Schema'; import assert from 'assert'; import { ROOT_ROLE_ID, ROOT_USER_ID } from '../constants'; diff --git a/src/triggers/userEntityGrant.ts b/src/triggers/userEntityGrant.ts index 2f745dc81..e4595a298 100644 --- a/src/triggers/userEntityGrant.ts +++ b/src/triggers/userEntityGrant.ts @@ -1,7 +1,7 @@ -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict } from 'general-app-domain/EntityDict'; import { CreateTriggerInTxn, Trigger } from 'oak-domain/lib/types/Trigger'; import { GeneralRuntimeContext } from '../RuntimeContext'; -import { CreateOperationData as CreateUserEntityGrantData } from 'oak-app-domain/UserEntityGrant/Schema'; +import { CreateOperationData as CreateUserEntityGrantData } from 'general-app-domain/UserEntityGrant/Schema'; import { assign, keys } from 'lodash'; import { OakCongruentRowExists } from 'oak-domain/lib/types'; diff --git a/src/triggers/wechatQrCode.ts b/src/triggers/wechatQrCode.ts index 948898e5e..45fb4ffdf 100644 --- a/src/triggers/wechatQrCode.ts +++ b/src/triggers/wechatQrCode.ts @@ -1,10 +1,10 @@ -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { EntityDict } from 'general-app-domain/EntityDict'; import { SelectTriggerAfter, Trigger } from 'oak-domain/lib/types/Trigger'; import { GeneralRuntimeContext } from '../RuntimeContext'; import assert from 'assert'; import { WechatSDK } from 'oak-external-sdk'; -import { WechatMpConfig } from 'oak-app-domain/Application/Schema'; +import { WechatMpConfig } from 'general-app-domain/Application/Schema'; import { shrinkUuidTo32Bytes } from 'oak-domain/lib/utils/uuid'; import { assign } from 'lodash'; diff --git a/src/typings/polyfill.d.ts b/src/typings/polyfill.d.ts index ec5df3e7e..78cdc8f14 100644 --- a/src/typings/polyfill.d.ts +++ b/src/typings/polyfill.d.ts @@ -1,5 +1,5 @@ import { MakeOakComponent, MakeOakPage, I18nWechatMpRuntimeBase } from 'oak-frontend-base'; -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { GeneralRuntimeContext } from '../RuntimeContext'; import aspectDict from '../aspects'; import { initialize } from '../features'; diff --git a/src/utils/check.ts b/src/utils/check.ts index 7ed65c646..6b37b6183 100644 --- a/src/utils/check.ts +++ b/src/utils/check.ts @@ -1,4 +1,4 @@ -import { EntityDict } from "oak-app-domain"; +import { EntityDict } from "general-app-domain"; import { ROOT_ROLE_ID } from "../constants"; import { GeneralRuntimeContext } from "../RuntimeContext"; diff --git a/src/utils/extraFile.ts b/src/utils/extraFile.ts index 68794b2c7..5b7e9367a 100644 --- a/src/utils/extraFile.ts +++ b/src/utils/extraFile.ts @@ -1,5 +1,5 @@ -import { OpSchema as ExtraFile } from 'oak-app-domain/ExtraFile/Schema'; -import { SystemConfig } from 'oak-app-domain/System/Schema'; +import { OpSchema as ExtraFile } from 'general-app-domain/ExtraFile/Schema'; +import { SystemConfig } from 'general-app-domain/System/Schema'; export function composeFileUrl( extraFile: Pick< diff --git a/src/watchers/index.ts b/src/watchers/index.ts index a482b5b5c..2df31419a 100644 --- a/src/watchers/index.ts +++ b/src/watchers/index.ts @@ -1,4 +1,4 @@ -import { EntityDict } from 'oak-app-domain'; +import { EntityDict } from 'general-app-domain'; import { Watcher } from 'oak-domain/lib/types'; import { GeneralRuntimeContext } from '../RuntimeContext';