增加状态码翻译

.env.dev

@@ -1,12 +1,15 @@
 APP_NAME=Laravel
+#上线时需要改成prod
 APP_ENV=local
 APP_KEY=base64:bdomFa+r6S774rRyFNeb4pCBxVe4WbuzAzk+LyP86+k=
+#上线时需要改成false
 APP_DEBUG=true
+#网站根域名
 APP_URL=http://localhost
 
 #网站主域名，不含http://www.
 TOP_DOMAIN=mietubl.com
-#分销商前端站点IP
+#分销商前端站点IP,用于提醒分销商绑定域名IP
 DIST_SITE_IP = 127.0.0.1
 
 LOG_CHANNEL=stack

app/Admin/Controllers/AuthController.php

@@ -68,9 +68,9 @@ class AuthController extends BaseAuthController
             $form->saved(function (Form $form) {
                 return $form
                     ->response()
-                    ->success(trans('admin.update_succeeded'))
+                    ->success(trans('admin.update_succeeded'));
                     //->redirect('/');
-                    ->script('location.reload();');//保存成功后刷新页面
+                    //->script('location.reload();');//保存成功后刷新页面
             });
 
         });

app/Admin/Controllers/BaseProductCategoryController.php

@@ -47,7 +47,7 @@ class BaseProductCategoryController extends AdminController
                 $filter->panel();
                 $filter->expand();
                 $filter->like('name')->width(2);
-                $filter->equal('enabled', admin_trans_label('Enabled'))->select(config('dictionary.enabled'))->width(2);
+                $filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //工具栏
             $grid->disableViewButton();

app/Admin/Controllers/BaseProductController.php

@@ -55,7 +55,7 @@ class BaseProductController extends AdminController
                 $filter->equal('sku')->width(2);
                 $filter->like('title')->width(2);
                 $filter->equal('category_id',admin_trans_label('category_name'))->select(BaseProductCategory::selectOptions())->width(2);
-                $filter->equal('enabled')->select(config('dictionary.enabled'))->width(2);
+                $filter->equal('enabled')->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //排序
             $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');
@@ -101,7 +101,7 @@ class BaseProductController extends AdminController
             })->unescape();
             $show->field('content')->unescape();
             $show->field('order');
-            $show->field('enabled')->using(config('dictionary.enabled'));
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
             $show->field('seo_title');
@@ -138,7 +138,7 @@ class BaseProductController extends AdminController
                 ->uniqueName()
                 ->accept(config('admin.upload.oss_image.accept'))
                 ->maxSize(config('admin.upload.oss_image.max_size'))
-                ->dir('images/product/'.date("Ymd"))
+                ->dir(config("admin.upload.directory.image").'/product/'.date("Ymd"))
                 ->customFormat(function ($images) {
                     // 数据格式化为数组['1.jpg','2.jpg'] 编辑时用到
                     return array_column($images, 'image_url');
@@ -156,7 +156,7 @@ class BaseProductController extends AdminController
                 $form->text('seo_title');
                 $form->text('seo_keywords');
                 $form->textarea('seo_description');
-            })->options(config('dictionary.visibility'))->default(1)->value(1);
+            })->options(admin_trans_array(config('dictionary.visibility')))->default(1)->value(1);
             //隐藏字段
             $form->ignore(['visibility']);
             //插入参数联动JS

app/Admin/Controllers/BaseProductParameterController.php

@@ -41,7 +41,7 @@ class BaseProductParameterController extends AdminController
                 $filter->panel();
                 $filter->expand();
                 $filter->equal('name')->width(2);
-                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'))->width(2);
+                $filter->equal('enabled', )->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //按钮
             $grid->disableViewButton();

app/Admin/Controllers/BaseVideoCategoryController.php

@@ -46,7 +46,7 @@ class BaseVideoCategoryController extends AdminController
                 $filter->panel();
                 $filter->expand();
                 $filter->equal('name')->width(2);
