Explorar o código

增加常量配置

duqinya %!s(int64=6) %!d(string=hai) anos
pai
achega
35a07c4957

+ 16 - 7
app/Repositories/CmsContentTemplateSetRepository.php

@@ -7,7 +7,6 @@ use App\Models\CmsContentTemplateSet;
 use App\Models\CmsSubjectProduct;
 use App\Models\CmsSubject;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Redis;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Tymon\JWTAuth\Facades\JWTAuth;
 
@@ -40,8 +39,8 @@ class CmsContentTemplateSetRepository
         }
 
         $group_array = [];
-        $group_key = env('REDIS_HOME_GROUP_KEY');
-        $market_key = env('REDIS_HOME_MARKET_KEY');
+        $group_key = config('constants.CMS_GROUP');
+        $market_key = config('constants.CMS_MARKET');
         //团购首页
         if ($request['type'] == 0) {
             if (Cache::has($group_key)) {
@@ -69,12 +68,15 @@ class CmsContentTemplateSetRepository
                 foreach ($decode_banner as $key=>$value){
                     $new_rule[$key]['id'] = $key;
                     $new_rule[$key]['rule'] = $value;
-                    $new_rule[$key]['rule']['b_id'] = $v['id'];
+                    $new_rule[$key]['rule']['b_id'] = strval($v['id']);
                 }
             }
         }
-
+        foreach ($new_rule as $v){
+            strval($v['rule']['link_url']);//强转link_url类型
+        }
         $group_array['content'][0]['rule'] = $new_rule;
+
         $subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1,'status'=>1])->get();
 
         $new_rule1 = [];
@@ -82,6 +84,9 @@ class CmsContentTemplateSetRepository
             $new_rule1[$k]['id'] = $v['id'];
             $new_rule1[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
         }
+        foreach ($new_rule1 as $v){
+            strval($v['rule']['link_url']);
+        }
 
         $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2,'status'=>1])->get();
         $new_rule2 = [];
@@ -89,6 +94,7 @@ class CmsContentTemplateSetRepository
             $new_rule2[$k]['id'] = $v['id'];
             $new_rule2[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
         }
+
         foreach ($new_rule2 as $k => $v) {
             if ($v) {
                 $rules = $v['rule'];
@@ -98,7 +104,7 @@ class CmsContentTemplateSetRepository
                 $pro_array = $product->toArray();
                 $res_id = implode(",", array_column($pro_array, 'product_id'));
                 $new_rule2[$k]['product_id'] = $res_id;
-                $new_rule2[$k]['subject_id'] = $rules['link_url'];
+                $new_rule2[$k]['subject_id'] = strval($rules['link_url']);
                 $new_rule2[$k]['show_type'] = $show_type->show_type ?? '';
                 unset($v['url']);
                 unset($v['show_num']);
@@ -115,6 +121,9 @@ class CmsContentTemplateSetRepository
                 $new_rule3[$k]['id'] = $v['id'];
                 $new_rule3[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
             }
+            foreach ($new_rule3 as $v){
+                strval($v['rule']['link_url']);
+            }
             $group_array['content'][1]['rule'] = $new_rule3;
             $group_array['content'][2]['area_type'] = "special";
             $group_array['content'][2]['rule'] = $new_rule1;
@@ -132,7 +141,7 @@ class CmsContentTemplateSetRepository
             $group_array['content'][2]['rule'] = $new_rule2;
 
             if (!Cache::has($group_key)) {
-                Cache::store('redis')->put($group_key, $group_array, 600);
+                Cache::store('redis')->put($group_key, $group_array, 1);
             }
         }
         return $group_array;

+ 1 - 0
bootstrap/app.php

@@ -32,6 +32,7 @@ $app->configure('jwt');
 $app->configure('customer');
 $app->configure('elasticsearch');
 $app->configure('database');
+$app->configure('constants');
 /*
 |--------------------------------------------------------------------------
 | Register Container Bindings

+ 10 - 0
config/constants.php

@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * 常量配置
+ */
+
+return [
+    'CMS_GROUP' => env('REDIS_CMS_GROUP_KEY', 'cms_shop_group'),
+    'CMS_MARKET' => env('REDIS_CMS_MARKET_KEY', 'cms_shop_market'),
+];