Browse Source

修改消息提醒

liaofei 3 years ago
parent
commit
3f3c003b13
2 changed files with 9 additions and 3 deletions
  1. 7 3
      crmeb/app/services/system/admin/SystemAdminServices.php
  2. 2 0
      crmeb/config/app.php

+ 7 - 3
crmeb/app/services/system/admin/SystemAdminServices.php

@@ -21,6 +21,7 @@ use app\dao\system\admin\SystemAdminDao;
 use app\services\system\SystemMenusServices;
 use crmeb\services\FormBuilder;
 use crmeb\services\workerman\ChannelService;
+use think\facade\Config;
 use think\facade\Event;
 
 /**
@@ -95,7 +96,10 @@ class SystemAdminServices extends BaseServices
         /** @var SystemMenusServices $services */
         $services = app()->make(SystemMenusServices::class);
         [$menus, $uniqueAuth] = $services->getMenusList($adminInfo->roles, (int)$adminInfo['level']);
-        [$queue, $timer] = Event::until('admin.login', [$key]);
+        $remind = Config::get('app.console_remind', false);
+        if ($remind) {
+            [$queue, $timer] = Event::until('admin.login', [$key]);
+        }
         return [
             'token' => $tokenInfo['token'],
             'expires_time' => $tokenInfo['params']['exp'],
@@ -110,8 +114,8 @@ class SystemAdminServices extends BaseServices
             'logo_square' => sys_config('site_logo_square'),
             'version' => get_crmeb_version(),
             'newOrderAudioLink' => get_file_link(sys_config('new_order_audio_link', '')),
-            'queue' => $queue,
-            'timer' => $timer
+            'queue' => $queue ?? false,
+            'timer' => $timer ?? false
         ];
     }
 

+ 2 - 0
crmeb/config/app.php

@@ -44,4 +44,6 @@ return [
     'error_message'    => '页面错误!请稍后再试~',
     // 显示错误信息
     'show_error_msg'   => false,
+    // 命令开启提醒
+    'console_remind'   => true
 ];