新增缓存累，完善其他功能

Author: xuanyanwow

cache/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

composer.lock

@@ -0,0 +1,11 @@
+<?php
+
+require "../vendor/autoload.php";
+
+use Siam\Cache;
+var_dump(Cache::getInstance()->del('name'));// true
+var_dump(Cache::getInstance()->has('name'));// false
+$res = Cache::getInstance()->set('name', 'siam' , 1);
+var_dump(Cache::getInstance()->get('name'));// siam
+sleep(1);
+var_dump(Cache::getInstance()->get('name'));// null

demo/cache.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * 缓存处理器
+ * User: Siam
+ * Date: 2020/7/2 0002
+ * Time: 23:07
+ */
+
+namespace Siam\AbstractInterface;
+
+
+interface CacheInterface
+{
+    public function set($key, $value, $ex);
+    public function get($key);
+    public function del($key);
+    public function has($key);
+}

src/siam/AbstractInterface/CacheInterface.php

@@ -17,6 +17,7 @@ class Api
      * @param string $code
      * @param array $data
      * @param string $msg
+     * @return string
      */
     public static function json($code, $data = [], $msg = '')
     {
@@ -36,8 +37,7 @@ public static function json($code, $data = [], $msg = '')
             # 记录log 会把所有输出的json记录起来 方便对接安卓调试
             Logger::getInstance()->log($json, "echoJson");
         }
-        echo $json;
-        exit;
+        return $json;
     }
 
     public static function send($code, $data = [], $msg = '')

src/siam/Api.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * 缓存器
+ * User: Siam
+ * Date: 2020/7/2 0002
+ * Time: 23:13
+ */
+
+namespace Siam;
+
+
+use Siam\AbstractInterface\CacheInterface;
+use Siam\Component\Di;
+use Siam\Component\Singleton;
+use Siam\Trace\CacheFile;
+
+class Cache implements CacheInterface
+{
+    use Singleton;
+
+    /**
+     * @var CacheInterface
+     */
+    private $cacheDriver;
+
+    function __construct(CacheInterface $cache = null)
+    {
+        if ($cache === null) {
+            $cache = new CacheFile(Di::getInstance()->get('CONFIG_CACHE_DIR'));
+        }
+        $this->cacheDriver = $cache;
+    }
+
+    public function set($key, $value, $ex)
+    {
+        return $this->cacheDriver->set($key, $value, $ex);
+    }
+
+    public function get($key)
+    {
+        return $this->cacheDriver->get($key);
+    }
+
+    public function del($key)
+    {
+        return $this->cacheDriver->del($key);
+    }
+
+    public function has($key)
+    {
+        return $this->cacheDriver->has($key);
+    }
+}

src/siam/Cache.php

@@ -49,7 +49,7 @@ public function setTimeout($s)
      * @return mixed
      * @throws \Exception
      */
-    public function send($url, $data = null, $cert = [], $post = true)
+    public function send($url, $data = null, $cert = [], $post = true, $callable = null)
     {
         # 初始化一个cURL会话
         $curl = curl_init();
@@ -96,6 +96,11 @@ public function send($url, $data = null, $cert = [], $post = true)
         }
 
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+
+        // 执行自定义
+        if (!empty($callable) && is_callable($callable)){
+            call_user_func($callable, $curl);
+        }
         $response = curl_exec($curl);  // 执行一个cURL会话并且获取相关回复
 
         if ($response === false) {

src/siam/Curl.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * 基于文件的缓存驱动
+ * User: Siam
+ * Date: 2020/7/2 0002
+ * Time: 23:07
+ */
+
+namespace Siam\Trace;
+
+
+use Siam\AbstractInterface\CacheInterface;
+
+class CacheFile implements CacheInterface
+{
+    protected $path = "../cache/";
+    public function __construct($path = null)
+    {
+        if ($path !== null) $this->path = $path;
+    }
+
+    public function set($key, $value, $ex = 0)
+    {
+        $data = [
+            'key'   => $key,
+            'value' => $value,
+            'ex'    => time() + $ex,
+        ];
+        $filename = $this->path . $key .".cache";
+        $cache = json_encode($data,256);
+        $int = file_put_contents($filename, $cache);
+
+        return $int === strlen($cache);
+    }
+
+    public function get($key)
+    {
+        $filename = $this->path . $key .".cache";
+        if (!is_file($filename)) return null;
+        $data = file_get_contents($filename);
+        $data = json_decode($data, true);
+        if ($data['ex'] !== 0 && time() >= $data['ex']){
+            $this->del($key);
+            return null;
+        }
+
+        return $data['value'];
+    }
+
+    public function del($key)
+    {
+        $filename = $this->path . $key .".cache";
+        if (!is_file($filename)) return false;
+        unlink($filename);
+        return true;
+    }
+
+    public function has($key)
+    {
+        $filename = $this->path . $key .".cache";
+        if (!is_file($filename)) return false;
+        return true;
+    }
+}

src/siam/Trace/CacheFile.php

@@ -10,6 +10,7 @@
 
 
 use Siam\Api;
+use Siam\Cache;
 use Siam\Component\Singleton;
 use Siam\Curl;
 
@@ -66,8 +67,7 @@ public function getToken()
      */
     private function getByCache()
     {
-        // $cache = Cache::tag('token')->get($this->data['mism_appid'] . "_token");
-        $cache = false;
+        $cache = Cache::getInstance()->get($this->data['mism_appid'] . "_token");
         return $cache;
     }
 
@@ -77,8 +77,8 @@ private function getByCache()
      */
     private function getByHttp()
     {
-        if (empty($this->data['mism_appid'])) Api::json('500', [], 'mism_appid为空');
-        if (empty($this->data['mism_appsecret'])) Api::json('500', [], 'mism_appsecret为空');
+        if (empty($this->data['mism_appid'])) exit(Api::json('500', [], 'mism_appid为空'));
+        if (empty($this->data['mism_appsecret'])) exit(Api::json('500', [], 'mism_appsecret为空'));
 
         $url = str_replace("__APPID__", $this->data['mism_appid'], self::$GET_TOKEN);
         $url = str_replace("__SECRET__", $this->data['mism_appsecret'], $url);
@@ -87,14 +87,14 @@ private function getByHttp()
         try {
             $res = $CURL->send($url);
         } catch (\Exception $e) {
-            Api::json('500', [], '请求失败');
+            exit(Api::json('500', [], '请求失败'));
         }
         $resA  = json_decode($res, true);
 
         $ticket = isset($resA['access_token']) ? $resA['access_token'] : false;
         if ($ticket) {
             $cacheName = $this->data['mism_appid'] . "_token";
-            // Cache::tag('token')->set($cacheName, $ticket, 7200);
+            Cache::getInstance()->set($cacheName, $ticket, 7200);
             return $ticket;
         }else{
             # 没有正常获取到那肯定有问题，输出提供给调试

src/siam/Wechat/AccessToken.php

@@ -9,6 +9,7 @@
 namespace Siam\Wechat;
 
 use Siam\Api;
+use Siam\Cache;
 use Siam\Component\Singleton;
 use Siam\Curl;
 
@@ -65,9 +66,8 @@ public function getTicket()
      */
     private function getByCache()
     {
-        if (empty($this->data['mism_appid'])) Api::json('500', [], 'mism_appid为空');
-        // $cache = Cache::tag('ticket')->get($this->data['mism_appid'] . "_ticket");
-        $cache = false;
+        if (empty($this->data['mism_appid'])) exit(Api::json('500', [], 'mism_appid为空'));
+        $cache = Cache::getInstance()->get($this->data['mism_appid'] . "_ticket");
         return $cache;
     }
 
@@ -77,22 +77,22 @@ private function getByCache()
      */
     private function getByHttp()
     {
-        if (empty($this->token)) Api::json('500', [], 'token为空');
+        if (empty($this->token)) exit(Api::json('500', [], 'token为空'));
 
         $url = str_replace("__TOKEN__", $this->token, self::$GET_TICKET);
 
         $CURL = Curl::getInstance();
         try {
             $res = $CURL->send($url);
         } catch (\Exception $e) {
-            Api::json('500', [], '请求ticket失败');
+            exit(Api::json('500', [], '请求ticket失败'));
         }
         $res  = json_decode($res, true);
 
         $ticket = $res['ticket'];
         if ($ticket) {
             $cacheName = $this->data['mism_appid'] . "_ticket";
-            // Cache::tag('ticket')->set($cacheName, $ticket, 7200);
+            Cache::getInstance()->set($cacheName, $ticket, 7200);
             return $ticket;
         }
         return false;

src/siam/Wechat/ApiTicket.php

@@ -15,6 +15,7 @@ class Work
     use Singleton;
 
     private $lastData;
+    private $key;
 
     private function __construct($config = [])
     {