From 5e46cd67c7d2080108f89400b8357253cdf6b4d0 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Fri, 25 Jan 2019 10:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=85=8D=E7=BD=AE=E3=80=81=E4=BC=98=E5=8C=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=8A=B6=E6=80=81=E7=A0=81=E8=BF=94=E5=9B=9E=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vilson <545522390@qq.com>
---
 application/common/Model/Task.php               |  4 ++--
 .../common/Plugins/GateWayWorker/config.php     | 17 ++++++++---------
 .../Plugins/GateWayWorker/start_gateway.php     | 11 ++++++++++-
 extend/controller/BasicApi.php                  |  1 +
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index e815bfa..3a52692 100644
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -308,7 +308,7 @@ class Task extends CommonModel
         if ($task['deleted']) {
             throw new \Exception('任务在回收站中无法进行编辑', 3);
         }
-        if ($task['parentDone']) {
+        if ($task['pcode'] && $task['parentDone']) {
             throw new \Exception('父任务已完成，无法重做子任务', 4);
         }
         if ($task['hasUnDone']) {
@@ -445,7 +445,7 @@ class Task extends CommonModel
         if ($done != -1) {
             $doneSql = " and t.done = {$done}";
         }
-        $sql = "select *,t.id as id,t.name as name,t.code as code from {$prefix}task as t join {$prefix}project as p on t.project_code = p.code where  t.deleted = 0 {$doneSql} and t.assign_to = '{$memberCode}' and p.deleted = 0 order by t.id desc";
+        $sql = "select *,t.id as id,t.name as name,t.code as code,t.create_time as create_time from {$prefix}task as t join {$prefix}project as p on t.project_code = p.code where  t.deleted = 0 {$doneSql} and t.assign_to = '{$memberCode}' and p.deleted = 0 order by t.id desc";
         $total = Db::query($sql);
         $total = count($total);
         $sql .= " limit {$offset},{$limit}";
diff --git a/application/common/Plugins/GateWayWorker/config.php b/application/common/Plugins/GateWayWorker/config.php
index e629ba1..cbf536b 100644
--- a/application/common/Plugins/GateWayWorker/config.php
+++ b/application/common/Plugins/GateWayWorker/config.php
@@ -1,12 +1,11 @@
 <?php
-define('SERVER_ADDRESS', '192.168.0.159');//服务注册地址，需为内网IP地址
+define('SERVER_ADDRESS', '172.18.176.189');//服务注册地址，需为内网IP地址
 define('SERVER_PORT', '2346');//服务注册端口
 define('CLIENT_PORT', '2345');//客户端监听端口
-define('USE_SSL', false);//是否使用ssl
-define('SSL_CONFIG', array(
-    // 请使用绝对路径
-    'local_cert' => '/www/wwwroot/pearProjectApi/server.pem', // 也可以是crt文件
-    'local_pk' => '/www/wwwroot/pearProjectApi/server.key',
-    'verify_peer' => false,
-    'allow_self_signed' => true, //如果是自签名证书需要开启此选项
-));//ssl配置
+
+//ssl配置 请使用绝对路径。不开启可以不用关注
+define('USE_SSL', true);//是否使用ssl
+define('LOCAL_CERT', '/www/wwwroot/EasyProjectApi/server.pem');// 证书路径也可以是crt文件
+define('LOCAL_PK', '/www/wwwroot/EasyProjectApi/server.key');
+define('VERIFY_PEER', false);
+define('ALLOW_SELF_SIGNED', true);//如果是自签名证书需要开启此选项
diff --git a/application/common/Plugins/GateWayWorker/start_gateway.php b/application/common/Plugins/GateWayWorker/start_gateway.php
index 5b87a97..058f943 100644
--- a/application/common/Plugins/GateWayWorker/start_gateway.php
+++ b/application/common/Plugins/GateWayWorker/start_gateway.php
@@ -21,7 +21,16 @@ require_once __DIR__ . '/config.php';
 $context = array();
 if (USE_SSL) {
     // 证书最好是申请的证书
-    $context = SSL_CONFIG;
+    $context = [
+        // 更多ssl选项请参考手册 http://php.net/manual/zh/context.ssl.php
+        'ssl' => [
+            // 请使用绝对路径
+            'local_cert' => LOCAL_CERT, // 也可以是crt文件
+            'local_pk' => LOCAL_PK,
+            'verify_peer' => VERIFY_PEER,
+            'allow_self_signed' => ALLOW_SELF_SIGNED, //如果是自签名证书需要开启此选项
+        ]
+    ];
 }
 
 // gateway 进程，这里使用Text协议，可以用telnet测试
diff --git a/extend/controller/BasicApi.php b/extend/controller/BasicApi.php
index bc69c62..5867f11 100644
--- a/extend/controller/BasicApi.php
+++ b/extend/controller/BasicApi.php
@@ -56,6 +56,7 @@ class BasicApi
      */
     protected function error($msg, $code = 201, $data = [])
     {
+        $code < 200 && $code += 200;
         ToolsService::error($msg, $data, $code);
     }