- 修复验证网址URL

- 增加微信公众号微信授权

src/exception/WeChatException.php

@@ -0,0 +1,32 @@
+<?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
+// | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
+// +----------------------------------------------------------------------
+
+namespace DtApp\ThinkLibrary\exception;
+
+use Exception;
+
+/**
+ * 微信错误处理
+ * Class WeChatException
+ * @package DtApp\ThinkLibrary\exception
+ */
+class WeChatException extends Exception
+{
+    public function errorMessage()
+    {
+        return $this->getMessage();
+    }
+}

src/helper/Pregs.php

@@ -153,7 +153,7 @@ class Pregs
      */
     public function isLink($url): bool
     {
-        if (preg_match("/http:\/\/[\w.]+[\w\/]*[\w.]*\??[\w=&\+\%]*/is", $url)) return true;
+        if (preg_match("/http|https:\/\/[\w.]+[\w\/]*[\w.]*\??[\w=&\+\%]*/is", $url)) return true;
         return false;
     }
 

src/service/WeChat/MessageManagementService.php

@@ -14,7 +14,6 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-
 namespace DtApp\ThinkLibrary\service\WeChat;
 
 use DtApp\ThinkLibrary\exception\CurlException;

src/service/WeChat/WebApps.php

@@ -0,0 +1,123 @@
+<?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
+// | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
+// +----------------------------------------------------------------------
+
+namespace DtApp\ThinkLibrary\service\WeChat;
+
+use DtApp\ThinkLibrary\exception\WeChatException;
+use DtApp\ThinkLibrary\facade\Pregs;
+use DtApp\ThinkLibrary\facade\Urls;
+use DtApp\ThinkLibrary\Service;
+
+/**
+ * Class WebApps
+ * @package DtApp\ThinkLibrary\service\WeChat
+ */
+class WebApps extends Service
+{
+    /**
+     * 微信授权登录（OAuth2.0）
+     * @var string
+     */
+    private $authorize_url = 'https://open.weixin.qq.com/connect/oauth2/authorize';
+
+    /**
+     * 公众号的唯一标识
+     * @var
+     */
+    private $app_id;
+
+    /**
+     * 授权后重定向的回调链接地址， 请使用 urlEncode 对链接进行处理
+     * @var
+     */
+    private $redirect_uri;
+
+    /**
+     * 返回类型，请填写code
+     * @var string
+     */
+    private $response_type = 'code';
+    private $scope = "snsapi_base";
+    private $state = "";
+
+    /**
+     * 公众号的唯一标识
+     * @param string $appId
+     * @return $this
+     */
+    public function appId(string $appId)
+    {
+        $this->app_id = $appId;
+        return $this;
+    }
+
+    /**
+     * 授权后重定向的回调链接地址， 请使用 urlEncode 对链接进行处理
+     * @param string $redirectUri
+     * @return $this
+     * @throws WeChatException
+     */
+    public function redirectUri(string $redirectUri)
+    {
+        dump($redirectUri);
+        if (empty(Pregs::isLink($redirectUri))) throw new WeChatException("请检查redirectUri，是否正确");
+        $this->redirect_uri = Urls::lenCode($redirectUri);
+        return $this;
+    }
+
+    /**
+     * 应用授权作用域，snsapi_base （不弹出授权页面，直接跳转，只能获取用户openid），snsapi_userinfo （弹出授权页面，可通过openid拿到昵称、性别、所在地。并且， 即使在未关注的情况下，只要用户授权，也能获取其信息 ）
+     * @param string $scope
+     * @return $this
+     * @throws WeChatException
+     */
+    public function scope(string $scope)
+    {
+        if ($scope === "snsapi_base") $this->scope = $scope;
+        elseif ($scope === "snsapi_userinfo") $this->scope = $scope;
+        else throw new WeChatException("请检查scope参数");
+        return $this;
+    }
+
+    /**
+     * 重定向后会带上state参数，开发者可以填写a-zA-Z0-9的参数值，最多128字节
+     * @param string $state
+     * @return $this
+     */
+    public function state(string $state)
+    {
+        $this->state = $state;
+        return $this;
+    }
+
+    /**
+     * 网页授权
+     * https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/Wechat_webpage_authorization.html#0
+     * @throws WeChatException
+     */
+    public function oauth2()
+    {
+        if (strlen($this->state) > 128) throw new WeChatException("请检查state参数，最多128字节");
+        $params = Urls::toParams([
+            'appid' => $this->app_id,
+            'redirect_uri' => $this->redirect_uri,
+            'response_type' => $this->response_type,
+            'scope' => $this->scope,
+            'state' => $this->state
+        ]);
+        return header("Location:{$this->authorize_url}?$params#wechat_redirect");
+    }
+}

src/service/WeChat/WiFiService.php

@@ -0,0 +1,43 @@
+<?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
+// | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
+// +----------------------------------------------------------------------
+
+namespace DtApp\ThinkLibrary\service\WeChat;
+
+use DtApp\ThinkLibrary\exception\CurlException;
+use DtApp\ThinkLibrary\Service;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
+
+class WiFiService extends Service
+{
+    /**
+     * 连Wi-Fi完成页跳转小程序
+     * https://developers.weixin.qq.com/doc/offiaccount/WiFi_via_WeChat/WiFi_mini_programs.html
+     * @param string $access_token
+     * @param array $data
+     * @return array|bool|mixed|string
+     * @throws CurlException
+     */
+    public function fiNihPageSet(string $access_token, array $data = [])
+    {
+        $url = "https://api.weixin.qq.com/bizwifi/finishpage/set?access_token={$access_token}";
+        if (is_array($data)) $data = json_encode($data);
+        return HttpService::instance()
+            ->url($url)
+            ->post()
+            ->data($data)
+            ->toArray();
+    }
+}

tests/wechat.php

@@ -0,0 +1,29 @@
+<?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
+// | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
+// +----------------------------------------------------------------------
+
+use DtApp\ThinkLibrary\exception\WeChatException;
+use DtApp\ThinkLibrary\service\WeChat\WebApps;
+
+require '../vendor/autoload.php';
+
+try {
+    dump(WebApps::instance()
+        ->appId("")
+        ->redirectUri("https://www.dtapp.net")
+        ->oauth2());
+} catch (WeChatException $e) {
+    var_dump($e->getMessage());
+}