升级提示

app-mall/controllers/AuthController.php

@@ -165,7 +165,7 @@ class AuthController extends PublicController
                 $allowShopAdminIdsStr = getenv('MALL_UPGRADE_ALLOW_USER_IDS') ?: '';
                 $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
                 if (!in_array($userId, $allowShopAdminIds)) {
-                    util::fail('系统升级中，稍后再试，编号'.$userId);
+                    util::fail('系统升级中，稍后再试，编号：'.$userId);
                 }
             }
         }

app-mall/controllers/HdController.php

@@ -128,7 +128,7 @@ class HdController extends BaseController
             $allowShopAdminIdsStr = getenv('MALL_UPGRADE_ALLOW_USER_IDS') ?: '';
             $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
             if (!in_array($userId, $allowShopAdminIds)) {
-                util::fail('系统升级中，稍后再试，编号'.$userId);
+                util::fail('系统升级中，稍后再试，编号：'.$userId);
             }
         }
 

app-mall/controllers/UserController.php

@@ -196,7 +196,7 @@ class UserController extends BaseController
                 $allowShopAdminIdsStr = getenv('MALL_UPGRADE_ALLOW_USER_IDS') ?: '';
                 $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
                 if (!in_array($userId, $allowShopAdminIds)) {
-                    util::fail('系统升级中，稍后再试，编号' . $userId);
+                    util::fail('系统升级中，稍后再试，编号：' . $userId);
                 }
             }
         }
@@ -220,6 +220,18 @@ class UserController extends BaseController
             CustomClass::buildRelation($this->shop, $user);
         }
         $userId = $user->id ?? 0;
+
+        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);
+                }
+            }
+        }
+
         $token = !empty($userId) ? jwt::getNewToken($userId) : '';
         $fullUser = UserClass::getById($userId, true);