Merge branch 'wzq-sj' into test

modules/Callback/Installer.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Modules\ContentManage;
+namespace Modules\Callback;
 
 use Catch\Support\Module\Installer as ModuleInstaller;
-use Modules\ContentManage\Providers\ContentManageServiceProvider;
+use Modules\Callback\Providers\CallbackServiceProvider;
 
 class Installer extends ModuleInstaller
 {
@@ -11,12 +11,12 @@ class Installer extends ModuleInstaller
     {
         // TODO: Implement info() method.
         return [
-            'title' => '内容中台',
-            'name' => 'contentManage',
-            'path' => 'contentManage',
-            'keywords' => '内容中台',
-            'description' => '内容中台管理模块',
-            'provider' => ContentManageServiceProvider::class
+            'title' => '回传管理',
+            'name' => 'callback',
+            'path' => 'callback',
+            'keywords' => '回传管理',
+            'description' => '回传管理管理模块',
+            'provider' => CallbackServiceProvider::class
         ];
     }
 

modules/Channel/Installer.php

@@ -14,8 +14,8 @@ class Installer extends ModuleInstaller
             'title' => '渠道管理',
             'name' => 'channel',
             'path' => 'channel',
-            'keywords' => '内容中台',
-            'description' => '内容中台管理模块',
+            'keywords' => '渠道管理',
+            'description' => '渠道管理模块',
             'provider' => ChannelServiceProvider::class
         ];
     }

modules/Channel/Middlewares/ContentManageGate.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Modules\ContentManage\Middlewares;
-
-use Illuminate\Http\Request;
-use Modules\ContentManage\Exceptions\PermissionForbidden;
-use Modules\User\Models\User;
-
-class ContentManageGate
-{
-    public function handle(Request $request, \Closure $next)
-    {
-        if ($request->isMethod('get')) {
-            return $next($request);
-        }
-
-        /* @var User $user */
-        $user = $request->user(getGuardName());
-
-        if (! $user->can()) {
-            throw new PermissionForbidden();
-        }
-
-        return $next($request);
-    }
-}

modules/Channel/Services/Notice/NoitceTypeService.php

@@ -11,7 +11,7 @@
 namespace Modules\System\Services\Notice;
 
 use Illuminate\Support\Facades\DB;
-use Modules\ContentManage\Models\NoticeTypes;
+use Modules\System\Models\NoticeTypes;
 
 class NoitceTypeService
 {

modules/CpManage/Models/Cp/Cps.php

@@ -13,7 +13,7 @@ namespace Modules\CpManage\Models\Cp;
 use Catch\Exceptions\FailedException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
-use Modules\ContentManage\Services\CpManage\CpService;
+use Modules\CpManage\Services\CpManage\CpService;
 
 class Cps extends Model
 {

modules/Manage/Installer.php

@@ -16,7 +16,7 @@ class Installer extends ModuleInstaller
             'path' => 'manage',
             'keywords' => '',
             'description' => '',
-            'provider' => ContentManageServiceProvider::class
+            'provider' => ManageServiceProvider::class
         ];
     }
 

modules/System/Exceptions/ContentBusinessException.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Modules\ContentManage\Exceptions;
-
-use Throwable;
-
-class ContentBusinessException extends \RuntimeException
-{
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
-
-    public static function throwError($error, Throwable $previous = null) {
-        throw (new static($error[1], $error[0], $previous));
-    }
-}

modules/System/Exceptions/ContentManageForbidden.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Modules\ContentManage\Exceptions;
-
-use Catch\Enums\Code;
-use Catch\Exceptions\CatchException;
-use Symfony\Component\HttpFoundation\Response;
-
-class ContentManageForbidden extends CatchException
-{
-    protected $message = 'permission forbidden';
-
-    protected $code = Code::PERMISSION_FORBIDDEN;
-
-
-    public function statusCode(): int
-    {
-        return Response::HTTP_FORBIDDEN;
-    }
-}

