Procházet zdrojové kódy

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

From-wh před 2 roky
rodič
revize
cc2e6872fc
1 změnil soubory, kde provedl 2 přidání a 2 odebrání
  1. 2 2
      crmeb/app/api/controller/v1/PublicController.php

+ 2 - 2
crmeb/app/api/controller/v1/PublicController.php

@@ -305,10 +305,10 @@ class PublicController
             ['image', ''],
             ['image', ''],
             ['code', ''],
             ['code', ''],
         ], true);
         ], true);
-        if ($imageUrl !== '' && !preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $imageUrl)) {
+        if ($imageUrl !== '' && !preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $imageUrl) && strpos($imageUrl, "phar://") !== false) {
             return app('json')->success(['code' => false, 'image' => false]);
             return app('json')->success(['code' => false, 'image' => false]);
         }
         }
-        if ($codeUrl !== '' && !(preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $codeUrl) || strpos($codeUrl, 'https://mp.weixin.qq.com/cgi-bin/showqrcode') !== false)) {
+        if ($codeUrl !== '' && !(preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $codeUrl) || strpos($codeUrl, 'https://mp.weixin.qq.com/cgi-bin/showqrcode') !== false) && strpos($codeUrl, "phar://") !== false) {
             return app('json')->success(['code' => false, 'image' => false]);
             return app('json')->success(['code' => false, 'image' => false]);
         }
         }
         try {
         try {