Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/cms-service into develop

app/Repositories/CmsContentTemplateSetRepository.php

@@ -44,15 +44,22 @@ class CmsContentTemplateSetRepository
 
         $group_array['content'][0]['area_type'] = "banner";
 
-        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0])->get();
+        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0,'status'=>1])->get();
         $new_rule = [];
         foreach ($banner_rule->toArray() as $k => $v) {
-            $new_rule[$k]['id'] = $v['id'];
-            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
+//            $new_rule[$k]['id'] = $v['id'];
+//            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
+            $decode_banner = \GuzzleHttp\json_decode($v['rule'], true);
+            foreach ($decode_banner as $key=>$value){
+                $new_rule[$key]['id'] = $key;
+                $new_rule[$key]['rule'] = $value;
+                $new_rule[$key]['rule']['b_id'] = $v['id'];
+
+            }
         }
-        $group_array['content'][0]['rule'] = $new_rule;
 
-        $subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1])->get();
+        $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 = [];
         foreach ($subject_rule->toArray() as $k => $v) {
@@ -60,7 +67,7 @@ class CmsContentTemplateSetRepository
             $new_rule1[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
         }
 
-        $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2])->get();
+        $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2,'status'=>1])->get();
         $new_rule2 = [];
         foreach ($floor_rule->toArray() as $k => $v) {
             $new_rule2[$k]['id'] = $v['id'];
@@ -69,8 +76,9 @@ class CmsContentTemplateSetRepository
         foreach ($new_rule2 as $k => $v) {
             if ($v) {
                 $rules = $v['rule'];
+                $show_num = intval($rules['show_num']);
                 $show_type = $this->cmsSubject->select('show_type')->where('id', $rules['link_url'])->first();
-                $product = $this->cmsSubjectProduct->where('subject_id', $rules['link_url'])->orderBy('sort', 'asc')->get();
+                $product = $this->cmsSubjectProduct->where('subject_id', $rules['link_url'])->orderBy('sort', 'asc')->limit($show_num)->get();
                 $pro_array = $product->toArray();
                 $res_id = implode(",", array_column($pro_array, 'product_id'));
                 $new_rule2[$k]['product_id'] = $res_id;
@@ -85,7 +93,7 @@ class CmsContentTemplateSetRepository
 
         if ($request['type'] == 1) {
             $group_array['content'][1]['area_type'] = "category";
-            $category_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 3])->get();
+            $category_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 3,'status'=>1])->get();
             $new_rule3 = [];
             foreach ($category_rule->toArray() as $k => $v) {
                 $new_rule3[$k]['id'] = $v['id'];

bootstrap/app.php

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

config/database.php

@@ -0,0 +1,131 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */
+
+    'default' => env('DB_CONNECTION', 'mysql'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */
+
+    'connections' => [
+
+        'sqlite' => [
+            'driver' => 'sqlite',
+            'database' => env('DB_DATABASE', database_path('database.sqlite')),
+            'prefix' => env('DB_PREFIX', ''),
+        ],
+
+        'mysql' => [
+            'driver' => 'mysql',
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', 3306),
+            'database' => env('DB_DATABASE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => env('DB_CHARSET', 'utf8mb4'),
+            'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
+            'prefix' => env('DB_PREFIX', ''),
+            'strict' => env('DB_STRICT_MODE', true),
+            'engine' => env('DB_ENGINE', null),
+            'timezone' => env('DB_TIMEZONE', '+08:00'),
+        ],
+
+        'pgsql' => [
+            'driver' => 'pgsql',
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', 5432),
+            'database' => env('DB_DATABASE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'charset' => env('DB_CHARSET', 'utf8'),
+            'prefix' => env('DB_PREFIX', ''),
+            'schema' => env('DB_SCHEMA', 'public'),
+            'sslmode' => env('DB_SSL_MODE', 'prefer'),
+        ],
+
+        'sqlsrv' => [
+            'driver' => 'sqlsrv',
+            'host' => env('DB_HOST', 'localhost'),
+            'port' => env('DB_PORT', 1433),
+            'database' => env('DB_DATABASE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'charset' => env('DB_CHARSET', 'utf8'),
+            'prefix' => env('DB_PREFIX', ''),
+        ],
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk haven't actually been run in the database.
+    |
+    */
+
+    'migrations' => 'migrations',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */
+
+    'redis' => [
+
+        'client' => 'predis',
+
+        'cluster' => env('REDIS_CLUSTER', false),
+
+        'default' => [
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'password' => env('REDIS_PASSWORD', null),
+            'port' => env('REDIS_PORT', 6379),
+            'database' => env('REDIS_DB', 0),
+            'read_write_timeout' => 0,
+        ],
+
+        'cache' => [
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'password' => env('REDIS_PASSWORD', null),
+            'port' => env('REDIS_PORT', 6379),
+            'database' => env('REDIS_CACHE_DB', 1),
+        ],
+
+    ],
+
+];