liuzejian 1 年間 前
コミット
70f4fcc4cb
91 ファイル変更262 行追加197 行削除
  1. 0 2
      modules/Channel/Http/Controllers/OrdersController.php
  2. 12 12
      modules/Channel/Http/Controllers/PayTemplateController.php
  3. 2 2
      modules/Channel/Http/Controllers/UserMiniprogramController.php
  4. 1 1
      modules/Channel/Http/Controllers/WechatMinprogramUserController.php
  5. 1 3
      modules/Channel/Models/PayTemplate.php
  6. 1 3
      modules/Channel/Models/PayTemplateItem.php
  7. 0 1
      modules/Channel/Services/Notice/NoitceTypeService.php
  8. 1 2
      modules/Channel/Services/Notice/NoticesService.php
  9. 0 1
      modules/Common/Http/Controllers/ModuleController.php
  10. 0 4
      modules/Common/Providers/CommonServiceProvider.php
  11. 1 1
      modules/Common/Support/Upload/Uploader.php
  12. 0 1
      modules/CpManage/Models/Cp/Cps.php
  13. 0 1
      modules/CpManage/Providers/CpManageServiceProvider.php
  14. 0 2
      modules/Develop/Http/Controllers/ModuleController.php
  15. 1 1
      modules/Develop/Models/Schemas.php
  16. 0 1
      modules/Develop/Providers/DevelopServiceProvider.php
  17. 1 1
      modules/Develop/Support/Generate/Create/Model.php
  18. 1 1
      modules/Develop/Support/Generate/Create/Schema.php
  19. 1 1
      modules/Develop/database/migrations/Schemas.php
  20. 1 1
      modules/Develop/routes/route.php
  21. 5 4
      modules/Develop/views/generate/components/codeGen.vue
  22. 1 1
      modules/Develop/views/generate/components/store.ts
  23. 3 3
      modules/Develop/views/generate/components/structure.vue
  24. 1 4
      modules/Develop/views/generate/index.vue
  25. 3 3
      modules/Develop/views/module/create.vue
  26. 4 4
      modules/Develop/views/module/index.vue
  27. 3 3
      modules/Develop/views/module/install.vue
  28. 1 1
      modules/Develop/views/router.ts
  29. 2 2
      modules/Develop/views/schema/create.vue
  30. 4 4
      modules/Develop/views/schema/index.vue
  31. 2 1
      modules/Develop/views/schema/show.vue
  32. 3 3
      modules/Develop/views/schema/steps/schema.vue
  33. 5 5
      modules/Develop/views/schema/steps/structure.vue
  34. 1 1
      modules/Develop/views/schema/store/index.ts
  35. 1 3
      modules/Jiesuan/Http/Controllers/VerifyBankInfoController.php
  36. 0 1
      modules/Jiesuan/Providers/JiesuanServiceProvider.php
  37. 0 1
      modules/Jiesuan/routes/route.php
  38. 16 17
      modules/Manage/Http/Controllers/MiniprogramController.php
  39. 1 1
      modules/Manage/Http/Requests/MiniprogramRequest.php
  40. 2 2
      modules/Manage/Http/Requests/MiniprogramUpdateRequest.php
  41. 0 1
      modules/Manage/Providers/ManageServiceProvider.php
  42. 1 2
      modules/Manage/routes/route.php
  43. 37 0
      modules/Operation/Http/Controllers/FirstPageController.php
  44. 32 0
      modules/Operation/Installer.php
  45. 29 0
      modules/Operation/Providers/OperationServiceProvider.php
  46. 10 0
      modules/Operation/README.md
  47. 8 0
      modules/Operation/routes/route.php
  48. 0 1
      modules/OrderRefund/Providers/OrderRefundServiceProvider.php
  49. 1 2
      modules/OrderRefund/Services/RefundOrderService.php
  50. 0 1
      modules/Payment/Providers/PaymentServiceProvider.php
  51. 1 1
      modules/Permissions/Http/Controllers/DepartmentsController.php
  52. 1 1
      modules/Permissions/Http/Controllers/JobsController.php
  53. 1 1
      modules/Permissions/Http/Controllers/PermissionsController.php
  54. 1 1
      modules/Permissions/Http/Controllers/RolesController.php
  55. 0 3
      modules/Permissions/Middlewares/RoleCheck.php
  56. 1 1
      modules/Permissions/Models/Traits/DataRange.php
  57. 0 1
      modules/Permissions/Providers/PermissionsServiceProvider.php
  58. 0 1
      modules/Permissions/database/seeder/PermissionsMenusSeeder.php
  59. 2 2
      modules/Permissions/routes/route.php
  60. 3 3
      modules/Permissions/views/departments/form/create.vue
  61. 4 4
      modules/Permissions/views/departments/index.vue
  62. 3 3
      modules/Permissions/views/jobs/form/create.vue
  63. 4 4
      modules/Permissions/views/jobs/index.vue
  64. 5 5
      modules/Permissions/views/permissions/form/create.vue
  65. 5 5
      modules/Permissions/views/permissions/index.vue
  66. 3 3
      modules/Permissions/views/roles/form/create.vue
  67. 4 4
      modules/Permissions/views/roles/index.vue
  68. 0 1
      modules/System/Http/Controllers/NoticeTypesController.php
  69. 0 1
      modules/System/Providers/SystemServiceProvider.php
  70. 0 1
      modules/System/Services/Notice/NoitceTypeService.php
  71. 1 2
      modules/System/Services/Notice/NoticesService.php
  72. 0 1
      modules/Tuiguang/routes/route.php
  73. 0 1
      modules/User/Http/Controllers/UserController.php
  74. 1 3
      modules/User/Listeners/Login.php
  75. 1 1
      modules/User/Middlewares/OperatingMiddleware.php
  76. 0 1
      modules/User/Models/LogOperate.php
  77. 0 1
      modules/User/Models/Traits/UserRelations.php
  78. 1 1
      modules/User/Models/User.php
  79. 0 1
      modules/User/Providers/UserServiceProvider.php
  80. 1 1
      modules/User/views/router.ts
  81. 1 1
      modules/User/views/user/center.vue
  82. 1 1
      modules/User/views/user/components/department.vue
  83. 2 2
      modules/User/views/user/components/loginLog.vue
  84. 2 2
      modules/User/views/user/components/operateLog.vue
  85. 4 4
      modules/User/views/user/components/profile.vue
  86. 3 3
      modules/User/views/user/create.vue
  87. 6 6
      modules/User/views/user/index.vue
  88. 0 2
      modules/Video/Http/Controllers/EpisodeController.php
  89. 0 1
      modules/Video/Http/Controllers/VideoController.php
  90. 0 1
      modules/Video/Providers/VideoServiceProvider.php
  91. 0 2
      modules/Video/routes/route.php