-                $filter->equal('enabled', admin_trans_label('enabled'))->select(config('dictionary.enabled'))->width(2);
+                $filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //按钮
             $grid->disableViewButton();

app/Admin/Controllers/BaseVideoController.php

@@ -54,7 +54,7 @@ class BaseVideoController extends AdminController
                 $filter->equal('sku')->width(2);
                 $filter->like('title')->width(2);
                 $filter->equal('category_id',admin_trans_label('category'))->select(BaseVideoCategory::selectOptions())->width(2);
-                $filter->equal('enabled', admin_trans_label('enabled'))->select(config('dictionary.enabled'))->width(2);
+                $filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //排序
             $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');
@@ -86,11 +86,11 @@ class BaseVideoController extends AdminController
                     'wrapped'=>true,
                     'escape'=>false,
                     'width'=>['label' => '2','field'=>'8'],
-                    'label'=>'Video Url',
+                    'label'=>admin_trans_label('video_url'),
                     'content'=>$content
                 ]);
             });
-            $show->field('video_url','Video player')->as(function ($value) {
+            $show->field('video_url',admin_trans_label('video_player'))->as(function ($value) {
                 $html = '
                 <iframe width="560" height="315" src="'.$value.'"
                         title="YouTube video player"
@@ -101,7 +101,7 @@ class BaseVideoController extends AdminController
                 return $html;
             })->unescape();
             $show->field('remark')->unescape();
-            $show->field('enabled')->using(config('dictionary.enabled'));
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
         });
@@ -125,7 +125,7 @@ class BaseVideoController extends AdminController
                 ->uniqueName()
                 ->accept(config('admin.upload.oss_image.accept'))
                 ->maxSize(config('admin.upload.oss_image.max_size'))
-                ->dir('images/video/'.date("Ymd"));//
+                ->dir(config("admin.upload.directory.image").'/video/'.date("Ymd"));//
             $form->url("video_url")->required();
             $form->editor('remark');
             $form->switch('is_pinned')->default(0);

app/Admin/Controllers/DistAdminDistributorController.php

@@ -60,7 +60,7 @@ class DistAdminDistributorController extends AdminController
                 $filter->equal('company_name', )->width(2);
                 $filter->equal('site_name')->width(2);
                 $filter->equal('domain')->width(2);
-                $filter->equal('enabled', )->select(config('dictionary.enabled'))->width(2);
+                $filter->equal('enabled', )->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             // 排序
             $grid->model()->orderBy("id",'desc');
@@ -107,7 +107,7 @@ class DistAdminDistributorController extends AdminController
             $show->field('linkedin');
             $show->field('tiktok');
             $show->field('remark');
-            $show->field('enabled')->using(config('dictionary.enabled'));
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
             // 按钮

app/Admin/Controllers/DistAdminUserController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Renderable\DistDistributorTable;
 use App\Admin\Repositories\DistAdminUser;
+use App\Models\DistAdminDistributor;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -38,8 +39,7 @@ class DistAdminUserController extends AdminController
             $grid->column('id')->sortable();
             $grid->column('username');
             $grid->column('name');
-            $grid->column('distributor.company_name',admin_trans_label('company_name'));
-            $grid->column('distributor.level_domain',admin_trans_label('level_domain'));
+            $grid->column('distributor.company_name',admin_trans_label('distributor_company_name'));
             $grid->column('language')->using(config('dictionary.languages'));
             $grid->column('enabled')->switch();
             $grid->column('created_at');
@@ -51,7 +51,7 @@ class DistAdminUserController extends AdminController
                 $filter->equal('username')->width(2);
                 $filter->equal('name',)->width(2);
                 $filter->like('distributor.company_name', admin_trans_label('company_name'))->width(2);
-                $filter->equal('enabled', )->select(config('dictionary.enabled'))->width(2);
+                $filter->equal('enabled', )->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //排序
             $grid->model()->orderBy("id",'desc');
