mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化消息推送配置、优化接口状态码返回逻辑

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-01-25 10:44:02 +08:00
parent 990200e0b8
commit 5e46cd67c7
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/common/Model/Task.php
View File

@ -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}";

17
application/common/Plugins/GateWayWorker/config.php
View File

@ -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);//如果是自签名证书需要开启此选项

11
application/common/Plugins/GateWayWorker/start_gateway.php
View File

@ -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测试

1
extend/controller/BasicApi.php
View File

@ -56,6 +56,7 @@ class BasicApi
*/
protected function error($msg, $code = 201, $data = [])
{
$code < 200 && $code += 200;
ToolsService::error($msg, $data, $code);
}