test1

test2

modules/System/routes/route.php

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use Modules\System\Http\Controllers\NoticesController;
+use Modules\System\Http\Controllers\T1Controller;
 use Modules\System\Http\Controllers\NoticeTypesController;
 
 Route::prefix('system')->group(function () {
@@ -19,32 +19,32 @@ Route::prefix('system')->group(function () {
         // 通知管理
         Route::prefix('notice')->group(function(){
             // 添加通知
-            Route::post('add',[NoticesController::class, 'addNotice']);
+            Route::post('add',[T1Controller::class, 'addNotice']);
             // 通知列表
-            Route::any('list',[NoticesController::class, 'list']);
+            Route::any('list',[T1Controller::class, 'list']);
             //  删除通知
-            Route::post('del/{id}',[NoticesController::class, 'delete']);
+            Route::post('del/{id}',[T1Controller::class, 'delete']);
             //   修改通知状态
-            Route::post('enable/{id}',[NoticesController::class, 'enable']);
+            Route::post('enable/{id}',[T1Controller::class, 'enable']);
             // 获取编辑信息
-            Route::get('edit/{id}',[NoticesController::class, 'info']);
+            Route::get('edit/{id}',[T1Controller::class, 'info']);
             // 保存编辑
-            Route::post('edit/{id}',[NoticesController::class, 'edit']);
+            Route::post('edit/{id}',[T1Controller::class, 'edit']);
 
             // 不判断权限
             Route::prefix("")->group(function (){
                 // 通知对象接口
-                Route::any('obj_option',[NoticesController::class, 'objOption'])->withoutMiddleware(config('catch.route.middlewares'));
+                Route::any('obj_option',[T1Controller::class, 'objOption'])->withoutMiddleware(config('catch.route.middlewares'));
                 // 我的通知
-                Route::any('mine',[NoticesController::class, 'myNotices'])->withoutMiddleware(config('catch.route.middlewares'));
+                Route::any('mine',[T1Controller::class, 'myNotices'])->withoutMiddleware(config('catch.route.middlewares'));
                 //  已读
-                Route::get('read/{id}',[NoticesController::class, 'setRead'])->withoutMiddleware(config('catch.route.middlewares'));
+                Route::get('read/{id}',[T1Controller::class, 'setRead'])->withoutMiddleware(config('catch.route.middlewares'));
                 // 用户删除
-                Route::get('user_del/{id}',[NoticesController::class, 'userDel'])->withoutMiddleware(config('catch.route.middlewares'));
+                Route::get('user_del/{id}',[T1Controller::class, 'userDel'])->withoutMiddleware(config('catch.route.middlewares'));
                 // 查看通知信息
-                Route::any('detail/{id}',[NoticesController::class, 'detail'])->withoutMiddleware(config('catch.route.middlewares'));
+                Route::any('detail/{id}',[T1Controller::class, 'detail'])->withoutMiddleware(config('catch.route.middlewares'));
                 // 获取首页弹窗消息
-                Route::any('popup',[NoticesController::class, 'getPopup'])->withoutMiddleware(config('catch.route.middlewares'));
+                Route::any('popup',[T1Controller::class, 'getPopup'])->withoutMiddleware(config('catch.route.middlewares'));
 
             });
 

modules/T1/Exceptions/ContentBusinessException.php

@@ -0,0 +1,17 @@
+<?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/T1/Exceptions/ContentManageForbidden.php

@@ -0,0 +1,20 @@
+<?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/T1/Exceptions/Errors.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Modules\ContentManage\Exceptions;
+
+class Errors
+{
+    public const REQUEST_HTTP_STATUS_ERROR = [500001, '请求上游接口返回http状态码有误'];
+    public const REQUEST_CODE_STATUS_ERROR = [500002, '请求上游接口返回code状态码有误'];
+}

modules/T1/Http/Controllers/T1Controller.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * ${CARET}
+ * @file:NoticesController.php
+ * @Created by gnitif
+ * @Date: 2023/3/27
+ * @Time: 11:18
+ */
+
+
+namespace Modules\T1\Http\Controllers;
+
+
+use Catch\Base\CatchController as Controller;
+use Catch\Exceptions\FailedException;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Illuminate\Http\Request;
+use Modules\System\Http\Requests\NoticeRequest;
+use Modules\System\Models\NoticeTypes;
+use Modules\System\Services\Notice\NoticesService;
+
+class T1Controller extends Controller
+{
+    public function list(Request $request)
+    {
+        return ['t1', 'list'];
+    }
+
+    public function list2(Request $request)
+    {
+        return ['t2', 'list2'];
+    }
+}

modules/T1/Installer.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Modules\ContentManage;
+
+use Catch\Support\Module\Installer as ModuleInstaller;
+use Modules\ContentManage\Providers\ContentManageServiceProvider;
+
+class Installer extends ModuleInstaller
+{
+    protected function info(): array
+    {
+        // TODO: Implement info() method.
+        return [
+            'title' => '内容中台',
+            'name' => 'contentManage',
+            'path' => 'contentManage',
+            'keywords' => '内容中台',
+            'description' => '内容中台管理模块',
+            'provider' => ContentManageServiceProvider::class
+        ];
+    }
+
+    protected function requirePackages(): void
+    {
+        // TODO: Implement requirePackages() method.
+    }
+
+    protected function removePackages(): void
+    {
+        // TODO: Implement removePackages() method.
+    }
+}

modules/T1/Middlewares/ContentManageGate.php

@@ -0,0 +1,26 @@
+<?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/T1/Models/BaseModel.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Modules\System\Models;
+
+use Catch\Base\CatchModel as Model;
+use Illuminate\Database\Eloquent\Builder;
+
+
+abstract class BaseModel extends Model
+{
+
+    protected array $defaultHidden = [];
+
+    protected array $defaultCasts = [
+        'created_at' => 'datetime:Y-m-d H:i:s',
+
+        'updated_at' => 'datetime:Y-m-d H:i:s',
+    ];
+    protected $dateFormat = '';
+
+    public static function bootSoftDeletes(): void{
+
+    }
+
+
+    public function scopeActive(Builder $query): void
+    {
+        $query->where($this->table.'.is_enabled', 1);
+    }
+}

modules/T1/Models/NoticeTypes.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Modules\System\Models;
+
+
+
+class NoticeTypes extends BaseModel
+{
+    protected $table = 'notice_types';
+
+    protected $fillable = [
+        'id', 'name', 'is_deleted', 'created_at', 'updated_at', 'deleted_at',
+    ];
+
+}

modules/T1/Models/Notices.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Modules\System\Models;
+
+
+class Notices extends BaseModel
+{
+    protected $table = 'notices';
+
+    protected $fillable = [
+        'id', 'title', 'content', 'notice_type_id', "sort", 'type', 'notice_obj', 'is_popup', 'is_deleted', 'created_at', 'updated_at', 'deleted_at',
+    ];
+
+    /**
+     * @var array
+     */
+    protected array $fields = ['id', 'title', 'content', "sort", 'notice_type_id', 'type', 'notice_obj', 'is_popup', 'created_at', 'updated_at'];
+
+    /**
+     * @var array
+     */
+    protected array $form = ['title', 'content', 'notice_type_id',"sort", 'type', 'notice_obj', 'is_popup'];
+
+
+    protected $casts = ['notice_obj' => 'array'];
+
+    public array $searchable = [
+        'title' => 'like',
+        'notice_type_id' => '=',
+        'type' => '=',
+
+    ];
+
+    protected string $sortField = 'sort';
+
+
+
+    /**
+     *  添加通知
+     * @param array $data
+     * @return bool
+     * @throws \ReflectionException
+     */
+    public function storeBy(array $data): mixed
+    {
+        $result = '';
+        $this->beginTransaction();
+        try {
+            $result = $this->create($this->filterData($data));
+            if (isset($data['user_ids']) && !empty($data['user_ids'])) {
+                $this->addUserNotice($data['user_ids'], $result->id);
+            }
+            $this->commit();
+        } catch (\Exception $exception) {
+            $this->rollback();
+        }
+        return $result->id ?? 0;
+    }
+
+    private function addUserNotice(mixed $userIds, mixed $id)
+    {
+        $list = [];
+        foreach ($userIds as $val) {
+            $list[] = ['user_id' => $val, 'notice_id' => $id];
+        }
+        if (!empty($list)) {
+            UserNotice::insert($list);
+        }
+        return true;
+    }
+
+
+}

modules/T1/Models/UserNotice.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Modules\System\Models;
+
+
+class UserNotice extends BaseModel
+{
+    protected $table = 'user_notice';
+
+    protected $fillable = [
+        'id', 'user_id', 'notice_id', 'is_deleted', 'is_read', 'created_at', 'updated_at', 'deleted_at',
+    ];
+
+}

modules/T1/Providers/T1ServiceProvider.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\T1\Providers;
+
+use Catch\Providers\CatchModuleServiceProvider;
+
+class T1ServiceProvider extends CatchModuleServiceProvider
+{
+    /**
+     * middlewares
+     *
+     * @return string[]
+     */
+    protected function middlewares(): array
+    {
+       return [];
+    }
+
+    /**
+     * route path
+     *
+     * @return string|array
+     */
+    public function moduleName(): string|array
+    {
+        // TODO: Implement path() method.
+        return 't1';
+    }
+}

modules/T1/README.md

@@ -0,0 +1,10 @@
+#内容中台管理模块
+关于内容中台 相关的后台接口，对外api接口，都写在这里
+配置文件放在： config目录下，读取配置文件示例：config('contentManage.zhushuyunpublicapi.public_domain');
+config("模块名.配置文件名.配置项");
+
+数据库模型文件放在：Models 目录下面
+服务层文件放在：Services 目录下面
+控制器放在：modules/ContentManage/Http/Controllers 目录下面
+中间件放在：modules/ContentManage/Middlewares 目录下面
+路由只能现在 modules/ContentManage/rout/route.php 文件里

modules/T1/routes/route.php

@@ -0,0 +1,10 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\T1\Http\Controllers\T1Controller;
+
+Route::prefix('t1')->group(function () {
+    Route::get('list', [T1Controller::class,'list']);
+    Route::get('list2', [T1Controller::class,'list2']);
+});
+

modules/T2/Exceptions/ContentBusinessException.php

@@ -0,0 +1,17 @@
+<?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/T2/Exceptions/ContentManageForbidden.php

@@ -0,0 +1,20 @@
+<?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/T2/Exceptions/Errors.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Modules\ContentManage\Exceptions;
+
+class Errors
+{
+    public const REQUEST_HTTP_STATUS_ERROR = [500001, '请求上游接口返回http状态码有误'];
+    public const REQUEST_CODE_STATUS_ERROR = [500002, '请求上游接口返回code状态码有误'];
+}

modules/T2/Http/Controllers/T2Controller.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * ${CARET}
+ * @file:NoticesController.php
+ * @Created by gnitif
+ * @Date: 2023/3/27
+ * @Time: 11:18
+ */
+
+
+namespace Modules\T2\Http\Controllers;
+
+
+use Catch\Base\CatchController as Controller;
+
+use Illuminate\Http\Request;
+
+
+class T2Controller extends Controller
+{
+    public function list(Request $request)
+    {
+        return ['t2', 'list'];
+    }
+    public function list2(Request $request)
+    {
+        return ['t2', 'list2'];
+    }
+}

modules/T2/Http/Controllers/UserTrait.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Modules\ContentManage\Http\Controllers;
+
+use Catch\Base\CatchController;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use Modules\User\Models\User;
+
+trait UserTrait
+{
+    // 当前登录用户
+    protected $currentUser;
+
+    /**
+     * 获取当前登录用户
+     * @return User
+     */
+    protected function getCurrentUser(): User {
+        if(!$this->currentUser) {
+            $this->currentUser = $this->getLoginUser();
+        }
+        return $this->currentUser;
+    }
+    /**
+     * 当前用户的所有的角色标识的结合
+     * @return Collection
+     */
+    protected function listUserRoles():Collection {
+        return $this->getCurrentUser()->roles->pluck('identify');
+    }
+
+    /**
+     * 当前用户是否是cp角色
+     * @return bool
+     */
+    public function userIsCp():bool {
+        return $this->listUserRoles()->contains('cp');
+    }
+
+    /**
+     * 如果当前用户是cp角色,返回cp_name,否则返回null
+     * @return string
+     */
+    public function getUserCpName():string|null {
+        if($this->userIsCp()) {
+            return DB::table('user_belong_to_cp')
+                ->where([
+                    'is_enabled' => 1,
+                    'user_id' => $this->getCurrentUser()->id,
+                ])->value('cp_name');
+        } else {
+            return null;
+        }
+    }
+}

modules/T2/Installer.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Modules\ContentManage;
+
+use Catch\Support\Module\Installer as ModuleInstaller;
+use Modules\ContentManage\Providers\ContentManageServiceProvider;
+
+class Installer extends ModuleInstaller
+{
+    protected function info(): array
+    {
+        // TODO: Implement info() method.
+        return [
+            'title' => '内容中台',
+            'name' => 'contentManage',
+            'path' => 'contentManage',
+            'keywords' => '内容中台',
+            'description' => '内容中台管理模块',
+            'provider' => ContentManageServiceProvider::class
+        ];
+    }
+
+    protected function requirePackages(): void
+    {
+        // TODO: Implement requirePackages() method.
+    }
+
+    protected function removePackages(): void
+    {
+        // TODO: Implement removePackages() method.
+    }
+}

modules/T2/Middlewares/ContentManageGate.php

@@ -0,0 +1,26 @@
+<?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/T2/Models/BaseModel.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Modules\System\Models;
+
+use Catch\Base\CatchModel as Model;
+use Illuminate\Database\Eloquent\Builder;
+
+
+abstract class BaseModel extends Model
+{
+
+    protected array $defaultHidden = [];
+
+    protected array $defaultCasts = [
+        'created_at' => 'datetime:Y-m-d H:i:s',
+
+        'updated_at' => 'datetime:Y-m-d H:i:s',
+    ];
+    protected $dateFormat = '';
+
+    public static function bootSoftDeletes(): void{
+
+    }
+
+
+    public function scopeActive(Builder $query): void
+    {
+        $query->where($this->table.'.is_enabled', 1);
+    }
+}

modules/T2/Models/NoticeTypes.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Modules\System\Models;
+
+
+
+class NoticeTypes extends BaseModel
+{
+    protected $table = 'notice_types';
+
+    protected $fillable = [
+        'id', 'name', 'is_deleted', 'created_at', 'updated_at', 'deleted_at',
+    ];
+
+}

modules/T2/Models/Notices.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Modules\System\Models;
+
+
+class Notices extends BaseModel
+{
+    protected $table = 'notices';
+
+    protected $fillable = [
+        'id', 'title', 'content', 'notice_type_id', "sort", 'type', 'notice_obj', 'is_popup', 'is_deleted', 'created_at', 'updated_at', 'deleted_at',
+    ];
+
+    /**
+     * @var array
+     */
+    protected array $fields = ['id', 'title', 'content', "sort", 'notice_type_id', 'type', 'notice_obj', 'is_popup', 'created_at', 'updated_at'];
+
+    /**
+     * @var array
+     */
+    protected array $form = ['title', 'content', 'notice_type_id',"sort", 'type', 'notice_obj', 'is_popup'];
+
+
+    protected $casts = ['notice_obj' => 'array'];
+
+    public array $searchable = [
+        'title' => 'like',
+        'notice_type_id' => '=',
+        'type' => '=',
+
+    ];
+
+    protected string $sortField = 'sort';
+
+
+
+    /**
+     *  添加通知
+     * @param array $data
+     * @return bool
+     * @throws \ReflectionException
+     */
+    public function storeBy(array $data): mixed
+    {
+        $result = '';
+        $this->beginTransaction();
+        try {
+            $result = $this->create($this->filterData($data));
+            if (isset($data['user_ids']) && !empty($data['user_ids'])) {
+                $this->addUserNotice($data['user_ids'], $result->id);
+            }
+            $this->commit();
+        } catch (\Exception $exception) {
+            $this->rollback();
+        }
+        return $result->id ?? 0;
+    }
+
+    private function addUserNotice(mixed $userIds, mixed $id)
+    {
+        $list = [];
+        foreach ($userIds as $val) {
+            $list[] = ['user_id' => $val, 'notice_id' => $id];
+        }
+        if (!empty($list)) {
+            UserNotice::insert($list);
+        }
+        return true;
+    }
+
+
+}

modules/T2/Models/UserNotice.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Modules\System\Models;
+
+
+class UserNotice extends BaseModel
+{
+    protected $table = 'user_notice';
+
+    protected $fillable = [
+        'id', 'user_id', 'notice_id', 'is_deleted', 'is_read', 'created_at', 'updated_at', 'deleted_at',
+    ];
+
+}

modules/T2/Providers/T2ServiceProvider.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Modules\T2\Providers;
+
+use Catch\CatchAdmin;
+use Catch\Providers\CatchModuleServiceProvider;
+use Modules\ContentManage\Middlewares\ContentManageGate;
+
+class T2ServiceProvider extends CatchModuleServiceProvider
+{
+    /**
+     * middlewares
+     *
+     * @return string[]
+     */
+    protected function middlewares(): array
+    {
+       return [];
+    }
+
+    /**
+     * route path
+     *
+     * @return string|array
+     */
+    public function moduleName(): string|array
+    {
+        // TODO: Implement path() method.
+        return 't2';
+    }
+}

modules/T2/README.md

@@ -0,0 +1,10 @@
+#内容中台管理模块
+关于内容中台 相关的后台接口，对外api接口，都写在这里
+配置文件放在： config目录下，读取配置文件示例：config('contentManage.zhushuyunpublicapi.public_domain');
+config("模块名.配置文件名.配置项");
+
+数据库模型文件放在：Models 目录下面
+服务层文件放在：Services 目录下面
+控制器放在：modules/ContentManage/Http/Controllers 目录下面
+中间件放在：modules/ContentManage/Middlewares 目录下面
+路由只能现在 modules/ContentManage/rout/route.php 文件里

modules/T2/routes/route.php

@@ -0,0 +1,10 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\T2\Http\Controllers\T2Controller;
+
+
+Route::prefix('t2')->group(function () {
+    Route::get('list', [T2Controller::class,'list']);
+    Route::get('list', [T2Controller::class, 'list2']);
+});