zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-21 07:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix comment spacing problem (build 443)

Browse Source
This commit is contained in:
crazywhalecc
2022-03-20 16:23:07 +08:00
parent 444a77933a
commit 7ce3ef41df
26 changed files with 91 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ZM/Event/EventDispatcher.php
View File

@@ -19,15 +19,15 @@ use ZM\Utils\ZMUtil;
class EventDispatcher
{
public const STATUS_NORMAL = 0; //正常结束
public const STATUS_NORMAL = 0; // 正常结束
public const STATUS_INTERRUPTED = 1; //被interrupt了，不管在什么地方
public const STATUS_INTERRUPTED = 1; // 被interrupt了，不管在什么地方
public const STATUS_EXCEPTION = 2; //执行过程中抛出了异常
public const STATUS_EXCEPTION = 2; // 执行过程中抛出了异常
public const STATUS_BEFORE_FAILED = 3; //中间件HandleBefore返回了false，所以不执行此方法
public const STATUS_BEFORE_FAILED = 3; // 中间件HandleBefore返回了false，所以不执行此方法
public const STATUS_RULE_FAILED = 4; //判断事件执行的规则函数判定为false，所以不执行此方法
public const STATUS_RULE_FAILED = 4; // 判断事件执行的规则函数判定为false，所以不执行此方法
/** @var int */
public $status = self::STATUS_NORMAL;
@@ -133,7 +133,7 @@ class EventDispatcher
if ($this->status === self::STATUS_RULE_FAILED) {
$this->status = self::STATUS_NORMAL;
}
//TODO:没有过滤before的false，可能会导致一些问题，先观望一下
// TODO:没有过滤before的false，可能会导致一些问题，先观望一下
} catch (InterruptException $e) {
$this->store = $e->return_var;
$this->status = self::STATUS_INTERRUPTED;
@@ -200,7 +200,7 @@ class EventDispatcher
}
$middleware_obj = EventManager::$middlewares[$middleware->middleware];
$before = $middleware_obj['class'];
//var_dump($middleware_obj);
// var_dump($middleware_obj);
$r[$k] = new $before();
$r[$k]->class = $q_c;
$r[$k]->method = $q_f;

2
src/ZM/Event/EventManager.php
View File

@@ -61,7 +61,7 @@ class EventManager
if (server()->worker_id !== $vss->worker_id && $vss->worker_id != -1) {
return;
}
//echo server()->worker_id.PHP_EOL;
// echo server()->worker_id.PHP_EOL;
$plain_class = $vss->class;
Console::debug('Added Middleware-based timer: ' . $plain_class . ' -> ' . $vss->method);
Timer::tick($vss->tick_ms, function () use ($vss, $dispatcher) {

4
src/ZM/Event/SwooleEvent/OnMessage.php
View File

@@ -52,10 +52,10 @@ class OnMessage implements SwooleEvent
return false;
});
try {
//$starttime = microtime(true);
// $starttime = microtime(true);
$dispatcher1->dispatchEvents($conn);
$dispatcher->dispatchEvents($conn);
//Console::success("Used ".round((microtime(true) - $starttime) * 1000, 3)." ms!");
// Console::success("Used ".round((microtime(true) - $starttime) * 1000, 3)." ms!");
} catch (Exception $e) {
$error_msg = $e->getMessage() . ' at ' . $e->getFile() . '(' . $e->getLine() . ')';
Console::error(zm_internal_errcode('E00017') . 'Uncaught exception ' . get_class($e) . ' when calling "message": ' . $error_msg);

4
src/ZM/Event/SwooleEvent/OnRequest.php
View File

@@ -66,7 +66,7 @@ class OnRequest implements SwooleEvent
$div->method = $node['method'];
$div->request_method = $node['request_method'];
$div->class = $node['class'];
//Console::success("正在执行路由：".$node["method"]);
// Console::success("正在执行路由：".$node["method"]);
$dispatcher->dispatchEvent($div, null, $params, $request, $response);
if (is_string($dispatcher->store) && !$response->isEnd()) {
$response->end($dispatcher->store);
@@ -74,7 +74,7 @@ class OnRequest implements SwooleEvent
}
}
if (!$response->isEnd()) {
//Console::warning('返回了404');
// Console::warning('返回了404');
HttpUtil::responseCodePage($response, 404);
}
} catch (InterruptException $e) {

22
src/ZM/Event/SwooleEvent/OnWorkerStart.php
View File

@@ -66,7 +66,7 @@ class OnWorkerStart implements SwooleEvent
} elseif (!isset($error['type'])) {
return;
}
//DataProvider::saveBuffer();
// DataProvider::saveBuffer();
/* @var Server $server */
if (server() === null) {
$server->shutdown();
@@ -77,10 +77,10 @@ class OnWorkerStart implements SwooleEvent
Console::verbose("Worker #{$server->worker_id} starting");
Framework::$server = $server;
//ZMBuf::resetCache(); //清空变量缓存
//ZMBuf::set("wait_start", []); //添加队列，在workerStart运行完成前先让其他协程等待执行
// ZMBuf::resetCache(); //清空变量缓存
// ZMBuf::set("wait_start", []); //添加队列，在workerStart运行完成前先让其他协程等待执行
//TODO: 单独抽出来MySQL和Redis连接池
// TODO: 单独抽出来MySQL和Redis连接池
$this->initMySQLPool();
// 开箱即用的Redis
@@ -93,9 +93,9 @@ class OnWorkerStart implements SwooleEvent
}
}
$this->loadAnnotations(); //加载composer资源、phar外置包、注解解析注册等
$this->loadAnnotations(); // 加载composer资源、phar外置包、注解解析注册等
EventManager::registerTimerTick(); //启动计时器
EventManager::registerTimerTick(); // 启动计时器
set_coroutine_params(['server' => $server, 'worker_id' => $worker_id]);
$dispatcher = new EventDispatcher(OnStart::class);
$dispatcher->setRuleFunction(function ($v) {
@@ -151,7 +151,7 @@ class OnWorkerStart implements SwooleEvent
if (Framework::$instant_mode) {
goto skip;
}
//加载各个模块的注解类，以及反射
// 加载各个模块的注解类，以及反射
Console::debug('Mapping annotations');
$parser = new AnnotationParser();
$composer = json_decode(file_get_contents(DataProvider::getSourceRootDir() . '/composer.json'), true);
@@ -187,16 +187,16 @@ class OnWorkerStart implements SwooleEvent
}
$parser->registerMods();
EventManager::loadEventByParser($parser); //加载事件
EventManager::loadEventByParser($parser); // 加载事件
skip:
//加载自定义的全局函数
// 加载自定义的全局函数
Console::debug('Loading context class...');
$context_class = ZMConfig::get('global', 'context_class');
if (!is_a($context_class, ContextInterface::class, true)) {
throw new ZMKnownException('E00032', 'Context class must implemented from ContextInterface!');
}
//加载插件
// 加载插件
$obb_onebot = ZMConfig::get('global', 'onebot') ??
ZMConfig::get('global', 'modules')['onebot'] ??
['status' => true, 'single_bot_mode' => false, 'message_level' => 99999];
@@ -251,7 +251,7 @@ class OnWorkerStart implements SwooleEvent
if (!empty($real_conf)) {
Console::info('Connecting to MySQL pool');
ob_start();
phpinfo(); //这个phpinfo是有用的，不能删除
phpinfo(); // 这个phpinfo是有用的，不能删除
$str = ob_get_clean();
$str = explode("\n", $str);
foreach ($str as $v) {