diff --git a/app/http/middleware/ContextMiddleware.php b/app/http/middleware/ContextMiddleware.php index f4fb167..86e60cd 100644 --- a/app/http/middleware/ContextMiddleware.php +++ b/app/http/middleware/ContextMiddleware.php @@ -23,13 +23,13 @@ class ContextMiddleware extends middleware if ($request->header('x-encrypted') == 'true') { $encryptedData = $request->param('encryptedData',''); if($encryptedData) { -// try{ + try{ $jsonInput = \app\Request::decryptCryptoJSData($encryptedData); -// }catch (\Throwable){ -// $jsonInput = null; -// } + }catch (\Throwable){ + $jsonInput = null; + } - if($jsonInput) { + if(empty($jsonInput)) { return json(['code'=>500,'message'=>'E0.数据解密失败']); } $request->withInput($jsonInput); diff --git a/z_ele/src/utils/request.ts b/z_ele/src/utils/request.ts index d2db9f7..d1a6307 100644 --- a/z_ele/src/utils/request.ts +++ b/z_ele/src/utils/request.ts @@ -37,7 +37,6 @@ export function decryptData(ciphertext: string): any { if (!jsonString) { throw new Error('Decryption failed: Invalid key or ciphertext'); } - return JSON.parse(jsonString); } /**