Merge branch 'liuzj-fist-page-dev' into test

# Conflicts:
#	modules/Manage/Http/Controllers/MiniprogramController.php

modules/Channel/Http/Controllers/OrdersController.php

@@ -11,11 +11,9 @@ namespace Modules\Channel\Http\Controllers;
 
 use Catch\Base\CatchController;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use Modules\Channel\Models\UserHasMiniprograms;
 use Modules\Channel\Services\Order\OrderService;
 use Modules\User\Http\Controllers\UserTrait;
-use Modules\User\Models\User;
 
 class OrdersController extends CatchController
 {

modules/Channel/Http/Controllers/PayTemplateController.php

@@ -3,20 +3,20 @@
 namespace Modules\Channel\Http\Controllers;
 
 use Carbon\Carbon;
-use Illuminate\Http\Request;
 use Catch\Base\CatchController;
-use Modules\Common\Errors\Errors;
+use Illuminate\Http\Request;
+use Modules\Channel\Exceptions\ChannelBusinessException;
 use Modules\Channel\Models\PayProduct;
 use Modules\Channel\Models\PayTemplate;
 use Modules\Channel\Models\PayTemplateItem;
-use Modules\Channel\Exceptions\ChannelBusinessException;
 use Modules\Channel\Services\User\UserService;
+use Modules\Common\Errors\Errors;
 
 class PayTemplateController extends CatchController
 {
     public function __construct(protected readonly PayTemplate $payTemplate,protected readonly PayTemplateItem $payTemplateItem,protected readonly PayProduct $payProduct)
     {
-        
+
     }
 
 
@@ -41,7 +41,7 @@ class PayTemplateController extends CatchController
             'uid','=',$uid
         ]];
         if($name){
-            $where[] = ['name','like','%'.$name.'%']; 
+            $where[] = ['name','like','%'.$name.'%'];
         }
         return $this->payTemplate->orderBy('id','desc')->where($where)->paginate(20);
     }
@@ -117,7 +117,7 @@ class PayTemplateController extends CatchController
             $data[] = [
                 'pay_template_id'=>$pay_template_info->id,'pay_product_id'=>$product_info->id,
                 'is_first_pay'=>$option['type'] == 'FIRST_COIN' ?1:0,'is_default'=>$option['price'] == $default_optioin ?1:0,
-                'status'=>1,'sequence'=>$option['sequence'],'created_at'=>Carbon::now(),'updated_at'=>Carbon::now()  
+                'status'=>1,'sequence'=>$option['sequence'],'created_at'=>Carbon::now(),'updated_at'=>Carbon::now()
             ];
         }
 
@@ -151,7 +151,7 @@ class PayTemplateController extends CatchController
         ->get();
         $type_list = collect($this->optionTypeList());
         foreach($pay_template_item as $item){
-            
+
             if($item->type == 'COIN' && $item->is_first_pay == 1){
                 $item->type == 'FIRST_COIN';
             }
@@ -162,7 +162,7 @@ class PayTemplateController extends CatchController
                 $item->charge_coin = $item->type_name;
             }
 
-            
+
             $item->sequence_text = $this->sequence_map[$item->sequence];
             $item->default_text = $item->is_default? '默认项':"非默认项";
         }
@@ -247,7 +247,7 @@ class PayTemplateController extends CatchController
                     $type = 'COIN';
                 }
                 $product_info = $this->getPayProduct($option['price'], $type,$option['given']);
-            
+
                 $pay_template_item = $this->payTemplateItem->where('pay_template_id',$id)->where('pay_product_id',$product_info->id)->first();
                 if($pay_template_item){
                     $pay_template_item->status = 1;
@@ -259,7 +259,7 @@ class PayTemplateController extends CatchController
                     $data = [
                         'pay_template_id'=>$id,'pay_product_id'=>$product_info->id,
                         'is_first_pay'=>$option['type'] == 'FIRST_COIN' ?1:0,'is_default'=>$option['price'] == $default_optioin ?1:0,
-                        'status'=>1,'sequence'=>$option['sequence'],'created_at'=>Carbon::now(),'updated_at'=>Carbon::now()  
+                        'status'=>1,'sequence'=>$option['sequence'],'created_at'=>Carbon::now(),'updated_at'=>Carbon::now()
                     ];
                     $this->payTemplateItem->insert($data);
                 }
@@ -298,7 +298,7 @@ class PayTemplateController extends CatchController
         }
         $product_info = $this->getPayProduct($price,$type,$given);
         if($info->pay_product_id == $product_info->id){
-            $info->is_first_pay = $is_first_pay; 
+            $info->is_first_pay = $is_first_pay;
             $info->is_default = $is_default;
             $info->save();
         }else{
@@ -307,7 +307,7 @@ class PayTemplateController extends CatchController
             $data = [
                 'pay_template_id'=>$info->pay_template_id,'pay_product_id'=>$product_info->id,
                 'is_first_pay'=>$is_first_pay,'is_default'=>$is_default,
-                'status'=>1,'sequence'=>$sequence,'created_at'=>Carbon::now(),'updated_at'=>Carbon::now()  
+                'status'=>1,'sequence'=>$sequence,'created_at'=>Carbon::now(),'updated_at'=>Carbon::now()
             ];
             $this->payTemplateItem->insert($data);
         }

modules/Channel/Http/Controllers/UserMiniprogramController.php

