From 84a4336a1f0abe1f30809c07c2bdd7ee0713fd5e Mon Sep 17 00:00:00 2001 From: wenjiarui Date: Wed, 6 Dec 2023 11:21:53 +0800 Subject: [PATCH] build --- .../application/panel/web.pc.module.less | 6 +++--- es/utils/cos/ctyun.js | 17 +++++++++-------- es/utils/cos/qiniu.js | 13 +++++++------ es/utils/sms/ali.d.ts | 3 ++- es/utils/sms/ali.js | 3 +-- es/utils/sms/tencent.d.ts | 3 ++- es/utils/sms/tencent.js | 4 ++-- lib/utils/cos/ctyun.js | 17 +++++++++-------- lib/utils/cos/qiniu.js | 13 +++++++------ lib/utils/sms/ali.d.ts | 3 ++- lib/utils/sms/ali.js | 3 +-- lib/utils/sms/tencent.d.ts | 3 ++- lib/utils/sms/tencent.js | 4 ++-- 13 files changed, 49 insertions(+), 43 deletions(-) diff --git a/es/components/application/panel/web.pc.module.less b/es/components/application/panel/web.pc.module.less index f7db4d9fb..9fcb0825b 100644 --- a/es/components/application/panel/web.pc.module.less +++ b/es/components/application/panel/web.pc.module.less @@ -1,5 +1,5 @@ .tabLabel { - // writing-mode: vertical-rl; - // letter-spacing: .2rem; - writing-mode: horizontal-tb; + // writing-mode: vertical-rl; + // letter-spacing: .2rem; + writing-mode: horizontal-tb; } \ No newline at end of file diff --git a/es/utils/cos/ctyun.js b/es/utils/cos/ctyun.js index 502512ea9..6feeabec5 100644 --- a/es/utils/cos/ctyun.js +++ b/es/utils/cos/ctyun.js @@ -33,9 +33,9 @@ export default class CTYun { } async upload(extraFile, uploadFn, file) { const uploadMeta = extraFile.uploadMeta; - let result; + let response; try { - result = await uploadFn(file, 'file', uploadMeta.uploadHost, { + response = await uploadFn(file, 'file', uploadMeta.uploadHost, { key: uploadMeta.key, Policy: uploadMeta.policy, AWSAccessKeyId: uploadMeta.accessKey, @@ -48,21 +48,22 @@ export default class CTYun { } let isSuccess = false; if (process.env.OAK_PLATFORM === 'wechatMp') { - // 小程序端上传 使用wx.uploadFile - if (result.errMsg === 'uploadFile:ok') { - const jsonData = JSON.parse(result.data); - isSuccess = !!jsonData.key; + // 小程序端上传 使用wx.uploadFile + // 待测试 + if (response.errMsg === 'uploadFile:ok') { + const data = JSON.parse(response.data); + isSuccess = !!(data.status === 204); } } else { - isSuccess = !!(result.success === true || result.key); + isSuccess = !!(response.status === 204); } // 解析回调 if (isSuccess) { return; } else { - throw new OakUploadException('图片上传七牛失败'); + throw new OakUploadException('图片上传天翼云失败'); } } composeFileUrl(extraFile, context, style) { diff --git a/es/utils/cos/qiniu.js b/es/utils/cos/qiniu.js index 0306a98d4..1d268784f 100644 --- a/es/utils/cos/qiniu.js +++ b/es/utils/cos/qiniu.js @@ -33,9 +33,9 @@ export default class Qiniu { } async upload(extraFile, uploadFn, file) { const uploadMeta = extraFile.uploadMeta; - let result; + let response; try { - result = await uploadFn(file, 'file', uploadMeta.uploadHost, { + response = await uploadFn(file, 'file', uploadMeta.uploadHost, { key: uploadMeta.key, token: uploadMeta.uploadToken, }, true); @@ -47,13 +47,14 @@ export default class Qiniu { let isSuccess = false; if (process.env.OAK_PLATFORM === 'wechatMp') { // 小程序端上传 使用wx.uploadFile - if (result.errMsg === 'uploadFile:ok') { - const jsonData = JSON.parse(result.data); - isSuccess = !!jsonData.key; + if (response.errMsg === 'uploadFile:ok') { + const data = JSON.parse(response.data); + isSuccess = !!(data.success === true || data.key); } } else { - isSuccess = !!(result.success === true || result.key); + const data = await response.json(); + isSuccess = !!(data.success === true || data.key); } // 解析回调 if (isSuccess) { diff --git a/es/utils/sms/ali.d.ts b/es/utils/sms/ali.d.ts index 7f1063fe1..62f11c0a4 100644 --- a/es/utils/sms/ali.d.ts +++ b/es/utils/sms/ali.d.ts @@ -2,9 +2,10 @@ import { BackendRuntimeContext } from '../../context/BackendRuntimeContext'; import Sms from "../../types/Sms"; import { ED } from '../../types/RuntimeCxt'; import { EntityDict } from '../../oak-app-domain'; +import { AliSmsConfig } from '../../types/Config'; export default class Ali implements Sms> { name: string; - getConfig(context: BackendRuntimeContext): any; + getConfig(context: BackendRuntimeContext): AliSmsConfig; syncTemplate(systemId: string): Promise; sendSms(params: { mobile: string; diff --git a/es/utils/sms/ali.js b/es/utils/sms/ali.js index 15d785899..8dbcef6f6 100644 --- a/es/utils/sms/ali.js +++ b/es/utils/sms/ali.js @@ -30,13 +30,12 @@ export default class Ali { signName: defaultSignName, }); const { code, message, requestId } = result; - if (result?.code === 'Ok') { + if (code === 'Ok') { return { success: true, res: result, }; } - console.warn(message); return { success: false, res: result, diff --git a/es/utils/sms/tencent.d.ts b/es/utils/sms/tencent.d.ts index dbca15526..2189dd809 100644 --- a/es/utils/sms/tencent.d.ts +++ b/es/utils/sms/tencent.d.ts @@ -2,9 +2,10 @@ import { BackendRuntimeContext } from '../../context/BackendRuntimeContext'; import Sms from "../../types/Sms"; import { ED } from '../../types/RuntimeCxt'; import { EntityDict } from '../../oak-app-domain'; +import { TencentSmsConfig } from '../../types/Config'; export default class Tencent implements Sms> { name: string; - getConfig(context: BackendRuntimeContext, systemId?: string): Promise; + getConfig(context: BackendRuntimeContext, systemId?: string): Promise; syncTemplate(systemId: string, context: BackendRuntimeContext): Promise<{ templateCode: string; templateName: string; diff --git a/es/utils/sms/tencent.js b/es/utils/sms/tencent.js index bf59fb3c2..8e625556a 100644 --- a/es/utils/sms/tencent.js +++ b/es/utils/sms/tencent.js @@ -78,7 +78,7 @@ export default class Tencent { TemplateId: templateCode, SignName: defaultSignName, }); - const code = get(result, 'SendStatusSet.[0].Code', ''); + const code = result?.SendStatusSet?.[0]?.Code || ''; if (code === 'Ok') { return { success: true, @@ -86,7 +86,7 @@ export default class Tencent { }; } return { - success: true, + success: false, res: result, }; } diff --git a/lib/utils/cos/ctyun.js b/lib/utils/cos/ctyun.js index 346e12247..c0b440ff5 100644 --- a/lib/utils/cos/ctyun.js +++ b/lib/utils/cos/ctyun.js @@ -35,9 +35,9 @@ class CTYun { } async upload(extraFile, uploadFn, file) { const uploadMeta = extraFile.uploadMeta; - let result; + let response; try { - result = await uploadFn(file, 'file', uploadMeta.uploadHost, { + response = await uploadFn(file, 'file', uploadMeta.uploadHost, { key: uploadMeta.key, Policy: uploadMeta.policy, AWSAccessKeyId: uploadMeta.accessKey, @@ -50,21 +50,22 @@ class CTYun { } let isSuccess = false; if (process.env.OAK_PLATFORM === 'wechatMp') { - // 小程序端上传 使用wx.uploadFile - if (result.errMsg === 'uploadFile:ok') { - const jsonData = JSON.parse(result.data); - isSuccess = !!jsonData.key; + // 小程序端上传 使用wx.uploadFile + // 待测试 + if (response.errMsg === 'uploadFile:ok') { + const data = JSON.parse(response.data); + isSuccess = !!(data.status === 204); } } else { - isSuccess = !!(result.success === true || result.key); + isSuccess = !!(response.status === 204); } // 解析回调 if (isSuccess) { return; } else { - throw new Exception_1.OakUploadException('图片上传七牛失败'); + throw new Exception_1.OakUploadException('图片上传天翼云失败'); } } composeFileUrl(extraFile, context, style) { diff --git a/lib/utils/cos/qiniu.js b/lib/utils/cos/qiniu.js index 547e92038..c56df9a63 100644 --- a/lib/utils/cos/qiniu.js +++ b/lib/utils/cos/qiniu.js @@ -35,9 +35,9 @@ class Qiniu { } async upload(extraFile, uploadFn, file) { const uploadMeta = extraFile.uploadMeta; - let result; + let response; try { - result = await uploadFn(file, 'file', uploadMeta.uploadHost, { + response = await uploadFn(file, 'file', uploadMeta.uploadHost, { key: uploadMeta.key, token: uploadMeta.uploadToken, }, true); @@ -49,13 +49,14 @@ class Qiniu { let isSuccess = false; if (process.env.OAK_PLATFORM === 'wechatMp') { // 小程序端上传 使用wx.uploadFile - if (result.errMsg === 'uploadFile:ok') { - const jsonData = JSON.parse(result.data); - isSuccess = !!jsonData.key; + if (response.errMsg === 'uploadFile:ok') { + const data = JSON.parse(response.data); + isSuccess = !!(data.success === true || data.key); } } else { - isSuccess = !!(result.success === true || result.key); + const data = await response.json(); + isSuccess = !!(data.success === true || data.key); } // 解析回调 if (isSuccess) { diff --git a/lib/utils/sms/ali.d.ts b/lib/utils/sms/ali.d.ts index 7f1063fe1..62f11c0a4 100644 --- a/lib/utils/sms/ali.d.ts +++ b/lib/utils/sms/ali.d.ts @@ -2,9 +2,10 @@ import { BackendRuntimeContext } from '../../context/BackendRuntimeContext'; import Sms from "../../types/Sms"; import { ED } from '../../types/RuntimeCxt'; import { EntityDict } from '../../oak-app-domain'; +import { AliSmsConfig } from '../../types/Config'; export default class Ali implements Sms> { name: string; - getConfig(context: BackendRuntimeContext): any; + getConfig(context: BackendRuntimeContext): AliSmsConfig; syncTemplate(systemId: string): Promise; sendSms(params: { mobile: string; diff --git a/lib/utils/sms/ali.js b/lib/utils/sms/ali.js index d53069586..a2a419595 100644 --- a/lib/utils/sms/ali.js +++ b/lib/utils/sms/ali.js @@ -33,13 +33,12 @@ class Ali { signName: defaultSignName, }); const { code, message, requestId } = result; - if (result?.code === 'Ok') { + if (code === 'Ok') { return { success: true, res: result, }; } - console.warn(message); return { success: false, res: result, diff --git a/lib/utils/sms/tencent.d.ts b/lib/utils/sms/tencent.d.ts index dbca15526..2189dd809 100644 --- a/lib/utils/sms/tencent.d.ts +++ b/lib/utils/sms/tencent.d.ts @@ -2,9 +2,10 @@ import { BackendRuntimeContext } from '../../context/BackendRuntimeContext'; import Sms from "../../types/Sms"; import { ED } from '../../types/RuntimeCxt'; import { EntityDict } from '../../oak-app-domain'; +import { TencentSmsConfig } from '../../types/Config'; export default class Tencent implements Sms> { name: string; - getConfig(context: BackendRuntimeContext, systemId?: string): Promise; + getConfig(context: BackendRuntimeContext, systemId?: string): Promise; syncTemplate(systemId: string, context: BackendRuntimeContext): Promise<{ templateCode: string; templateName: string; diff --git a/lib/utils/sms/tencent.js b/lib/utils/sms/tencent.js index 6db5a59a3..8fe3c7fd2 100644 --- a/lib/utils/sms/tencent.js +++ b/lib/utils/sms/tencent.js @@ -81,7 +81,7 @@ class Tencent { TemplateId: templateCode, SignName: defaultSignName, }); - const code = (0, lodash_1.get)(result, 'SendStatusSet.[0].Code', ''); + const code = result?.SendStatusSet?.[0]?.Code || ''; if (code === 'Ok') { return { success: true, @@ -89,7 +89,7 @@ class Tencent { }; } return { - success: true, + success: false, res: result, }; }