Merge branch 'master' into release

app/Repositories/CmsContentTemplateSetRepository.php

@@ -305,6 +305,7 @@ class CmsContentTemplateSetRepository
             $group_array['content'][$count + $key + 1]['link_type'] = $val['link_type'];
             $group_array['content'][$count + $key + 1]['rule'] = $val['rule'];
         }
+        $group_array['is_show'] = intval(config('customer.exchange_shop_is_show'));
 
 //        if (!Cache::has($exchange_key)) {
 //            Cache::store('redis')->put($exchange_key, $group_array, 600);//10分钟过期

config/customer.tpl

@@ -6,4 +6,5 @@ return [
     'app_service_url' => '{app_service_url}',
     'cms_subject_one_bgimg' => '{cms_subject_one_bgimg}',
     'cms_subject_two_bgimg' => '{cms_subject_two_bgimg}',
+    'exchange_shop_is_show' => '{exchange_shop_is_show}',
 ];

public/index.php

@@ -10,7 +10,7 @@
 | is ready to receive HTTP / Console requests from the environment.
 |
 */
-
+ini_set('molten.service_name', 'cms-service');
 $app = require __DIR__.'/../bootstrap/app.php';
 
 /*