diff --git a/extend/workermans/model/Base.php b/extend/workermans/model/Base.php index 51907ed..8a44e7b 100644 --- a/extend/workermans/model/Base.php +++ b/extend/workermans/model/Base.php @@ -142,7 +142,7 @@ class Base extends Model $session = Gateway::getSession($g_client_id); $session[$msg_id] = $time; Gateway::setSession($g_client_id, $session); - $redis_name = $g_client_id . '_lock'; + $redis_name = 'lock:' . $g_client_id . '_lock'; $result = Redis::get($redis_name); if($result) { }else { @@ -175,7 +175,7 @@ class Base extends Model $session = Gateway::getSession($g_client_id); unset($session[$msg_id]); Gateway::setSession($g_client_id, $session); - $redis_name = $g_client_id . '_lock'; + $redis_name = 'lock:' . $g_client_id . '_lock'; $result = Redis::get($redis_name); if($result) { Redis::del($redis_name); @@ -319,7 +319,7 @@ class Base extends Model self::add_log_file('----无回执--' .date('Y-m-d H:i:s'). '--->' . $result); } - $r_name = $client_id . '_lock'; + $r_name = 'lock:' . $client_id . '_lock'; // 处理锁单消息 $result = Redis::get($r_name); if($result) { diff --git a/plugin/webman/gateway/Events.php b/plugin/webman/gateway/Events.php index 40e35a3..d45fd2d 100644 --- a/plugin/webman/gateway/Events.php +++ b/plugin/webman/gateway/Events.php @@ -278,6 +278,10 @@ class Events $number = $red_number; $message['number'] = $red_number; } + if($number < $data[0]['number'] && $red_number == 0) { + $number = 0; + $message['number'] = 0; + } } } $d_data = false;