正在显示
1 个修改的文件
包含
15 行增加
和
3 行删除
@@ -82,6 +82,18 @@ public function response($msg = 'success', $code = self::SUCCESS, $data = [], $r | @@ -82,6 +82,18 @@ public function response($msg = 'success', $code = self::SUCCESS, $data = [], $r | ||
82 | throw new HttpResponseException($response); | 82 | throw new HttpResponseException($response); |
83 | } | 83 | } |
84 | 84 | ||
85 | + public function responseNew($message = 'success', $status = self::SUCCESS, $data = [], $result_code = 200, $type = 'application/json') | ||
86 | + { | ||
87 | + $result = [ | ||
88 | + 'message' => $message, | ||
89 | + 'status' => $status, | ||
90 | + 'data' => $data, | ||
91 | + ]; | ||
92 | + $this->header['Content-Type'] = $type; | ||
93 | + $response = response($result, $result_code, $this->header); | ||
94 | + throw new HttpResponseException($response); | ||
95 | + } | ||
96 | + | ||
85 | /** | 97 | /** |
86 | * GET请求 | 98 | * GET请求 |
87 | * @param $url | 99 | * @param $url |
@@ -465,7 +477,7 @@ public function transmit($request, $type = self::TYPEVISIT, $traffic = self::TRA | @@ -465,7 +477,7 @@ public function transmit($request, $type = self::TYPEVISIT, $traffic = self::TRA | ||
465 | { | 477 | { |
466 | $data = $request->all(); | 478 | $data = $request->all(); |
467 | if (empty($data)) { | 479 | if (empty($data)) { |
468 | - $this->success(); | 480 | + $this->response(); |
469 | } | 481 | } |
470 | 482 | ||
471 | if($type == self::TYPEINQUIRY){ | 483 | if($type == self::TYPEINQUIRY){ |
@@ -481,7 +493,7 @@ public function transmit($request, $type = self::TYPEVISIT, $traffic = self::TRA | @@ -481,7 +493,7 @@ public function transmit($request, $type = self::TYPEVISIT, $traffic = self::TRA | ||
481 | //判断是否是爬虫 | 493 | //判断是否是爬虫 |
482 | $isReptile = $this->isReptile($request); | 494 | $isReptile = $this->isReptile($request); |
483 | if ($isReptile) { | 495 | if ($isReptile) { |
484 | - $this->success(); | 496 | + $this->response(); |
485 | } | 497 | } |
486 | 498 | ||
487 | $data["device_port"] = $this->userAgentHandle($request->header('User-Agent'), $data["device_port"] ?? self::DEVICE_PORT_ONE); | 499 | $data["device_port"] = $this->userAgentHandle($request->header('User-Agent'), $data["device_port"] ?? self::DEVICE_PORT_ONE); |
@@ -512,7 +524,7 @@ public function transmit($request, $type = self::TYPEVISIT, $traffic = self::TRA | @@ -512,7 +524,7 @@ public function transmit($request, $type = self::TYPEVISIT, $traffic = self::TRA | ||
512 | if($type == self::TYPEINQUIRY){ | 524 | if($type == self::TYPEINQUIRY){ |
513 | $this->response("success", self::SUCCESS, $resp["data"] ?? []); | 525 | $this->response("success", self::SUCCESS, $resp["data"] ?? []); |
514 | }else{ | 526 | }else{ |
515 | - $this->success($resp["data"] ?? []); | 527 | + $this->responseNew("success", self::SUCCESS, $resp["data"] ?? []); |
516 | } | 528 | } |
517 | } | 529 | } |
518 | 530 |
-
请 注册 或 登录 后发表评论