适配了common的编译声明

2024-04-10 15:33:28 +08:00 · 2024-04-10 15:33:28 +08:00 · beae8eb15a
parent 3bd50bf988
commit beae8eb15a
30 changed files with 187 additions and 220 deletions
--- a/es/aspects/AspectDict.d.ts
+++ b/es/aspects/AspectDict.d.ts
@ -6,65 +6,65 @@ import { Style } from '../types/Style';
 import { MaterialType } from '../types/WeChat';
 import { BackendRuntimeContext } from '../context/BackendRuntimeContext';
 import { WechatPublicEventData, WechatMpEventData } from 'oak-external-sdk';
-export type GeneralAspectDict<ED extends EntityDict, Cxt extends BackendRuntimeContext<ED>> = {
+export type AspectDict<ED extends EntityDict> = {
    mergeUser: (params: {
        from: string;
        to: string;
-    }, context: Cxt) => Promise<void>;
-    refreshWechatPublicUserInfo: (params: {}, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
+    refreshWechatPublicUserInfo: (params: {}, context: BackendRuntimeContext<ED>) => Promise<void>;
    getWechatMpUserPhoneNumber: (params: {
        code: string;
        env: WechatMpEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    loginByMobile: (params: {
        captcha?: string;
        password?: string;
        mobile: string;
        disableRegister?: boolean;
        env: WebEnv | WechatMpEnv | NativeEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    loginWechat: ({ code, env, wechatLoginId, }: {
        code: string;
        env: WebEnv;
        wechatLoginId?: string;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    logout: (params: {
        tokenValue: string;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    loginWechatMp: ({ code, env, }: {
        code: string;
        env: WechatMpEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    syncUserInfoWechatMp: ({ nickname, avatarUrl, encryptedData, iv, signature, }: {
        nickname: string;
        avatarUrl: string;
        encryptedData: string;
        iv: string;
        signature: string;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    wakeupParasite: (params: {
        id: string;
        env: WebEnv | WechatMpEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    refreshToken: (params: {
        tokenValue: string;
        env: WebEnv | WechatMpEnv | NativeEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    sendCaptcha: (params: {
        mobile: string;
        env: WechatMpEnv | WebEnv;
        type: 'login' | 'changePassword' | 'confirm';
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    getApplication: (params: {
        type: AppType;
        domain: string;
        data: ED['application']['Selection']['data'];
        appId?: string;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    signatureJsSDK: (params: {
        url: string;
        env: WebEnv;
-    }, context: Cxt) => Promise<{
+    }, context: BackendRuntimeContext<ED>) => Promise<{
        signature: any;
        noncestr: string;
        timestamp: number;
@ -74,34 +74,34 @@ export type GeneralAspectDict<ED extends EntityDict, Cxt extends BackendRuntimeC
        entity: 'platform' | 'system';
        entityId: string;
        config: Config;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    updateStyle: (params: {
        entity: 'platform' | 'system' | 'application';
        entityId: string;
        style: Style;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    updateApplicationConfig: (params: {
        entity: 'application';
        entityId: string;
        config: EntityDict['application']['Schema']['config'];
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    switchTo: (params: {
        userId: string;
-    }, context: Cxt) => Promise<void>;
-    getMpUnlimitWxaCode: (wechatQrCodeId: string, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
+    getMpUnlimitWxaCode: (wechatQrCodeId: string, context: BackendRuntimeContext<ED>) => Promise<string>;
    createWechatLogin: (params: {
        type: EntityDict['wechatLogin']['Schema']['type'];
        interval: number;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    unbindingWechat: (params: {
        wechatUserId: string;
        captcha?: string;
        mobile?: string;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    loginByWechat: (params: {
        wechatLoginId: string;
        env: WebEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    getInfoByUrl: (params: {
        url: string;
    }) => Promise<{
@ -111,14 +111,14 @@ export type GeneralAspectDict<ED extends EntityDict, Cxt extends BackendRuntimeC
    }>;
    getChangePasswordChannels: (params: {
        userId: string;
-    }, context: Cxt) => Promise<string[]>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string[]>;
    updateUserPassword: (params: {
        userId: string;
        prevPassword?: string;
        mobile?: string;
        captcha?: string;
        newPassword: string;
-    }, context: Cxt) => Promise<{
+    }, context: BackendRuntimeContext<ED>) => Promise<{
        result: string;
        times?: number;
    }>;
@ -127,125 +127,125 @@ export type GeneralAspectDict<ED extends EntityDict, Cxt extends BackendRuntimeC
        type: AppType;
        entity?: string;
        entityId?: string;
-    }, context: Cxt) => Promise<string>;
-    uploadWechatMedia: (params: any, context: Cxt) => Promise<{
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
+    uploadWechatMedia: (params: any, context: BackendRuntimeContext<ED>) => Promise<{
        mediaId: string;
    }>;
    getCurrentMenu: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getMenu: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    createMenu: (params: {
        applicationId: string;
        menuConfig: any;
        id: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    createConditionalMenu: (params: {
        applicationId: string;
        menuConfig: any;
        id: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    deleteConditionalMenu: (params: {
        applicationId: string;
        menuId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    deleteMenu: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    batchGetArticle: (params: {
        applicationId: string;
        offset?: number;
        count: number;
        noContent?: 0 | 1;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getArticle: (params: {
        applicationId: string;
        articleId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    batchGetMaterialList: (params: {
        applicationId: string;
        type: MaterialType;
        offset?: number;
        count: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getMaterial: (params: {
        applicationId: string;
        mediaId: string;
        isPermanent?: boolean;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    deleteMaterial: (params: {
        applicationId: string;
        mediaId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    createTag: (params: {
        applicationId: string;
        name: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getTags: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    editTag: (params: {
        applicationId: string;
        id: number;
        name: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    deleteTag: (params: {
        applicationId: string;
        id: string;
        wechatId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    syncMessageTemplate: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
-    getMessageType: (params: {}, content: Cxt) => Promise<string[]>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
+    getMessageType: (params: {}, content: BackendRuntimeContext<ED>) => Promise<string[]>;
    syncTag: (params: {
        applicationId: string;
        id: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    oneKeySync: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getTagUsers: (params: {
        applicationId: string;
        tagId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    batchtagging: (params: {
        applicationId: string;
        openIdList: string[];
        tagId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    batchuntagging: (params: {
        applicationId: string;
        openIdList: string[];
        tagId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getUserTags: (params: {
        applicationId: string;
        openId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getUsers: (params: {
        applicationId: string;
        nextOpenId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    tagging: (params: {
        applicationId: string;
        openId: string;
        tagIdList: number[];
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    syncToLocale: (params: {
        applicationId: string;
        openId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    syncToWechat: (params: {
        applicationId: string;
        id: string;
        openId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    syncSmsTemplate: (params: {
        systemId: string;
        origin: string;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
 };
-export default GeneralAspectDict;
+export default AspectDict;
--- a/es/aspects/index.d.ts
+++ b/es/aspects/index.d.ts
@ -71,4 +71,4 @@ declare const aspectDict: {
    syncSmsTemplate: typeof syncSmsTemplate;
 };
 export default aspectDict;
-export { GeneralAspectDict as AspectDict } from './AspectDict';
+export { AspectDict } from './AspectDict';
--- a/es/checkers/index.d.ts
+++ b/es/checkers/index.d.ts
@ -1,2 +1,2 @@
-declare const checkers: (import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "address", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "application", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "token", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "user", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "mobile", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "message", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "parasite", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>>)[];
+declare const checkers: (import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "parasite", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "message", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "mobile", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "user", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "token", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "application", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "address", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>>)[];
 export default checkers;
--- a/es/components/extraFile/commit/index.d.ts
+++ b/es/components/extraFile/commit/index.d.ts
@ -12,7 +12,7 @@ declare const _default: <ED2 extends EntityDict & BaseEntityDict, T2 extends key
    type?: ButtonProps['type'] | AmButtonProps['type'];
    executeText?: string | undefined;
    buttonProps?: (ButtonProps & {
-        color?: "default" | "success" | "primary" | "warning" | "danger" | undefined;
+        color?: "default" | "success" | "warning" | "primary" | "danger" | undefined;
        fill?: "none" | "solid" | "outline" | undefined;
        size?: "small" | "large" | "middle" | "mini" | undefined;
        block?: boolean | undefined;
--- a/es/context/FrontendRuntimeContext.d.ts
+++ b/es/context/FrontendRuntimeContext.d.ts
@ -3,19 +3,15 @@ import { FrontendRuntimeContext as Frc, SerializedData as Fsd } from 'oak-fronte
 import { BasicFeatures } from 'oak-frontend-base';
 import { EntityDict } from '../oak-app-domain';
 import { RuntimeContext } from './RuntimeContext';
-import GeneralAspectDict from '../aspects/AspectDict';
-import { CommonAspectDict } from 'oak-common-aspect';
 import { SyncRowStore } from 'oak-domain/lib/store/SyncRowStore';
 import { FeatureDict } from '../features';
-import { BackendRuntimeContext } from './BackendRuntimeContext';
-export type AspectDict<ED extends EntityDict & BaseEntityDict> = GeneralAspectDict<ED, BackendRuntimeContext<ED>> & CommonAspectDict<ED, BackendRuntimeContext<ED>>;
 export interface SerializedData extends Fsd {
    a?: string;
    t?: string;
    userId?: string;
    rm?: boolean;
 }
-export declare abstract class FrontendRuntimeContext<ED extends EntityDict & BaseEntityDict> extends Frc<ED, BackendRuntimeContext<ED>, GeneralAspectDict<ED, BackendRuntimeContext<ED>>> implements RuntimeContext {
+export declare abstract class FrontendRuntimeContext<ED extends EntityDict & BaseEntityDict> extends Frc<ED> implements RuntimeContext {
    private application;
    private token;
    constructor(store: SyncRowStore<ED, FrontendRuntimeContext<ED>>, features: FeatureDict<ED> & BasicFeatures<ED>);
--- a/es/index.d.ts
+++ b/es/index.d.ts
@ -1,5 +1,5 @@
-export type { FeatureDict as GeneralFeatures } from './features';
-export type { GeneralAspectDict } from './aspects/AspectDict';
+export type { FeatureDict } from './features';
+export type { AspectDict } from './aspects/AspectDict';
 export * from './types/Exception';
 export * from './types/Message';
 export * from './types/RuntimeCxt';
--- a/es/triggers/index.d.ts
+++ b/es/triggers/index.d.ts
@ -1,2 +1,2 @@
-declare const _default: (import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "account", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "address", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "application", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "article", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "articleMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "extraFile", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "user", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "message", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "notification", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatLogin", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "parasite", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "sessionMessage", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMpJump", import("..").BRC<import("../oak-app-domain").EntityDict>>)[];
+declare const _default: (import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMpJump", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "sessionMessage", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "parasite", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatLogin", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "notification", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "message", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "user", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "extraFile", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "articleMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "article", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "application", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "address", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "account", import("..").BRC<import("../oak-app-domain").EntityDict>>)[];
 export default _default;
--- a/es/triggers/toDo.d.ts
+++ b/es/triggers/toDo.d.ts
@ -14,7 +14,7 @@ export declare function createToDo<ED extends EntityDict & BaseEntityDict, T ext
    redirectTo: EntityDict['toDo']['OpSchema']['redirectTo'];
    entity: any;
    entityId: string;
-}, userIds?: string[]): Promise<0 | 1>;
+}, userIds?: string[]): Promise<1 | 0>;
 /**
 * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成
 * 必须在entity的action的后trigger中调用
--- a/es/types/RuntimeCxt.d.ts
+++ b/es/types/RuntimeCxt.d.ts
@ -1,9 +1,6 @@
-import { CommonAspectDict } from 'oak-common-aspect';
-import GeneralAspectDict from '../aspects/AspectDict';
 import { BackendRuntimeContext } from '../context/BackendRuntimeContext';
 import { FrontendRuntimeContext } from '../context/FrontendRuntimeContext';
 import { EntityDict } from '../oak-app-domain';
 export type BRC<ED extends EntityDict> = BackendRuntimeContext<ED>;
-export type AD<ED extends EntityDict> = GeneralAspectDict<ED, BRC<ED>> & CommonAspectDict<ED, BRC<ED>>;
 export type FRC<ED extends EntityDict> = FrontendRuntimeContext<ED>;
 export type RuntimeCxt<ED extends EntityDict> = FRC<ED> | BRC<ED>;
--- a/lib/aspects/AspectDict.d.ts
+++ b/lib/aspects/AspectDict.d.ts
@ -6,65 +6,65 @@ import { Style } from '../types/Style';
 import { MaterialType } from '../types/WeChat';
 import { BackendRuntimeContext } from '../context/BackendRuntimeContext';
 import { WechatPublicEventData, WechatMpEventData } from 'oak-external-sdk';
-export type GeneralAspectDict<ED extends EntityDict, Cxt extends BackendRuntimeContext<ED>> = {
+export type AspectDict<ED extends EntityDict> = {
    mergeUser: (params: {
        from: string;
        to: string;
-    }, context: Cxt) => Promise<void>;
-    refreshWechatPublicUserInfo: (params: {}, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
+    refreshWechatPublicUserInfo: (params: {}, context: BackendRuntimeContext<ED>) => Promise<void>;
    getWechatMpUserPhoneNumber: (params: {
        code: string;
        env: WechatMpEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    loginByMobile: (params: {
        captcha?: string;
        password?: string;
        mobile: string;
        disableRegister?: boolean;
        env: WebEnv | WechatMpEnv | NativeEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    loginWechat: ({ code, env, wechatLoginId, }: {
        code: string;
        env: WebEnv;
        wechatLoginId?: string;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    logout: (params: {
        tokenValue: string;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    loginWechatMp: ({ code, env, }: {
        code: string;
        env: WechatMpEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    syncUserInfoWechatMp: ({ nickname, avatarUrl, encryptedData, iv, signature, }: {
        nickname: string;
        avatarUrl: string;
        encryptedData: string;
        iv: string;
        signature: string;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    wakeupParasite: (params: {
        id: string;
        env: WebEnv | WechatMpEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    refreshToken: (params: {
        tokenValue: string;
        env: WebEnv | WechatMpEnv | NativeEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    sendCaptcha: (params: {
        mobile: string;
        env: WechatMpEnv | WebEnv;
        type: 'login' | 'changePassword' | 'confirm';
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    getApplication: (params: {
        type: AppType;
        domain: string;
        data: ED['application']['Selection']['data'];
        appId?: string;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    signatureJsSDK: (params: {
        url: string;
        env: WebEnv;
-    }, context: Cxt) => Promise<{
+    }, context: BackendRuntimeContext<ED>) => Promise<{
        signature: any;
        noncestr: string;
        timestamp: number;
@ -74,34 +74,34 @@ export type GeneralAspectDict<ED extends EntityDict, Cxt extends BackendRuntimeC
        entity: 'platform' | 'system';
        entityId: string;
        config: Config;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    updateStyle: (params: {
        entity: 'platform' | 'system' | 'application';
        entityId: string;
        style: Style;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    updateApplicationConfig: (params: {
        entity: 'application';
        entityId: string;
        config: EntityDict['application']['Schema']['config'];
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    switchTo: (params: {
        userId: string;
-    }, context: Cxt) => Promise<void>;
-    getMpUnlimitWxaCode: (wechatQrCodeId: string, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
+    getMpUnlimitWxaCode: (wechatQrCodeId: string, context: BackendRuntimeContext<ED>) => Promise<string>;
    createWechatLogin: (params: {
        type: EntityDict['wechatLogin']['Schema']['type'];
        interval: number;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    unbindingWechat: (params: {
        wechatUserId: string;
        captcha?: string;
        mobile?: string;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
    loginByWechat: (params: {
        wechatLoginId: string;
        env: WebEnv;
-    }, context: Cxt) => Promise<string>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
    getInfoByUrl: (params: {
        url: string;
    }) => Promise<{
@ -111,14 +111,14 @@ export type GeneralAspectDict<ED extends EntityDict, Cxt extends BackendRuntimeC
    }>;
    getChangePasswordChannels: (params: {
        userId: string;
-    }, context: Cxt) => Promise<string[]>;
+    }, context: BackendRuntimeContext<ED>) => Promise<string[]>;
    updateUserPassword: (params: {
        userId: string;
        prevPassword?: string;
        mobile?: string;
        captcha?: string;
        newPassword: string;
-    }, context: Cxt) => Promise<{
+    }, context: BackendRuntimeContext<ED>) => Promise<{
        result: string;
        times?: number;
    }>;
@ -127,125 +127,125 @@ export type GeneralAspectDict<ED extends EntityDict, Cxt extends BackendRuntimeC
        type: AppType;
        entity?: string;
        entityId?: string;
-    }, context: Cxt) => Promise<string>;
-    uploadWechatMedia: (params: any, context: Cxt) => Promise<{
+    }, context: BackendRuntimeContext<ED>) => Promise<string>;
+    uploadWechatMedia: (params: any, context: BackendRuntimeContext<ED>) => Promise<{
        mediaId: string;
    }>;
    getCurrentMenu: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getMenu: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    createMenu: (params: {
        applicationId: string;
        menuConfig: any;
        id: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    createConditionalMenu: (params: {
        applicationId: string;
        menuConfig: any;
        id: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    deleteConditionalMenu: (params: {
        applicationId: string;
        menuId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    deleteMenu: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    batchGetArticle: (params: {
        applicationId: string;
        offset?: number;
        count: number;
        noContent?: 0 | 1;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getArticle: (params: {
        applicationId: string;
        articleId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    batchGetMaterialList: (params: {
        applicationId: string;
        type: MaterialType;
        offset?: number;
        count: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getMaterial: (params: {
        applicationId: string;
        mediaId: string;
        isPermanent?: boolean;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    deleteMaterial: (params: {
        applicationId: string;
        mediaId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    createTag: (params: {
        applicationId: string;
        name: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getTags: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    editTag: (params: {
        applicationId: string;
        id: number;
        name: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    deleteTag: (params: {
        applicationId: string;
        id: string;
        wechatId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    syncMessageTemplate: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
-    getMessageType: (params: {}, content: Cxt) => Promise<string[]>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
+    getMessageType: (params: {}, content: BackendRuntimeContext<ED>) => Promise<string[]>;
    syncTag: (params: {
        applicationId: string;
        id: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    oneKeySync: (params: {
        applicationId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getTagUsers: (params: {
        applicationId: string;
        tagId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    batchtagging: (params: {
        applicationId: string;
        openIdList: string[];
        tagId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    batchuntagging: (params: {
        applicationId: string;
        openIdList: string[];
        tagId: number;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getUserTags: (params: {
        applicationId: string;
        openId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    getUsers: (params: {
        applicationId: string;
        nextOpenId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    tagging: (params: {
        applicationId: string;
        openId: string;
        tagIdList: number[];
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    syncToLocale: (params: {
        applicationId: string;
        openId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    syncToWechat: (params: {
        applicationId: string;
        id: string;
        openId: string;
-    }, context: Cxt) => Promise<any>;
+    }, context: BackendRuntimeContext<ED>) => Promise<any>;
    syncSmsTemplate: (params: {
        systemId: string;
        origin: string;
-    }, context: Cxt) => Promise<void>;
+    }, context: BackendRuntimeContext<ED>) => Promise<void>;
 };
-export default GeneralAspectDict;
+export default AspectDict;
--- a/lib/aspects/index.d.ts
+++ b/lib/aspects/index.d.ts
@ -71,4 +71,4 @@ declare const aspectDict: {
    syncSmsTemplate: typeof syncSmsTemplate;
 };
 export default aspectDict;
-export { GeneralAspectDict as AspectDict } from './AspectDict';
+export { AspectDict } from './AspectDict';
--- a/lib/checkers/index.d.ts
+++ b/lib/checkers/index.d.ts
@ -1,2 +1,2 @@
-declare const checkers: (import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "address", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "application", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "token", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "user", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "mobile", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "message", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "parasite", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>>)[];
+declare const checkers: (import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "parasite", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "message", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "mobile", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "user", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "token", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "application", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Checker<import("../oak-app-domain").EntityDict, "address", import("..").RuntimeCxt<import("../oak-app-domain").EntityDict>>)[];
 export default checkers;
--- a/lib/context/FrontendRuntimeContext.d.ts
+++ b/lib/context/FrontendRuntimeContext.d.ts
@ -3,19 +3,15 @@ import { FrontendRuntimeContext as Frc, SerializedData as Fsd } from 'oak-fronte
 import { BasicFeatures } from 'oak-frontend-base';
 import { EntityDict } from '../oak-app-domain';
 import { RuntimeContext } from './RuntimeContext';
-import GeneralAspectDict from '../aspects/AspectDict';
-import { CommonAspectDict } from 'oak-common-aspect';
 import { SyncRowStore } from 'oak-domain/lib/store/SyncRowStore';
 import { FeatureDict } from '../features';
-import { BackendRuntimeContext } from './BackendRuntimeContext';
-export type AspectDict<ED extends EntityDict & BaseEntityDict> = GeneralAspectDict<ED, BackendRuntimeContext<ED>> & CommonAspectDict<ED, BackendRuntimeContext<ED>>;
 export interface SerializedData extends Fsd {
    a?: string;
    t?: string;
    userId?: string;
    rm?: boolean;
 }
-export declare abstract class FrontendRuntimeContext<ED extends EntityDict & BaseEntityDict> extends Frc<ED, BackendRuntimeContext<ED>, GeneralAspectDict<ED, BackendRuntimeContext<ED>>> implements RuntimeContext {
+export declare abstract class FrontendRuntimeContext<ED extends EntityDict & BaseEntityDict> extends Frc<ED> implements RuntimeContext {
    private application;
    private token;
    constructor(store: SyncRowStore<ED, FrontendRuntimeContext<ED>>, features: FeatureDict<ED> & BasicFeatures<ED>);
--- a/lib/index.d.ts
+++ b/lib/index.d.ts
@ -1,5 +1,5 @@
-export type { FeatureDict as GeneralFeatures } from './features';
-export type { GeneralAspectDict } from './aspects/AspectDict';
+export type { FeatureDict } from './features';
+export type { AspectDict } from './aspects/AspectDict';
 export * from './types/Exception';
 export * from './types/Message';
 export * from './types/RuntimeCxt';
--- a/lib/triggers/index.d.ts
+++ b/lib/triggers/index.d.ts
@ -1,2 +1,2 @@
-declare const _default: (import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "account", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "address", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "application", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "article", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "articleMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "extraFile", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "user", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "message", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "notification", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatLogin", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "parasite", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "sessionMessage", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMpJump", import("..").BRC<import("../oak-app-domain").EntityDict>>)[];
+declare const _default: (import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMpJump", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "sessionMessage", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "parasite", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatLogin", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "notification", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "message", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "user", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "extraFile", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "articleMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "article", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "application", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "address", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "account", import("..").BRC<import("../oak-app-domain").EntityDict>>)[];
 export default _default;
--- a/lib/triggers/toDo.d.ts
+++ b/lib/triggers/toDo.d.ts
@ -14,7 +14,7 @@ export declare function createToDo<ED extends EntityDict & BaseEntityDict, T ext
    redirectTo: EntityDict['toDo']['OpSchema']['redirectTo'];
    entity: any;
    entityId: string;
-}, userIds?: string[]): Promise<0 | 1>;
+}, userIds?: string[]): Promise<1 | 0>;
 /**
 * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成
 * 必须在entity的action的后trigger中调用
--- a/lib/types/RuntimeCxt.d.ts
+++ b/lib/types/RuntimeCxt.d.ts
@ -1,9 +1,6 @@
-import { CommonAspectDict } from 'oak-common-aspect';
-import GeneralAspectDict from '../aspects/AspectDict';
 import { BackendRuntimeContext } from '../context/BackendRuntimeContext';
 import { FrontendRuntimeContext } from '../context/FrontendRuntimeContext';
 import { EntityDict } from '../oak-app-domain';
 export type BRC<ED extends EntityDict> = BackendRuntimeContext<ED>;
-export type AD<ED extends EntityDict> = GeneralAspectDict<ED, BRC<ED>> & CommonAspectDict<ED, BRC<ED>>;
 export type FRC<ED extends EntityDict> = FrontendRuntimeContext<ED>;
 export type RuntimeCxt<ED extends EntityDict> = FRC<ED> | BRC<ED>;
--- a/src/aspects/AspectDict.ts
+++ b/src/aspects/AspectDict.ts
@ -7,18 +7,17 @@ import { MediaType, MaterialType } from '../types/WeChat';
 import { BackendRuntimeContext } from '../context/BackendRuntimeContext';
 import { WechatPublicEventData, WechatMpEventData } from 'oak-external-sdk';

-export type GeneralAspectDict<
-    ED extends EntityDict,
-    Cxt extends BackendRuntimeContext<ED>
+export type AspectDict<
+    ED extends EntityDict
    > = {
        mergeUser: (
            params: { from: string; to: string },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<void>;
-        refreshWechatPublicUserInfo: (params: {}, context: Cxt) => Promise<void>;
+        refreshWechatPublicUserInfo: (params: {}, context: BackendRuntimeContext<ED>) => Promise<void>;
        getWechatMpUserPhoneNumber: (
            params: { code: string; env: WechatMpEnv },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        loginByMobile: (
            params: {
@ -28,7 +27,7 @@ export type GeneralAspectDict<
                disableRegister?: boolean;
                env: WebEnv | WechatMpEnv | NativeEnv;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        loginWechat: (
            {
@ -40,9 +39,9 @@ export type GeneralAspectDict<
                env: WebEnv;
                wechatLoginId?: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
-        logout: (params: { tokenValue: string }, context: Cxt) => Promise<void>;
+        logout: (params: { tokenValue: string }, context: BackendRuntimeContext<ED>) => Promise<void>;
        loginWechatMp: (
            {
                code,
@ -51,7 +50,7 @@ export type GeneralAspectDict<
                code: string;
                env: WechatMpEnv;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        syncUserInfoWechatMp: (
            {
@ -67,21 +66,21 @@ export type GeneralAspectDict<
                iv: string;
                signature: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<void>;
        wakeupParasite: (
            params: {
                id: string;
                env: WebEnv | WechatMpEnv;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        refreshToken: (
            params: {
                tokenValue: string;
                env: WebEnv | WechatMpEnv | NativeEnv;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        sendCaptcha: (
            params: {
@ -89,7 +88,7 @@ export type GeneralAspectDict<
                env: WechatMpEnv | WebEnv;
                type: 'login' | 'changePassword' | 'confirm';
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        getApplication: (
            params: {
@ -98,14 +97,14 @@ export type GeneralAspectDict<
                data: ED['application']['Selection']['data'],
                appId?: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        signatureJsSDK: (
            params: {
                url: string;
                env: WebEnv;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<{
            signature: any;
            noncestr: string;
@ -118,7 +117,7 @@ export type GeneralAspectDict<
                entityId: string;
                config: Config;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<void>;
        updateStyle: (
            params: {
@ -126,7 +125,7 @@ export type GeneralAspectDict<
                entityId: string;
                style: Style;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<void>;
        updateApplicationConfig: (
            params: {
@ -134,24 +133,24 @@ export type GeneralAspectDict<
                entityId: string;
                config: EntityDict['application']['Schema']['config'];
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<void>;
        switchTo: (
            params: {
                userId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<void>;
        getMpUnlimitWxaCode: (
            wechatQrCodeId: string,
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        createWechatLogin: (
            params: {
                type: EntityDict['wechatLogin']['Schema']['type'];
                interval: number;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        unbindingWechat: (
            params: {
@ -159,14 +158,14 @@ export type GeneralAspectDict<
                captcha?: string;
                mobile?: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<void>;
        loginByWechat: (
            params: {
                wechatLoginId: string;
                env: WebEnv;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        getInfoByUrl: (params: { url: string }) => Promise<{
            title: string;
@ -175,7 +174,7 @@ export type GeneralAspectDict<
        }>;
        getChangePasswordChannels: (
            params: { userId: string },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string[]>;
        updateUserPassword: (
            params: {
@ -185,7 +184,7 @@ export type GeneralAspectDict<
                captcha?: string;
                newPassword: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<{ result: string; times?: number }>;
        createSession: (
            params: {
@ -194,23 +193,23 @@ export type GeneralAspectDict<
                entity?: string;
                entityId?: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<string>;
        uploadWechatMedia: (
            params: any,
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<{ mediaId: string }>;
        getCurrentMenu: (
            params: {
                applicationId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        getMenu: (
            params: {
                applicationId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        createMenu: (
            params: {
@ -218,7 +217,7 @@ export type GeneralAspectDict<
                menuConfig: any;
                id: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        createConditionalMenu: (
            params: {
@ -226,20 +225,20 @@ export type GeneralAspectDict<
                menuConfig: any;
                id: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        deleteConditionalMenu: (
            params: {
                applicationId: string;
                menuId: number;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        deleteMenu: (
            params: {
                applicationId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        batchGetArticle: (
            params: {
@ -248,14 +247,14 @@ export type GeneralAspectDict<
                count: number;
                noContent?: 0 | 1;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        getArticle: (
            params: {
                applicationId: string;
                articleId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        batchGetMaterialList: (
            params: {
@ -264,7 +263,7 @@ export type GeneralAspectDict<
                offset?: number;
                count: number;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        getMaterial: (
            params: {
@ -272,27 +271,27 @@ export type GeneralAspectDict<
                mediaId: string;
                isPermanent?: boolean; // 获取临时素材或永久素材 默认获取临时
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        deleteMaterial: (
            params: {
                applicationId: string;
                mediaId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        createTag: (
            params: {
                applicationId: string;
                name: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        getTags: (
            params: {
                applicationId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        editTag: (
            params: {
@ -300,7 +299,7 @@ export type GeneralAspectDict<
                id: number;
                name: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        deleteTag: (
            params: {
@ -308,34 +307,34 @@ export type GeneralAspectDict<
                id: string;
                wechatId: number;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        syncMessageTemplate: (
            params: {
                applicationId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
-        getMessageType: (params: {}, content: Cxt) => Promise<string[]>;
+        getMessageType: (params: {}, content: BackendRuntimeContext<ED>) => Promise<string[]>;
        syncTag: (
            params: {
                applicationId: string;
                id: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        oneKeySync: (
            params: {
                applicationId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        getTagUsers: (
            params: {
                applicationId: string;
                tagId: number;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        batchtagging: (
            params: {
@ -343,7 +342,7 @@ export type GeneralAspectDict<
                openIdList: string[];
                tagId: number;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        batchuntagging: (
            params: {
@ -351,21 +350,21 @@ export type GeneralAspectDict<
                openIdList: string[];
                tagId: number;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        getUserTags: (
            params: {
                applicationId: string;
                openId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        getUsers: (
            params: {
                applicationId: string;
                nextOpenId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        tagging: (
            params: {
@ -373,14 +372,14 @@ export type GeneralAspectDict<
                openId: string;
                tagIdList: number[];
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        syncToLocale: (
            params: {
                applicationId: string;
                openId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        syncToWechat: (
            params: {
@ -388,15 +387,15 @@ export type GeneralAspectDict<
                id: string;
                openId: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<any>;
        syncSmsTemplate: (
            params: {
                systemId: string;
                origin: string;
            },
-            context: Cxt
+            context: BackendRuntimeContext<ED>
        ) => Promise<void>;
    };

-export default GeneralAspectDict;
+export default AspectDict;
--- a/src/aspects/index.ts
+++ b/src/aspects/index.ts
@ -120,4 +120,4 @@ const aspectDict = {
 };

 export default aspectDict;
-export { GeneralAspectDict as AspectDict } from './AspectDict';
+export { AspectDict } from './AspectDict';
--- a/src/context/FrontendRuntimeContext.ts
+++ b/src/context/FrontendRuntimeContext.ts
@ -8,7 +8,6 @@ import { RuntimeContext } from './RuntimeContext';
 import { Application } from '../features/application';
 import { Token } from '../features/token';
 import GeneralAspectDict from '../aspects/AspectDict';
-import { CommonAspectDict } from 'oak-common-aspect';
 import { SyncRowStore } from 'oak-domain/lib/store/SyncRowStore';
 import { FeatureDict } from '../features';
 import { BackendRuntimeContext } from './BackendRuntimeContext';
@ -20,7 +19,6 @@ import {
 } from '../types/Exception';
 import { OakUnloggedInException } from 'oak-domain/lib/types';

-export type AspectDict<ED extends EntityDict & BaseEntityDict> = GeneralAspectDict<ED, BackendRuntimeContext<ED>> & CommonAspectDict<ED, BackendRuntimeContext<ED>>;
 // 上下文被serialize后的数据内容
 export interface SerializedData extends Fsd {
    a?: string;
@ -30,7 +28,7 @@ export interface SerializedData extends Fsd {
 };

 export abstract class FrontendRuntimeContext<ED extends EntityDict & BaseEntityDict>
-    extends Frc<ED, BackendRuntimeContext<ED>, GeneralAspectDict<ED, BackendRuntimeContext<ED>>>
+    extends Frc<ED>
    implements RuntimeContext {
    private application: Application<ED>;
    private token: Token<ED>;
--- a/src/features/application.ts
+++ b/src/features/application.ts
@ -12,7 +12,6 @@ import { MediaType, MediaVideoDescription } from '../types/WeChat';
 import {
    OakApplicationLoadingException,
 } from '../types/Exception';
-import { FRC, BRC, AD } from '../types/RuntimeCxt';

 export class Application<ED extends EntityDict> extends Feature {
    private applicationId?: string;
--- a/src/features/config.ts
+++ b/src/features/config.ts
@ -3,7 +3,6 @@ import { EntityDict } from '../oak-app-domain';
 import { Cache } from 'oak-frontend-base/es/features/cache';
 import { Config as ConfigDef } from '../types/Config';
 import { Style as StyleDef } from '../types/Style';
-import { FRC, BRC, AD } from '../types/RuntimeCxt';

 export class Config<ED extends EntityDict> extends Feature {
    private cache: Cache<ED>;
--- a/src/features/extraFile.ts
+++ b/src/features/extraFile.ts
@ -1,7 +1,6 @@
 import { Feature } from 'oak-frontend-base/es/types/Feature';
 import { Upload } from 'oak-frontend-base/es/utils/upload';
 import { Cache } from 'oak-frontend-base/es/features/cache';
-import { CommonAspectDict } from 'oak-common-aspect';
 import { EntityDict } from '../oak-app-domain';
 import { Application } from './application'
 import { bytesToSize, getFileURL } from '../utils/extraFile';
@ -11,7 +10,6 @@ import { OpSchema } from '../oak-app-domain/ExtraFile/Schema';
 import { unset } from 'oak-domain/lib/utils/lodash';
 import { generateNewId, generateNewIdAsync } from 'oak-domain/lib/utils/uuid';
 import { extraFileProjection } from '../types/Projection';
-import { FRC, BRC, AD } from '../types/RuntimeCxt';

 export type FileState = 'local' | 'uploading' | 'uploaded' | 'failed';

@ -289,7 +287,7 @@ export class ExtraFile<ED extends EntityDict> extends Feature {
        formData2.append(name || 'file', file as File);

        const { result } = await this.cache.exec(
-            aspectName as keyof AD<ED>,
+            aspectName,
            formData2
        );
        return result;
--- a/src/features/wechatPublicTag.ts
+++ b/src/features/wechatPublicTag.ts
@ -2,7 +2,6 @@ import { Feature } from 'oak-frontend-base/es/types/Feature';
 import { EntityDict } from '../oak-app-domain';
 import { Cache } from 'oak-frontend-base/es/features/cache';
 import { LocalStorage } from 'oak-frontend-base/es/features/localStorage';
-import { FRC, BRC, AD } from '../types/RuntimeCxt';

 export class WechatPublicTag<ED extends EntityDict> extends Feature {
    private cache: Cache<ED>;
--- a/src/features/wechatSdk.mp.ts
+++ b/src/features/wechatSdk.mp.ts
@ -3,7 +3,6 @@ import { EntityDict } from '../oak-app-domain';
 import { Cache } from 'oak-frontend-base/es/features/cache';
 import { Message } from 'oak-frontend-base/es/features/message';
 import { OakMpHaveToSubscribeMessage } from '../types/Exception';
-import { FRC, BRC, AD } from '../types/RuntimeCxt';
 import assert from 'assert';


--- a/src/features/wechatSdk.native.ts
+++ b/src/features/wechatSdk.native.ts
@ -2,8 +2,6 @@ import { Feature } from 'oak-frontend-base/es/types/Feature';
 import { EntityDict } from '../oak-app-domain';
 import { Cache } from 'oak-frontend-base/es/features/cache';
 import { LocalStorage } from 'oak-frontend-base/es/features/localStorage';
-import { FRC, BRC, AD } from '../types/RuntimeCxt';
-

 export class WechatSdk<ED extends EntityDict> extends Feature {
    private cache: Cache<ED>;
--- a/src/features/wechatSdk.web.ts
+++ b/src/features/wechatSdk.web.ts
@ -12,7 +12,6 @@ import { LocalStorage } from 'oak-frontend-base/es/features/localStorage';
 import { Environment } from 'oak-frontend-base/es/features/environment';
 import { WebEnv } from 'oak-domain/lib/types/Environment';
 import { uniq } from 'oak-domain/lib/utils/lodash';
-import { FRC, BRC, AD } from '../types/RuntimeCxt';

 import wx from 'weixin-js-sdk';

--- a/src/index.ts
+++ b/src/index.ts
@ -2,8 +2,8 @@
 // import { registerMessageNotificationConverters } from './triggers/message';
 // import { registerWeChatPublicEventCallback } from './endpoints';

-export type { FeatureDict as GeneralFeatures } from './features';
-export type { GeneralAspectDict } from './aspects/AspectDict';
+export type { FeatureDict } from './features';
+export type { AspectDict } from './aspects/AspectDict';
 export * from './types/Exception';
 export * from './types/Message';
 export * from './types/RuntimeCxt';
--- a/src/types/RuntimeCxt.ts
+++ b/src/types/RuntimeCxt.ts
@ -1,11 +1,9 @@
-import { CommonAspectDict } from 'oak-common-aspect';
+import { AspectDict as CommonAspectDict } from 'oak-common-aspect';
 import GeneralAspectDict from '../aspects/AspectDict';
 import { BackendRuntimeContext } from '../context/BackendRuntimeContext';
 import { FrontendRuntimeContext } from '../context/FrontendRuntimeContext';
 import { EntityDict } from '../oak-app-domain';

 export type BRC<ED extends EntityDict> = BackendRuntimeContext<ED>;
-export type AD<ED extends EntityDict> = GeneralAspectDict<ED, BRC<ED>> &
-    CommonAspectDict<ED, BRC<ED>>;
 export type FRC<ED extends EntityDict> = FrontendRuntimeContext<ED>;
 export type RuntimeCxt<ED extends EntityDict> = FRC<ED> | BRC<ED>;
--- a/src/utils/cos/index.ts
+++ b/src/utils/cos/index.ts
@ -1,9 +1,4 @@
 import { assert } from 'oak-domain/lib/utils/assert';
-import { BackendRuntimeContext } from '../../context/BackendRuntimeContext';
-import {
-    FrontendRuntimeContext,
-    AspectDict,
-} from '../../context/FrontendRuntimeContext';
 import { BRC, FRC } from '../../types/RuntimeCxt';
 import { EntityDict } from '../../oak-app-domain';