@@ -86,10 +86,10 @@ class DistAdminUserController extends AdminController
 
 
             $show->row(function ($show) {
-                $show->width(6)->field('distributor.company_name', admin_trans_label('company_name'));
+                $show->width(6)->field('distributor.company_name', admin_trans_label('distributor_company_name'));
                 $show->width(6)->field('distributor.company_address',admin_trans_label('company_address'));
                 $show->width(6)->field('distributor.site_name',admin_trans_label('site_name'));
-                $show->width(6)->field('distributor.level_domain',admin_trans_label('level_domain'));
+             //   $show->width(6)->field('distributor.level_domain',admin_trans_label('level_domain'));
                 $show->width(6)->field('distributor.country',admin_trans_label('country'));
                 $show->width(6)->field('distributor.contact_number',admin_trans_label('contact_number'));
                 $show->width(6)->field('distributor.service_hotline',admin_trans_label('service_hotline'));
@@ -124,7 +124,8 @@ class DistAdminUserController extends AdminController
             $form->select('language')->options(config('dictionary.languages'))->required();
             $form->selectTable('dist_id', admin_trans_label('distributor'))
                 ->title('distId')
-                ->from(DistDistributorTable::make());
+                ->from(DistDistributorTable::make())
+                ->model(DistAdminDistributor::class, 'id', 'company_name');;
             $form->switch('enabled')->default(1);
             //保存前回调
             $form->saving(function (Form $form) {

app/Admin/Controllers/DistAppearanceController.php

@@ -61,7 +61,7 @@ class DistAppearanceController extends AdminController
                 $filter->panel();
                 $filter->expand();
                 $filter->equal('title')->width(2);
-                $filter->equal('enabled', )->select(config('dictionary.enabled'))->width(2);
+                $filter->equal('enabled', )->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             // 操作
             $grid->actions(function (Grid\Displayers\Actions $actions) {
@@ -90,7 +90,7 @@ class DistAppearanceController extends AdminController
                 return CommonHelper::displayImage($dataImages,100);
             })->unescape();
             $show->field('describe');
-            $show->field('enabled')->using(config('dictionary.enabled'));
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
             $show->disableDeleteButton();
@@ -113,7 +113,7 @@ class DistAppearanceController extends AdminController
                 ->uniqueName()
                 ->accept(config('admin.upload.oss_image.accept'))
                 ->maxSize(config('admin.upload.oss_image.max_size'))
-                ->dir('images/appearance/'.date("Ymd"));//
+                ->dir(config("admin.upload.directory.image").'/appearance/'.date("Ymd"));//
             $form->textarea('describe');
             $form->switch('enabled')->default(0);
             $form->saving(function (Form $form) {

app/Admin/Controllers/DistInquiryController.php

@@ -45,11 +45,11 @@ class DistInquiryController extends AdminController
             $grid->column('consulting_products');
             //$grid->column('distributor.username', 'Distributor Username');
             $grid->column('distributor.company_name', admin_trans_label('distributor_company_name'));
-            $grid->column('status')->using(config('dictionary.inquiryStatus'))->label([
+            $grid->column('status')->using(admin_trans_array(config('dictionary.inquiryStatus')))->label([
                 0 => 'default',
                 1 => 'info',
                 2 => 'success',
-            ])->filter(Grid\Column\Filter\In::make(config('dictionary.inquiryStatus')));
+            ])->filter(Grid\Column\Filter\In::make(admin_trans_array(config('dictionary.inquiryStatus'))));
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
             //筛选
@@ -97,7 +97,7 @@ class DistInquiryController extends AdminController
             $show->field('distributor.company_name',admin_trans_label('distributor_company_name'));
             $show->field('content');
             $show->field('ip_address');
-            $show->field('status')->using(config('dictionary.inquiryStatus'));
+            $show->field('status')->using(admin_trans_array(config('dictionary.inquiryStatus')));
             $show->field('created_at');
             $show->field('updated_at');
             //按钮

app/Admin/routes.php

@@ -39,3 +39,16 @@ Route::group([
     //模板变量
     $router->resource('dist-template-var', 'DistAppearanceVariableController');
 });
+
+/*
+ * 重写上传路由，修改tinymce上传路径
+ */
+$attributes = [
+    'prefix'     => admin_base_path('dcat-api'),
+    'middleware' => config('admin.route.middleware'),
+    'as'         => 'dcat-api.',
+];
+app('router')->group($attributes, function ($router) {
+    $router->post('editor-md/upload', function () {exit;})->name('editor-md.upload');
+    $router->post('tinymce/upload', 'App\Http\Controllers\TinymceController@upload')->name('tinymce.upload');
+});

app/Distributor/Controllers/AuthController.php

@@ -134,9 +134,9 @@ class AuthController extends BaseAuthController
             $form->saved(function (Form $form) {
                 return $form
                     ->response()
-                    ->success(trans('admin.update_succeeded'))
+                    ->success(trans('admin.update_succeeded'));
                     //->redirect('/');
-                    ->script('location.reload();');//保存成功后刷新页面
+                   // ->script('location.reload();');//保存成功后刷新页面
             });
 
 //            // 在从数据库中取出记录时，如果 language 为空，则默认给它一个值

app/Distributor/Controllers/DistInquiryController.php

@@ -46,7 +46,7 @@ class DistInquiryController extends AdminDistController
             $grid->column('consulting_products');
             //$grid->column('distributor.username', 'Distributor Username');
             //$grid->column('distributor.company_name', admin_trans_label('distributor_company_name'));
-            $grid->column('status')->using(config('dictionary.inquiryStatus'))->label([
+            $grid->column('status')->using(admin_trans_array(config('dictionary.inquiryStatus')))->label([
                 0 => 'default',
                 1 => 'info',
                 2 => 'success',
@@ -54,7 +54,7 @@ class DistInquiryController extends AdminDistController
            // $grid->column('created_at')->sortable();
             //筛选
             $grid->filter(function (Grid\Filter $filter) {
-                $inquiryStatus = config('dictionary.inquiryStatus');
+                $inquiryStatus = admin_trans_array(config('dictionary.inquiryStatus'));
                 unset($inquiryStatus[0]);
                 $filter->panel();
                 $filter->expand();

app/Distributor/Controllers/DistProductCategoryController.php

@@ -101,7 +101,7 @@ class DistProductCategoryController extends AdminDistController
                 $form->text('seo_keywords');
                 $form->textarea('seo_description');
                 $form->text('slug',admin_trans_label('url_and_handle'))->width(9, 2)->prepend(getSiteDomain().config('dictionary.site_url.product_category').'/');
-            })->options(config('dictionary.visibility'))->default(1)->value(1);
+            })->options(admin_trans_array(config('dictionary.visibility')))->default(1)->value(1);
             //隐藏字段
             $form->hidden('dist_id'); // 隐藏dist_id字段,用于保存
             $form->ignore(['visibility']);

app/Distributor/Controllers/DistProductController.php

@@ -71,7 +71,7 @@ class DistProductController extends AdminDistController
                 $filter->like('title')->width(2);
                 $filter->equal('sku')->width(2);
                 $filter->equal('category_id',admin_trans_label('category'))->select(DistProductCategory::selectOptions())->width(2);;
-                $filter->equal('enabled', admin_trans_label('enabled'))->select(array_map('admin_trans_label', config('dictionary.enabled')))->width(2);;
+                $filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array( config('dictionary.enabled')))->width(2);;
             });
             //排序
             $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');
@@ -130,7 +130,7 @@ class DistProductController extends AdminDistController
             })->unescape();
             $show->field('content')->unescape();
             $show->field('order');
-            $show->field('enabled')->using(config('dictionary.enabled'));
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
             $show->field('seo_title');
@@ -169,7 +169,7 @@ class DistProductController extends AdminDistController
                 ->uniqueName()
                 ->accept(config('distributor.upload.oss_image.accept'))
                 ->maxSize(config('distributor.upload.oss_image.max_size'))
-                ->dir('dist_images/product/'.date("Ymd"))
+                ->dir(config("distributor.upload.directory.image").'/product/'.date("Ymd"))
                 ->customFormat(function () {
                     // 数据格式化为数组['1.jpg','2.jpg'] 编辑时用到
                     return array_column($this->images, 'image_url');
@@ -188,7 +188,7 @@ class DistProductController extends AdminDistController
                 $form->text('seo_keywords');
                 $form->textarea('seo_description');
                 $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.products').'/');
-            })->options(config('dictionary.visibility'))->default(1)->value(1);
+            })->options(admin_trans_array(config('dictionary.visibility')))->default(1)->value(1);
             //隐藏字段
             $form->hidden('dist_id'); // 隐藏dist_id字段,用于保存
             $form->ignore(['visibility']);

app/Distributor/Controllers/DistVideoCategoryController.php

@@ -70,7 +70,7 @@ class DistVideoCategoryController extends AdminDistController
                 $form->text('seo_keywords');
                 $form->textarea('seo_description');
                 $form->text('slug',admin_trans_label('url_and_handle'))->width(9, 2)->prepend(getSiteDomain().config('dictionary.site_url.video_category').'/');
-            })->options(config('dictionary.visibility'))->default(1)->value(1);
+            })->options(admin_trans_array(config('dictionary.visibility')))->default(1)->value(1);
             //隐藏
             $form->hidden('dist_id'); // 隐藏dist_id字段,用于保存
             $form->ignore(['visibility']);

