升级与限制

app-ghs/controllers/AdminController.php

@@ -373,7 +373,11 @@ class AdminController extends BaseController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($this->shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;

app-ghs/controllers/AuthController.php

@@ -190,7 +190,11 @@ class AuthController extends PublicController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;
@@ -321,7 +325,11 @@ class AuthController extends PublicController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;
@@ -597,7 +605,11 @@ class AuthController extends PublicController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;
@@ -707,7 +719,11 @@ class AuthController extends PublicController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;

app-hd/controllers/AdminController.php

@@ -166,7 +166,11 @@ class AdminController extends BaseController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];

app-hd/controllers/ApplyController.php

@@ -260,7 +260,11 @@ class ApplyController extends BaseController
 
             $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
             if ($hdUpgrading == 1) {
-                util::fail('系统升级中，稍后再试');
+                $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+                $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+                if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                    util::fail('系统升级中，稍后再试');
+                }
             }
             $transaction->commit();
             //noticeUtil::push("花店 {$shopName} 手机号 {$mobile} 注册", '15280215347');

app-hd/controllers/AuthController.php

@@ -189,7 +189,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];
@@ -291,7 +295,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];
@@ -416,7 +424,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];
@@ -607,6 +619,7 @@ class AuthController extends PublicController
         $token = jwt::getNewToken($adminId);
         $shopAdmin->lastLogin = date("Y-m-d H:i:s");
         $shopAdmin->save();
+        $shopAdminId = $shopAdmin->id ?? 0;
 
         //是否有切换门店的权限
         $switchShop = \biz\shop\classes\ShopAdminClass::hasSwitchShopRight($shopAdmin);
@@ -616,7 +629,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];
@@ -717,7 +734,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];