Skip to content

G
goods
Commit efbf42a4 authored by luhongguang's avatar luhongguang
Browse files
Options

update: composer update

parent 94450e16
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 57 deletions
composer.json
View file @ efbf42a4
......@@ -6,7 +6,7 @@
"require": {
"php": "7.2.*",
"ext-json": "*",
"api/php_utils":"1.0.8",
"api/php_utils":"1.0.9",
"api/php_services":"1.0.1",
"ext-openssl": "*"
},
......
composer.lock
View file @ efbf42a4
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "9e55c737bafc692c733922eda874da75",
"content-hash": "d2165c30c914433949003e43fb6dc9b2",
"packages": [
{
"name": "api/php_services",
......@@ -30,11 +30,11 @@
},
{
"name": "api/php_utils",
"version": "v1.0.8",
"version": "v1.0.9",
"source": {
"type": "git",
"url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
"reference": "15534ea42a1bc55400fd33acb03f5644d5607228"
"reference": "866e88e927a0af5ac7545405d9783764ea76bbc2"
},
"require": {
"elasticsearch/elasticsearch": "~7.0",
......@@ -53,7 +53,7 @@
}
},
"description": "bp api php_utils",
"time": "2021-08-09T09:41:21+00:00"
"time": "2021-08-11T11:54:12+00:00"
},
{
"name": "bacon/bacon-qr-code",
......@@ -610,16 +610,16 @@
},
{
"name": "khanamiryan/qrcode-detector-decoder",
"version": "1.0.5.1",
"version": "1.0.5.2",
"source": {
"type": "git",
"url": "https://github.com/khanamiryan/php-qrcode-detector-decoder.git",
"reference": "b96163d4f074970dfe67d4185e75e1f4541b30ca"
"reference": "04fdd58d86a387065f707dc6d3cc304c719910c1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/b96163d4f074970dfe67d4185e75e1f4541b30ca",
"reference": "b96163d4f074970dfe67d4185e75e1f4541b30ca",
"url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/04fdd58d86a387065f707dc6d3cc304c719910c1",
"reference": "04fdd58d86a387065f707dc6d3cc304c719910c1",
"shasum": ""
},
"require": {
......@@ -659,9 +659,9 @@
],
"support": {
"issues": "https://github.com/khanamiryan/php-qrcode-detector-decoder/issues",
"source": "https://github.com/khanamiryan/php-qrcode-detector-decoder/tree/1.0.5.1"
"source": "https://github.com/khanamiryan/php-qrcode-detector-decoder/tree/1.0.5.2"
},
"time": "2021-04-21T08:02:08+00:00"
"time": "2021-07-13T18:46:38+00:00"
},
{
"name": "mongodb/mongodb",
......@@ -1692,12 +1692,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
"reference": "691dd2a4739ce1ec5ea09355569977ad3a283142"
"reference": "aaa09eb714623e935494b5852c1eff260b704ae1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/property-access/zipball/691dd2a4739ce1ec5ea09355569977ad3a283142",
"reference": "691dd2a4739ce1ec5ea09355569977ad3a283142",
"url": "https://api.github.com/repos/symfony/property-access/zipball/aaa09eb714623e935494b5852c1eff260b704ae1",
"reference": "aaa09eb714623e935494b5852c1eff260b704ae1",
"shasum": ""
},
"require": {
......@@ -1765,7 +1765,7 @@
"type": "tidelift"
}
],
"time": "2021-08-09T09:36:42+00:00"
"time": "2021-08-09T12:23:16+00:00"
},
{
"name": "symfony/property-info",
......
vendor/api/php_utils/src/Http/HttpUtil.php
View file @ efbf42a4
......@@ -21,6 +21,7 @@ namespace Api\PhpUtils\Http;
use Api\PhpUtils\Log\FileLog;
use Api\PhpUtils\Log\Tracer;
use Api\PhpUtils\Mon\MonUtil;
class HttpUtil
......@@ -58,6 +59,10 @@ class HttpUtil
*/
public static function get(string $url,array $params = [], int $timeout = 10000,int $retries = 1, array $headers = [], string $proxy = '',array $curl_opts = []): array
{
// 增加traceId
if(is_array($headers)) {
$headers['X-TRACE-ID'] = Tracer::getTraceId();
}
$url = $url ."?". http_build_query($params);
return self::curl($url, $timeout, $retries, $headers, [], $proxy, 'GET', $curl_opts);
}
......@@ -90,6 +95,10 @@ class HttpUtil
*/
public static function post(string $url, $post,int $timeout = 10000,int $retries = 1,array $headers = [], string $proxy = '',array $curl_opts = []): array
{
// 增加traceId
if(is_array($headers)) {
$headers['X-TRACE-ID'] = Tracer::getTraceId();
}
return self::curl($url, $timeout, $retries, $headers, $post, $proxy, 'POST', $curl_opts);
}
......
vendor/api/php_utils/src/Http/Request.php
View file @ efbf42a4
......@@ -2,6 +2,7 @@
namespace Api\PhpUtils\Http;
use Api\PhpUtils\Log\FileLog;
use Api\PhpUtils\Log\Tracer;
use Api\PhpUtils\Mon\MonUtil;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Exception\TransferException;
......@@ -64,6 +65,12 @@ class Request
if (!empty($timeout)) {
$options['timeout'] = $timeout / 1000;
}
// 增加traceId
if(is_array($headers)) {
$headers['X-TRACE-ID'] = Tracer::getTraceId();
}
if (!empty($headers)) {
$options['headers'] = $headers;
}
......@@ -140,6 +147,12 @@ class Request
if (!empty($timeout)) {
$options['timeout'] = $timeout / 1000;
}
// 增加traceId
if(is_array($headers)) {
$headers['X-TRACE-ID'] = Tracer::getTraceId();
}
if (!empty($headers)) {
$options['headers'] = $headers;
}
......
vendor/composer/InstalledVersions.php
View file @ efbf42a4
......@@ -27,12 +27,12 @@ class InstalledVersions
private static $installed = array (
'root' =>
array (
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'aliases' =>
array (
),
'reference' => '55a9b3da37fd599a6786f4e48280cc01def39fed',
'reference' => '94450e16db513b1dd4d9cbb15869e03e3a0da5b8',
'name' => 'yidian/yaf_demo',
),
'versions' =>
......@@ -48,12 +48,12 @@ private static $installed = array (
),
'api/php_utils' =>
array (
'pretty_version' => 'v1.0.8',
'version' => '1.0.8.0',
'pretty_version' => 'v1.0.9',
'version' => '1.0.9.0',
'aliases' =>
array (
),
'reference' => '15534ea42a1bc55400fd33acb03f5644d5607228',
'reference' => '866e88e927a0af5ac7545405d9783764ea76bbc2',
),
'bacon/bacon-qr-code' =>
array (
......@@ -141,12 +141,12 @@ private static $installed = array (
),
'khanamiryan/qrcode-detector-decoder' =>
array (
'pretty_version' => '1.0.5.1',
'version' => '1.0.5.1',
'pretty_version' => '1.0.5.2',
'version' => '1.0.5.2',
'aliases' =>
array (
),
'reference' => 'b96163d4f074970dfe67d4185e75e1f4541b30ca',
'reference' => '04fdd58d86a387065f707dc6d3cc304c719910c1',
),
'mongodb/mongodb' =>
array (
......@@ -305,7 +305,7 @@ private static $installed = array (
'aliases' =>
array (
),
'reference' => '691dd2a4739ce1ec5ea09355569977ad3a283142',
'reference' => 'aaa09eb714623e935494b5852c1eff260b704ae1',
),
'symfony/property-info' =>
array (
......@@ -327,12 +327,12 @@ private static $installed = array (
),
'yidian/yaf_demo' =>
array (
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'aliases' =>
array (
),
'reference' => '55a9b3da37fd599a6786f4e48280cc01def39fed',
'reference' => '94450e16db513b1dd4d9cbb15869e03e3a0da5b8',
),
),
);
......
vendor/composer/autoload_classmap.php
View file @ efbf42a4
......@@ -104,6 +104,7 @@ return array(
'App\\Models\\demo\\mysql\\User' => $baseDir . '/application/models/demo/mysql/User.php',
'App\\Models\\goods\\mysql\\Category' => $baseDir . '/application/models/goods/mysql/Category.php',
'App\\Models\\goods\\mysql\\GoodsOperationRecord' => $baseDir . '/application/models/goods/mysql/GoodsOperationRecord.php',
'App\\Models\\goods\\mysql\\GoodsRefundRecord' => $baseDir . '/application/models/goods/mysql/GoodsRefundRecord.php',
'App\\Models\\goods\\mysql\\GoodsSku' => $baseDir . '/application/models/goods/mysql/GoodsSku.php',
'App\\Models\\goods\\mysql\\GoodsSkuPicRecord' => $baseDir . '/application/models/goods/mysql/GoodsSkuPicRecord.php',
'App\\Models\\goods\\mysql\\GoodsSkuSubShop' => $baseDir . '/application/models/goods/mysql/GoodsSkuSubShop.php',
......@@ -137,10 +138,12 @@ return array(
'App\\Services\\goods\\CategoryService' => $baseDir . '/application/services/goods/CategoryService.php',
'App\\Services\\goods\\ElasticGoodService' => $baseDir . '/application/services/goods/ElasticGoodService.php',
'App\\Services\\goods\\GoodsService' => $baseDir . '/application/services/goods/GoodsService.php',
'App\\Services\\goods\\GoodsSnapshotsService' => $baseDir . '/application/services/goods/GoodsSnapshotsService.php',
'App\\Services\\goods\\MarketingPindanGoodsService' => $baseDir . '/application/services/goods/MarketingPindanGoodsService.php',
'App\\Services\\goods\\OtaService' => $baseDir . '/application/services/goods/OtaService.php',
'App\\Services\\marketing\\DistributionService' => $baseDir . '/application/services/marketing/DistributionService.php',
'App\\Services\\marketing\\DistributorService' => $baseDir . '/application/services/marketing/DistributorService.php',
'App\\Services\\marketing\\MarketingForOrderService' => $baseDir . '/application/services/marketing/MarketingForOrderService.php',
'App\\Services\\marketing\\MarketingGoodsService' => $baseDir . '/application/services/marketing/MarketingGoodsService.php',
'App\\Services\\marketing\\MarketingService' => $baseDir . '/application/services/marketing/MarketingService.php',
'App\\Services\\marketing\\TakePlaceService' => $baseDir . '/application/services/marketing/TakePlaceService.php',
......
vendor/composer/autoload_static.php
View file @ efbf42a4
......@@ -333,6 +333,7 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
'App\\Models\\demo\\mysql\\User' => __DIR__ . '/../..' . '/application/models/demo/mysql/User.php',
'App\\Models\\goods\\mysql\\Category' => __DIR__ . '/../..' . '/application/models/goods/mysql/Category.php',
'App\\Models\\goods\\mysql\\GoodsOperationRecord' => __DIR__ . '/../..' . '/application/models/goods/mysql/GoodsOperationRecord.php',
'App\\Models\\goods\\mysql\\GoodsRefundRecord' => __DIR__ . '/../..' . '/application/models/goods/mysql/GoodsRefundRecord.php',
'App\\Models\\goods\\mysql\\GoodsSku' => __DIR__ . '/../..' . '/application/models/goods/mysql/GoodsSku.php',
'App\\Models\\goods\\mysql\\GoodsSkuPicRecord' => __DIR__ . '/../..' . '/application/models/goods/mysql/GoodsSkuPicRecord.php',
'App\\Models\\goods\\mysql\\GoodsSkuSubShop' => __DIR__ . '/../..' . '/application/models/goods/mysql/GoodsSkuSubShop.php',
......@@ -366,10 +367,12 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
'App\\Services\\goods\\CategoryService' => __DIR__ . '/../..' . '/application/services/goods/CategoryService.php',
'App\\Services\\goods\\ElasticGoodService' => __DIR__ . '/../..' . '/application/services/goods/ElasticGoodService.php',
'App\\Services\\goods\\GoodsService' => __DIR__ . '/../..' . '/application/services/goods/GoodsService.php',
'App\\Services\\goods\\GoodsSnapshotsService' => __DIR__ . '/../..' . '/application/services/goods/GoodsSnapshotsService.php',
'App\\Services\\goods\\MarketingPindanGoodsService' => __DIR__ . '/../..' . '/application/services/goods/MarketingPindanGoodsService.php',
'App\\Services\\goods\\OtaService' => __DIR__ . '/../..' . '/application/services/goods/OtaService.php',
'App\\Services\\marketing\\DistributionService' => __DIR__ . '/../..' . '/application/services/marketing/DistributionService.php',
'App\\Services\\marketing\\DistributorService' => __DIR__ . '/../..' . '/application/services/marketing/DistributorService.php',
'App\\Services\\marketing\\MarketingForOrderService' => __DIR__ . '/../..' . '/application/services/marketing/MarketingForOrderService.php',
'App\\Services\\marketing\\MarketingGoodsService' => __DIR__ . '/../..' . '/application/services/marketing/MarketingGoodsService.php',
'App\\Services\\marketing\\MarketingService' => __DIR__ . '/../..' . '/application/services/marketing/MarketingService.php',
'App\\Services\\marketing\\TakePlaceService' => __DIR__ . '/../..' . '/application/services/marketing/TakePlaceService.php',
......
vendor/composer/installed.json
View file @ efbf42a4
......@@ -27,12 +27,12 @@
},
{
"name": "api/php_utils",
"version": "v1.0.8",
"version_normalized": "1.0.8.0",
"version": "v1.0.9",
"version_normalized": "1.0.9.0",
"source": {
"type": "git",
"url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
"reference": "15534ea42a1bc55400fd33acb03f5644d5607228"
"reference": "866e88e927a0af5ac7545405d9783764ea76bbc2"
},
"require": {
"elasticsearch/elasticsearch": "~7.0",
......@@ -44,7 +44,7 @@
"mongodb/mongodb": "1.4.3",
"php": "7.2.*"
},
"time": "2021-08-09T09:41:21+00:00",
"time": "2021-08-11T11:54:12+00:00",
"type": "library",
"installation-source": "source",
"autoload": {
......@@ -637,17 +637,17 @@
},
{
"name": "khanamiryan/qrcode-detector-decoder",
"version": "1.0.5.1",
"version_normalized": "1.0.5.1",
"version": "1.0.5.2",
"version_normalized": "1.0.5.2",
"source": {
"type": "git",
"url": "https://github.com/khanamiryan/php-qrcode-detector-decoder.git",
"reference": "b96163d4f074970dfe67d4185e75e1f4541b30ca"
"reference": "04fdd58d86a387065f707dc6d3cc304c719910c1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/b96163d4f074970dfe67d4185e75e1f4541b30ca",
"reference": "b96163d4f074970dfe67d4185e75e1f4541b30ca",
"url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/04fdd58d86a387065f707dc6d3cc304c719910c1",
"reference": "04fdd58d86a387065f707dc6d3cc304c719910c1",
"shasum": ""
},
"require": {
......@@ -656,7 +656,7 @@
"require-dev": {
"phpunit/phpunit": "^5.7 | ^7.5 | ^8.0 | ^9.0"
},
"time": "2021-04-21T08:02:08+00:00",
"time": "2021-07-13T18:46:38+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
......@@ -689,7 +689,7 @@
],
"support": {
"issues": "https://github.com/khanamiryan/php-qrcode-detector-decoder/issues",
"source": "https://github.com/khanamiryan/php-qrcode-detector-decoder/tree/1.0.5.1"
"source": "https://github.com/khanamiryan/php-qrcode-detector-decoder/tree/1.0.5.2"
},
"install-path": "../khanamiryan/qrcode-detector-decoder"
},
......@@ -1768,12 +1768,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
"reference": "691dd2a4739ce1ec5ea09355569977ad3a283142"
"reference": "aaa09eb714623e935494b5852c1eff260b704ae1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/property-access/zipball/691dd2a4739ce1ec5ea09355569977ad3a283142",
"reference": "691dd2a4739ce1ec5ea09355569977ad3a283142",
"url": "https://api.github.com/repos/symfony/property-access/zipball/aaa09eb714623e935494b5852c1eff260b704ae1",
"reference": "aaa09eb714623e935494b5852c1eff260b704ae1",
"shasum": ""
},
"require": {
......@@ -1788,7 +1788,7 @@
"suggest": {
"psr/cache-implementation": "To cache access methods."
},
"time": "2021-08-09T09:36:42+00:00",
"time": "2021-08-09T12:23:16+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
......
vendor/composer/installed.php
View file @ efbf42a4
<?php return array (
'root' =>
array (
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'aliases' =>
array (
),
'reference' => '55a9b3da37fd599a6786f4e48280cc01def39fed',
'reference' => '94450e16db513b1dd4d9cbb15869e03e3a0da5b8',
'name' => 'yidian/yaf_demo',
),
'versions' =>
......@@ -22,12 +22,12 @@
),
'api/php_utils' =>
array (
'pretty_version' => 'v1.0.8',
'version' => '1.0.8.0',
'pretty_version' => 'v1.0.9',
'version' => '1.0.9.0',
'aliases' =>
array (
),
'reference' => '15534ea42a1bc55400fd33acb03f5644d5607228',
'reference' => '866e88e927a0af5ac7545405d9783764ea76bbc2',
),
'bacon/bacon-qr-code' =>
array (
......@@ -115,12 +115,12 @@
),
'khanamiryan/qrcode-detector-decoder' =>
array (
'pretty_version' => '1.0.5.1',
'version' => '1.0.5.1',
'pretty_version' => '1.0.5.2',
'version' => '1.0.5.2',
'aliases' =>
array (
),
'reference' => 'b96163d4f074970dfe67d4185e75e1f4541b30ca',
'reference' => '04fdd58d86a387065f707dc6d3cc304c719910c1',
),
'mongodb/mongodb' =>
array (
......@@ -279,7 +279,7 @@
'aliases' =>
array (
),
'reference' => '691dd2a4739ce1ec5ea09355569977ad3a283142',
'reference' => 'aaa09eb714623e935494b5852c1eff260b704ae1',
),
'symfony/property-info' =>
array (
......@@ -301,12 +301,12 @@
),
'yidian/yaf_demo' =>
array (
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'aliases' =>
array (
),
'reference' => '55a9b3da37fd599a6786f4e48280cc01def39fed',
'reference' => '94450e16db513b1dd4d9cbb15869e03e3a0da5b8',
),
),
);
vendor/khanamiryan/qrcode-detector-decoder/lib/QrReader.php
View file @ efbf42a4
......@@ -91,7 +91,7 @@ final class QrReader
{
$this->decode();
if (method_exists($this->result, 'toString')) {
if ($this->result !== false && method_exists($this->result, 'toString')) {
return $this->result->toString();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment