Merge pull request #5 from xudianyang/master

+

Author: xudianyang

README.md

@@ -23,35 +23,80 @@ PHP微服务框架即“Micro Service Framework For PHP”，是Camera360社区
 * 支持独立进程的定时器
 * 支持独立配置进程
 
-## 安装
+## 环境要求
+
+- Linux，FreeBSD，MacOS(有兼容问题)
+- Linux内核版本2.3.32以上(支持epoll)
+- PHP-7.0及以上版本（生产环境建议使用PHP-7.1）
+- gcc-4.4以上版本
+- [swoole-1.9.15](https://github.com/swoole/swoole-src/archive/v1.9.15.tar.gz)及以上版本（暂不支持Swoole-2.0）
+- [hiredis-0.13.3](https://github.com/redis/hiredis/archive/v0.13.3.tar.gz)
+- [yac](https://github.com/laruence/yac/archive/yac-2.0.2.tar.gz)
+- [phpredis](http://pecl.php.net/get/redis-3.1.2.tgz)
+- composer
 
-推荐安装方式，编辑项目的composer.json，加入依赖`pinguo/php-msf`
 
-```json
-{
-  "require": {
-    "pinguo/php-msf": "dev-master"
-  }
-}
+## 快速起步
+   
+```bash
+$>curl -sS https://cdn.rawgit.com/pinguo/php-msf-docker/ee580877/installer.php | php
 ```
 
-或者
+`installer.php`会检查运行环境，根据你的自定义配置，自动创建项目模板，composer安装依赖，启动服务。
+
+如果一切顺利，运行到最后你将看到如下的输出：
 
 ```bash
-$composer require pinguo/php-msf
+[2017-09-06 16:08:34] Run composer install success
+[2017-09-06 16:08:34] Congratulations, all are installed successfully!
+[2017-09-06 16:08:34] You can, visit http://127.0.0.1:8990/Welcome for test
+      _______                               ____
+________  / /_  ____        ____ ___  _____/ __/
+___/ __ \/ __ \/ __ \______/ __ `__ \/ ___/ /_
+__/ /_/ / / / / /_/ /_____/ / / / / (__  ) __/
+_/ .___/_/ /_/ .___/     /_/ /_/ /_/____/_/
+/_/         /_/         Camera360 Open Source TM
+[2017-09-06 16:08:34] Swoole  Version: 1.9.18
+[2017-09-06 16:08:34] PHP     Version: 7.1.8
+[2017-09-06 16:08:34] Application ENV: docker
+[2017-09-06 16:08:34] Listen     Addr: 0.0.0.0
+[2017-09-06 16:08:34] Listen     Port: 8990
 ```
 
-更多参考[DEMO](https://github.com/pinguo/php-msf-demo)
+访问测试：
 
-## 环境要求
+```bash
+$>curl http://127.0.0.1:8990/Welcome
+hello world!
+```
 
-- Linux，FreeBSD，MacOS(有兼容问题)
-- Linux内核版本2.3.32以上(支持epoll)
-- PHP-7.0及以上版本（推荐使用PHP-7.1）
-- gcc-4.4以上版本
-- [swoole-1.9.15](https://github.com/swoole/swoole-src/archive/v1.9.15.tar.gz)及以上版本（暂不支持Swoole-2.0）
-- [hiredis-0.13.3](https://github.com/redis/hiredis/archive/v0.13.3.tar.gz)
-- composer
+注意端口，如果你不是8990，你需要修改，然后访问测试。
+
+
+调试模式
+
+```bash
+$>./server.php start
+```
+
+Daemon模式
+
+```bash
+$>./server.php start -d
+```
+
+
+停止服务
+
+```bash
+$>./server.php stop
+```
+
+重启服务
+
+```bash
+$>./server.php restart
+```
 
 ## 定位
 

composer.json

@@ -13,7 +13,6 @@
     "pinguo/php-exception": "dev-master",
     "pinguo/plates": "dev-master",
     "hassankhan/config": "~0.10",
-    "alcaeus/mongo-php-adapter": "^1.0",
     "flexihash/flexihash": "^2.0.0"
   },
   "autoload": {

src/Base/Output.php

@@ -164,41 +164,82 @@ public function set(&$request, &$response = null)
      */
     public function setStatusHeader($code = 200)
     {
-        $this->response->status($code);
+        if (empty(self::$codes[$code])) {
+            $code = 500;
+        }
+
+        if (!empty($this->response)) {
+            $this->response->status($code);
+        }
+
         return $this;
     }
 
     /**
-     * 响应json格式数据
+     * 设置响应的Content-Type报头
+     *
+     * @param string $mime_type Content-Type的值，如application/json;charset=utf-8
+     * @return $this
+     */
+    public function setContentType($mime_type)
+    {
+        $this->setHeader('Content-Type', $mime_type);
+        return $this;
+    }
+
+    /**
+     * 设置响应的其他HTTP报头
+     *
+     * @param string $key HTTP报头Key
+     * @param string $value HTTP报头Value
+     * @return $this
+     */
+    public function setHeader($key, $value)
+    {
+        $this->response->header($key, $value);
+        return $this;
+    }
+
+    /**
+     * 设置HTTP响应的cookie信息，与PHP的setcookie()参数一致
+     *
+     * @param string $key Cookie名称
+     * @param string $value Cookie值
+     * @param int $expire 有效时间
+     * @param string $path 有效路径
+     * @param string $domain 有效域名
+     * @param bool $secure Cookie是否仅仅通过安全的HTTPS连接传给客户端
+     * @param bool $httponly 设置成TRUE，Cookie仅可通过HTTP协议访问
+     * @return $this
+     */
+    public function setCookie(
+        $key,
+        $value = '',
+        $expire = 0,
+        $path = '/',
+        $domain = '',
+        $secure = false,
+        $httponly = false
+    ) {
+        $this->response->cookie($key, $value, $expire, $path, $domain, $secure, $httponly);
+        return $this;
+    }
+
+    /**
+     * 响应原始数据
      *
      * @param mixed|null $data 响应数据
-     * @param string $message 响应提示
      * @param int $status 响应HTTP状态码
-     * @param callable|null $callback jsonp参数名
      */
-    public function outputJson($data = null, $message = '', $status = 200, $callback = null)
+    public function output($data = null, $status = 200)
     {
         $this->getContext()->getLog()->pushLog('status', $status);
 
-        $result = [
-            'data'       => $data,
-            'status'     => $status,
-            'message'    => empty($message) ? 'success' : $message,
-            'serverTime' => microtime(true),
-        ];
-
         switch ($this->controller->requestType) {
             case Marco::HTTP_REQUEST:
-                $callback = $this->getCallback($callback);
-                if (!is_null($callback)) {
-                    $output = $callback . '(' . json_encode($result) . ');';
-                } else {
-                    $output = json_encode($result);
-                }
-
                 if (!empty($this->response)) {
-                    $this->setContentType('application/json; charset=UTF-8');
-                    $this->end($output);
+                    $this->setStatusHeader($status);
+                    $this->end($data);
                 }
                 break;
             case Marco::TCP_REQUEST:
@@ -207,6 +248,19 @@ public function outputJson($data = null, $message = '', $status = 200, $callback
         }
     }
 
+    /**
+     * 响应json格式数据
+     *
+     * @param mixed|null $data 响应数据
+     * @param int $status 响应HTTP状态码
+     */
+    public function outputJson($data = null, $status = 200)
+    {
+        $this->setContentType('application/json; charset=UTF-8');
+        $data = json_encode($data);
+        $this->output($data, $status);
+    }
+
     /**
      * 通过模板引擎响应输出HTML
      *
@@ -247,80 +301,6 @@ public function outputView(array $data, $view = null)
         $this->end($response);
     }
 
-    /**
-     * 获取jsonp的callback名称
-     *
-     * @param string $callback jsonp的callback参数名称
-     * @return string
-     */
-    public function getCallback($callback)
-    {
-        $input = $this->getContext()->getInput();
-        if (is_null($callback) && (!empty($input->postGet('callback')) ||
-                !empty($input->postGet('cb')) ||
-                !empty($input->postGet('jsonpCallback')))
-        ) {
-            $callback = !empty($input->postGet('callback'))
-                ? $input->postGet('callback')
-                : !empty($input->postGet('cb'))
-                    ? $input->postGet('cb')
-                    : $input->postGet('jsonpCallback');
-        }
-
-        return $callback;
-    }
-
-    /**
-     * 设置响应的Content-Type报头
-     *
-     * @param string $mime_type Content-Type的值，如application/json;charset=utf-8
-     * @return $this
-     */
-    public function setContentType($mime_type)
-    {
-        $this->setHeader('Content-Type', $mime_type);
-        return $this;
-    }
-
-    /**
-     * 设置响应的其他HTTP报头
-     *
-     * @param string $key HTTP报头Key
-     * @param string $value HTTP报头Value
-     * @return $this
-     */
-    public function setHeader($key, $value)
-    {
-        $this->response->header($key, $value);
-        return $this;
-    }
-
-    /**
-     * 设置HTTP响应的cookie信息，与PHP的setcookie()参数一致
-     *
-     * @param string $key Cookie名称
-     * @param string $value Cookie值
-     * @param int $expire 有效时间
-     * @param string $path 有效路径
-     * @param string $domain 有效域名
-     * @param bool $secure Cookie是否仅仅通过安全的HTTPS连接传给客户端
-     * @param bool $httponly 设置成TRUE，Cookie仅可通过HTTP协议访问
-     * @return $this
-     */
-    public function setCookie(
-        $key,
-        $value = '',
-        $expire = 0,
-        $path = '/',
-        $domain = '',
-        $secure = false,
-        $httponly = false
-    ) {
-        $this->response->cookie($key, $value, $expire, $path, $domain, $secure, $httponly);
-        return $this;
-    }
-
-
     /**
      * 结束HTTP请求，发送响应体
      *

src/Client/Http/Client.php

@@ -214,6 +214,10 @@ public function goDnsLookup($url = '', $timeout = 0, $headers = [])
      */
     public function goPost($url = '', $data = [], $timeout = 30000, $headers = [])
     {
+        if (empty($data)) {
+            throw new Exception('post data is empty');
+        }
+
         if (!($this->client instanceof \swoole_http_client)) {
             throw new Exception('You must complete the DNS query first, Such as $client->goDnsLookup()');
         }
@@ -273,6 +277,10 @@ public function goGet($url = '', $query = null, $timeout = 30000, $headers = [])
      */
     public function goSinglePost($url = '', $data = [], $timeout = 30000, $headers = [])
     {
+        if (empty($data)) {
+            throw new Exception('post data is empty');
+        }
+
         if (empty($this->urlData)) {
             $this->urlData = self::parseUrl($url);
         } else {
@@ -386,6 +394,11 @@ public function goConcurrent(array $requests)
                         $this->getContext()->getLog()->error('$requests[' . $key . '] method field not valid, must be GET or POST, And Case Sensitive');
                         continue;
                     }
+
+                    if ($method == 'POST' && empty($request['data'])) {
+                        $this->getContext()->getLog()->error('$requests[' . $key . '] post data is empty');
+                        continue;
+                    }
                 }
 
                 if (!isset($request['timeout'])) {

src/Client/RpcClient.php

@@ -222,11 +222,11 @@ public function remoteHttpCall($method, array $args)
         }
 
         if ($response && !empty($response['body']) && ($jsonRes = json_decode($response['body'], true))) {
-            if ($jsonRes['status'] !== 200) {
+            if ($response['statusCode'] !== 200) {
                 $this->getContext()->getLog()->warning(dump($response, false, true));
                 return false;
             } else {
-                return $jsonRes['data'];
+                return $jsonRes;
             }
         } else {
             $this->getContext()->getLog()->warning(dump($response, false, true));
@@ -279,11 +279,11 @@ public static function goConcurrent(array $multiRpc)
         $responses = yield $context->getObject(Client::class)->goConcurrent($requests);
         foreach ($responses as $key => $response) {
             if ($response && !empty($response['body']) && ($jsonRes = json_decode($response['body'], true))) {
-                if ($jsonRes['status'] !== 200) {
+                if ($response['statusCode'] !== 200) {
                     $results[$key] = false;
                     $context->getContext()->getLog()->warning(dump($response, false, true));
                 } else {
-                    $results[$key] = $jsonRes['data'];
+                    $results[$key] = $jsonRes;
                 }
             } else {
                 $results[$key] = false;