+ 0 - 2
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
 {

+ 12 - 12
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);
         }

+ 2 - 2
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
 {

+ 1 - 1
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;
 

+ 1 - 3
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',
     ];
 
 }

+ 1 - 3
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',
     ];
 
 }

+ 0 - 1
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

+ 1 - 2
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
 {

+ 0 - 1
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
 {

+ 0 - 4
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
 {

+ 1 - 1
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
 {

+ 0 - 1
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
 {

+ 0 - 1
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
 {

+ 0 - 2
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

+ 1 - 1
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
 {

+ 0 - 1
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;

+ 1 - 1
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
 {

+ 1 - 1
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

+ 1 - 1
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()

+ 1 - 1
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);

+ 5 - 4
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)
 

+ 1 - 1
modules/Develop/views/generate/components/store.ts

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

+ 3 - 3
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()
 

+ 1 - 4
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>

+ 3 - 3
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,

+ 4 - 4
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'
 

+ 3 - 3
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')

+ 1 - 1
modules/Develop/views/router.ts

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

+ 2 - 2
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()
 

+ 4 - 4
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)
 

+ 2 - 1
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,

+ 3 - 3
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()

+ 5 - 5
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()

+ 1 - 1
modules/Develop/views/schema/store/index.ts

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

+ 1 - 3
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' => [

+ 0 - 1
modules/Jiesuan/Providers/JiesuanServiceProvider.php

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

+ 0 - 1
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 () {

+ 16 - 17
modules/Manage/Http/Controllers/MiniprogramController.php

@@ -2,19 +2,18 @@
 
 namespace Modules\Manage\Http\Controllers;
 
-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
@@ -23,7 +22,7 @@ class MiniprogramController extends CatchController
     use UserTrait;
     public function __construct(protected readonly Miniprogram $miniprogram,protected readonly UserHasMiniprograms $userHasMiniprograms)
     {
-        
+
     }
 
     const  COMPANY_ROLE = 'company';
@@ -45,13 +44,13 @@ class MiniprogramController extends CatchController
         $page_size = $request->input('limit', 15);
         $where = [];
         if($name){
-            $where[] = ['name','like','%'.$name.'%']; 
+            $where[] = ['name','like','%'.$name.'%'];
         }
         if($play_name){
-            $where[] = ['play_name','like','%'.$play_name.'%']; 
+            $where[] = ['play_name','like','%'.$play_name.'%'];
         }
         if($company){
-            $where[] = ['company','like','%'.$company.'%']; 
+            $where[] = ['company','like','%'.$company.'%'];
         }
 
         if($type){
@@ -67,7 +66,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 ?'启用':'禁用';
@@ -143,10 +142,10 @@ class MiniprogramController extends CatchController
 
     /**
      * 绑定小程序和投放公司的关系 或者投放公司把小程序分配给优化师
-     * @param [type] $miniprogram_id 
+     * @param [type] $miniprogram_id
      * @param Request $request  uid=2,3,4,5 actison=on|off on:分配,off取消分配
      * @return array
-     * 
+     *
      */
     public function allocationStore($miniprogram_id,Request $request)
     {
@@ -202,12 +201,12 @@ class MiniprogramController extends CatchController
      * response = [
      *      'on'=>[ ['id'=>1,'username'=>'公司1','user_has_miniprogram'=>1],[]  ],
      *      'off'=>[['id'=>1,'username'=>'公司1','user_has_miniprogram'=>0],[]],
-     *      'all'=>[ 
+     *      'all'=>[
      *          ['id'=>1,'username'=>'公司1','user_has_miniprogram'=>1],
-     *          ['id'=>2,'username'=>'公司1','user_has_miniprogram'=>0] 
+     *          ['id'=>2,'username'=>'公司1','user_has_miniprogram'=>0]
      *          ]
      *      ]
-     * 
+     *
      */
     public function getAllocationInfo($miniprogram_id){
         $uid = $this->getLoginUser()->id;
@@ -216,7 +215,7 @@ class MiniprogramController extends CatchController
         }else{
             $all_company_account = UserService::getOptimizers($uid,['users.username','users.id']);
         }
-       
+
         $result = $all_company_account->map(function ($item,$key) use($miniprogram_id) {
             $info = $this->userHasMiniprograms->where('uid',$item->id)->where('miniprogram_id',$miniprogram_id)->where('is_enabled',1)->count();
             if($info){

+ 1 - 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
 {

+ 2 - 2
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
 {
@@ -37,7 +37,7 @@ class MiniprogramUpdateRequest extends FormRequest
         ];
     }
 
-    
+
     public function messages(): array
     {
         return [

+ 0 - 1
modules/Manage/Providers/ManageServiceProvider.php

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

+ 1 - 2
modules/Manage/routes/route.php

@@ -1,7 +1,6 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-
 use Modules\Manage\Http\Controllers\MiniprogramController;
 
 Route::prefix('manage')->group(function(){
@@ -33,4 +32,4 @@ Route::prefix('manage')->group(function(){
         ->withoutMiddleware(config('catch.route.middlewares'));
 
     });
-});
+});

+ 37 - 0
modules/Operation/Http/Controllers/FirstPageController.php

@@ -0,0 +1,37 @@
+<?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\User\Http\Controllers\UserTrait;
+
+class FirstPageController extends CatchController
+{
+    use ValidatesRequests;
+    use UserTrait;
+
+    /**
+     *  首页列表
+     */
+    public function list(Request $request) {
+        $result = DB::table('first_pages')
+            ->orderBy('id', 'desc')
+            ->paginate($request->input('limit', 15));
+    }
+
+    public function add(Request $request) {
+
+    }
+
+    public function changeStatus(Request $request) {
+
+    }
+
+    public function config(Request $request) {
+
+    }
+}
+

+ 32 - 0
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.
+    }
+}

+ 29 - 0
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';
+    }
+}

+ 10 - 0
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 文件里

+ 8 - 0
modules/Operation/routes/route.php

@@ -0,0 +1,8 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::prefix('operationManage')->group(function () {
+
+});
+

+ 0 - 1
modules/OrderRefund/Providers/OrderRefundServiceProvider.php

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

ファイルの差分が大きいため隠しています
+ 1 - 2
modules/OrderRefund/Services/RefundOrderService.php


+ 0 - 1
modules/Payment/Providers/PaymentServiceProvider.php

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

+ 1 - 1
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
 {

+ 1 - 1
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
 {

+ 1 - 1
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
 {

+ 1 - 1
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
 {

+ 0 - 3
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;
 
 /**

+ 1 - 1
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
 {

+ 0 - 1
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;
 

+ 0 - 1
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

+ 2 - 2
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);

+ 3 - 3
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,

+ 4 - 4
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'
 

+ 3 - 3
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,

+ 4 - 4
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'
 

+ 5 - 5
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,

+ 5 - 5
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'

+ 3 - 3
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({

+ 4 - 4
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'
 

+ 0 - 1
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;

+ 0 - 1
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;
 

+ 0 - 1
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

+ 1 - 2
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
 {

+ 0 - 1
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 () {

+ 0 - 1
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;

+ 1 - 3
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
      *

+ 1 - 1
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
 {

+ 0 - 1
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

+ 0 - 1
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

+ 1 - 1
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

+ 0 - 1
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;

+ 1 - 1
modules/User/views/router.ts

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

+ 1 - 1
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'

+ 1 - 1
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({

+ 2 - 2
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'
 

+ 2 - 2
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'
 

+ 4 - 4
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

+ 3 - 3
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({

+ 6 - 6
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()
 

+ 0 - 2
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

+ 0 - 1
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

+ 0 - 1
modules/Video/Providers/VideoServiceProvider.php

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

+ 0 - 2
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;