1.优化findUserActiveSessions

2.优化findUserActiveTokens
3.修改文章和提问可用tag数量
4.优化用户锁定相关

app/Http/Admin/Services/User.php

@@ -206,9 +206,6 @@ class User extends Service
 
         if (!empty($post['vip_expiry_time'])) {
             $data['vip_expiry_time'] = $validator->checkVipExpiryTime($post['vip_expiry_time']);
-            if ($data['vip_expiry_time'] < time()) {
-                $data['vip'] = 0;
-            }
         }
 
         if (isset($post['locked'])) {
@@ -217,9 +214,6 @@ class User extends Service
 
         if (!empty($post['lock_expiry_time'])) {
             $data['lock_expiry_time'] = $validator->checkLockExpiryTime($post['lock_expiry_time']);
-            if ($data['lock_expiry_time'] < time()) {
-                $data['locked'] = 0;
-            }
         }
 
         $oldAdminRole = $user->admin_role;

app/Http/Admin/Views/article/edit.volt

@@ -47,7 +47,7 @@
             xmSelect.render({
                 el: '#xm-tag-ids',
                 name: 'xm_tag_ids',
-                max: 3,
+                max: 5,
                 filterable: true,
                 filterMethod: function (val, item, index, prop) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;

app/Http/Admin/Views/question/edit.volt

@@ -46,7 +46,7 @@
             xmSelect.render({
                 el: '#xm-tag-ids',
                 name: 'xm_tag_ids',
-                max: 3,
+                max: 5,
                 filterable: true,
                 filterMethod: function (val, item, index, prop) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;

app/Library/AppInfo.php

@@ -16,7 +16,7 @@ class AppInfo
 
     protected $link = 'https://www.koogua.com';
 
-    protected $version = '1.7.2';
+    protected $version = '1.7.3';
 
     public function __get($name)
     {

app/Repos/UserSession.php

@@ -22,6 +22,7 @@ class UserSession extends Repository
     {
         return UserSessionModel::query()
             ->where('user_id = :user_id:', ['user_id' => $userId])
+            ->andWhere('expire_time < :time:', ['time' => time()])
             ->andWhere('deleted = 0')
             ->execute();
     }

app/Repos/UserToken.php

@@ -22,6 +22,8 @@ class UserToken extends Repository
     {
         return UserTokenModel::query()
             ->where('user_id = :user_id:', ['user_id' => $userId])
+            ->andWhere('expire_time < :time:', ['time' => time()])
+            ->andWhere('deleted = 0')
             ->execute();
     }
 

app/Services/Auth/Api.php

@@ -95,7 +95,6 @@ class Api extends AuthService
         $cache = $this->getCache();
 
         foreach ($userTokens as $record) {
-            $record->delete();
             $key = $this->getTokenCacheKey($record->token);
             $cache->delete($key);
         }
@@ -111,7 +110,6 @@ class Api extends AuthService
 
         foreach ($userTokens as $record) {
             if ($record->client_type == $clientType) {
-                $record->delete();
                 $key = $this->getTokenCacheKey($record->token);
                 $cache->delete($key);
             }

app/Services/Auth/Home.php

@@ -65,7 +65,6 @@ class Home extends AuthService
         if ($records->count() == 0) return;
 
         foreach ($records as $record) {
-            $record->delete();
             $key = $this->getSessionCacheKey($record->session_id);
             $cache->delete($key);
         }

app/Validators/Account.php

@@ -184,11 +184,18 @@ class Account extends Validator
 
     public function checkIfAllowLogin(UserModel $user)
     {
-        $case1 = $user->locked == 1;
+        $locked = false;
-        $case2 = $user->lock_expiry_time > time();
 
-        if ($case1 && $case2) {
+        if ($user->locked == 1) {
-            throw new ForbiddenException('account.locked');
+            if ($user->lock_expiry_time == 0) {
+                $locked = true;
+            } elseif ($user->lock_expiry_time > time()) {
+                $locked = true;
+            }
+        }
+
+        if ($locked) {
+            throw new BadRequestException('account.locked');
         }
     }