From fb4c66319d740009ad8578c31b14afbf4faeb17a Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Mon, 31 Jul 2017 11:35:19 +0800
Subject: [PATCH] =?UTF-8?q?fecshop=E5=B1=80=E9=83=A8=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84cache=20key=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/appfront/widgets/Footer.php  | 7 ++++---
 app/appfront/widgets/Head.php    | 5 +++--
 app/appfront/widgets/Headers.php | 5 +++--
 app/appfront/widgets/Menu.php    | 7 ++++---
 app/apphtml5/widgets/Footer.php  | 9 +++++----
 app/apphtml5/widgets/Head.php    | 5 +++--
 app/apphtml5/widgets/Headers.php | 5 +++--
 app/apphtml5/widgets/Menu.php    | 7 ++++---
 8 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/appfront/widgets/Footer.php b/app/appfront/widgets/Footer.php
index 17712bbd..fc4831b1 100644
--- a/app/appfront/widgets/Footer.php
+++ b/app/appfront/widgets/Footer.php
@@ -16,8 +16,9 @@ class Footer implements BlockCache
 
     public function getCacheKey()
     {
-        $lang = Yii::$service->store->currentLangCode;
-
-        return self::BLOCK_CACHE_PREFIX.'_'.$lang;
+        $lang           = Yii::$service->store->currentLangCode;
+        $appName        = Yii::$service->helper->getAppName();
+        $cacheKeyName   = 'footer';
+        return self::BLOCK_CACHE_PREFIX.'_'.$appName.'_'.$lang.'_'.$cacheKeyName;
     }
 }
diff --git a/app/appfront/widgets/Head.php b/app/appfront/widgets/Head.php
index 09d65a62..f9a74193 100644
--- a/app/appfront/widgets/Head.php
+++ b/app/appfront/widgets/Head.php
@@ -21,7 +21,8 @@ class Head implements BlockCache
         $controllerId = Yii::$app->controller->id;
         $actionId = Yii::$app->controller->action->id;
         $urlPathKey = $moduleId.'_'.$controllerId.'_'.$actionId;
-
-        return self::BLOCK_CACHE_PREFIX.'_'.$store.'_'.$urlPathKey;
+        $appName        = Yii::$service->helper->getAppName();
+        $cacheKeyName   = 'head';
+        return self::BLOCK_CACHE_PREFIX.'_'.$store.'_'.$urlPathKey.'_'.$appName.'_'.$cacheKeyName;
     }
 }
diff --git a/app/appfront/widgets/Headers.php b/app/appfront/widgets/Headers.php
index 49d21aad..993a4b9a 100644
--- a/app/appfront/widgets/Headers.php
+++ b/app/appfront/widgets/Headers.php
@@ -30,7 +30,8 @@ class Headers implements BlockCache
     {
         $lang = Yii::$service->store->currentLangCode;
         $currency = Yii::$service->page->currency->getCurrentCurrency();
-
-        return self::BLOCK_CACHE_PREFIX.'_'.$lang.'_'.$currency;
+        $appName        = Yii::$service->helper->getAppName();
+        $cacheKeyName   = 'footer';
+        return self::BLOCK_CACHE_PREFIX.'_'.$lang.'_'.$currency.'_'.$appName.'_'.$cacheKeyName;
     }
 }
diff --git a/app/appfront/widgets/Menu.php b/app/appfront/widgets/Menu.php
index 26a32904..11c3e4c7 100644
--- a/app/appfront/widgets/Menu.php
+++ b/app/appfront/widgets/Menu.php
@@ -18,8 +18,9 @@ class Menu implements BlockCache
 
     public function getCacheKey()
     {
-        $lang = Yii::$service->store->currentLangCode;
-
-        return self::BLOCK_CACHE_PREFIX.'_'.$lang;
+        $lang           = Yii::$service->store->currentLangCode;
+        $appName        = Yii::$service->helper->getAppName();
+        $cacheKeyName   = 'menu';
+        return self::BLOCK_CACHE_PREFIX.'_'.$lang.'_'.$appName.'_'.$cacheKeyName;
     }
 }
diff --git a/app/apphtml5/widgets/Footer.php b/app/apphtml5/widgets/Footer.php
index ff0ca0a8..25cfd341 100644
--- a/app/apphtml5/widgets/Footer.php
+++ b/app/apphtml5/widgets/Footer.php
@@ -14,10 +14,11 @@ class Footer implements BlockCache
         ];
     }
 
-    public function getCacheKey()
+     public function getCacheKey()
     {
-        $lang = Yii::$service->store->currentLangCode;
-
-        return self::BLOCK_CACHE_PREFIX.'_'.$lang;
+        $lang           = Yii::$service->store->currentLangCode;
+        $appName        = Yii::$service->helper->getAppName();
+        $cacheKeyName   = 'footer';
+        return self::BLOCK_CACHE_PREFIX.'_'.$appName.'_'.$lang.'_'.$cacheKeyName;
     }
 }
diff --git a/app/apphtml5/widgets/Head.php b/app/apphtml5/widgets/Head.php
index dc06b297..303b17bf 100644
--- a/app/apphtml5/widgets/Head.php
+++ b/app/apphtml5/widgets/Head.php
@@ -21,7 +21,8 @@ class Head implements BlockCache
         $controllerId = Yii::$app->controller->id;
         $actionId = Yii::$app->controller->action->id;
         $urlPathKey = $moduleId.'_'.$controllerId.'_'.$actionId;
-
-        return self::BLOCK_CACHE_PREFIX.'_'.$store.'_'.$urlPathKey;
+        $appName        = Yii::$service->helper->getAppName();
+        $cacheKeyName   = 'head';
+        return self::BLOCK_CACHE_PREFIX.'_'.$store.'_'.$urlPathKey.'_'.$appName.'_'.$cacheKeyName;
     }
 }
diff --git a/app/apphtml5/widgets/Headers.php b/app/apphtml5/widgets/Headers.php
index 86edc381..1440df6a 100644
--- a/app/apphtml5/widgets/Headers.php
+++ b/app/apphtml5/widgets/Headers.php
@@ -30,7 +30,8 @@ class Headers implements BlockCache
     {
         $lang = Yii::$service->store->currentLangCode;
         $currency = Yii::$service->page->currency->getCurrentCurrency();
-
-        return self::BLOCK_CACHE_PREFIX.'_'.$lang.'_'.$currency;
+        $appName        = Yii::$service->helper->getAppName();
+        $cacheKeyName   = 'footer';
+        return self::BLOCK_CACHE_PREFIX.'_'.$lang.'_'.$currency.'_'.$appName.'_'.$cacheKeyName;
     }
 }
diff --git a/app/apphtml5/widgets/Menu.php b/app/apphtml5/widgets/Menu.php
index 9ade42f2..37085b1a 100644
--- a/app/apphtml5/widgets/Menu.php
+++ b/app/apphtml5/widgets/Menu.php
@@ -18,8 +18,9 @@ class Menu implements BlockCache
 
     public function getCacheKey()
     {
-        $lang = Yii::$service->store->currentLangCode;
-
-        return self::BLOCK_CACHE_PREFIX.'_'.$lang;
+        $lang           = Yii::$service->store->currentLangCode;
+        $appName        = Yii::$service->helper->getAppName();
+        $cacheKeyName   = 'menu';
+        return self::BLOCK_CACHE_PREFIX.'_'.$lang.'_'.$appName.'_'.$cacheKeyName;
     }
 }
-- 
GitLab