1
0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-29 05:41:37 +08:00

Merge branch 'koogua/v1.5.7' into demo

This commit is contained in:
koogua 2022-08-17 17:18:34 +08:00
commit 1b6bca81df
6 changed files with 155 additions and 100 deletions

View File

@ -2,8 +2,10 @@
- 清理群组残留 - 清理群组残留
- 升级腾讯云存储SDK到v2.5.6 - 升级腾讯云存储SDK到v2.5.6
- GuzzleHttp升级到v6.5.7
- 优化HtmlPurifier缓存目录自动创建 - 优化HtmlPurifier缓存目录自动创建
- 优化问题回答排序问题 - 优化问题回答排序问题
- 优化腾讯云短信错误日志
- 整理查询构建语句 - 整理查询构建语句
- 整理优化CSS - 整理优化CSS

View File

@ -13,7 +13,7 @@
### 系统功能 ### 系统功能
实现了点播、直播、专栏、面授、问答、会员、群组、微聊、积分、秒杀等。 实现了点播、直播、专栏、面授、问答、会员、积分、秒杀等。
友情提示: 友情提示:

View File

@ -91,6 +91,10 @@ abstract class Smser extends Service
$result = $sendStatus->getCode() == 'Ok'; $result = $sendStatus->getCode() == 'Ok';
if ($result == false) {
$this->logger->error('Send Message Failed ' . $response->toJsonString());
}
} catch (TencentCloudSDKException $e) { } catch (TencentCloudSDKException $e) {
$this->logger->error('Send Message Exception ' . kg_json_encode([ $this->logger->error('Send Message Exception ' . kg_json_encode([

View File

@ -6,7 +6,7 @@
"ext-json": "*", "ext-json": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",
"phalcon/incubator": "^3.4", "phalcon/incubator": "^3.4",
"guzzlehttp/guzzle": "^6.3", "guzzlehttp/guzzle": "^6.5",
"swiftmailer/swiftmailer": "^6.0", "swiftmailer/swiftmailer": "^6.0",
"peppeocchi/php-cron-scheduler": "^3.0", "peppeocchi/php-cron-scheduler": "^3.0",
"yansongda/pay": "^2.9", "yansongda/pay": "^2.9",

240
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "622aedbe5e6c6efd01392f6d81b10bc9", "content-hash": "b5eaf9b151226966d37ce2703e2e1efc",
"packages": [ "packages": [
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -25,16 +25,16 @@
"preferred": true "preferred": true
} }
] ]
}, },
"require": { "require": {
"dasprid/enum": "^1.0.3", "dasprid/enum": "^1.0.3",
"ext-iconv": "*", "ext-iconv": "*",
"php": "^7.1 || ^8.0" "php": "^7.1 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phly/keep-a-changelog": "^1.4", "phly/keep-a-changelog": "^1.4",
"phpunit/phpunit": "^7 | ^8 | ^9", "phpunit/phpunit": "^7 | ^8 | ^9",
"squizlabs/php_codesniffer": "^3.4" "squizlabs/php_codesniffer": "^3.4"
}, },
"suggest": { "suggest": {
"ext-imagick": "to generate QR code images" "ext-imagick": "to generate QR code images"
@ -711,16 +711,16 @@
"email": "info@endroid.nl" "email": "info@endroid.nl"
} }
], ],
"description": "Endroid QR Code", "description": "Endroid QR Code",
"homepage": "https://github.com/endroid/qr-code", "homepage": "https://github.com/endroid/qr-code",
"keywords": [ "keywords": [
"bundle", "bundle",
"code", "code",
"endroid", "endroid",
"php", "php",
"qr", "qr",
"qrcode" "qrcode"
], ],
"support": { "support": {
"issues": "https://github.com/endroid/qr-code/issues", "issues": "https://github.com/endroid/qr-code/issues",
"source": "https://github.com/endroid/qr-code/tree/3.9.6" "source": "https://github.com/endroid/qr-code/tree/3.9.6"
@ -811,16 +811,16 @@
] ]
}, },
"require": { "require": {
"guzzlehttp/guzzle": "^6.2", "guzzlehttp/guzzle": "^6.2",
"guzzlehttp/promises": "~1.3", "guzzlehttp/promises": "~1.3",
"guzzlehttp/psr7": "~1.0", "guzzlehttp/psr7": "~1.0",
"php": ">=5.5.0" "php": ">=5.5.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0|~5.0" "phpunit/phpunit": "~4.0|~5.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.9-dev" "dev-master": "0.9-dev"
} }
@ -853,26 +853,26 @@
}, },
"time": "2016-11-24T13:34:15+00:00" "time": "2016-11-24T13:34:15+00:00"
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.5.5", "version": "6.5.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" "reference": "724562fa861e21a4071c652c8a159934e4f05592"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592",
"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", "reference": "724562fa861e21a4071c652c8a159934e4f05592",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true "preferred": true
} }
] ]
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"guzzlehttp/promises": "^1.0", "guzzlehttp/promises": "^1.0",
@ -895,41 +895,85 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": { "files": [
"GuzzleHttp\\": "src/" "src/functions_include.php"
}, ],
"files": [ "psr-4": {
"src/functions_include.php" "GuzzleHttp\\": "src/"
] }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
"authors": [ "authors": [
{ {
"name": "Michael Dowling", "name": "Graham Campbell",
"email": "mtdowling@gmail.com", "email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/mtdowling" "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", "description": "Guzzle is a PHP HTTP client library",
"homepage": "http://guzzlephp.org/", "homepage": "http://guzzlephp.org/",
"keywords": [ "keywords": [
"client", "client",
"curl", "curl",
"framework", "framework",
"http", "http",
"http client", "http client",
"rest", "rest",
"web service" "web service"
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/6.5" "source": "https://github.com/guzzle/guzzle/tree/6.5.7"
}, },
"time": "2020-06-16T21:01:06+00:00" "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", "name": "guzzlehttp/guzzle-services",
"version": "1.1.3", "version": "1.1.3",
@ -2245,15 +2289,15 @@
"description": "Common interfaces for simple caching", "description": "Common interfaces for simple caching",
"keywords": [ "keywords": [
"cache", "cache",
"caching", "caching",
"psr", "psr",
"psr-16", "psr-16",
"simple-cache" "simple-cache"
], ],
"support": { "support": {
"source": "https://github.com/php-fig/simple-cache/tree/master" "source": "https://github.com/php-fig/simple-cache/tree/master"
}, },
"time": "2017-10-23T01:57:42+00:00" "time": "2017-10-23T01:57:42+00:00"
}, },
{ {
"name": "qcloud/cos-sdk-v5", "name": "qcloud/cos-sdk-v5",
@ -2300,22 +2344,22 @@
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
"authors": [ "authors": [
{ {
"name": "yaozongyou", "name": "yaozongyou",
"email": "yaozongyou@vip.qq.com" "email": "yaozongyou@vip.qq.com"
}, },
{ {
"name": "lewzylu", "name": "lewzylu",
"email": "327874225@qq.com" "email": "327874225@qq.com"
}, },
{ {
"name": "tuunalai", "name": "tuunalai",
"email": "550566181@qq.com" "email": "550566181@qq.com"
} }
], ],
"description": "PHP SDK for QCloud COS", "description": "PHP SDK for QCloud COS",
"keywords": [ "keywords": [
"cos", "cos",

View File

@ -2095,6 +2095,11 @@
border-bottom: none; border-bottom: none;
} }
.order-item .price {
color: red;
font-style: normal;
}
.order-card { .order-card {
padding-bottom: 20px; padding-bottom: 20px;
margin-bottom: 20px; margin-bottom: 20px;