命名空间

Author: wuwu123

README.md

@@ -1,43 +1,10 @@
 ## 个推 php
 
 
-composer require wujie/getui
+composer require wujie/getui:dev-master
 
-```php
-<?php
-$config = new \getui\config\Config([
-    "app_key" => "1",
-    "app_id" => "2",
-    "master_secret" => "3",
-    "logo_url" => "http://dev.img.ybzg.com/static/app/user/getui_logo.png"
-]);
+```text
 
-$push = new \getui\src\httpRequest\push\PushSign($config);
-//$push->setMsgtype(\getui\src\template\Message::MSG_TYPE_LINK)
-//    ->setTitle("1")
-//    ->setText("22")
-//    ->setRequestOtherParams("https://www.baidu.com")
-//    ->setCid("1f118061aef2af0aaca1617a6d48d2d7")
-//    ->request();
-//var_dump($push->getHttpModel()->getResultDataBody());
-
-//$push->setMsgtype(\getui\src\template\Message::MSG_TYPE_TRANSMISSION)
-//    ->setTitle("1")
-//    ->setText("22")
-//    ->setTransmission("https://www.baidu.com")
-//    ->setCid("1f118061aef2af0aaca1617a6d48d2d7")
-//    ->request();
-//var_dump($push->getHttpModel()->getResultDataBody());
-
-
-//批量推送
-$push = new \getui\src\httpRequest\push\PushList($config);
-$push->setMsgtype(\getui\src\template\Message::MSG_TYPE_NOTIFICATION)
-    ->setTitle("1")
-    ->setText("22")
-    ->setTransmission("https://www.baidu.com")
-    ->pushListSend(["1f118061aef2af0aaca1617a6d48d2d7"])
-    ->request();// request(1) 失败重试一次 request(1 ， 1) 失败重试一次  超时时间 1秒
-var_dump($push->getHttpModel()->getResultDataBody());
+test/test.php
 
 ```

src/cache/CacheInterface.php

@@ -6,7 +6,7 @@
  * Time: 10:41
  */
 
-namespace getui\src\cache;
+namespace getui\cache;
 
 
 interface CacheInterface

src/cache/CacheModel.php

@@ -6,7 +6,7 @@
  * Time: 16:40
  */
 
-namespace getui\src\cache;
+namespace getui\cache;
 
 
 trait CacheModel

src/cache/FileCache.php

@@ -6,7 +6,7 @@
  * Time: 16:35
  */
 
-namespace getui\src\cache;
+namespace getui\cache;
 
 
 use Symfony\Component\Cache\Simple\FilesystemCache;

src/cache/RedisCache.php

@@ -6,7 +6,7 @@
  * Time: 10:43
  */
 
-namespace getui\src\cache;
+namespace getui\cache;
 
 
 class RedisCache implements CacheInterface

src/config/Config.php

@@ -6,8 +6,7 @@
  * Time: 12:11
  */
 namespace getui\config;
-use getui\src\cache\CacheInterface;
-use getui\src\cache\CacheModel;
+use getui\cache\CacheModel;
 
 class Config
 {

src/exception/ErrorCode.php

@@ -6,7 +6,7 @@
  * Time: 11:55
  */
 
-namespace getui\src\exception;
+namespace getui\exception;
 
 
 class ErrorCode

src/exception/RequestException.php

@@ -6,7 +6,7 @@
  * Time: 11:53
  */
 
-namespace getui\src\exception;
+namespace getui\exception;
 class RequestException extends \Exception
 {
 

src/httpRequest/AuthToken.php

@@ -6,14 +6,14 @@
  * Time: 12:08
  */
 
-namespace getui\src\httpRequest;
+namespace getui\httpRequest;
 
 
 use getui\config\Config;
-use getui\src\cache\CacheInterface;
-use getui\src\cache\CacheModel;
-use getui\src\cache\FileCache;
-use getui\src\exception\RequestException;
+use getui\cache\CacheInterface;
+use getui\cache\CacheModel;
+use getui\cache\FileCache;
+use getui\exception\RequestException;
 
 class AuthToken
 {

src/httpRequest/HttpRequest.php

@@ -6,11 +6,11 @@
  * Time: 10:58
  */
 
-namespace getui\src\httpRequest;
+namespace getui\httpRequest;
 
 use getui\config\Config;
-use getui\src\exception\ErrorCode;
-use getui\src\exception\RequestException;
+use getui\exception\ErrorCode;
+use getui\exception\RequestException;
 use GuzzleHttp\Client;
 
 class HttpRequest
@@ -97,16 +97,6 @@ public function getResultDataBody(): array
         return $this->resultDataBody;
     }
 
-    /**
-     * @param array $resultDataBody
-     * @return $this
-     */
-    public function setResultDataBody(array $resultDataBody)
-    {
-        $this->resultDataBody = $resultDataBody;
-        return $this;
-    }
-
     /**
      * @return float
      */
@@ -133,16 +123,6 @@ public function getRetry(): int
         return $this->retry;
     }
 
-    /**
-     * @param int $retry
-     * @return $this
-     */
-    public function setRetry(int $retry)
-    {
-        $this->retry = $retry;
-        return $this;
-    }
-
     /**
      * @return int
      */
@@ -151,16 +131,6 @@ public function getErrorCount(): int
         return $this->errorCount;
     }
 
-    /**
-     * @param int $errorCount
-     * @return $this
-     */
-    public function setErrorCount(int $errorCount)
-    {
-        $this->errorCount = $errorCount;
-        return $this;
-    }
-
     /**
      * @return string
      */
@@ -169,16 +139,6 @@ public function getBaseUrl(): string
         return $this->baseUrl;
     }
 
-    /**
-     * @param string $baseUrl
-     * @return $this
-     */
-    public function setBaseUrl(string $baseUrl)
-    {
-        $this->baseUrl = $baseUrl;
-        return $this;
-    }
-
     /**
      * @return Config
      */
@@ -226,13 +186,22 @@ public function __construct(int $retry = 0, int $timeOut = 1)
         $this->setTimeOut($timeOut);
     }
 
+    /**
+     * 请求前初始化参数
+     */
     private function init()
     {
         $this->httpClient = new Client($this->getRequestConfig());
         $this->resultData = null;
         $this->resultDataBody = [];
     }
 
+    /**
+     * 请求url
+     *
+     * @param $url
+     * @return string
+     */
     public function getRequestUrl($url)
     {
         return $this->getBaseUrl() . $this->getConfig()->getAppId() . "/" . $url;

src/httpRequest/HttpRequestCommon.php

@@ -6,11 +6,10 @@
  * Time: 15:15
  */
 
-namespace getui\src\httpRequest;
+namespace getui\httpRequest;
 
 
 use getui\config\Config;
-use getui\src\cache\CacheInterface;
 
 class HttpRequestCommon
 {

src/httpRequest/push/Base.php

@@ -6,11 +6,11 @@
  * Time: 16:06
  */
 
-namespace getui\src\httpRequest\push;
+namespace getui\httpRequest\push;
 
 use getui\config\Config;
-use getui\src\httpRequest\HttpRequest;
-use getui\src\template\Message;
+use getui\httpRequest\HttpRequest;
+use getui\template\Message;
 
 abstract class Base
 {

src/httpRequest/push/PushList.php

@@ -6,11 +6,11 @@
  * Time: 15:48
  */
 
-namespace getui\src\httpRequest\push;
+namespace getui\httpRequest\push;
 
 
-use getui\src\exception\RequestException;
-use getui\src\httpRequest\push\appCondition\AppConditions;
+use getui\exception\RequestException;
+use getui\httpRequest\push\appCondition\AppConditions;
 
 class PushList extends Base
 {

src/httpRequest/push/PushSign.php

@@ -6,7 +6,7 @@
  * Time: 16:46
  */
 
-namespace getui\src\httpRequest\push;
+namespace getui\httpRequest\push;
 
 
 use getui\config\Config;

src/httpRequest/push/RequestParams.php

@@ -7,10 +7,10 @@
  * Time: 17:00
  */
 
-namespace getui\src\httpRequest\push;
+namespace getui\httpRequest\push;
 
 
-use getui\src\template\Style;
+use getui\template\Style;
 
 trait RequestParams
 {

src/httpRequest/push/appCondition/AppConditions.php

@@ -6,7 +6,7 @@
  * Time: 19:02
  */
 
-namespace getui\src\httpRequest\push\appCondition;
+namespace getui\httpRequest\push\appCondition;
 
 
 class AppConditions

src/httpRequest/push/templateRequest.php

@@ -6,14 +6,14 @@
  * Time: 15:02
  */
 
-namespace getui\src\httpRequest\push;
+namespace getui\httpRequest\push;
 
 
-use getui\src\template\Link;
-use getui\src\template\Notification;
-use getui\src\template\Notypopload;
-use getui\src\template\PushInfo;
-use getui\src\template\Style;
+use getui\template\Link;
+use getui\template\Notification;
+use getui\template\Notypopload;
+use getui\template\PushInfo;
+use getui\template\Style;
 
 trait templateRequest
 {

src/httpRequest/user/User.php

@@ -6,10 +6,10 @@
  * Time: 15:11
  */
 
-namespace getui\src\httpRequest\user;
+namespace getui\httpRequest\user;
 
-use getui\src\httpRequest\HttpRequest;
-use getui\src\httpRequest\HttpRequestCommon;
+use getui\httpRequest\HttpRequest;
+use getui\httpRequest\HttpRequestCommon;
 
 class User extends HttpRequestCommon
 {

src/template/Link.php

@@ -6,7 +6,7 @@
  * Time: 下午2:14
  */
 
-namespace getui\src\template;
+namespace getui\template;
 
 class Link implements Template
 {

src/template/Message.php

@@ -6,7 +6,7 @@
  * Time: 下午3:18
  */
 
-namespace getui\src\template;
+namespace getui\template;
 
 class Message implements Template
 {

src/template/Notification.php

@@ -6,7 +6,7 @@
  * Time: 下午2:14
  */
 
-namespace getui\src\template;
+namespace getui\template;
 
 class Notification implements Template
 {

src/template/Notypopload.php

@@ -6,7 +6,7 @@
  * Time: 下午2:28
  */
 
-namespace getui\src\template;
+namespace getui\template;
 
 class Notypopload implements Template
 {