From 5f6ee9af8d9b8eac6c4a9b7c72de340a38e67f52 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Thu, 31 Dec 2020 11:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BF=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=B9=B6=E5=8F=91=E9=87=8D=E5=A4=8D=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Library/Utils/Lock.php | 79 ++++++++++++++++++++++++++++++++++++++
 app/Listeners/User.php     | 55 ++++++++++++++++++--------
 app/Repos/Online.php       | 21 +++++-----
 3 files changed, 129 insertions(+), 26 deletions(-)
 create mode 100644 app/Library/Utils/Lock.php

diff --git a/app/Library/Utils/Lock.php b/app/Library/Utils/Lock.php
new file mode 100644
index 00000000..f3fb6be4
--- /dev/null
+++ b/app/Library/Utils/Lock.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Library\Utils;
+
+use App\Library\Cache\Backend\Redis as RedisCache;
+use Phalcon\Di;
+use Phalcon\Text;
+
+class Lock
+{
+
+    /**
+     * @param string $itemId
+     * @param int $expire
+     * @return bool|string
+     */
+    public static function addLock($itemId, $expire = 600)
+    {
+        if (!$itemId || $expire <= 0) {
+            return false;
+        }
+
+        /**
+         * @var RedisCache $cache
+         */
+        $cache = Di::getDefault()->getShared('cache');
+
+        $redis = $cache->getRedis();
+
+        $lockId = Text::random(Text::RANDOM_ALNUM, 16);
+
+        $keyName = self::getLockKey($itemId);
+
+        $result = $redis->set($keyName, $lockId, ['nx', 'ex' => $expire]);
+
+        return $result ? $lockId : false;
+    }
+
+    /**
+     * @param string $itemId
+     * @param string $lockId
+     * @return bool
+     */
+    public static function releaseLock($itemId, $lockId)
+    {
+        if (!$itemId || !$lockId) {
+            return false;
+        }
+
+        /**
+         * @var RedisCache $cache
+         */
+        $cache = Di::getDefault()->getShared('cache');
+
+        $redis = $cache->getRedis();
+
+        $keyName = self::getLockKey($itemId);
+
+        $redis->watch($keyName);
+
+        /**
+         * 监听key防止被修改或删除，提交事务后会自动取消监控，其他情况需手动解除监控
+         */
+        if ($lockId == $redis->get($keyName)) {
+            $redis->multi()->del($keyName)->exec();
+            return true;
+        }
+
+        $redis->unwatch();
+
+        return false;
+    }
+
+    public static function getLockKey($itemId)
+    {
+        return sprintf('kg_lock:%s', $itemId);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Listeners/User.php b/app/Listeners/User.php
index 4d60f7a5..16ae1453 100644
--- a/app/Listeners/User.php
+++ b/app/Listeners/User.php
@@ -2,6 +2,7 @@
 
 namespace App\Listeners;
 
+use App\Library\Utils\Lock as LockUtil;
 use App\Models\Online as OnlineModel;
 use App\Models\User as UserModel;
 use App\Repos\Online as OnlineRepo;
@@ -15,7 +16,13 @@ class User extends Listener
 
     public function online(Event $event, $source, UserModel $user)
     {
+        $itemId = "user:{$user->id}";
+
+        $lockId = LockUtil::addLock($itemId);
+
         $now = time();
+        $clientType = $this->getClientType();
+        $clientIp = $this->getClientIp();
 
         if ($now - $user->active_time > 600) {
 
@@ -25,28 +32,46 @@ class User extends Listener
 
             $onlineRepo = new OnlineRepo();
 
-            $online = $onlineRepo->findByUserDate($user->id, date('Y-m-d'));
+            $records = $onlineRepo->findByUserDate($user->id, date('Y-m-d'));
 
-            if ($online) {
+            if ($records->count() > 0) {
 
-                $online->active_time = $now;
-                $online->client_type = $this->getClientType();
-                $online->client_ip = $this->getClientIp();
+                $online = null;
 
-                $online->update();
+                foreach ($records as $record) {
+                    if ($record->client_type == $clientType && $record->client_ip == $clientIp) {
+                        $online = $record;
+                        break;
+                    }
+                }
+
+                if ($online) {
+                    $online->active_time = $now;
+                    $online->update();
+                } else {
+                    $this->createOnline($user->id, $clientType, $clientIp);
+                }
 
             } else {
-
-                $online = new OnlineModel();
-
-                $online->user_id = $user->id;
-                $online->active_time = $now;
-                $online->client_type = $this->getClientType();
-                $online->client_ip = $this->getClientIp();
-
-                $online->create();
+                $this->createOnline($user->id, $clientType, $clientIp);
             }
         }
+
+        LockUtil::releaseLock($itemId, $lockId);
+    }
+
+    protected function createOnline($userId, $clientType, $clientIp)
+    {
+        $online = new OnlineModel();
+
+        $online->user_id = $userId;
+        $online->client_type = $clientType;
+        $online->client_ip = $clientIp;
+        $online->active_time = time();
+
+        $online->create();
+
+        return $online;
     }
 
 }
\ No newline at end of file
diff --git a/app/Repos/Online.php b/app/Repos/Online.php
index 1d833cbf..7a16ce30 100644
--- a/app/Repos/Online.php
+++ b/app/Repos/Online.php
@@ -3,7 +3,8 @@
 namespace App\Repos;
 
 use App\Models\Online as OnlineModel;
-use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
 
 class Online extends Repository
 {
@@ -11,20 +12,18 @@ class Online extends Repository
     /**
      * @param int $userId
      * @param string $activeDate
-     * @return OnlineModel|Model|bool
+     * @return ResultsetInterface|Resultset|OnlineModel[]
      */
     public function findByUserDate($userId, $activeDate)
     {
-        $activeTime = strtotime($activeDate);
+        $startTime = strtotime($activeDate);
 
-        return OnlineModel::findFirst([
-            'conditions' => 'user_id = ?1 AND active_time BETWEEN ?2 AND ?3',
-            'bind' => [
-                1 => $userId,
-                2 => $activeTime,
-                3 => $activeTime + 86400,
-            ],
-        ]);
+        $endTime = $startTime + 86400;
+
+        return OnlineModel::query()
+            ->where('user_id = :user_id:', ['user_id' => $userId])
+            ->betweenWhere('active_time', $startTime, $endTime)
+            ->execute();
     }
 
 }
\ No newline at end of file