Merge branch 'koogua/v1.5.7' into demo

CHANGELOG.md

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

README.md

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

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([

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",

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",
@@ -855,16 +855,16 @@
         },
     {
       "name": "guzzlehttp/guzzle",
-            "version": "6.5.5",
+      "version": "6.5.7",
       "source": {
         "type": "git",
         "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
+        "reference": "724562fa861e21a4071c652c8a159934e4f05592"
       },
       "dist": {
         "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": "",
         "mirrors": [
           {
@@ -895,22 +895,52 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
               "files": [
                 "src/functions_include.php"
-                ]
+              ],
+              "psr-4": {
+                "GuzzleHttp\\": "src/"
+              }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
+              {
+                "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",
@@ -926,9 +956,23 @@
             ],
       "support": {
         "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",

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;