正在显示
3 个修改的文件
包含
16 行增加
和
26 行删除
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | return [ | 3 | return [ |
| 4 | - 'base_uri' => 'https://open.singlewindow.gz.cn', | ||
| 5 | 'record_sn' => '', | 4 | 'record_sn' => '', |
| 6 | 'secret_key' => '', | 5 | 'secret_key' => '', |
| 7 | 'company_cert_sn' => '', | 6 | 'company_cert_sn' => '', |
| 8 | 'sender_sn' => '', | 7 | 'sender_sn' => '', |
| 9 | 'receiver_sn' => '', | 8 | 'receiver_sn' => '', |
| 10 | 'client' => [ | 9 | 'client' => [ |
| 11 | - 'timeout' => 30 | ||
| 12 | - ] | 10 | + 'base_uri' => '', |
| 11 | + 'timeout' => 30, | ||
| 12 | + 'verify' => false | ||
| 13 | + ], | ||
| 14 | + 'signature' => '' | ||
| 13 | ]; | 15 | ]; |
| @@ -29,27 +29,18 @@ class Client implements ClientInterface | @@ -29,27 +29,18 @@ class Client implements ClientInterface | ||
| 29 | */ | 29 | */ |
| 30 | protected $config = []; | 30 | protected $config = []; |
| 31 | 31 | ||
| 32 | - protected function __construct(RequestInterface $request) | ||
| 33 | - { | ||
| 34 | - $this->guzzleHttp = new GuzzleHttp([ | ||
| 35 | - 'base_uri' => Arr::get($this->config, 'base_uri'), | ||
| 36 | - 'verify' => false | ||
| 37 | - ]); | ||
| 38 | - $this->request = $request; | ||
| 39 | - $this->config = config('gz-cbec'); | ||
| 40 | - } | ||
| 41 | - | ||
| 42 | /** | 32 | /** |
| 43 | - * @param RequestInterface $request | 33 | + * Client constructor. |
| 44 | * | 34 | * |
| 45 | - * @return ClientInterface | 35 | + * @param RequestInterface $request |
| 46 | */ | 36 | */ |
| 47 | - protected static function make(RequestInterface $request): ClientInterface | 37 | + protected function __construct(RequestInterface $request) |
| 48 | { | 38 | { |
| 49 | - return new static($request); | 39 | + $this->request = $request; |
| 40 | + $this->config = config('gz-cbec'); | ||
| 41 | + $this->guzzleHttp = new GuzzleHttp((array)Arr::get($this->config, 'client')); | ||
| 50 | } | 42 | } |
| 51 | 43 | ||
| 52 | - | ||
| 53 | /** | 44 | /** |
| 54 | * @return ResponseInterface | 45 | * @return ResponseInterface |
| 55 | * @throws Exception | 46 | * @throws Exception |
| @@ -77,13 +68,12 @@ class Client implements ClientInterface | @@ -77,13 +68,12 @@ class Client implements ClientInterface | ||
| 77 | * @param RequestInterface $request | 68 | * @param RequestInterface $request |
| 78 | * | 69 | * |
| 79 | * @return array | 70 | * @return array |
| 71 | + * @throws Exception | ||
| 80 | */ | 72 | */ |
| 81 | public static function request(RequestInterface $request): array | 73 | public static function request(RequestInterface $request): array |
| 82 | { | 74 | { |
| 83 | - $client = self::make($request); | ||
| 84 | - /** | ||
| 85 | - * @var ResponseInterface $response | ||
| 86 | - */ | 75 | + $client = new static($request); |
| 76 | + | ||
| 87 | $response = $client->send(); | 77 | $response = $client->send(); |
| 88 | 78 | ||
| 89 | $content = $response->getBody()->getContents(); | 79 | $content = $response->getBody()->getContents(); |
| @@ -4,7 +4,6 @@ namespace Lackoxygen\GzCbec\Request; | @@ -4,7 +4,6 @@ namespace Lackoxygen\GzCbec\Request; | ||
| 4 | 4 | ||
| 5 | use Carbon\Carbon; | 5 | use Carbon\Carbon; |
| 6 | use Illuminate\Support\Arr; | 6 | use Illuminate\Support\Arr; |
| 7 | -use Illuminate\Support\Collection; | ||
| 8 | use Lackoxygen\GzCbec\Constant\XML; | 7 | use Lackoxygen\GzCbec\Constant\XML; |
| 9 | use Lackoxygen\GzCbec\Contract\RequestInterface; | 8 | use Lackoxygen\GzCbec\Contract\RequestInterface; |
| 10 | use Lackoxygen\GzCbec\Contract\XMLInterface; | 9 | use Lackoxygen\GzCbec\Contract\XMLInterface; |
| @@ -12,7 +11,6 @@ use Lackoxygen\GzCbec\Exception\Exception; | @@ -12,7 +11,6 @@ use Lackoxygen\GzCbec\Exception\Exception; | ||
| 12 | use Lackoxygen\GzCbec\Request\Head\Head; | 11 | use Lackoxygen\GzCbec\Request\Head\Head; |
| 13 | use Lackoxygen\GzCbec\Request\Packet\GzReportTransfer; | 12 | use Lackoxygen\GzCbec\Request\Packet\GzReportTransfer; |
| 14 | use Lackoxygen\GzCbec\Request\Report\Node\Receiver; | 13 | use Lackoxygen\GzCbec\Request\Report\Node\Receiver; |
| 15 | -use Lackoxygen\GzCbec\Utils\RSA; | ||
| 16 | use Lackoxygen\GzCbec\Utils\Signature; | 14 | use Lackoxygen\GzCbec\Utils\Signature; |
| 17 | 15 | ||
| 18 | class Packet | 16 | class Packet |
| @@ -46,7 +44,7 @@ class Packet | @@ -46,7 +44,7 @@ class Packet | ||
| 46 | public function getContent(): string | 44 | public function getContent(): string |
| 47 | { | 45 | { |
| 48 | try { | 46 | try { |
| 49 | - $head = new Head(); | 47 | + $head = new Head; |
| 50 | $head->setMessageId($this->request->getGuid()); | 48 | $head->setMessageId($this->request->getGuid()); |
| 51 | $head->setMessageType($this->request->getMessageType()); | 49 | $head->setMessageType($this->request->getMessageType()); |
| 52 | $head->setSender($this->config['sender_sn']); | 50 | $head->setSender($this->config['sender_sn']); |
| @@ -64,7 +62,7 @@ class Packet | @@ -64,7 +62,7 @@ class Packet | ||
| 64 | $xmlHead = sprintf(XML::DATA, $firstLabel, $this->request->getGuid(), $this->request->getVersion(), | 62 | $xmlHead = sprintf(XML::DATA, $firstLabel, $this->request->getGuid(), $this->request->getVersion(), |
| 65 | $firstLabel); | 63 | $firstLabel); |
| 66 | $dataXml = $this->request->toXML($xmlHead); | 64 | $dataXml = $this->request->toXML($xmlHead); |
| 67 | - $data = base64_encode($dataXml); | 65 | + $data = base64_encode($dataXml); |
| 68 | $packet->setData($data); | 66 | $packet->setData($data); |
| 69 | } | 67 | } |
| 70 | $xml = $packet->toXML(XML::TRANSFER); | 68 | $xml = $packet->toXML(XML::TRANSFER); |
-
请 注册 或 登录 后发表评论