From 831a37b9ef2acdef9ada116a0901067fdce6471f Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Thu, 21 Apr 2022 10:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96logo=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=9B=E5=A2=9E=E5=8A=A0=E7=BC=BA=E5=A4=B1=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .example.env                                          | 3 +++
 app/admin/config/admin.php                            | 6 +++++-
 app/common/service/AuthService.php                    | 4 +++-
 public/static/plugs/lay-module/layuimini/miniAdmin.js | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.example.env b/.example.env
index 7dd3876..4332ed0 100644
--- a/.example.env
+++ b/.example.env
@@ -46,3 +46,6 @@ STATIC_PATH=/static
 
 # OSS静态文件路径前缀
 OSS_STATIC_PREFIX=static_ulthon_admin
+
+# 没有节点控制的是否放行
+DEFAULT_AUTH_CHECK=false
\ No newline at end of file
diff --git a/app/admin/config/admin.php b/app/admin/config/admin.php
index eea48bc..0c5489d 100644
--- a/app/admin/config/admin.php
+++ b/app/admin/config/admin.php
@@ -10,6 +10,8 @@
 // | github开源项目：https://github.com/zhongshaofa/EasyAdmin
 // +----------------------------------------------------------------------
 
+use think\facade\Env;
+
 return [
 
     // 不需要验证登录的控制器
@@ -35,4 +37,6 @@ return [
         'login/index',
         'login/out',
     ],
-];
\ No newline at end of file
+
+    'default_auth_check' => Env::get('adminsystem.default_auth_check', false)
+];
diff --git a/app/common/service/AuthService.php b/app/common/service/AuthService.php
index 2f2c4a3..e1d29dd 100644
--- a/app/common/service/AuthService.php
+++ b/app/common/service/AuthService.php
@@ -14,6 +14,7 @@ namespace app\common\service;
 
 use app\common\constants\AdminConstant;
 use EasyAdmin\tool\CommonTool;
+use think\facade\Config;
 use think\facade\Db;
 
 /**
@@ -103,7 +104,8 @@ class AuthService
         }
         // 判断是否加入节点控制，优先获取缓存信息
         if (!isset($this->nodeList[$node])) {
-            return false;
+            
+            return Config::get('admin.default_auth_check');
         }
         $nodeInfo = $this->nodeList[$node];
         if ($nodeInfo['is_auth'] == 0) {
diff --git a/public/static/plugs/lay-module/layuimini/miniAdmin.js b/public/static/plugs/lay-module/layuimini/miniAdmin.js
index 3528300..44c19bd 100644
--- a/public/static/plugs/lay-module/layuimini/miniAdmin.js
+++ b/public/static/plugs/lay-module/layuimini/miniAdmin.js
@@ -85,7 +85,7 @@ define(["jquery", "miniMenu", "miniTheme", "miniTab"], function ($, miniMenu, mi
          */
         renderLogo: function (data) {
             var logoHtml = '';
-            if (data.image.length != 0) {
+            if (data.image) {
                 logoHtml = '<img src="' + data.image + '" alt="logo">';
             }
             var html = '<a href="' + data.href + '">' + logoHtml + '<h1>' + data.title + '</h1></a>';