app/Distributor/Controllers/DistVideoController.php

@@ -60,7 +60,7 @@ class DistVideoController extends AdminDistController
                 $filter->equal('sku')->width(2);
                 $filter->like('title')->width(2);
                 $filter->equal('category_id',admin_trans_label('category'))->select(DistVideoCategory::selectOptions())->width(2);
-                $filter->equal('enabled', admin_trans_label('enabled'))->select(array_map('admin_trans_label', config('dictionary.enabled')))->width(2);
+                $filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array( config('dictionary.enabled')))->width(2);
 
 
             });
@@ -95,11 +95,11 @@ class DistVideoController extends AdminDistController
                     'wrapped'=>true,
                     'escape'=>false,
                     'width'=>['label' => '2','field'=>'8'],
-                    'label'=>'Video Url',
+                    'label'=>admin_trans_label('video_url'),
                     'content'=>$content
                 ]);
             });
-            $show->field('video_url','Video player')->as(function ($value) {
+            $show->field('video_url',admin_trans_label('video_player'))->as(function ($value) {
                 $html = '
                 <iframe width="560" height="315" src="'.$value.'"
                         title="YouTube video player"
@@ -110,7 +110,7 @@ class DistVideoController extends AdminDistController
                 return $html;
             })->unescape();
             $show->field('remark')->unescape();
-            $show->field('enabled')->using(config('dictionary.enabled'));
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
             // SEO
@@ -139,9 +139,9 @@ class DistVideoController extends AdminDistController
             $form->image("cover_image", admin_trans_label('cover_image'))
                 ->autoUpload()
                 ->uniqueName()
-                ->accept(config('admin.upload.oss_image.accept'))
-                ->maxSize(config('admin.upload.oss_image.max_size'))
-                ->dir('images/video/'.date("Ymd"));//
+                ->accept(config('distributor.upload.oss_image.accept'))
+                ->maxSize(config('distributor.upload.oss_image.max_size'))
+                ->dir(config("distributor.upload.directory.image").'/video/'.date("Ymd"));//
             $form->url("video_url", admin_trans_label('video_url'))->required();
             $form->editor('remark');
             $form->switch('is_pinned')->default(0);
@@ -152,7 +152,7 @@ class DistVideoController extends AdminDistController
                 $form->text('seo_keywords');
                 $form->textarea('seo_description');
                 $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.video').'/');
-            })->options(config('dictionary.visibility'))->default(1)->value(1);
+            })->options(admin_trans_array(config('dictionary.visibility')))->default(1)->value(1);
             //
             $form->hidden('dist_id'); // 隐藏dist_id字段,用于保存
             $form->ignore(['visibility']);

