From 28fe879dcddee7ce4904411e0062d7138b1d2feb Mon Sep 17 00:00:00 2001 From: qsc <3153284618@qq.com> Date: Sat, 19 Aug 2023 14:53:39 +0800 Subject: [PATCH] =?UTF-8?q?captcha=20type=E5=AD=97=E6=AE=B5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0confirm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/aspects/AspectDict.d.ts | 2 +- lib/aspects/token.d.ts | 2 +- lib/entities/Captcha.d.ts | 2 +- lib/entities/Captcha.js | 3 ++- lib/features/token.d.ts | 2 +- lib/oak-app-domain/Captcha/Schema.d.ts | 6 +++--- lib/oak-app-domain/Captcha/Storage.js | 2 +- lib/oak-app-domain/Captcha/locales/zh_CN.json | 2 +- lib/oak-app-domain/Relation.d.ts | 6 ++++-- lib/oak-app-domain/Relation.js | 4 +++- src/aspects/AspectDict.ts | 2 +- src/aspects/token.ts | 2 +- src/entities/Captcha.ts | 5 +++-- src/features/token.ts | 2 +- src/oak-app-domain/Captcha/Schema.ts | 6 +++--- src/oak-app-domain/Captcha/Storage.ts | 2 +- src/oak-app-domain/Captcha/locales/zh_CN.json | 2 +- src/oak-app-domain/Relation.ts | 6 ++++-- src/triggers/parasite.ts | 2 +- 19 files changed, 34 insertions(+), 26 deletions(-) diff --git a/lib/aspects/AspectDict.d.ts b/lib/aspects/AspectDict.d.ts index 0075770cf..d61623439 100644 --- a/lib/aspects/AspectDict.d.ts +++ b/lib/aspects/AspectDict.d.ts @@ -49,7 +49,7 @@ export declare type GeneralAspectDict Promise; getApplication: (params: { type: AppType; diff --git a/lib/aspects/token.d.ts b/lib/aspects/token.d.ts index 2d533fe4b..636884328 100644 --- a/lib/aspects/token.d.ts +++ b/lib/aspects/token.d.ts @@ -47,7 +47,7 @@ export declare function syncUserInfoWechatMp>({ mobile, env, type: type2 }: { mobile: string; env: WechatMpEnv | WebEnv; - type: 'login' | 'changePassword'; + type: 'login' | 'changePassword' | 'confirm'; }, context: Cxt): Promise; export declare function switchTo>({ userId }: { userId: string; diff --git a/lib/entities/Captcha.d.ts b/lib/entities/Captcha.d.ts index a95a04112..6ea421582 100644 --- a/lib/entities/Captcha.d.ts +++ b/lib/entities/Captcha.d.ts @@ -8,5 +8,5 @@ export interface Schema extends EntityShape { env: Object; expired: Boolean; expiresAt: Datetime; - type: 'login' | 'changePassword'; + type: 'login' | 'changePassword' | 'confirm'; } diff --git a/lib/entities/Captcha.js b/lib/entities/Captcha.js index 4f872dd9f..4830a5710 100644 --- a/lib/entities/Captcha.js +++ b/lib/entities/Captcha.js @@ -38,7 +38,8 @@ var entityDesc = { }, type: { login: '登录', - changePassword: '修改密码' + changePassword: '修改密码', + confirm: '校验', } }, }, diff --git a/lib/features/token.d.ts b/lib/features/token.d.ts index 493b260a6..58e0f1b86 100644 --- a/lib/features/token.d.ts +++ b/lib/features/token.d.ts @@ -34,7 +34,7 @@ export declare class Token; + sendCaptcha(mobile: string, type: 'login' | 'changePassword' | 'confirm'): Promise; switchTo(userId: string): Promise; refreshWechatPublicUserInfo(): Promise; getWechatMpUserPhoneNumber(code: string): Promise; diff --git a/lib/oak-app-domain/Captcha/Schema.d.ts b/lib/oak-app-domain/Captcha/Schema.d.ts index 4bc41591d..0e64b1a96 100644 --- a/lib/oak-app-domain/Captcha/Schema.d.ts +++ b/lib/oak-app-domain/Captcha/Schema.d.ts @@ -12,7 +12,7 @@ export declare type OpSchema = EntityShape & { env: Object; expired: Boolean; expiresAt: Datetime; - type: 'login' | 'changePassword'; + type: 'login' | 'changePassword' | 'confirm'; iState?: IState | null; }; export declare type OpAttr = keyof OpSchema; @@ -24,7 +24,7 @@ export declare type Schema = EntityShape & { env: Object; expired: Boolean; expiresAt: Datetime; - type: 'login' | 'changePassword'; + type: 'login' | 'changePassword' | 'confirm'; iState?: IState | null; } & { [A in ExpressionKey]?: any; @@ -41,7 +41,7 @@ declare type AttrFilter = { env: Object; expired: Q_BooleanValue; expiresAt: Q_DateValue; - type: Q_EnumValue<'login' | 'changePassword'>; + type: Q_EnumValue<'login' | 'changePassword' | 'confirm'>; iState: Q_EnumValue; }; export declare type Filter = MakeFilter>; diff --git a/lib/oak-app-domain/Captcha/Storage.js b/lib/oak-app-domain/Captcha/Storage.js index 3ffdd935c..075d867aa 100644 --- a/lib/oak-app-domain/Captcha/Storage.js +++ b/lib/oak-app-domain/Captcha/Storage.js @@ -40,7 +40,7 @@ exports.desc = { type: { notNull: true, type: "enum", - enumeration: ["login", "changePassword"] + enumeration: ["login", "changePassword", "confirm"] }, iState: { type: "enum", diff --git a/lib/oak-app-domain/Captcha/locales/zh_CN.json b/lib/oak-app-domain/Captcha/locales/zh_CN.json index 183fd09cc..c9e0e218f 100644 --- a/lib/oak-app-domain/Captcha/locales/zh_CN.json +++ b/lib/oak-app-domain/Captcha/locales/zh_CN.json @@ -1 +1 @@ -{ "name": "验证码", "attr": { "mobile": "手机号", "code": "验证码", "visitorId": "用户标识", "reason": "失败原因", "env": "用户环境", "expired": "是否过期", "expiresAt": "过期时间", "iState": "状态", "type": "类型" }, "action": { "send": "发送", "fail": "失败", "success": "成功" }, "v": { "iState": { "unsent": "未发送", "sending": "发送中", "sent": "已发送", "failure": "已失败" }, "type": { "login": "登录", "changePassword": "修改密码" } } } +{ "name": "验证码", "attr": { "mobile": "手机号", "code": "验证码", "visitorId": "用户标识", "reason": "失败原因", "env": "用户环境", "expired": "是否过期", "expiresAt": "过期时间", "iState": "状态", "type": "类型" }, "action": { "send": "发送", "fail": "失败", "success": "成功" }, "v": { "iState": { "unsent": "未发送", "sending": "发送中", "sent": "已发送", "failure": "已失败" }, "type": { "login": "登录", "changePassword": "修改密码", "confirm": "校验" } } } diff --git a/lib/oak-app-domain/Relation.d.ts b/lib/oak-app-domain/Relation.d.ts index 462f5aded..8ce8c4c62 100644 --- a/lib/oak-app-domain/Relation.d.ts +++ b/lib/oak-app-domain/Relation.d.ts @@ -1,8 +1,10 @@ -import { AuthCascadePath, AuthDeduceRelationMap, SelectFreeEntities } from "oak-domain/lib/types/Entity"; +import { AuthCascadePath, AuthDeduceRelationMap } from "oak-domain/lib/types/Entity"; import { EntityDict } from "./EntityDict"; import { CreateOperationData as Relation } from "./Relation/Schema"; export declare const ActionCascadePathGraph: AuthCascadePath[]; export declare const RelationCascadePathGraph: AuthCascadePath[]; export declare const relations: Relation[]; export declare const deducedRelationMap: AuthDeduceRelationMap; -export declare const selectFreeEntities: SelectFreeEntities; +export declare const selectFreeEntities: (keyof EntityDict)[]; +export declare const updateFreeEntities: (keyof EntityDict)[]; +export declare const createFreeEntities: (keyof EntityDict)[]; diff --git a/lib/oak-app-domain/Relation.js b/lib/oak-app-domain/Relation.js index 7584cc821..e10530ae8 100644 --- a/lib/oak-app-domain/Relation.js +++ b/lib/oak-app-domain/Relation.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.selectFreeEntities = exports.deducedRelationMap = exports.relations = exports.RelationCascadePathGraph = exports.ActionCascadePathGraph = void 0; +exports.createFreeEntities = exports.updateFreeEntities = exports.selectFreeEntities = exports.deducedRelationMap = exports.relations = exports.RelationCascadePathGraph = exports.ActionCascadePathGraph = void 0; exports.ActionCascadePathGraph = [ ["changePasswordTemp", "user", "changePasswordTemp", false], ["email", "user", "email", false], @@ -31,3 +31,5 @@ exports.RelationCascadePathGraph = []; exports.relations = []; exports.deducedRelationMap = {}; exports.selectFreeEntities = []; +exports.updateFreeEntities = []; +exports.createFreeEntities = []; diff --git a/src/aspects/AspectDict.ts b/src/aspects/AspectDict.ts index 2a6ff2106..446ed1274 100644 --- a/src/aspects/AspectDict.ts +++ b/src/aspects/AspectDict.ts @@ -81,7 +81,7 @@ export type GeneralAspectDict< sendCaptcha: (params: { mobile: string; env: WechatMpEnv | WebEnv; - type: 'login' | 'changePassword'; + type: 'login' | 'changePassword' | 'confirm'; }, context: Cxt) => Promise; getApplication: ( params: { diff --git a/src/aspects/token.ts b/src/aspects/token.ts index 97289e757..d6d3f7296 100644 --- a/src/aspects/token.ts +++ b/src/aspects/token.ts @@ -1488,7 +1488,7 @@ export async function sendCaptcha< }: { mobile: string; env: WechatMpEnv | WebEnv; - type: 'login' | 'changePassword'; + type: 'login' | 'changePassword' | 'confirm'; }, context: Cxt ): Promise { diff --git a/src/entities/Captcha.ts b/src/entities/Captcha.ts index c3f543ca3..9b3feb7cb 100644 --- a/src/entities/Captcha.ts +++ b/src/entities/Captcha.ts @@ -11,7 +11,7 @@ export interface Schema extends EntityShape { env: Object; expired: Boolean; expiresAt: Datetime; - type: 'login' | 'changePassword'; + type: 'login' | 'changePassword' | 'confirm'; }; type IState = 'unsent' | 'sending' | 'sent' | 'failure'; @@ -60,7 +60,8 @@ const entityDesc: EntityDesc; + type: Q_EnumValue<'login' | 'changePassword' | 'confirm'>; iState: Q_EnumValue; }; export type Filter = MakeFilter>; diff --git a/src/oak-app-domain/Captcha/Storage.ts b/src/oak-app-domain/Captcha/Storage.ts index 6f9a06c45..7b3481ed9 100644 --- a/src/oak-app-domain/Captcha/Storage.ts +++ b/src/oak-app-domain/Captcha/Storage.ts @@ -39,7 +39,7 @@ export const desc: StorageDesc = { type: { notNull: true, type: "enum", - enumeration: ["login", "changePassword"] + enumeration: ["login", "changePassword", "confirm"] }, iState: { type: "enum", diff --git a/src/oak-app-domain/Captcha/locales/zh_CN.json b/src/oak-app-domain/Captcha/locales/zh_CN.json index 937b6fa7f..aec0caad2 100644 --- a/src/oak-app-domain/Captcha/locales/zh_CN.json +++ b/src/oak-app-domain/Captcha/locales/zh_CN.json @@ -1 +1 @@ -{"name":"验证码","attr":{"mobile":"手机号","code":"验证码","visitorId":"用户标识","reason":"失败原因","env":"用户环境","expired":"是否过期","expiresAt":"过期时间","iState":"状态","type":"类型"},"action":{"send":"发送","fail":"失败","success":"成功"},"v":{"iState":{"unsent":"未发送","sending":"发送中","sent":"已发送","failure":"已失败"},"type":{"login":"登录","changePassword":"修改密码"}}} \ No newline at end of file +{"name":"验证码","attr":{"mobile":"手机号","code":"验证码","visitorId":"用户标识","reason":"失败原因","env":"用户环境","expired":"是否过期","expiresAt":"过期时间","iState":"状态","type":"类型"},"action":{"send":"发送","fail":"失败","success":"成功"},"v":{"iState":{"unsent":"未发送","sending":"发送中","sent":"已发送","failure":"已失败"},"type":{"login":"登录","changePassword":"修改密码","confirm":"校验"}}} \ No newline at end of file diff --git a/src/oak-app-domain/Relation.ts b/src/oak-app-domain/Relation.ts index 44c68d29e..cf31092e9 100644 --- a/src/oak-app-domain/Relation.ts +++ b/src/oak-app-domain/Relation.ts @@ -1,4 +1,4 @@ -import { AuthCascadePath, AuthDeduceRelationMap, SelectFreeEntities } from "oak-domain/lib/types/Entity"; +import { AuthCascadePath, AuthDeduceRelationMap } from "oak-domain/lib/types/Entity"; import { EntityDict } from "./EntityDict"; import { CreateOperationData as Relation } from "./Relation/Schema"; export const ActionCascadePathGraph: AuthCascadePath[] = [ @@ -30,4 +30,6 @@ export const ActionCascadePathGraph: AuthCascadePath[] = [ export const RelationCascadePathGraph: AuthCascadePath[] = []; export const relations: Relation[] = []; export const deducedRelationMap: AuthDeduceRelationMap = {}; -export const selectFreeEntities: SelectFreeEntities = []; \ No newline at end of file +export const selectFreeEntities: (keyof EntityDict)[] = []; +export const updateFreeEntities: (keyof EntityDict)[] = []; +export const createFreeEntities: (keyof EntityDict)[] = []; \ No newline at end of file diff --git a/src/triggers/parasite.ts b/src/triggers/parasite.ts index 2f7740661..88df42655 100644 --- a/src/triggers/parasite.ts +++ b/src/triggers/parasite.ts @@ -1,6 +1,6 @@ import { generateNewId, generateNewIdAsync } from 'oak-domain/lib/utils/uuid'; import { Trigger, CreateTrigger, UpdateTrigger, SelectTrigger } from 'oak-domain/lib/types/Trigger'; -import { CreateOperationData as CreateParasiteData } from '../general-app-domain/Parasite/Schema'; +// import { CreateOperationData as CreateParasiteData } from '../general-app-domain/Parasite/Schema'; import { EntityDict } from '../oak-app-domain/EntityDict'; import { OakRowInconsistencyException, OakExternalException, SelectOpResult } from 'oak-domain/lib/types';