modules/System/Exceptions/Errors.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\ContentManage\Exceptions;
+namespace Modules\System\Exceptions;
 
 class Errors
 {

modules/System/Installer.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Modules\ContentManage;
+namespace Modules\System;
 
 use Catch\Support\Module\Installer as ModuleInstaller;
-use Modules\ContentManage\Providers\ContentManageServiceProvider;
+use Modules\System\Providers\SystemServiceProvider;
 
 class Installer extends ModuleInstaller
 {
@@ -11,12 +11,12 @@ class Installer extends ModuleInstaller
     {
         // TODO: Implement info() method.
         return [
-            'title' => '内容中台',
-            'name' => 'contentManage',
-            'path' => 'contentManage',
-            'keywords' => '内容中台',
-            'description' => '内容中台管理模块',
-            'provider' => ContentManageServiceProvider::class
+            'title' => '系统管理',
+            'name' => 'system',
+            'path' => 'system',
+            'keywords' => '系统管理',
+            'description' => '系统管理管理模块',
+            'provider' => SystemServiceProvider::class
         ];
     }
 

modules/System/Middlewares/ContentManageGate.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Modules\ContentManage\Middlewares;
-
-use Illuminate\Http\Request;
-use Modules\ContentManage\Exceptions\PermissionForbidden;
-use Modules\User\Models\User;
-
-class ContentManageGate
-{
-    public function handle(Request $request, \Closure $next)
-    {
-        if ($request->isMethod('get')) {
-            return $next($request);
-        }
-
-        /* @var User $user */
-        $user = $request->user(getGuardName());
-
-        if (! $user->can()) {
-            throw new PermissionForbidden();
-        }
-
-        return $next($request);
-    }
-}

modules/System/Providers/SystemServiceProvider.php

@@ -4,7 +4,7 @@ namespace Modules\System\Providers;
 
 use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
-use Modules\ContentManage\Middlewares\ContentManageGate;
+use Modules\System\Middlewares\SystemGate;
 
 class SystemServiceProvider extends CatchModuleServiceProvider
 {

modules/Tuiguang/Installer.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Modules\ContentManage;
+namespace Modules\Tuiguang;
 
 use Catch\Support\Module\Installer as ModuleInstaller;
-use Modules\ContentManage\Providers\ContentManageServiceProvider;
+use Modules\ContentManage\Providers\TuiguangServiceProvider;
 
 class Installer extends ModuleInstaller
 {
@@ -11,12 +11,12 @@ class Installer extends ModuleInstaller
     {
         // TODO: Implement info() method.
         return [
-            'title' => '内容中台',
-            'name' => 'contentManage',
-            'path' => 'contentManage',
-            'keywords' => '内容中台',
-            'description' => '内容中台管理模块',
-            'provider' => ContentManageServiceProvider::class
+            'title' => '推广管理',
+            'name' => 'tuiguang',
+            'path' => 'tuiguang',
+            'keywords' => '推广管理',
+            'description' => '推广管理模块',
+            'provider' => TuiguangServiceProvider::class
         ];
     }
 

modules/Video/Exceptions/ContentBusinessException.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Modules\ContentManage\Exceptions;
-
-use Throwable;
-
-class ContentBusinessException extends \RuntimeException
-{
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
-
-    public static function throwError($error, Throwable $previous = null) {
-        throw (new static($error[1], $error[0], $previous));
-    }
-}

modules/Video/Exceptions/ContentManageForbidden.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Modules\ContentManage\Exceptions;
-
-use Catch\Enums\Code;
-use Catch\Exceptions\CatchException;
-use Symfony\Component\HttpFoundation\Response;
-
-class ContentManageForbidden extends CatchException
-{
-    protected $message = 'permission forbidden';
-
-    protected $code = Code::PERMISSION_FORBIDDEN;
-
-
-    public function statusCode(): int
-    {
-        return Response::HTTP_FORBIDDEN;
-    }
-}

modules/Video/Exceptions/Errors.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\ContentManage\Exceptions;
+namespace Modules\Video\Exceptions;
 
 class Errors
 {

modules/Video/Installer.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Modules\ContentManage;
+namespace Modules\Video;
 
 use Catch\Support\Module\Installer as ModuleInstaller;
-use Modules\ContentManage\Providers\ContentManageServiceProvider;
+use Modules\Video\Providers\VideoServiceProvider;
 
 class Installer extends ModuleInstaller
 {
@@ -11,12 +11,12 @@ class Installer extends ModuleInstaller
     {
         // TODO: Implement info() method.
         return [
-            'title' => '内容中台',
-            'name' => 'contentManage',
-            'path' => 'contentManage',
-            'keywords' => '内容中台',
-            'description' => '内容中台管理模块',
-            'provider' => ContentManageServiceProvider::class
+            'title' => '视频管理',
+            'name' => 'video',
+            'path' => 'video',
+            'keywords' => '视频管理',
+            'description' => '视频管理模块',
+            'provider' => VideoServiceProvider::class
         ];
     }
 

modules/Video/Providers/VideoServiceProvider.php

@@ -4,7 +4,6 @@ namespace Modules\Video\Providers;
 
 use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
-use Modules\ContentManage\Middlewares\ContentManageGate;
 
 class VideoServiceProvider extends CatchModuleServiceProvider
 {