app/Distributor/Controllers/ImportProductController.php

@@ -74,7 +74,7 @@ class ImportProductController extends AdminDistController
                 $filter->equal('sku')->width(2);
                 $filter->like('title')->width(2);
                 $filter->equal('category_id',admin_trans_label('category'))->select(BaseProductCategory::selectOptions())->width(2);
-                //$filter->equal('enabled', admin_trans_label('enabled'))->select(array_map('admin_trans_label', config('dictionary.enabled')))->width(2);
+                //$filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array( config('dictionary.enabled')))->width(2);
             });
             //$grid->column('order');
            //$grid->column('enabled');

app/Distributor/Controllers/SitePagesController.php

@@ -58,7 +58,7 @@ class SitePagesController extends AdminDistController
                 return $date;
             });
             //状态
-            $grid->column('status')->using(config('dictionary.pages_status'));
+            $grid->column('status')->using(admin_trans_array(config('dictionary.pages_status')));
             $grid->column('updated_at')->sortable();
             $grid->column('created_at');
             $grid->filter(function (Grid\Filter $filter) {
@@ -99,7 +99,7 @@ class SitePagesController extends AdminDistController
                 return CommonHelper::displayImage($dataImages,150);
             })->unescape();
             $show->field('content')->unescape();
-            $show->field('status')->using(config('dictionary.pages_status'));
+            $show->field('status')->using(admin_trans_array(config('dictionary.pages_status')));
             $show->field('created_at');
             $show->field('updated_at');
             $show->field('seo_title');
