diff --git a/CHANGELOG.md b/CHANGELOG.md index eb18fbed..84517528 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,10 @@ - 清理群组残留 - 升级腾讯云存储SDK到v2.5.6 +- GuzzleHttp升级到v6.5.7 - 优化HtmlPurifier缓存目录自动创建 - 优化问题回答排序问题 +- 优化腾讯云短信错误日志 - 整理查询构建语句 - 整理优化CSS diff --git a/README.md b/README.md index dbf933d0..5fada448 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ### 系统功能 -实现了点播、直播、专栏、面授、问答、会员、群组、微聊、积分、秒杀等。 +实现了点播、直播、专栏、面授、问答、会员、积分、秒杀等。 友情提示： diff --git a/app/Services/Smser.php b/app/Services/Smser.php index 6408fd82..8d470a08 100644 --- a/app/Services/Smser.php +++ b/app/Services/Smser.php @@ -91,6 +91,10 @@ abstract class Smser extends Service $result = $sendStatus->getCode() == 'Ok'; + if ($result == false) { + $this->logger->error('Send Message Failed ' . $response->toJsonString()); + } + } catch (TencentCloudSDKException $e) { $this->logger->error('Send Message Exception ' . kg_json_encode([ diff --git a/composer.json b/composer.json index 662c2f88..f7057b2a 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "ext-json": "*", "ext-fileinfo": "*", "phalcon/incubator": "^3.4", - "guzzlehttp/guzzle": "^6.3", + "guzzlehttp/guzzle": "^6.5", "swiftmailer/swiftmailer": "^6.0", "peppeocchi/php-cron-scheduler": "^3.0", "yansongda/pay": "^2.9", diff --git a/composer.lock b/composer.lock index 00a18430..5f392a26 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "622aedbe5e6c6efd01392f6d81b10bc9", + "content-hash": "b5eaf9b151226966d37ce2703e2e1efc", "packages": [ { "name": "bacon/bacon-qr-code", @@ -25,16 +25,16 @@ "preferred": true } ] - }, - "require": { - "dasprid/enum": "^1.0.3", - "ext-iconv": "*", - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "phly/keep-a-changelog": "^1.4", - "phpunit/phpunit": "^7 | ^8 | ^9", - "squizlabs/php_codesniffer": "^3.4" + }, + "require": { + "dasprid/enum": "^1.0.3", + "ext-iconv": "*", + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "phly/keep-a-changelog": "^1.4", + "phpunit/phpunit": "^7 | ^8 | ^9", + "squizlabs/php_codesniffer": "^3.4" }, "suggest": { "ext-imagick": "to generate QR code images" @@ -711,16 +711,16 @@ "email": "info@endroid.nl" } ], - "description": "Endroid QR Code", - "homepage": "https://github.com/endroid/qr-code", - "keywords": [ - "bundle", - "code", - "endroid", - "php", - "qr", - "qrcode" - ], + "description": "Endroid QR Code", + "homepage": "https://github.com/endroid/qr-code", + "keywords": [ + "bundle", + "code", + "endroid", + "php", + "qr", + "qrcode" + ], "support": { "issues": "https://github.com/endroid/qr-code/issues", "source": "https://github.com/endroid/qr-code/tree/3.9.6" @@ -811,16 +811,16 @@ ] }, "require": { - "guzzlehttp/guzzle": "^6.2", - "guzzlehttp/promises": "~1.3", - "guzzlehttp/psr7": "~1.0", - "php": ">=5.5.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "type": "library", - "extra": { + "guzzlehttp/guzzle": "^6.2", + "guzzlehttp/promises": "~1.3", + "guzzlehttp/psr7": "~1.0", + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0|~5.0" + }, + "type": "library", + "extra": { "branch-alias": { "dev-master": "0.9-dev" } @@ -853,26 +853,26 @@ }, "time": "2016-11-24T13:34:15+00:00" }, - { - "name": "guzzlehttp/guzzle", - "version": "6.5.5", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, + { + "name": "guzzlehttp/guzzle", + "version": "6.5.7", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "724562fa861e21a4071c652c8a159934e4f05592" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592", + "reference": "724562fa861e21a4071c652c8a159934e4f05592", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", @@ -895,41 +895,85 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } ], "description": "Guzzle is a PHP HTTP client library", "homepage": "http://guzzlephp.org/", "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" ], - "support": { - "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5" - }, - "time": "2020-06-16T21:01:06+00:00" + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/6.5.7" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" + } + ], + "time": "2022-06-09T21:36:50+00:00" + }, { "name": "guzzlehttp/guzzle-services", "version": "1.1.3", @@ -2245,15 +2289,15 @@ "description": "Common interfaces for simple caching", "keywords": [ "cache", - "caching", - "psr", - "psr-16", - "simple-cache" + "caching", + "psr", + "psr-16", + "simple-cache" ], - "support": { - "source": "https://github.com/php-fig/simple-cache/tree/master" - }, - "time": "2017-10-23T01:57:42+00:00" + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/master" + }, + "time": "2017-10-23T01:57:42+00:00" }, { "name": "qcloud/cos-sdk-v5", @@ -2300,22 +2344,22 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" - ], - "authors": [ - { - "name": "yaozongyou", - "email": "yaozongyou@vip.qq.com" - }, - { - "name": "lewzylu", - "email": "327874225@qq.com" - }, - { - "name": "tuunalai", - "email": "550566181@qq.com" - } - ], + "MIT" + ], + "authors": [ + { + "name": "yaozongyou", + "email": "yaozongyou@vip.qq.com" + }, + { + "name": "lewzylu", + "email": "327874225@qq.com" + }, + { + "name": "tuunalai", + "email": "550566181@qq.com" + } + ], "description": "PHP SDK for QCloud COS", "keywords": [ "cos", diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css index 35c30c2d..8c20cd92 100644 --- a/public/static/home/css/common.css +++ b/public/static/home/css/common.css @@ -2095,6 +2095,11 @@ border-bottom: none; } +.order-item .price { + color: red; + font-style: normal; +} + .order-card { padding-bottom: 20px; margin-bottom: 20px;