- 优化服务

CHANGELOG.md

-## v6.0.127 / 2020-11-26
+## v6.0.129 / 2020-11-26
+- 优化服务
+
+## v6.0.128 / 2020-11-26
 - 优化服务
 
 ## v6.0.127 / 2020-11-25

src/common.php

@@ -25,7 +25,7 @@ use DtApp\ThinkLibrary\service\SystemService;
 /**
  * 定义当前版本
  */
-const VERSION = '6.0.128';
+const VERSION = '6.0.129';
 
 if (!function_exists('get_ip_info')) {
     /**

src/service/douyin/WatermarkService.php

@@ -51,7 +51,7 @@ class WatermarkService extends Service
      * @return $this
      * @throws DtaException
      */
-    public function url($str)
+    public function url($str): self
     {
         if (Pregs::isLink($str)) {
             $url = $this->judgeUrl($str);

src/service/ksyun/Ks3Service.php

@@ -83,18 +83,6 @@ class Ks3Service extends Service
      */
     public function upload(string $object, string $filePath): ?bool
     {
-        //是否使用VHOST
-        define("KS3_API_VHOST", FALSE);
-        //是否开启日志(写入日志文件)
-        define("KS3_API_LOG", FALSE);
-        //是否显示日志(直接输出日志)
-        define("KS3_API_DISPLAY_LOG", FALSE);
-        //定义日志目录(默认是该项目log下)
-        define("KS3_API_LOG_PATH", "");
-        //是否使用HTTPS
-        define("KS3_API_USE_HTTPS", FALSE);
-        //是否开启curl debug模式
-        define("KS3_API_DEBUG_MODE", FALSE);
         require_once(__DIR__ . "/bin/Ks3Client.class.php");
         $client = new Ks3Client($this->accessKeyID, $this->accessKeySecret, $this->endpoint);
         $content = fopen($filePath, 'rb');

src/service/kuaishou/WatermarkService.php

+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkLibrary 6.0 for ThinkPhP 6.0
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2020 [ https://www.dtapp.net ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://gitee.com/liguangchun/ThinkLibrary
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 仓库地址 ：https://gitee.com/liguangchun/ThinkLibrary
+// | github 仓库地址 ：https://github.com/GC0202/ThinkLibrary
+// | gitlab 仓库地址 ：https://gitlab.com/liguangchun/thinklibrary
+// | weixin 仓库地址 ：https://git.weixin.qq.com/liguangchun/ThinkLibrary
+// | huaweicloud 仓库地址 ：https://codehub-cn-south-1.devcloud.huaweicloud.com/composer00001/ThinkLibrary.git
+// | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
+// +----------------------------------------------------------------------
+
+namespace DtApp\ThinkLibrary\service\kuaishou;
+
+use DtApp\ThinkLibrary\facade\Pregs;
+use DtApp\ThinkLibrary\Service;
+use GuzzleHttp\Client;
+use GuzzleHttp\Cookie\CookieJar;
+use GuzzleHttp\Psr7\Stream;
+
+/**
+ * 快手-视频去水印
+ * Class WatermarkService
+ * @package DtApp\ThinkLibrary\service\kuaishou
+ */
+class WatermarkService extends Service
+{
+    /**
+     * @var
+     */
+    private $url, $contents, $backtrack;
+
+    /**
+     * 设置网址
+     * @param $url
+     * @return $this
+     */
+    public function setUrl($url): self
+    {
+        if (Pregs::isLink($url)) {
+            $this->url = $url;
+        } else {
+            preg_match_all('#\bhttps?://[^,\s()<>]+(?:\([\w\d]+\)|([^,[:punct:]\s]|/))#', $url, $match);
+            $this->url = $match[0][0];
+        }
+        return $this;
+    }
+
+    /**
+     * 获取接口全部信息
+     * @return WatermarkService
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    private function getApi(): self
+    {
+        $this->contents = $this->getContents($this->url);
+        return $this;
+    }
+
+    /**
+     * 获取全部信息
+     * @return $this
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function getAll(): self
+    {
+        $this->getApi();
+        $data = [
+            'video_src' => $this->contents['video_src'],
+            'cover_image' => $this->contents['cover_image'],
+        ];
+        $this->backtrack = $data;
+        return $this;
+    }
+
+    /**
+     * 返回Array
+     * @return array|mixed
+     */
+    public function toArray()
+    {
+        if (empty($this->backtrack)) {
+            return [];
+        }
+        if (is_array($this->backtrack)) {
+            return $this->backtrack;
+        }
+        return json_decode($this->backtrack, true);
+    }
+
+    /**
+     * 获取
+     * @param $url
+     * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    private function getContents($url): array
+    {
+        $headers = [
+            'Connection' => 'keep-alive',
+            'User-Agent' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16D57 Version/12.0 Safari/604.1'
+        ];
+        $client = new Client(['timeout' => 2, 'headers' => $headers, 'http_errors' => false,]);
+        $data['headers'] = $headers;
+        $data['verify'] = __DIR__ . DIRECTORY_SEPARATOR . 'cacert.pem';
+        $jar = new CookieJar();
+        $data['cookies'] = $jar;
+        $response = $client->request('GET', $url, $data);
+        $body = $response->getBody();
+        if ($body instanceof Stream) {
+            $body = $body->getContents();
+        }
+        $result = htmlspecialchars_decode($body);
+        $pattern = '#"srcNoMark":"(.*?)"#';
+        preg_match($pattern, $result, $match);
+        $data['video_src'] = $match[1];
+        $pattern = '#"poster":"(.*?)"#';
+        preg_match($pattern, $result, $match);
+        if (!empty($match[1])) {
+            $data['cover_image'] = $match[1];
+            return $data;
+        }
+        return [];
+    }
+}
\ No newline at end of file

src/service/weishi/WatermarkService.php

+<?php
+
+namespace DtApp\ThinkLibrary\service\weishi;
+
+use DtApp\ThinkLibrary\facade\Pregs;
+use DtApp\ThinkLibrary\Service;
+use GuzzleHttp\Client;
+use GuzzleHttp\Cookie\CookieJar;
+use GuzzleHttp\Psr7\Stream;
+
+/**
+ * Class WatermarkService
+ * @package DtApp\ThinkLibrary\service\weishi
+ */
+class WatermarkService extends Service
+{
+    /**
+     * @var
+     */
+    private $url, $contents, $backtrack;
+
+    /**
+     * 设置网址
+     * @param $url
+     * @return WatermarkService
+     */
+    public function setUrl($url): self
+    {
+        if (Pregs::isLink($url)) {
+            $this->url = $url;
+        } else {
+            preg_match_all('#\bhttps?://[^,\s()<>]+(?:\([\w\d]+\)|([^,[:punct:]\s]|/))#', $url, $match);
+            $this->url = $match[0][0];
+        }
+        return $this;
+    }
+
+    /**
+     * 获取接口全部信息
+     * @return WatermarkService
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    private function getApi(): self
+    {
+        $this->contents = $this->getContents($this->url);
+        return $this;
+    }
+
+    /**
+     * 获取全部信息
+     * @return $this
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function getAll(): self
+    {
+        $this->getApi();
+        $data = [
+            'video_src' => $this->contents['video_src'],
+            'cover_image' => $this->contents['cover_image'],
+        ];
+        $this->backtrack = $data;
+        return $this;
+    }
+
+    /**
+     * 返回Array
+     * @return array|mixed
+     */
+    public function toArray()
+    {
+        if (empty($this->backtrack)) {
+            return [];
+        }
+        if (is_array($this->backtrack)) {
+            return $this->backtrack;
+        }
+        return json_decode($this->backtrack, true);
+    }
+
+    /**
+     * 获取
+     * @param $url
+     * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    private function getContents($url): array
+    {
+        $url = urldecode($url);
+        $headers = [
+            'Connection' => 'keep-alive',
+            'User-Agent' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16D57 Version/12.0 Safari/604.1'
+        ];
+        $client = new Client(['timeout' => 2, 'headers' => $headers, 'http_errors' => false,]);
+        $data = [];
+        if ($headers) {
+            $data['headers'] = $headers;
+        }
+        $data['verify'] = __DIR__ . DIRECTORY_SEPARATOR . 'cacert.pem';
+        $jar = new CookieJar;
+        $data['cookies'] = $jar;
+        if (!$params) {
+            $response = $client->request('GET', $url, $data);
+        } else {
+            $data ['form_params'] = $params;
+            $response = $client->request('POST', $url, $data);
+        }
+        $body = $response->getBody();
+        if ($body instanceof Stream) {
+            $body = $body->getContents();
+        }
+        $result = json_decode($body, true);
+        $file = 'weishi.txt';
+        $fp = fopen($file, 'ab');
+        fwrite($fp, $body);
+        fclose($fp);
+        if ($result['ret'] == 0) {
+            $video = $result['data']['feeds'][0];
+            $data['video_src'] = $video['video_url'];
+            $data['cover_image'] = $video['images'][0]['url'];
+            return $data;
+        }
+        return [];
+    }
+}
\ No newline at end of file