@@ -133,9 +133,9 @@ class SitePagesController extends AdminDistController
             $form->image("cover_image")
                 ->autoUpload()
                 ->uniqueName()
-                ->accept(config('admin.upload.oss_image.accept'))
-                ->maxSize(config('admin.upload.oss_image.max_size'))
-                ->dir('images/pages/'.date("Ymd"));
+                ->accept(config('distributor.upload.oss_image.accept'))
+                ->maxSize(config('distributor.upload.oss_image.max_size'))
+                ->dir(config("distributor.upload.directory.image").'/pages/'.date("Ymd"));
             $form->editor('content')->required();
             $form->switch('status',admin_trans_label('publish'))->default(1);
             //SEO
@@ -144,7 +144,7 @@ class SitePagesController extends AdminDistController
                 $form->text('seo_keywords');
                 $form->textarea('seo_description');
                 $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.pages').'/');
-            })->options(config('dictionary.visibility'))->default(1)->value(1);
+            })->options(admin_trans_array(config('dictionary.visibility')))->default(1)->value(1);
             //隐藏字段
             $form->hidden('dist_id',);
             $form->ignore(['visibility']);

app/Distributor/routes.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Distributor\Controllers\SiteMenuController;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 use Dcat\Admin\Admin;
@@ -55,9 +55,19 @@ Route::group([
     $router->get('api/pages', 'ApiController@pages');
     $router->get('api/tag', 'ApiController@tag');
     $router->get('api/generate-slug', 'ApiController@generateSlug');
-});
-
-
 
