Skip to content

Commit 3dea2eb

Browse files
committed
Add another condition
in case there is any error
1 parent e505b0d commit 3dea2eb

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/javascript/CoreHandler.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ export function Enc(
242242

243243
//压缩
244244
OriginalData = Compress(TempArray);
245-
//加密
246245

247246
try {
248247
AdvancedEncObj = new AdvancedEncConfig(
@@ -268,7 +267,7 @@ export function Enc(
268267
//遇到错误即AdvancedEncObj是一个null或者某个不可读取属性的非法值,自动缺省
269268
AdvancedEncObj = new AdvancedEncConfig();
270269
}
271-
270+
//加密
272271
OriginalData = Encrypt(OriginalData, key, AdvancedEncObj);
273272

274273
if (AdvancedEncObj.Enable) {
@@ -308,7 +307,8 @@ export function Enc(
308307
if (AdvancedEncObj.Enable) {
309308
if (
310309
AdvancedEncObj.FlexibleTransfer &&
311-
AdvancedEncObj.FlexibleTransfer.Enable
310+
AdvancedEncObj.FlexibleTransfer.Enable &&
311+
AdvancedEncObj.FlexibleTransfer.isRecursion
312312
) {
313313
//高级加密和灵活传输同时启用
314314
OriginStr = insertEncryptMarks(
@@ -331,7 +331,8 @@ export function Enc(
331331
} else {
332332
if (
333333
AdvancedEncObj.FlexibleTransfer &&
334-
AdvancedEncObj.FlexibleTransfer.Enable
334+
AdvancedEncObj.FlexibleTransfer.Enable &&
335+
AdvancedEncObj.FlexibleTransfer.isRecursion
335336
) {
336337
//只启用灵活传输
337338
OriginStr = insertEncryptMarks(

0 commit comments

Comments
 (0)