@@ -4,9 +4,9 @@ namespace Modules\Channel\Http\Controllers;
 
 use Catch\Base\CatchController;
 use Illuminate\Http\Request;
-use Modules\User\Models\User;
-use Modules\Channel\Models\UserHasMiniprograms;
 use Log;
+use Modules\Channel\Models\UserHasMiniprograms;
+use Modules\User\Models\User;
 
 class UserMiniprogramController extends CatchController
 {

modules/Channel/Http/Controllers/WechatMinprogramUserController.php

@@ -10,8 +10,8 @@
 namespace Modules\Channel\Http\Controllers;
 
 use Catch\Base\CatchController;
-use Illuminate\Http\Request;
 use Catch\Exceptions\FailedException;
+use Illuminate\Http\Request;
 use Modules\Channel\Services\WechatMinprogram\WechatMinprogramUserService;
 use Modules\User\Http\Controllers\UserTrait;
 

modules/Channel/Models/PayTemplate.php

@@ -2,15 +2,13 @@
 
 namespace Modules\Channel\Models;
 
-use Catch\Base\CatchModel as Model;
-
 
 class PayTemplate extends BaseModel
 {
     protected $table = 'pay_templates';
 
     protected $fillable = [
-        'id', 'name', 'uid','status', 'created_at', 'updated_at', 
+        'id', 'name', 'uid','status', 'created_at', 'updated_at',
     ];
 
 }

modules/Channel/Models/PayTemplateItem.php

@@ -2,15 +2,13 @@
 
 namespace Modules\Channel\Models;
 
-use Catch\Base\CatchModel as Model;
-
 
 class PayTemplateItem extends BaseModel
 {
     protected $table = 'pay_template_items';
 
     protected $fillable = [
-        'id', 'pay_template_id', 'pay_product_id', 'is_first_pay', 'is_default', 'status', 'sequence', 'created_at', 'updated_at', 
+        'id', 'pay_template_id', 'pay_product_id', 'is_first_pay', 'is_default', 'status', 'sequence', 'created_at', 'updated_at',
     ];
 
 }

modules/Channel/Services/Notice/NoitceTypeService.php

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

modules/Channel/Services/Notice/NoticesService.php

@@ -14,11 +14,10 @@ use Catch\Exceptions\FailedException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Modules\Permissions\Models\Roles;
 use Modules\System\Models\Notices;
 use Modules\System\Models\UserNotice;
-use Modules\Permissions\Models\Roles;
 use Modules\User\Models\User;
-use PharIo\Manifest\Author;
 
 class NoticesService
 {

modules/Common/Errors/Errors.php

@@ -27,4 +27,5 @@ class Errors
     public const  BANK_CARD_STATUS_ERROR = [500202, '银行卡不存在或当前状态不可提现'];
     public const  TIXIAN_RECORD_NOT_EXISTS = [500203, '提现记录不存在'];
     public const  TIXIAN_ONLY_ONCE_EVERY_DAY = [500204, '每天只能提现一次'];
+    public const  OPERATION_FIRST_PAGE_LIST_NOT_EXISTS = [500301, '首页列表配置项不存在'];
 }

modules/Common/Http/Controllers/ModuleController.php

@@ -5,7 +5,6 @@ namespace Modules\Common\Http\Controllers;
 use Catch\Base\CatchController;
 use Illuminate\Http\Request;
 use Modules\Common\Repository\Options\Modules;
-use Modules\User\Models\User;
 
 class ModuleController extends CatchController
 {

modules/Common/Providers/CommonServiceProvider.php

@@ -2,12 +2,8 @@
 
 namespace Modules\Common\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 use Modules\Common\Support\Trace\TraceContext;
-use Modules\User\Events\Login;
-use Modules\User\Listeners\Login as LoginListener;
-use Modules\User\Middlewares\OperatingMiddleware;
 
 class CommonServiceProvider extends CatchModuleServiceProvider
 {

modules/Common/Repository/Options/CommonParams.php

@@ -21,6 +21,10 @@ class CommonParams implements OptionInterface
              * 小程序类型
              */
             'miniprogramType' => $commonConfig['miniprogramType'],
+            /**
+             * 首页列表类型
+             */
+            'firstPageListType' => $commonConfig['firstPageListType'],
         ];
     }
 }

modules/Common/Support/Upload/Uploader.php

@@ -3,8 +3,8 @@
 namespace Modules\Common\Support\Upload;
 
 use Catch\Exceptions\FailedException;
-use Modules\Common\Support\Upload\Uses\LocalUpload;
 use Illuminate\Http\UploadedFile;
+use Modules\Common\Support\Upload\Uses\LocalUpload;
 
 class Uploader
 {

modules/Common/config/common.php

@@ -47,4 +47,17 @@ return [
             'val' => '抖音'
         ]
     ],
+    /**
+     * 首页列表分类
+     */
+    'firstPageListType' => [
+        [
+            'label' => '本周精选',
+            'val' => 1
+        ],
+        [
+            'label' => '优选好剧',
+            'val' => 2
+        ],
+    ],
 ];

modules/CpManage/Models/Cp/Cps.php

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

modules/CpManage/Providers/CpManageServiceProvider.php

@@ -4,7 +4,6 @@ namespace Modules\CpManage\Providers;
 
 
 use Catch\Providers\CatchModuleServiceProvider;
