Skip to content

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

update: composer update

parent bdf89778
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 36 deletions
composer.json
View file @ c1a11906
......@@ -6,7 +6,7 @@
"require": {
"php": "7.2.*",
"ext-json": "*",
"api/php_utils":"1.0.14",
"api/php_utils":"1.0.15",
"api/php_services":"1.0.13",
"ext-openssl": "*"
},
......
composer.lock
View file @ c1a11906
......@@ -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": "27230da37f9a20daffbb900882abde53",
"content-hash": "a7741f079784d6a5d991f5e205ec4307",
"packages": [
{
"name": "api/php_services",
......@@ -30,11 +30,11 @@
},
{
"name": "api/php_utils",
"version": "v1.0.14",
"version": "v1.0.15",
"source": {
"type": "git",
"url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
"reference": "a7bc4caaaee7aa1650e3055630860699c7fbc506"
"reference": "feb1de3de8f74171202237e1443f8a395038b8d7"
},
"require": {
"elasticsearch/elasticsearch": "~7.0",
......@@ -53,7 +53,7 @@
}
},
"description": "bp api php_utils",
"time": "2021-09-01T03:11:17+00:00"
"time": "2021-09-03T08:58:11+00:00"
},
{
"name": "bacon/bacon-qr-code",
......
vendor/api/php_utils/src/Http/HttpUtil.php
View file @ c1a11906
......@@ -61,7 +61,7 @@ class HttpUtil
{
// 增加traceId
if(is_array($headers)) {
$headers['X-TRACE-ID'] = Tracer::getTraceId();
$headers[] = 'X-TRACE-ID: ' . Tracer::getTraceId();
}
$url = $url ."?". http_build_query($params);
return self::curl($url, $timeout, $retries, $headers, [], $proxy, 'GET', $curl_opts);
......@@ -97,7 +97,7 @@ class HttpUtil
{
// 增加traceId
if(is_array($headers)) {
$headers['X-TRACE-ID'] = Tracer::getTraceId();
$headers[] = 'X-TRACE-ID: ' . Tracer::getTraceId();
}
return self::curl($url, $timeout, $retries, $headers, $post, $proxy, 'POST', $curl_opts);
}
......
vendor/api/php_utils/src/Log/FileLog.php
View file @ c1a11906
......@@ -16,9 +16,8 @@ class FileLog
* @param string $signature 本条日志签名
* @param string $detail_info 日志详细信息
* @param bool $with_access_log
* @param bool $is_output 是否输出
*/
public static function info($signature, $detail_info = '', $with_access_log = false,$is_output = false)
public static function info($signature, $detail_info = '', $with_access_log = false)
{
if(self::$log == false) {
return true;
......@@ -29,9 +28,6 @@ class FileLog
if ($with_access_log) {
$log .= ' [request info:] ' . self::accessLog();
}
if ($is_output) {
echo $log.PHP_EOL;
}
error_log($log);
}
......@@ -45,9 +41,8 @@ class FileLog
* @param string $signature 本条日志签名
* @param string $detail_info 日志详细信息
* @param \Exception $exception 异常信息
* @param bool $is_output 是否输出
*/
public static function waring($signature, $detail_info = '', $exception = null,$is_output = false)
public static function waring($signature, $detail_info = '', $exception = null)
{
$traceId = Tracer::getTraceId();
$log = 'PHP User_warning: [' . $signature . '] [traceId:'. $traceId .'] [detail info:] ' . $detail_info . ' [request info:] ' . self::accessLog();
......@@ -55,9 +50,6 @@ class FileLog
$exception_info = 'In ' . $exception->getFile() . ' on line ' . $exception->getLine() . ' ' . $exception->getCode() . ': ' . $exception->getMessage();
$log .= ' [exception info: ]' . $exception_info;
}
if ($is_output) {
echo $log.PHP_EOL;
}
error_log($log);
}
......@@ -68,9 +60,8 @@ class FileLog
* @param string $detail_info 日志详细信息
* @param \Exception $exception 异常信息
* @param array|string $mail_to 邮件接受者
* @param bool $is_output 是否输出
*/
public static function error($signature, $detail_info = '', $exception = null, $mail_to = '',$is_output = false)
public static function error($signature, $detail_info = '', $exception = null, $mail_to = '')
{
$traceId = Tracer::getTraceId();
$log = 'PHP User_error: [' . $signature . '] [traceId:'. $traceId .'] [detail info:] ' . $detail_info . ' [request info:] ' . self::accessLog();
......@@ -100,9 +91,6 @@ class FileLog
Email::sendMail('bp-noreply@yidian-inc.com', $mail, $subject, $body);
}
}
if ($is_output) {
echo $log.PHP_EOL;
}
}
public static function accessLog()
......
vendor/composer/InstalledVersions.php
View file @ c1a11906
......@@ -32,7 +32,7 @@ private static $installed = array (
'aliases' =>
array (
),
'reference' => '5b271e605f425df64cb7d8d019fa921c045caceb',
'reference' => 'bdf89778ba6a83a43c24ce687bdd41b5057a7532',
'name' => 'yidian/yaf_demo',
),
'versions' =>
......@@ -48,12 +48,12 @@ private static $installed = array (
),
'api/php_utils' =>
array (
'pretty_version' => 'v1.0.14',
'version' => '1.0.14.0',
'pretty_version' => 'v1.0.15',
'version' => '1.0.15.0',
'aliases' =>
array (
),
'reference' => 'a7bc4caaaee7aa1650e3055630860699c7fbc506',
'reference' => 'feb1de3de8f74171202237e1443f8a395038b8d7',
),
'bacon/bacon-qr-code' =>
array (
......@@ -332,7 +332,7 @@ private static $installed = array (
'aliases' =>
array (
),
'reference' => '5b271e605f425df64cb7d8d019fa921c045caceb',
'reference' => 'bdf89778ba6a83a43c24ce687bdd41b5057a7532',
),
),
);
......
vendor/composer/installed.json
View file @ c1a11906
......@@ -27,12 +27,12 @@
},
{
"name": "api/php_utils",
"version": "v1.0.14",
"version_normalized": "1.0.14.0",
"version": "v1.0.15",
"version_normalized": "1.0.15.0",
"source": {
"type": "git",
"url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
"reference": "a7bc4caaaee7aa1650e3055630860699c7fbc506"
"reference": "feb1de3de8f74171202237e1443f8a395038b8d7"
},
"require": {
"elasticsearch/elasticsearch": "~7.0",
......@@ -44,7 +44,7 @@
"mongodb/mongodb": "1.4.3",
"php": "7.2.*"
},
"time": "2021-09-01T03:11:17+00:00",
"time": "2021-09-03T08:58:11+00:00",
"type": "library",
"installation-source": "source",
"autoload": {
......
vendor/composer/installed.php
View file @ c1a11906
......@@ -6,7 +6,7 @@
'aliases' =>
array (
),
'reference' => '5b271e605f425df64cb7d8d019fa921c045caceb',
'reference' => 'bdf89778ba6a83a43c24ce687bdd41b5057a7532',
'name' => 'yidian/yaf_demo',
),
'versions' =>
......@@ -22,12 +22,12 @@
),
'api/php_utils' =>
array (
'pretty_version' => 'v1.0.14',
'version' => '1.0.14.0',
'pretty_version' => 'v1.0.15',
'version' => '1.0.15.0',
'aliases' =>
array (
),
'reference' => 'a7bc4caaaee7aa1650e3055630860699c7fbc506',
'reference' => 'feb1de3de8f74171202237e1443f8a395038b8d7',
),
'bacon/bacon-qr-code' =>
array (
......@@ -306,7 +306,7 @@
'aliases' =>
array (
),
'reference' => '5b271e605f425df64cb7d8d019fa921c045caceb',
'reference' => 'bdf89778ba6a83a43c24ce687bdd41b5057a7532',
),
),
);
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