Compare commits

..

3 Commits
2.8.8 ... v2

Author SHA1 Message Date
Jerry
d3d64c8f06 fix class empty caused bug 2023-06-13 15:31:51 +08:00
crazywhalecc
f0cba01bd7 update to 2.8.9, fix ergodic order via #365 2023-06-12 21:19:17 +08:00
crazywhalecc
ea83ea2cce update to 2.8.9, fix light cache wrong 2023-06-12 21:19:17 +08:00
4 changed files with 15 additions and 4 deletions

View File

@@ -105,6 +105,8 @@ class AnnotationParser
}
*/
// 保留ergodic注解
$append_ergodics = [];
// 生成主树
$this->annotation_map[$v]['class_annotations'] = $class_annotations;
$this->annotation_map[$v]['methods'] = $methods;
@@ -120,7 +122,8 @@ class AnnotationParser
foreach (($this->annotation_map[$v]['methods'] ?? []) as $method) {
$copy = clone $vs;
$copy->method = $method->getName();
$this->annotation_map[$v]['methods_annotations'][$method->getName()][] = $copy;
$append_ergodics[$method->getName()][] = $copy;
// $this->annotation_map[$v]['methods_annotations'][$method->getName()][] = $copy;
}
}
@@ -139,6 +142,13 @@ class AnnotationParser
$inserted = [];
// 预处理将Class的ergodic注解拼接到每个方法的注解列表前面且按照顺序修复 #365
foreach (($this->annotation_map[$v]['methods_annotations'] ?? []) as $method_name => $annos) {
if (isset($append_ergodics[$method_name])) {
$this->annotation_map[$v]['methods_annotations'][$method_name] = array_merge($append_ergodics[$method_name], $annos);
}
}
// 预处理3处理每个函数上面的特殊注解就是需要操作一些东西的
foreach (($this->annotation_map[$v]['methods_annotations'] ?? []) as $method_name => $methods_annotations) {
foreach ($methods_annotations as $method_anno) {

View File

@@ -30,7 +30,7 @@ class ConsoleApplication extends Application
{
public const VERSION_ID = 480;
public const VERSION = '2.8.8';
public const VERSION = '2.8.10';
private static $obj;

View File

@@ -75,7 +75,7 @@ class LightCache
} else {
return false;
}
$result = self::$kv_table->set((string)$k, [
$result = self::$kv_table->set((string) $k, [
'value' => $value,
'expire' => $v['expire'],
'data_type' => $data_type,
@@ -191,7 +191,7 @@ class LightCache
} elseif (is_bool($value)) {
$data_type = 'bool';
$value = json_encode($value);
} else {
} else {
throw new LightCacheException('E00048', 'Only can set string, array and int');
}
try {

View File

@@ -6,6 +6,7 @@ namespace ZM\Store;
use Exception;
use Swoole\Table;
use ZM\Config\ZMConfig;
use ZM\Exception\LightCacheException;
use ZM\Exception\ZMException;