-use Modules\CpManage\Middlewares\CpManageGate;
 
 class CpManageServiceProvider extends CatchModuleServiceProvider
 {

modules/Develop/Http/Controllers/ModuleController.php

@@ -3,14 +3,12 @@
 namespace Modules\Develop\Http\Controllers;
 
 use Catch\Base\CatchController;
-use Catch\CatchAdmin;
 use Catch\Contracts\ModuleRepositoryInterface;
 use Catch\Exceptions\FailedException;
 use Catch\Support\Module\ModuleRepository;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Storage;
-use Modules\Develop\Support\Generate\Module;
 use Modules\Develop\Support\ModuleInstall;
 
 class ModuleController extends CatchController

modules/Develop/Models/Schemas.php

@@ -7,8 +7,8 @@ use Catch\Enums\Status;
 use Exception;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
-use Modules\Develop\Support\Generate\Create\Schema;
 use Illuminate\Support\Facades\Schema as SchemaFacade;
+use Modules\Develop\Support\Generate\Create\Schema;
 
 class Schemas extends CatchModel
 {

modules/Develop/Providers/DevelopServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\Develop\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Events\Module\Created;
 use Catch\Events\Module\Deleted;
 use Catch\Providers\CatchModuleServiceProvider;

modules/Develop/Support/Generate/Create/Model.php

@@ -14,11 +14,11 @@ declare(strict_types=1);
 namespace Modules\Develop\Support\Generate\Create;
 
 use Catch\CatchAdmin;
+use Illuminate\Database\Eloquent\Model as EloquentModel;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Schema as SchemaFacade;
 use Illuminate\Support\Str;
-use Illuminate\Database\Eloquent\Model as EloquentModel;
 
 class Model extends Creator
 {

modules/Develop/Support/Generate/Create/Schema.php

@@ -17,8 +17,8 @@ use Catch\CatchAdmin;
 use Exception;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\File;
-use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Schema as MigrationSchema;
+use Illuminate\Support\Str;
 
 /**
  * schema

modules/Develop/database/migrations/Schemas.php

@@ -1,8 +1,8 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class () extends Migration {
     public function up()

modules/Develop/routes/route.php

@@ -1,8 +1,8 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use Modules\Develop\Http\Controllers\ModuleController;
 use Modules\Develop\Http\Controllers\GenerateController;
+use Modules\Develop\Http\Controllers\ModuleController;
 use Modules\Develop\Http\Controllers\SchemaController;
 
 Route::apiResource('module', ModuleController::class);

modules/Develop/views/generate/components/codeGen.vue

@@ -55,12 +55,13 @@
   </el-card>
 </template>
 <script lang="ts" setup>
-import { watch, onMounted, reactive, ref } from 'vue'
-import { useGenerateStore } from './store'
-import type { FormInstance } from 'element-plus'
+import {onMounted, reactive, ref} from 'vue'
+import {useGenerateStore} from './store'
+import type {FormInstance} from 'element-plus'
 import http from '/admin/support/http'
 import Structure from './structure.vue'
-import { useRouter } from 'vue-router'
+import {useRouter} from 'vue-router'
+
 const generateStore = useGenerateStore()
 const gen = reactive(generateStore.getCodeGen)
 

modules/Develop/views/generate/components/store.ts

@@ -1,4 +1,4 @@
-import { defineStore } from 'pinia'
+import {defineStore} from 'pinia'
 
 /**
  * 表结构信息

modules/Develop/views/generate/components/structure.vue

@@ -53,9 +53,9 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { computed } from 'vue'
-import { useGenerateStore } from './store'
-import { Delete } from '@element-plus/icons-vue'
+import {computed} from 'vue'
+import {useGenerateStore} from './store'
+import {Delete} from '@element-plus/icons-vue'
 
 const generateStore = useGenerateStore()
 

modules/Develop/views/generate/index.vue

@@ -4,7 +4,4 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref } from 'vue'
-
-import CodeGen from './components/codeGen.vue'
-</script>
+import CodeGen from './components/codeGen.vue'</script>

modules/Develop/views/module/create.vue

@@ -45,10 +45,10 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
+import {useCreate} from '/admin/composables/curd/useCreate'
+import {useShow} from '/admin/composables/curd/useShow'
 
-import { onMounted } from 'vue'
+import {onMounted} from 'vue'
 
 const props = defineProps({
   primary: String | Number,

modules/Develop/views/module/index.vue

@@ -47,12 +47,12 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
+import {computed, onMounted, ref} from 'vue'
 import Create from './create.vue'
 import Install from './install.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
+import {useGetList} from '/admin/composables/curd/useGetList'
+import {useDestroy} from '/admin/composables/curd/useDestroy'
+import {useOpen} from '/admin/composables/curd/useOpen'
 
 const api = 'module'
 

modules/Develop/views/module/install.vue

@@ -41,10 +41,10 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
+import {useCreate} from '/admin/composables/curd/useCreate'
 
-import { onMounted } from 'vue'
-import { Code } from '/admin/enum/app'
+import {onMounted} from 'vue'
+import {Code} from '/admin/enum/app'
 import Message from '/admin/support/message'
 
 const { formData, form, loading, submitForm, close } = useCreate('module/install')

modules/Develop/views/router.ts

@@ -1,4 +1,4 @@
-import { RouteRecordRaw } from 'vue-router'
+import {RouteRecordRaw} from 'vue-router'
 
 // @ts-ignore
 const router: RouteRecordRaw[] = [

modules/Develop/views/schema/create.vue

@@ -5,10 +5,10 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, watch } from 'vue'
+import {ref, watch} from 'vue'
 import Schema from './steps/schema.vue'
 import Structure from './steps/structure.vue'
-import { useSchemaStore } from './store'
+import {useSchemaStore} from './store'
 
 const schemaStore = useSchemaStore()
 

modules/Develop/views/schema/index.vue

@@ -52,12 +52,12 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
+import {computed, onMounted, ref} from 'vue'
 import Create from './create.vue'
 import Show from './show.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
+import {useGetList} from '/admin/composables/curd/useGetList'
+import {useDestroy} from '/admin/composables/curd/useDestroy'
+import {useOpen} from '/admin/composables/curd/useOpen'
 
 const schemaVisible = ref<boolean>(false)
 

modules/Develop/views/schema/show.vue

@@ -16,7 +16,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useShow } from '/admin/composables/curd/useShow'
+import {useShow} from '/admin/composables/curd/useShow'
+
 const props = defineProps({
   id: {
     type: Number,

modules/Develop/views/schema/steps/schema.vue

@@ -66,9 +66,9 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { reactive, computed, ref, unref } from 'vue'
-import { useSchemaStore } from '../store'
-import type { FormInstance } from 'element-plus'
+import {computed, ref, unref} from 'vue'
+import {useSchemaStore} from '../store'
+import type {FormInstance} from 'element-plus'
 
 const schemaStore = useSchemaStore()
 schemaStore.start()

modules/Develop/views/schema/steps/structure.vue

@@ -88,13 +88,13 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { computed, onMounted, Ref, ref } from 'vue'
-import { useSchemaStore, Structure } from '../store'
-import { Delete, Plus, Edit } from '@element-plus/icons-vue'
-import type { FormInstance } from 'element-plus'
+import {computed, onMounted, Ref, ref} from 'vue'
+import {Structure, useSchemaStore} from '../store'
+import {Delete, Edit, Plus} from '@element-plus/icons-vue'
+import type {FormInstance} from 'element-plus'
 import Message from '/admin/support/message'
 import http from '/admin/support/http'
-import { Code } from '/admin/enum/app'
+import {Code} from '/admin/enum/app'
 import Sortable from 'sortablejs'
 
 const schemaStore = useSchemaStore()

modules/Develop/views/schema/store/index.ts

@@ -1,4 +1,4 @@
-import { defineStore } from 'pinia'
+import {defineStore} from 'pinia'
 
 /**
  * 表信息

modules/Jiesuan/Http/Controllers/VerifyBankInfoController.php

@@ -10,8 +10,6 @@
 namespace Modules\Jiesuan\Http\Controllers;
 
 use Catch\Base\CatchController;
-
-use Catch\Exceptions\FailedException;
 use Illuminate\Http\Request;
 use Modules\Jiesuan\Http\Requests\VerifyCheckRequest;
 use Modules\Jiesuan\Services\BusinessmanService;
@@ -44,7 +42,7 @@ class VerifyBankInfoController extends CatchController
 
     public function check(VerifyCheckRequest $request)
     {
-       
+
         $param = [
             'status' => $request->input('status'),
             'checked_user' => [

modules/Jiesuan/Providers/JiesuanServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\Jiesuan\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 
 class JiesuanServiceProvider extends CatchModuleServiceProvider

modules/Jiesuan/routes/route.php

@@ -4,7 +4,6 @@ use Illuminate\Support\Facades\Route;
 use Modules\Jiesuan\Http\Controllers\BankAccountController;
 use Modules\Jiesuan\Http\Controllers\FinanceCheckController;
 use Modules\Jiesuan\Http\Controllers\JiesuanController;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions\F;
 
 
 Route::prefix('jiesuanManage')->group(function () {

modules/Manage/Http/Controllers/MiniprogramController.php

@@ -6,16 +6,16 @@ use Catch\Exceptions\FailedException;
 use Illuminate\Routing\Controller;
 use Catch\Base\CatchController;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Modules\Channel\Exceptions\ChannelBusinessException;
+use Modules\Channel\Models\UserHasMiniprograms;
+use Modules\Channel\Services\User\UserService;
+use Modules\Common\Errors\Errors;
 use Modules\Manage\Enmus\MiniprogramType;
 use Modules\Manage\Http\Requests\MiniprogramRequest;
 use Modules\Manage\Http\Requests\MiniprogramUpdateRequest;
 use Modules\Manage\Models\Miniprogram;
-use Modules\Channel\Models\UserHasMiniprograms;
-use Illuminate\Support\Facades\DB;
 use Modules\User\Http\Controllers\UserTrait;
-use Modules\Common\Errors\Errors;
-use Modules\Channel\Exceptions\ChannelBusinessException;
-use Modules\Channel\Services\User\UserService;
 
 
 class MiniprogramController extends CatchController
@@ -68,6 +68,7 @@ class MiniprogramController extends CatchController
             ->select('miniprogram.*')
             ->paginate($page_size);
         }
+
         foreach($result as $item){
             $item->type_name = MiniprogramType::from($item->type)->name();
             $item->status_name = $item->status == 1 ?'启用':'禁用';

modules/Manage/Http/Requests/MiniprogramRequest.php

@@ -3,8 +3,8 @@
 namespace Modules\Manage\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Modules\Manage\Enmus\MiniprogramType;
 use Illuminate\Validation\Rule;
+use Modules\Manage\Enmus\MiniprogramType;
 
 class MiniprogramRequest extends FormRequest
 {

modules/Manage/Http/Requests/MiniprogramUpdateRequest.php

@@ -3,8 +3,8 @@
 namespace Modules\Manage\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Modules\Manage\Enmus\MiniprogramType;
 use Illuminate\Validation\Rule;
+use Modules\Manage\Enmus\MiniprogramType;
 
 class MiniprogramUpdateRequest extends FormRequest
 {

modules/Manage/Providers/ManageServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\Manage\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 
 class ManageServiceProvider extends CatchModuleServiceProvider

modules/Manage/routes/route.php

@@ -1,7 +1,6 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-
 use Modules\Manage\Http\Controllers\MiniprogramController;
 use Modules\Manage\Http\Controllers\PayConfigController;
 

modules/Operation/Http/Controllers/FirstPageController.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace Modules\Operation\Http\Controllers;
+
+use Catch\Base\CatchController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Modules\Common\Errors\Errors;
+use Modules\Common\Exceptions\CommonBusinessException;
+use Modules\User\Http\Controllers\UserTrait;
+
+class FirstPageController extends CatchController
+{
+    use ValidatesRequests;
+    use UserTrait;
+
+    /**
+     *  首页列表
+     */
+    public function list(Request $request) {
+        $firstPageListTypeMap = collect(config('common.common.firstPageListType'))->keyBy('val')->toArray();
+        $result = DB::table('first_pages')
+            ->orderBy('id', 'desc')
+            ->paginate($request->input('limit', 15));
+        foreach ($result as $item) {
+            $item->type_str = $firstPageListTypeMap[$item->type]['label'] ?? '';
+            $item->duanjus = collect(\json_decode($item->duanjus, true))->sortBy('sort');
+        }
+        return $result;
+    }
+
+    /**
+     * 添加配置
+     * @param Request $request
+     * @return string
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function add(Request $request) {
+        $this->validate($request, [
+            'type' => 'required|in:1,2',
+            'status' => 'required|in:0,1'
+        ]);
+
+        $now = date('Y-m-d H:i:s');
+        if(1 == $request->input('status')) {
+            DB::table('first_pages')
+                ->where('type', $request->input('type'))
+                ->update(['status' => 0, 'updated_at' => $now]);
+        }
+
+        DB::table('first_pages')
+            ->insert([
+                'type' => $request->input('type'),
+                'status' => $request->input('status'),
+                'created_at' => $now,
+                'updated_at' => $now,
+            ]);
+        return 'ok';
+    }
+
+    /**
+     * 开启配置,一个列表类型中只允许一个配置开启
+     * @param Request $request
+     * @return string
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function enableStatus(Request $request) {
+        $this->validate($request, ['id' => 'required']);
+        $info = DB::table('first_pages')
+            ->where('id', $request->input('id'))
+            ->first();
+        if(!$info) {
+            CommonBusinessException::throwError(Errors::OPERATION_FIRST_PAGE_LIST_NOT_EXISTS);
+        }
+
+        $now = date('Y-m-d H:i:s');
+        DB::table('first_pages')
+            ->where('type', $info->type)
+            ->update(['status' => 0, 'updated_at' => $now]);
+        DB::table('first_pages')
+            ->where('id', $request->input('id'))
+            ->update(['status' => 1, 'updated_at' => $now]);
+        return 'ok';
+    }
+
+    /**
+     * 配置剧集
+     * @param Request $request
+     * @return string
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function setConfig(Request $request) {
+        $this->validate($request, [
+            'id' => 'required',
+            'duanjus' => 'nullable|array',
+        ]);
+
+        $now = date('Y-m-d H:i:s');
+        DB::table('first_pages')
+            ->where('id', $request->input('id'))
+            ->update(['duanjus' => \json_encode($request->input('duanjus', [])),
+                'updated_at' => $now]);
+
+        return 'ok';
+    }
+}
+

modules/Operation/Installer.php

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

modules/Operation/Providers/OperationServiceProvider.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Operation\Providers;
+
+use Catch\Providers\CatchModuleServiceProvider;
+
+class OperationServiceProvider 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 'operation';
+    }
+}

modules/Operation/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/Operation/routes/route.php

@@ -0,0 +1,14 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Operation\Http\Controllers\FirstPageController;
+
+Route::prefix('operationManage')->group(function () {
+    Route::prefix('firstPage')->group(function(){
+        Route::post('add', [FirstPageController::class, 'add']);
+        Route::post('enableStatus', [FirstPageController::class, 'enableStatus']);
+        Route::post('setConfig', [FirstPageController::class, 'setConfig']);
+        Route::get('list', [FirstPageController::class, 'list']);
+    });
+});
+

modules/OrderRefund/Providers/OrderRefundServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\OrderRefund\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 
 class OrderRefundServiceProvider extends CatchModuleServiceProvider

modules/OrderRefund/Services/RefundOrderService.php

@@ -10,7 +10,6 @@
 namespace Modules\OrderRefund\Services;
 
 use App\Libs\Pay\Palmpay;
-use Catch\Exceptions\FailedException;
 use Illuminate\Support\Facades\DB;
 use Modules\Channel\Services\Order\OrderService;
 use Modules\Manage\Models\Miniprogram;

modules/Payment/Providers/PaymentServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\Payment\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 
 class PaymentServiceProvider extends CatchModuleServiceProvider

modules/Permissions/Http/Controllers/DepartmentsController.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Modules\Permissions\Http\Controllers;
 
 use Catch\Base\CatchController as Controller;
-use Modules\Permissions\Models\Departments;
 use Illuminate\Http\Request;
+use Modules\Permissions\Models\Departments;
 
 class DepartmentsController extends Controller
 {

modules/Permissions/Http/Controllers/JobsController.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Modules\Permissions\Http\Controllers;
 
 use Catch\Base\CatchController as Controller;
-use Modules\Permissions\Models\Jobs;
 use Illuminate\Http\Request;
+use Modules\Permissions\Models\Jobs;
 
 class JobsController extends Controller
 {

modules/Permissions/Http/Controllers/PermissionsController.php

@@ -7,9 +7,9 @@ namespace Modules\Permissions\Http\Controllers;
 use Catch\Base\CatchController as Controller;
 use Catch\Exceptions\FailedException;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 use Modules\Permissions\Enums\MenuType;
 use Modules\Permissions\Models\Permissions;
-use Illuminate\Http\Request;
 
 class PermissionsController extends Controller
 {

modules/Permissions/Http/Controllers/RolesController.php

@@ -7,8 +7,8 @@ namespace Modules\Permissions\Http\Controllers;
 use Catch\Base\CatchController as Controller;
 use Catch\Exceptions\FailedException;
 use Modules\Permissions\Enums\DataRange;
-use Modules\Permissions\Models\Roles;
 use Modules\Permissions\Http\Requests\RoleRequest;
+use Modules\Permissions\Models\Roles;
 
 class RolesController extends Controller
 {

modules/Permissions/Middlewares/RoleCheck.php

@@ -3,11 +3,8 @@
 namespace Modules\Permissions\Middlewares;
 
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Route;
 use Modules\Common\Errors\Errors;
 use Modules\Common\Exceptions\CommonBusinessException;
-use Modules\Jiesuan\Http\Controllers\FinanceCheckController;
-use Modules\Permissions\Exceptions\PermissionForbidden;
 use Modules\User\Models\User;
 
 /**

modules/Permissions/Models/Traits/DataRange.php

@@ -5,9 +5,9 @@ namespace Modules\Permissions\Models\Traits;
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
+use Modules\Permissions\Enums\DataRange as DataRangeEnum;
 use Modules\Permissions\Models\Departments;
 use Modules\Permissions\Models\Roles;
-use Modules\Permissions\Enums\DataRange as DataRangeEnum;
 
 trait DataRange
 {

modules/Permissions/Providers/PermissionsServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\Permissions\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 use Modules\Permissions\Middlewares\PermissionGate;
 

modules/Permissions/database/seeder/PermissionsMenusSeeder.php

@@ -1,6 +1,5 @@
 <?php
 
-use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 
 return new class extends Seeder

modules/Permissions/routes/route.php

@@ -1,10 +1,10 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use Modules\Permissions\Http\Controllers\RolesController;
-use Modules\Permissions\Http\Controllers\JobsController;
 use Modules\Permissions\Http\Controllers\DepartmentsController;
+use Modules\Permissions\Http\Controllers\JobsController;
 use Modules\Permissions\Http\Controllers\PermissionsController;
+use Modules\Permissions\Http\Controllers\RolesController;
 
 Route::prefix('permissions')->group(function () {
     Route::apiResource('roles', RolesController::class);

modules/Permissions/views/departments/form/create.vue

@@ -25,10 +25,10 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
+import {useCreate} from '/admin/composables/curd/useCreate'
+import {useShow} from '/admin/composables/curd/useShow'
 import http from '/admin/support/http'
-import { onMounted, ref, unref } from 'vue'
+import {onMounted, ref, unref} from 'vue'
 
 const props = defineProps({
   primary: String | Number,

modules/Permissions/views/departments/index.vue

@@ -34,11 +34,11 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted } from 'vue'
+import {computed, onMounted} from 'vue'
 import Create from './form/create.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
+import {useGetList} from '/admin/composables/curd/useGetList'
+import {useDestroy} from '/admin/composables/curd/useDestroy'
+import {useOpen} from '/admin/composables/curd/useOpen'
 
 const api = 'permissions/departments'
 

modules/Permissions/views/jobs/form/create.vue

@@ -24,10 +24,10 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
+import {useCreate} from '/admin/composables/curd/useCreate'
+import {useShow} from '/admin/composables/curd/useShow'
 
-import { onMounted } from 'vue'
+import {onMounted} from 'vue'
 
 const props = defineProps({
   primary: String | Number,

modules/Permissions/views/jobs/index.vue

@@ -36,11 +36,11 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted } from 'vue'
+import {computed, onMounted} from 'vue'
 import Create from './form/create.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
+import {useGetList} from '/admin/composables/curd/useGetList'
+import {useDestroy} from '/admin/composables/curd/useDestroy'
+import {useOpen} from '/admin/composables/curd/useOpen'
 
 const api = 'permissions/jobs'
 

modules/Permissions/views/permissions/form/create.vue

@@ -99,12 +99,12 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
-import { useOpen } from '/admin/composables/curd/useOpen'
-import { onMounted, ref, watch } from 'vue'
+import {useCreate} from '/admin/composables/curd/useCreate'
+import {useShow} from '/admin/composables/curd/useShow'
+import {useOpen} from '/admin/composables/curd/useOpen'
+import {onMounted, ref, watch} from 'vue'
 import http from '/admin/support/http'
-import { MenuType } from '/admin/enum/app'
+import {MenuType} from '/admin/enum/app'
 
 const props = defineProps({
   primary: String | Number,

modules/Permissions/views/permissions/index.vue

@@ -51,12 +51,12 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
+import {computed, onMounted, ref} from 'vue'
 import Create from './form/create.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
-import { MenuType } from '/admin/enum/app'
+import {useGetList} from '/admin/composables/curd/useGetList'
+import {useDestroy} from '/admin/composables/curd/useDestroy'
+import {useOpen} from '/admin/composables/curd/useOpen'
+import {MenuType} from '/admin/enum/app'
 import http from '../../../../resources/admin/support/http'
 
 const api = 'permissions/permissions'

modules/Permissions/views/roles/form/create.vue

@@ -86,9 +86,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
-import { nextTick, onMounted, ref, unref, watch } from 'vue'
+import {useCreate} from '/admin/composables/curd/useCreate'
+import {useShow} from '/admin/composables/curd/useShow'
+import {nextTick, onMounted, ref, unref, watch} from 'vue'
 import http from '/admin/support/http'
 
 const props = defineProps({

modules/Permissions/views/roles/index.vue

@@ -31,11 +31,11 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
+import {computed, onMounted, ref} from 'vue'
 import Create from './form/create.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
+import {useGetList} from '/admin/composables/curd/useGetList'
+import {useDestroy} from '/admin/composables/curd/useDestroy'
+import {useOpen} from '/admin/composables/curd/useOpen'
 
 const api = 'permissions/roles'
 

modules/System/Http/Controllers/NoticeTypesController.php

@@ -11,7 +11,6 @@
 namespace Modules\System\Http\Controllers;
 
 use Catch\Base\CatchController as Controller;
-
 use Illuminate\Http\Request;
 use Modules\System\Http\Requests\NoticeTypeRequest;
 use Modules\System\Services\Notice\NoitceTypeService;

modules/System/Providers/SystemServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\System\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 use Modules\System\Middlewares\SystemGate;
 

modules/System/Services/Notice/NoitceTypeService.php

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

modules/System/Services/Notice/NoticesService.php

@@ -14,11 +14,10 @@ use Catch\Exceptions\FailedException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Modules\Permissions\Models\Roles;
 use Modules\System\Models\Notices;
 use Modules\System\Models\UserNotice;
-use Modules\Permissions\Models\Roles;
 use Modules\User\Models\User;
-use PharIo\Manifest\Author;
 
 class NoticesService
 {

modules/Tuiguang/routes/route.php

@@ -1,7 +1,6 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use Modules\Callback\Http\Controllers\JuliangAccountController;
 use Modules\Tuiguang\Http\Controllers\PromotionController;
 
 Route::prefix('tuiguang')->group(function () {

modules/User/Http/Controllers/UserController.php

@@ -8,7 +8,6 @@ use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Modules\Common\Repository\Options\Modules;
 use Modules\User\Models\LogLogin;
 use Modules\User\Models\LogOperate;
 use Modules\User\Models\User;

modules/User/Listeners/Login.php

@@ -4,12 +4,10 @@ namespace Modules\User\Listeners;
 
 use Catch\Enums\Status;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 use Illuminate\Support\Stringable;
 use Modules\User\Events\Login as Event;
 use Modules\User\Models\LogLogin;
-use Modules\User\Models\User;
 
 class Login
 {
@@ -32,7 +30,7 @@ class Login
             $event->user->save();
         }
     }
-    
+
     /**
      * login log
      *

modules/User/Middlewares/OperatingMiddleware.php

@@ -4,8 +4,8 @@ namespace Modules\User\Middlewares;
 
 use Closure;
 use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Modules\User\Models\LogOperate;
+use Symfony\Component\HttpFoundation\Response;
 
 class OperatingMiddleware
 {

modules/User/Models/LogOperate.php

@@ -11,7 +11,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Route;
 use Symfony\Component\HttpFoundation\Response;
 
 class LogOperate extends Model

modules/User/Models/Traits/UserRelations.php

@@ -7,7 +7,6 @@ use Catch\Support\Module\ModuleRepository;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Str;
 use Modules\Permissions\Models\Permissions;
 
 trait UserRelations

modules/User/Models/User.php

@@ -3,6 +3,7 @@
 namespace Modules\User\Models;
 
 use Catch\Base\CatchModel as Model;
+use Illuminate\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Laravel\Sanctum\HasApiTokens;
@@ -10,7 +11,6 @@ use Modules\Channel\Exceptions\ChannelBusinessException;
 use Modules\Common\Errors\Errors;
 use Modules\Common\Repository\Options\Modules;
 use Modules\User\Models\Traits\UserRelations;
-use Illuminate\Auth\Authenticatable;
 
 /**
  * @property int $id

modules/User/Providers/UserServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\User\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 use Modules\User\Events\Login;
 use Modules\User\Listeners\Login as LoginListener;

modules/User/views/router.ts

@@ -1,4 +1,4 @@
-import { RouteRecordRaw } from 'vue-router'
+import {RouteRecordRaw} from 'vue-router'
 
 // @ts-ignore
 const router: RouteRecordRaw[] = [

modules/User/views/user/center.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue'
+import {ref} from 'vue'
 import Profile from './components/profile.vue'
 import LoginLog from './components/loginLog.vue'
 import OperateLog from './components/operateLog.vue'

modules/User/views/user/components/department.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue'
+import {onMounted, ref} from 'vue'
 import http from '/admin/support/http'
 
 const props = defineProps({

modules/User/views/user/components/loginLog.vue

@@ -19,8 +19,8 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted } from 'vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
+import {computed, onMounted} from 'vue'
+import {useGetList} from '/admin/composables/curd/useGetList'
 
 const api = 'user/login/log'
 

modules/User/views/user/components/operateLog.vue

@@ -31,8 +31,8 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted } from 'vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
+import {computed, onMounted} from 'vue'
+import {useGetList} from '/admin/composables/curd/useGetList'
 
 const api = 'user/operate/log'
 

modules/User/views/user/components/profile.vue

@@ -52,12 +52,12 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue'
-import { useCreate } from '/admin/composables/curd/useCreate'
+import {onMounted, ref} from 'vue'
+import {useCreate} from '/admin/composables/curd/useCreate'
 import http from '/admin/support/http'
-import { Code } from '/admin/enum/app'
+import {Code} from '/admin/enum/app'
 import Message from '/admin/support/message'
-import { useUserStore } from '/admin/stores/modules/user'
+import {useUserStore} from '/admin/stores/modules/user'
 
 interface profile {
   avatar: string

modules/User/views/user/create.vue

@@ -68,10 +68,10 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
+import {useCreate} from '/admin/composables/curd/useCreate'
+import {useShow} from '/admin/composables/curd/useShow'
 
-import { onMounted, ref } from 'vue'
+import {onMounted, ref} from 'vue'
 import http from '/admin/support/http'
 
 const props = defineProps({

modules/User/views/user/index.vue

@@ -50,14 +50,14 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
+import {computed, onMounted, ref} from 'vue'
 import Create from './create.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
+import {useGetList} from '/admin/composables/curd/useGetList'
+import {useDestroy} from '/admin/composables/curd/useDestroy'
+import {useOpen} from '/admin/composables/curd/useOpen'
 import Department from './components/department.vue'
-import { useUserStore } from '/admin/stores/modules/user'
-import { isUndefined } from '/admin/support/helper'
+import {useUserStore} from '/admin/stores/modules/user'
+import {isUndefined} from '/admin/support/helper'
 
 const userStore = useUserStore()
 

modules/Video/Http/Controllers/EpisodeController.php

@@ -6,11 +6,9 @@ use Catch\Base\CatchController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Modules\Common\Errors\Errors;
 use Modules\Common\Exceptions\CommonBusinessException;
 use Modules\Common\Services\Qiniu\QiniuTokenService;
 use Modules\User\Http\Controllers\UserTrait;
-use Modules\User\Models\User;
 use Modules\Video\Services\VideoService;
 
 class EpisodeController extends CatchController

modules/Video/Http/Controllers/VideoController.php

@@ -9,7 +9,6 @@ use Illuminate\Support\Facades\DB;
 use Modules\Common\Errors\Errors;
 use Modules\Common\Exceptions\CommonBusinessException;
 use Modules\User\Http\Controllers\UserTrait;
-use Modules\User\Models\User;
 use Modules\Video\Services\VideoService;
 
 class VideoController extends CatchController

modules/Video/Providers/VideoServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Modules\Video\Providers;
 
-use Catch\CatchAdmin;
 use Catch\Providers\CatchModuleServiceProvider;
 
 class VideoServiceProvider extends CatchModuleServiceProvider

modules/Video/routes/route.php

@@ -1,8 +1,6 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use Modules\System\Http\Controllers\NoticesController;
-use Modules\System\Http\Controllers\NoticeTypesController;
 use Modules\Video\Http\Controllers\EpisodeController;
 use Modules\Video\Http\Controllers\VideoCategoryController;
 use Modules\Video\Http\Controllers\VideoController;

tests/Operation/Http/Controllers/FirstPageControllerTest.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Tests\Operation\Http\Controllers;
+
+use Modules\Operation\Http\Controllers\FirstPageController;
+use PHPUnit\Framework\TestCase;
+use Tests\UsedTestCase;
+
+class FirstPageControllerTest extends UsedTestCase
+{
+
+    public function testAdd()
+    {
+        $res = $this->withHeaders([
+            'Authorization' => 'Bearer '. $this->token,
+        ])->json('post','http://localhost/api/operationManage/firstPage/add', [
+            'type' => 1,
+            'status' => 0,
+        ]);
+        $this->dumpJson($res);
+    }
+    public function testList()
+    {
+        $res = $this->withHeaders([
+            'Authorization' => 'Bearer '. $this->token,
+        ])->json('get','http://localhost/api/operationManage/firstPage/list');
+        $res->dump();
+        $this->dumpJson($res);
+    }
+
+    public function testEnableStatus()
+    {
+        $res = $this->withHeaders([
+            'Authorization' => 'Bearer '. $this->token,
+        ])->json('post','http://localhost/api/operationManage/firstPage/enableStatus', [
+            'id' => 4,
+        ]);
+        $res->dump();
+        $this->dumpJson($res);
+    }
+
+    public function testsetConfig()
+    {
+        $res = $this->withHeaders([
+            'Authorization' => 'Bearer '. $this->token,
+        ])->json('post','http://localhost/api/operationManage/firstPage/setConfig', [
+            'id' => 4,
+            'duanjus' => []
+        ]);
+        $res->dump();
+        $this->dumpJson($res);
+    }
+
+
+}