Merge branch 'master' into dev

app-mall/controllers/AuthController.php

@@ -159,12 +159,14 @@ class AuthController extends PublicController
             //$userId = 106904;
         }
 
-        $mallUpgrading = getenv('MALL_UPGRADING') == false ? 0 : getenv('MALL_UPGRADING');
-        if ($mallUpgrading == 1) {
-            $allowShopAdminIdsStr = getenv('MALL_UPGRADE_ALLOW_USER_IDS') ?: '';
-            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
-            if (!in_array($userId, $allowShopAdminIds)) {
-                util::fail('系统升级中，稍后再试，编号'.$userId);
+        if($userId>0){
+            $mallUpgrading = getenv('MALL_UPGRADING') == false ? 0 : getenv('MALL_UPGRADING');
+            if ($mallUpgrading == 1) {
+                $allowShopAdminIdsStr = getenv('MALL_UPGRADE_ALLOW_USER_IDS') ?: '';
+                $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+                if (!in_array($userId, $allowShopAdminIds)) {
+                    util::fail('系统升级中，稍后再试，编号'.$userId);
+                }
             }
         }
 

app-mall/controllers/UserController.php

@@ -211,12 +211,14 @@ class UserController extends BaseController
         }
         $userId = $user->id ?? 0;
 
-        $mallUpgrading = getenv('MALL_UPGRADING') == false ? 0 : getenv('MALL_UPGRADING');
-        if ($mallUpgrading == 1) {
-            $allowShopAdminIdsStr = getenv('MALL_UPGRADE_ALLOW_USER_IDS') ?: '';
-            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
-            if (!in_array($userId, $allowShopAdminIds)) {
-                util::fail('系统升级中，稍后再试，编号'.$userId);
+        if ($userId > 0) {
+            $mallUpgrading = getenv('MALL_UPGRADING') == false ? 0 : getenv('MALL_UPGRADING');
+            if ($mallUpgrading == 1) {
+                $allowShopAdminIdsStr = getenv('MALL_UPGRADE_ALLOW_USER_IDS') ?: '';
+                $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+                if (!in_array($userId, $allowShopAdminIds)) {
+                    util::fail('系统升级中，稍后再试，编号' . $userId);
+                }
             }
         }