+});
 
 
+/*
+ * 重写上传路由，修改tinymce上传路径
+ */
+$attributes = [
+    'prefix'     => admin_base_path('dcat-api'),
+    'middleware' => config('admin.route.middleware'),
+    'as'         => 'dcat-api.',
+];
+app('router')->group($attributes, function ($router) {
+    $router->post('editor-md/upload', function () {exit;})->name('editor-md.upload');
+    $router->post('tinymce/upload', 'App\Http\Controllers\TinymceController@upload')->name('tinymce.upload');
+});

app/Http/Controllers/TinymceController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class TinymceController
+{
+    public function upload(Request $request)
+    {
+        $file = $request->file('file');
+       // $dir = trim($request->get('dir'), '/');
+        $disk = $this->disk();
+
+        //定死上传目录
+        $dir = config("admin.upload.tinymce_directory.image").'/'.date('Ymd').'/';
+        if (empty($dir)) {
+            die('dir error');
+        }
+        //定死上传目录 end
+
+        $newName = $this->generateNewName($file);
+
+        $disk->putFileAs($dir, $file, $newName);
+
+        return ['location' => $disk->url("{$dir}/$newName")];
+    }
+
+    protected function generateNewName(UploadedFile $file)
+    {
+        return uniqid(md5($file->getClientOriginalName())).'.'.$file->getClientOriginalExtension();
+    }
+
+    /**
+     * @return \Illuminate\Contracts\Filesystem\Filesystem|FilesystemAdapter
+     */
+    protected function disk()
+    {
+        $disk = request()->get('disk') ?: config('admin.upload.disk');
+
+        return Storage::disk($disk);
+    }
+}

app/helpers.php

@@ -198,5 +198,13 @@ if (!function_exists('generateRandomString')) {
     }
 }
 
-
+//翻译数组
+if (!function_exists('admin_trans_array')) {
+    function admin_trans_array($array) {
+        array_walk($array, function(&$value, $key) {
+            $value = admin_trans_label($value);
+        });
+        return $array;
+    }
+}
 

config/admin.php

@@ -278,6 +278,10 @@ return [
             'image' => 'images',
             'file'  => 'files',
         ],
+        //editor tinyMCE上传路径
+        'tinymce_directory' => [
+            'image' => 'uploads/images',
+        ],
 
         'oss_image' => [
             'accept' => 'jpg,png,gif,jpeg,webp',//允许上传的文件类型

config/dictionary.php

@@ -31,7 +31,7 @@ return [
     ],
     //询价状态
     'inquiryStatus' => [
-        '0' => 'New',
+        '0' => 'new',
         '1' => 'processing',
         '2' => 'processed',
     ],
@@ -49,13 +49,13 @@ return [
     ],
     //文章状态
     'pages_status' => [
-        '0' => 'Draft',
-        '1' => 'Published',
+        '0' => 'draft',
+        '1' => 'published',
     ],
     //
     'visibility' => [
-        '1' => 'Visible',
-        '0' => 'Hidden',
+        '1' => 'visible',
+        '0' => 'hidden',
     ],
     //站点URL配置
     'site_url' => [

config/distributor.php

@@ -268,6 +268,10 @@ return [
             'file'  => 'dist_files',
         ],
 
+        'tinymce_directory' => [
+            'image' => 'uploads/images',
+        ],
+
         'oss_image' => [
             'accept' => 'jpg,png,gif,jpeg,webp',//允许上传的文件类型
             'max_size' => 10240, // 上传文件大小限制，单位B

lang/zh_CN/global.php

@@ -125,6 +125,14 @@ return [
         'tags'                  => '标签',
         'url_and_handle'        => 'URL地址',
         'url_repeated'          => 'URL地址重复了，请检查',
+        'visible'               => '可见',
+        'hidden'                => '隐藏',
+        'draft'                 => '草稿',
+        'published'             => '已发布',
+        'video_player'          => '视频播放器',
+        'new'                  => '等待处理',
+        'processing'           => '处理中',
+        'processed'            => '已处理',
     ],
     'options' => [
         //