From c1511a03a0315656507ea6956dae3fc0fe59a62a Mon Sep 17 00:00:00 2001 From: wangwenchen <920960949@qq.com> Date: Wed, 27 Sep 2023 19:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=90=8E=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/aspects/AspectDict.d.ts | 7 + es/aspects/index.d.ts | 2 + es/aspects/index.js | 2 + es/aspects/session.d.ts | 10 ++ es/aspects/session.js | 157 ++++++++++++++++++++ es/aspects/sessionMessage.d.ts | 10 ++ es/aspects/sessionMessage.js | 14 ++ es/components/extraFile/commit/index.js | 111 ++++++-------- es/components/sessionMessage/list/index.js | 14 ++ es/config/constants.d.ts | 3 + es/config/constants.js | 3 + es/oak-app-domain/ModiEntity/Schema.d.ts | 2 +- es/triggers/index.d.ts | 2 +- lib/aspects/AspectDict.d.ts | 2 +- lib/aspects/index.d.ts | 2 + lib/components/extraFile/commit/index.js | 112 +++++++------- lib/components/sessionMessage/list/index.js | 14 ++ lib/config/constants.d.ts | 3 + lib/config/constants.js | 5 +- lib/oak-app-domain/Storage.js | 50 ++----- lib/triggers/index.d.ts | 2 +- 21 files changed, 357 insertions(+), 170 deletions(-) create mode 100644 es/aspects/session.d.ts create mode 100644 es/aspects/session.js create mode 100644 es/aspects/sessionMessage.d.ts create mode 100644 es/aspects/sessionMessage.js diff --git a/es/aspects/AspectDict.d.ts b/es/aspects/AspectDict.d.ts index 7b1609f7c..3e74a8354 100644 --- a/es/aspects/AspectDict.d.ts +++ b/es/aspects/AspectDict.d.ts @@ -4,6 +4,7 @@ import { EntityDict } from '../oak-app-domain'; import { Config } from '../types/Config'; import { MenuType } from '../types/WeChat'; import { BackendRuntimeContext } from '../context/BackendRuntimeContext'; +import { WechatPublicEventData, WechatMpEventData } from 'oak-external-sdk'; export type GeneralAspectDict> = { mergeUser: (params: { from: string; @@ -151,6 +152,12 @@ export type GeneralAspectDict Promise; + createSession: (params: { + data?: WechatPublicEventData | WechatMpEventData; + type: AppType; + entity?: string; + entityId?: string; + }, context: Cxt) => Promise; createTag: (params: { applicationId: string; name: string; diff --git a/es/aspects/index.d.ts b/es/aspects/index.d.ts index 8805d75aa..dc5f4a4f8 100644 --- a/es/aspects/index.d.ts +++ b/es/aspects/index.d.ts @@ -7,6 +7,7 @@ import { createWechatLogin } from './wechatLogin'; import { unbindingWechat } from './wechatUser'; import { getMpUnlimitWxaCode } from './wechatQrCode'; import { confirmUserEntityGrant } from './userEntityGrant'; +import { createSession } from './session'; import { getCurrentMenu, getMenu, createMenu, createConditionalMenu, deleteConditionalMenu, deleteMenu, batchGetArticle, getArticle, batchGetMaterialList, getMaterial } from './wechatMenu'; import { createTag, getTags, editTag, deleteTag } from './wechatPublicTag'; declare const aspectDict: { @@ -44,6 +45,7 @@ declare const aspectDict: { getArticle: typeof getArticle; batchGetMaterialList: typeof batchGetMaterialList; getMaterial: typeof getMaterial; + createSession: typeof createSession; createTag: typeof createTag; getTags: typeof getTags; editTag: typeof editTag; diff --git a/es/aspects/index.js b/es/aspects/index.js index 09397b30f..2c7e436f7 100644 --- a/es/aspects/index.js +++ b/es/aspects/index.js @@ -7,6 +7,7 @@ import { createWechatLogin } from './wechatLogin'; import { unbindingWechat } from './wechatUser'; import { getMpUnlimitWxaCode } from './wechatQrCode'; import { confirmUserEntityGrant } from './userEntityGrant'; +import { createSession } from './session'; import { getCurrentMenu, getMenu, createMenu, createConditionalMenu, deleteConditionalMenu, deleteMenu, batchGetArticle, getArticle, batchGetMaterialList, getMaterial, } from './wechatMenu'; import { createTag, getTags, editTag, deleteTag, } from './wechatPublicTag'; const aspectDict = { @@ -44,6 +45,7 @@ const aspectDict = { getArticle, batchGetMaterialList, getMaterial, + createSession, createTag, getTags, editTag, diff --git a/es/aspects/session.d.ts b/es/aspects/session.d.ts new file mode 100644 index 000000000..33186c9f5 --- /dev/null +++ b/es/aspects/session.d.ts @@ -0,0 +1,10 @@ +import { EntityDict } from "../oak-app-domain"; +import { AppType } from "../oak-app-domain/Application/Schema"; +import { BackendRuntimeContext } from "../context/BackendRuntimeContext"; +import { WechatPublicEventData, WechatMpEventData } from 'oak-external-sdk'; +export declare function createSession>(params: { + data?: WechatPublicEventData | WechatMpEventData; + type: AppType; + entity?: string; + entityId?: string; +}, context: Cxt): Promise; diff --git a/es/aspects/session.js b/es/aspects/session.js new file mode 100644 index 000000000..63252a91d --- /dev/null +++ b/es/aspects/session.js @@ -0,0 +1,157 @@ +import { generateNewIdAsync } from 'oak-domain/lib/utils/uuid'; +import assert from "assert"; +// export async function transformData< +// ED extends EntityDict, +// Cxt extends BackendRuntimeContext +// >( +// params: { +// data: WechatPublicEventData | WechatMpEventData; +// type: AppType, +// entity: string, +// entityId: string, +// }, +// context: Cxt +// ) { +// const { data, type, entity, entityId } = params; +// const { +// ToUserName, +// FromUserName, +// CreateTime, +// MsgType, +// // Event, +// Content, +// // EventKey, +// } = data; +// if (entity !== 'web') { +// const sessionMessageData = { +// createTime: CreateTime, +// type: MsgType, +// text: Content, +// // news: , +// aaoe: false, +// isRead: false, +// } +// return sessionMessageData +// } else { +// const sessionMessageData = { +// createTime: CreateTime, +// type: MsgType, +// text: Content, +// // news: , +// aaoe: false, +// isRead: false, +// } +// return sessionMessageData +// } +// } +export async function createSession(params, context) { + const { data, type, entity, entityId } = params; + const userId = context.getCurrentUserId(true); + let session; + let sessionMessage$session; + switch (type) { + case 'web': { + const systemId = context.getSystemId(); + const [application] = await context.select('application', { + data: { + id: 1, + systemId: 1, + type: 1, + }, + filter: { + systemId, + type: 'web' + } + }, {}); + const result = await context.select('session', { + data: { + id: 1, + entity: 1, + entityId: 1, + userId: 1, + lmts: 1, + }, + filter: { + entity: entity || 'application', + entityId: entityId || application?.id, + userId, + } + }, {}); + session = result[0]; + break; + } + case 'wechatMp': + case 'wechatPublic': { + assert(data, ''); + const { ToUserName, FromUserName, CreateTime, MsgType, + // Event, + Content, + // EventKey, + } = data; + const [wechatUser] = await context.select('wechatUser', { + data: { + id: 1, + openId: 1, + applicationId: 1, + }, + filter: { + openId: FromUserName, + } + }, {}); + sessionMessage$session = [ + { + id: await generateNewIdAsync(), + action: 'create', + data: { + id: await generateNewIdAsync(), + applicationId: wechatUser?.applicationId, + // sessionId: session[0]?.id, + wechatUser: wechatUser?.id, + createTime: CreateTime, + type: MsgType, + text: Content, + // news: , + aaoe: false, + }, + } + ]; + break; + } + default: { + assert(false, ''); + } + } + const sessionId = await generateNewIdAsync(); + if (session) { + if (!data) { + return session.id; + } + await context.operate('session', { + id: await generateNewIdAsync(), + action: 'update', + data: Object.assign({}, sessionMessage$session && { sessionMessage$session }), + filter: { + id: session.id, + } + }, { + dontCollect: true, + }); + return session.id; + } + else { + await context.operate('session', { + id: await generateNewIdAsync(), + action: 'create', + data: Object.assign({ + id: sessionId, + entity, + entityId, + userId, + lmts: Date.now(), + }, sessionMessage$session && { sessionMessage$session }), + }, { + dontCollect: true, + }); + return sessionId; + } +} diff --git a/es/aspects/sessionMessage.d.ts b/es/aspects/sessionMessage.d.ts new file mode 100644 index 000000000..6acc552bc --- /dev/null +++ b/es/aspects/sessionMessage.d.ts @@ -0,0 +1,10 @@ +import { EntityDict } from "../oak-app-domain"; +import { AppType } from "../oak-app-domain/Application/Schema"; +import { BackendRuntimeContext } from "../context/BackendRuntimeContext"; +import { WechatPublicEventData, WechatMpEventData } from 'oak-external-sdk'; +export declare function createSessionMessage>(params: { + data?: WechatPublicEventData | WechatMpEventData; + type: AppType; + entity?: string; + entityId?: string; +}, context: Cxt): Promise; diff --git a/es/aspects/sessionMessage.js b/es/aspects/sessionMessage.js new file mode 100644 index 000000000..2e4f07b8f --- /dev/null +++ b/es/aspects/sessionMessage.js @@ -0,0 +1,14 @@ +export async function createSessionMessage(params, context) { + const { data, type, entity, entityId } = params; + // const [application] = await context.select('application', { + // data: { + // id: 1, + // systemId: 1, + // type: 1, + // }, + // filter: { + // systemId, + // type: 'web' + // } + // }, {}); +} diff --git a/es/components/extraFile/commit/index.js b/es/components/extraFile/commit/index.js index 6026375fe..241e8d852 100644 --- a/es/components/extraFile/commit/index.js +++ b/es/components/extraFile/commit/index.js @@ -1,63 +1,48 @@ -"use strict"; -// import assert from 'assert'; -// import { ButtonProps } from 'antd'; -// import { ButtonProps as MobileButtonProps } from 'antd-mobile'; -// import { EntityDict } from '../../../oak-app-domain'; -// import { FileState } from '../../../features/extraFile2'; -// export default OakComponent({ -// formData({ features }) { -// const ids: string[] = this.getEfIds(); -// const states = ids.map( -// id => features.extraFile2.getFileState(id) -// ); -// let state: FileState = 'uploaded'; -// states.forEach( -// (ele) => { -// if (ele) { -// if (['failed', 'local'].includes(ele.state)) { -// state = ele.state; -// } -// else if (ele.state === 'uploading' && state === 'uploaded') { -// state = 'uploading'; -// } -// } -// } -// ); -// return { -// state, -// }; -// }, -// properties: { -// efPaths: [] as string[], -// size: 'middle' as ButtonProps['size'] | MobileButtonProps['size'], -// block: false as ButtonProps['block'] | MobileButtonProps['block'], -// type: 'primary' as ButtonProps['type'] | MobileButtonProps['type'], -// executeText: '', -// }, -// methods: { -// getEfIds() { -// const { efPaths } = this.props; -// const { oakFullpath } = this.state; -// assert(efPaths); -// if (oakFullpath) { -// const ids = efPaths.map( -// (path) => { -// const path2 = path ? `${oakFullpath}.path` : oakFullpath; -// const data = this.features.runningTree.getFreshValue(path2); -// if (data) { -// return (data as EntityDict['extraFile']['OpSchema'][]).map( -// ele => ele.id -// ); -// } -// } -// ).flat().filter( -// ele => !!ele -// ) as string[]; -// return ids; -// } -// return []; -// }, -// upload() { -// } -// } -// }); +import assert from 'assert'; +export default OakComponent({ + formData({ features }) { + const ids = this.getEfIds(); + const states = ids.map(id => features.extraFile2.getFileState(id)); + let state = 'uploaded'; + states.forEach((ele) => { + if (ele) { + if (['failed', 'local'].includes(ele.state)) { + state = ele.state; + } + else if (ele.state === 'uploading' && state === 'uploaded') { + state = 'uploading'; + } + } + }); + return { + state, + }; + }, + properties: { + efPaths: [], + size: 'middle', + block: false, + type: 'primary', + executeText: '', + }, + methods: { + getEfIds() { + const { efPaths } = this.props; + const { oakFullpath } = this.state; + assert(efPaths); + if (oakFullpath) { + const ids = efPaths.map((path) => { + const path2 = path ? `${oakFullpath}.path` : oakFullpath; + const data = this.features.runningTree.getFreshValue(path2); + if (data) { + return data.map(ele => ele.id); + } + }).flat().filter(ele => !!ele); + return ids; + } + return []; + }, + upload() { + } + } +}); diff --git a/es/components/sessionMessage/list/index.js b/es/components/sessionMessage/list/index.js index 43c2ea353..bcdb47fe8 100644 --- a/es/components/sessionMessage/list/index.js +++ b/es/components/sessionMessage/list/index.js @@ -1,4 +1,5 @@ import { generateNewId } from 'oak-domain/lib/utils/uuid'; +import { DATA_SUBSCRIBER_KEYS } from '../../../config/constants'; export default OakComponent({ entity: 'sessionMessage', projection: { @@ -42,6 +43,15 @@ export default OakComponent({ lifetimes: { async ready() { const { sessionId } = this.props; + this.subData([ + { + entity: 'sessionMessage', + filter: { + sessionId: sessionId, + }, + id: `${DATA_SUBSCRIBER_KEYS.sessionMessageList}-${sessionId}`, + } + ]); // const userId = this.features.token.getUserId(true); // const applicationId = this.features.application.getApplicationId(); // if (!sessionId) { @@ -73,6 +83,10 @@ export default OakComponent({ if (this.timer) { clearInterval(this.timer); } + const { sessionId } = this.props; + this.unSubData([ + `${DATA_SUBSCRIBER_KEYS.sessionMessageList}-${sessionId}` + ]); }, }, listeners: { diff --git a/es/config/constants.d.ts b/es/config/constants.d.ts index c3263c373..dc6dc247a 100644 --- a/es/config/constants.d.ts +++ b/es/config/constants.d.ts @@ -9,3 +9,6 @@ export declare const LOCAL_STORAGE_KEYS: { appId: string; token: string; }; +export declare const DATA_SUBSCRIBER_KEYS: { + sessionMessageList: string; +}; diff --git a/es/config/constants.js b/es/config/constants.js index 9ee5c31aa..3bce4af42 100644 --- a/es/config/constants.js +++ b/es/config/constants.js @@ -13,3 +13,6 @@ export const LOCAL_STORAGE_KEYS = { appId: 'ogb:f-application-id', token: 'ogb:f-token-token', }; +export const DATA_SUBSCRIBER_KEYS = { + sessionMessageList: 'sessionM-l', +}; diff --git a/es/oak-app-domain/ModiEntity/Schema.d.ts b/es/oak-app-domain/ModiEntity/Schema.d.ts index 75a650554..fe09162bf 100644 --- a/es/oak-app-domain/ModiEntity/Schema.d.ts +++ b/es/oak-app-domain/ModiEntity/Schema.d.ts @@ -370,7 +370,7 @@ export type UpdateOperationData = FormUpdateData | null; + entityId?: ForeignKey<"User" | "UserEntityGrant" | "UserSystem" | "UserWechatPublicTag" | "WechatLogin" | "WechatMenu" | "wechatPublicAutoReply" | "WechatPublicTag" | "wechatPublicTemplate" | "WechatQrCode" | "WechatUser"> | null; }) & { [k: string]: any; }; diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index c7da772bc..be82a19f5 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default; diff --git a/lib/aspects/AspectDict.d.ts b/lib/aspects/AspectDict.d.ts index 540e021a6..3e74a8354 100644 --- a/lib/aspects/AspectDict.d.ts +++ b/lib/aspects/AspectDict.d.ts @@ -26,7 +26,7 @@ export type GeneralAspectDict Promise; - logout: ({ }: {}, context: Cxt) => Promise; + logout: ({}: {}, context: Cxt) => Promise; loginWechatMp: ({ code, env, }: { code: string; env: WechatMpEnv; diff --git a/lib/aspects/index.d.ts b/lib/aspects/index.d.ts index 8805d75aa..dc5f4a4f8 100644 --- a/lib/aspects/index.d.ts +++ b/lib/aspects/index.d.ts @@ -7,6 +7,7 @@ import { createWechatLogin } from './wechatLogin'; import { unbindingWechat } from './wechatUser'; import { getMpUnlimitWxaCode } from './wechatQrCode'; import { confirmUserEntityGrant } from './userEntityGrant'; +import { createSession } from './session'; import { getCurrentMenu, getMenu, createMenu, createConditionalMenu, deleteConditionalMenu, deleteMenu, batchGetArticle, getArticle, batchGetMaterialList, getMaterial } from './wechatMenu'; import { createTag, getTags, editTag, deleteTag } from './wechatPublicTag'; declare const aspectDict: { @@ -44,6 +45,7 @@ declare const aspectDict: { getArticle: typeof getArticle; batchGetMaterialList: typeof batchGetMaterialList; getMaterial: typeof getMaterial; + createSession: typeof createSession; createTag: typeof createTag; getTags: typeof getTags; editTag: typeof editTag; diff --git a/lib/components/extraFile/commit/index.js b/lib/components/extraFile/commit/index.js index 6026375fe..f4128b694 100644 --- a/lib/components/extraFile/commit/index.js +++ b/lib/components/extraFile/commit/index.js @@ -1,63 +1,51 @@ "use strict"; -// import assert from 'assert'; -// import { ButtonProps } from 'antd'; -// import { ButtonProps as MobileButtonProps } from 'antd-mobile'; -// import { EntityDict } from '../../../oak-app-domain'; -// import { FileState } from '../../../features/extraFile2'; -// export default OakComponent({ -// formData({ features }) { -// const ids: string[] = this.getEfIds(); -// const states = ids.map( -// id => features.extraFile2.getFileState(id) -// ); -// let state: FileState = 'uploaded'; -// states.forEach( -// (ele) => { -// if (ele) { -// if (['failed', 'local'].includes(ele.state)) { -// state = ele.state; -// } -// else if (ele.state === 'uploading' && state === 'uploaded') { -// state = 'uploading'; -// } -// } -// } -// ); -// return { -// state, -// }; -// }, -// properties: { -// efPaths: [] as string[], -// size: 'middle' as ButtonProps['size'] | MobileButtonProps['size'], -// block: false as ButtonProps['block'] | MobileButtonProps['block'], -// type: 'primary' as ButtonProps['type'] | MobileButtonProps['type'], -// executeText: '', -// }, -// methods: { -// getEfIds() { -// const { efPaths } = this.props; -// const { oakFullpath } = this.state; -// assert(efPaths); -// if (oakFullpath) { -// const ids = efPaths.map( -// (path) => { -// const path2 = path ? `${oakFullpath}.path` : oakFullpath; -// const data = this.features.runningTree.getFreshValue(path2); -// if (data) { -// return (data as EntityDict['extraFile']['OpSchema'][]).map( -// ele => ele.id -// ); -// } -// } -// ).flat().filter( -// ele => !!ele -// ) as string[]; -// return ids; -// } -// return []; -// }, -// upload() { -// } -// } -// }); +Object.defineProperty(exports, "__esModule", { value: true }); +const tslib_1 = require("tslib"); +const assert_1 = tslib_1.__importDefault(require("assert")); +exports.default = OakComponent({ + formData({ features }) { + const ids = this.getEfIds(); + const states = ids.map(id => features.extraFile2.getFileState(id)); + let state = 'uploaded'; + states.forEach((ele) => { + if (ele) { + if (['failed', 'local'].includes(ele.state)) { + state = ele.state; + } + else if (ele.state === 'uploading' && state === 'uploaded') { + state = 'uploading'; + } + } + }); + return { + state, + }; + }, + properties: { + efPaths: [], + size: 'middle', + block: false, + type: 'primary', + executeText: '', + }, + methods: { + getEfIds() { + const { efPaths } = this.props; + const { oakFullpath } = this.state; + (0, assert_1.default)(efPaths); + if (oakFullpath) { + const ids = efPaths.map((path) => { + const path2 = path ? `${oakFullpath}.path` : oakFullpath; + const data = this.features.runningTree.getFreshValue(path2); + if (data) { + return data.map(ele => ele.id); + } + }).flat().filter(ele => !!ele); + return ids; + } + return []; + }, + upload() { + } + } +}); diff --git a/lib/components/sessionMessage/list/index.js b/lib/components/sessionMessage/list/index.js index 1f3633c15..0100db849 100644 --- a/lib/components/sessionMessage/list/index.js +++ b/lib/components/sessionMessage/list/index.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const uuid_1 = require("oak-domain/lib/utils/uuid"); +const constants_1 = require("../../../config/constants"); exports.default = OakComponent({ entity: 'sessionMessage', projection: { @@ -44,6 +45,15 @@ exports.default = OakComponent({ lifetimes: { async ready() { const { sessionId } = this.props; + this.subData([ + { + entity: 'sessionMessage', + filter: { + sessionId: sessionId, + }, + id: `${constants_1.DATA_SUBSCRIBER_KEYS.sessionMessageList}-${sessionId}`, + } + ]); // const userId = this.features.token.getUserId(true); // const applicationId = this.features.application.getApplicationId(); // if (!sessionId) { @@ -75,6 +85,10 @@ exports.default = OakComponent({ if (this.timer) { clearInterval(this.timer); } + const { sessionId } = this.props; + this.unSubData([ + `${constants_1.DATA_SUBSCRIBER_KEYS.sessionMessageList}-${sessionId}` + ]); }, }, listeners: { diff --git a/lib/config/constants.d.ts b/lib/config/constants.d.ts index c3263c373..dc6dc247a 100644 --- a/lib/config/constants.d.ts +++ b/lib/config/constants.d.ts @@ -9,3 +9,6 @@ export declare const LOCAL_STORAGE_KEYS: { appId: string; token: string; }; +export declare const DATA_SUBSCRIBER_KEYS: { + sessionMessageList: string; +}; diff --git a/lib/config/constants.js b/lib/config/constants.js index 79a4572f1..52031a855 100644 --- a/lib/config/constants.js +++ b/lib/config/constants.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.LOCAL_STORAGE_KEYS = exports.getWechatPublicTags = exports.registerWechatPublicTags = exports.WechatPublicTags = void 0; +exports.DATA_SUBSCRIBER_KEYS = exports.LOCAL_STORAGE_KEYS = exports.getWechatPublicTags = exports.registerWechatPublicTags = exports.WechatPublicTags = void 0; exports.WechatPublicTags = {}; function registerWechatPublicTags(_WechatPublicTags) { exports.WechatPublicTags = _WechatPublicTags; @@ -18,3 +18,6 @@ exports.LOCAL_STORAGE_KEYS = { appId: 'ogb:f-application-id', token: 'ogb:f-token-token', }; +exports.DATA_SUBSCRIBER_KEYS = { + sessionMessageList: 'sessionM-l', +}; diff --git a/lib/oak-app-domain/Storage.js b/lib/oak-app-domain/Storage.js index 68690146c..8e6d28131 100644 --- a/lib/oak-app-domain/Storage.js +++ b/lib/oak-app-domain/Storage.js @@ -44,26 +44,11 @@ const Storage_40 = require("./UserSystem/Storage"); const Storage_41 = require("./UserWechatPublicTag/Storage"); const Storage_42 = require("./WechatLogin/Storage"); const Storage_43 = require("./WechatMenu/Storage"); -const Storage_44 = require("./WechatPublicTag/Storage"); -const Storage_45 = require("./WechatQrCode/Storage"); -const Storage_46 = require("./WechatUser/Storage"); -const Storage_31 = require("./Session/Storage"); -const Storage_32 = require("./SessionMessage/Storage"); -const Storage_33 = require("./Station/Storage"); -const Storage_34 = require("./Subscription/Storage"); -const Storage_35 = require("./Subway/Storage"); -const Storage_36 = require("./SubwayStation/Storage"); -const Storage_37 = require("./System/Storage"); -const Storage_38 = require("./Token/Storage"); -const Storage_39 = require("./UserSystem/Storage"); -const Storage_40 = require("./UserWechatPublicTag/Storage"); -const Storage_41 = require("./WechatLogin/Storage"); -const Storage_42 = require("./WechatMenu/Storage"); -const Storage_43 = require("./wechatPublicAutoReply/Storage"); -const Storage_44 = require("./WechatPublicTag/Storage"); -const Storage_45 = require("./WechatPublicTemplate/Storage"); -const Storage_46 = require("./WechatQrCode/Storage"); -const Storage_47 = require("./WechatUser/Storage"); +const Storage_44 = require("./wechatPublicAutoReply/Storage"); +const Storage_45 = require("./WechatPublicTag/Storage"); +const Storage_46 = require("./WechatPublicTemplate/Storage"); +const Storage_47 = require("./WechatQrCode/Storage"); +const Storage_48 = require("./WechatUser/Storage"); exports.storageSchema = { actionAuth: Storage_1.desc, i18n: Storage_2.desc, @@ -108,24 +93,9 @@ exports.storageSchema = { userWechatPublicTag: Storage_41.desc, wechatLogin: Storage_42.desc, wechatMenu: Storage_43.desc, - wechatPublicTag: Storage_44.desc, - wechatQrCode: Storage_45.desc, - wechatUser: Storage_46.desc - session: Storage_31.desc, - sessionMessage: Storage_32.desc, - station: Storage_33.desc, - subscription: Storage_34.desc, - subway: Storage_35.desc, - subwayStation: Storage_36.desc, - system: Storage_37.desc, - token: Storage_38.desc, - userSystem: Storage_39.desc, - userWechatPublicTag: Storage_40.desc, - wechatLogin: Storage_41.desc, - wechatMenu: Storage_42.desc, - wechatPublicAutoReply: Storage_43.desc, - wechatPublicTag: Storage_44.desc, - wechatPublicTemplate: Storage_45.desc, - wechatQrCode: Storage_46.desc, - wechatUser: Storage_47.desc + wechatPublicAutoReply: Storage_44.desc, + wechatPublicTag: Storage_45.desc, + wechatPublicTemplate: Storage_46.desc, + wechatQrCode: Storage_47.desc, + wechatUser: Storage_48.desc }; diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index 212a53d9e..be82a19f5 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default;