Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into develop

app/Admin/Controllers/LanzuServiceSpeakerController.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\LanzuServiceSpeaker;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+
+class LanzuServiceSpeakerController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new LanzuServiceSpeaker(), function (Grid $grid) {
+            $grid->id->sortable();
+            $grid->device_name;
+            $grid->store_id;
+
+            $grid->created_at;
+            $grid->updated_at->sortable();
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new LanzuServiceSpeaker(), function (Show $show) {
+            $show->id;
+            $show->created_at;
+            $show->updated_at;
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new LanzuServiceSpeaker(), function (Form $form) {
+            $form->display('id');
+
+            $form->display('created_at');
+            $form->display('updated_at');
+        });
+    }
+}

app/Admin/Repositories/LanzuServiceSpeaker.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\LanzuServiceSpeaker as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class LanzuServiceSpeaker extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/Admin/routes.php

@@ -13,5 +13,6 @@ Route::group([
 ], function (Router $router) {
 
     $router->get('/', 'HomeController@index');
+    $router->resource('/speaker', 'LanzuServiceSpeakerController');
 
 });

app/Models/BaseModel.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BaseModel extends Model
+{
+    protected $connection = 'mysql_no_prefix';
+}

app/Models/LanzuServiceSpeaker.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LanzuServiceSpeaker extends Model
+{
+	use HasDateTimeFormatter;
+    protected $table = 'lanzu_service_speakers';
+
+}

config/admin.php

@@ -314,7 +314,7 @@ return [
     */
     'layout' => [
         // indigo, blue, blue-light, blue-dark, green
-        'color' => 'indigo',
+        'color' => 'green',
 
         'body_class' => '',
 

config/app.php

@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'Asia/Shanghai',
 
     /*
     |--------------------------------------------------------------------------
@@ -80,7 +80,7 @@ return [
     |
     */
 
-    'locale' => 'en',
+    'locale' => 'zh-cn',
 
     /*
     |--------------------------------------------------------------------------

config/database.php

@@ -54,7 +54,27 @@ return [
             'unix_socket' => env('DB_SOCKET', ''),
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
-            'prefix' => 'mp_',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+
+        'mysql_no_prefix' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            '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' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
             'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,