代码提交

Server/application/api/controller/UserController.php

@@ -266,7 +266,7 @@ class UserController extends BaseController
      * 获取验证码
      * @return \think\response\Json
      */
-    public function getVerifyCode()
+    public function getVerifyCode($isJson = false)
     {
         $headerData = ['client:' . self::CLIENT_TYPE];
         $header = setHeader($headerData, '', 'plain');
@@ -279,17 +279,19 @@ class UserController extends BaseController
             if (is_array($response)) {
                 // 如果verifyCodeImage和verifySessionId都不为null，返回它们
                 if (!empty($response['verifyCodeImage']) && !empty($response['verifySessionId'])) {
-                    return successJson([
+                    $returnData = [
                         'verifyCodeImage' => $response['verifyCodeImage'],
                         'verifySessionId' => $response['verifySessionId']
-                    ]);
+                    ];
+                    return !empty($isJson) ? json_encode(['code' => 200,'data' => $returnData]) : successJson($returnData);
                 }
             }
             
             // 如果不是预期的格式，返回原始数据
-            return successJson($response);
+            return !empty($isJson) ? json_encode(['code' => 500,'data' => $response]) : errorJson('无需验证码');
         } catch (\Exception $e) {
-            return errorJson('获取验证码失败：' . $e->getMessage());
+            $msg = '获取验证码失败'. $e->getMessage();
+            return !empty($isJson) ? json_encode(['code' => 400,'msg' => $msg]) : errorJson($msg);
         }
     }