'文件改动'

app/admin/controller/UploadFile.php → app/admin/controller/UploadFileController.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 
 use support\Storage;
 
-class UploadFile
+class UploadFileController
 {
     /**
      * @Desc 上传文件

app/admin/controller/auth/Auth.php → app/admin/controller/auth/AuthController.php

@@ -6,7 +6,7 @@ use app\admin\service\auth\AuthService;
 use app\admin\validate\auth\AuthValidate;
 use support\Request;
 
-class Auth
+class AuthController
 {
     public $notNeedLogin = ['login'];
 

app/admin/controller/life/Cinema.php → app/admin/controller/life/CinemaController.php

@@ -8,7 +8,7 @@ use app\model\Cinema as CinemaModel;
 use support\Request;
 use support\Response;
 
-class Cinema extends Curd
+class CinemaController extends Curd
 {
 
     public function __construct()

app/admin/controller/life/CinemaIlk.php → app/admin/controller/life/CinemaIlkController.php

@@ -8,7 +8,7 @@ use app\model\CinemaIlk as CinemaIlkModel;
 use support\Request;
 use support\Response;
 
-class CinemaIlk extends Curd
+class CinemaIlkController extends Curd
 {
 
     public function __construct()

app/admin/controller/life/CinemaPerformers.php → app/admin/controller/life/CinemaPerformersController.php

@@ -6,7 +6,7 @@ use app\admin\validate\life\CinemaPerformersValidate;
 use app\model\CinemaPerformers as CinemaPerformersModel;
 use app\controller\Curd;
 
-class CinemaPerformers extends Curd
+class CinemaPerformersController extends Curd
 {
     public function __construct()
     {

app/admin/controller/life/CollegeCourses.php → app/admin/controller/life/CollegeCoursesController.php

@@ -8,7 +8,7 @@ use app\model\CollegeCourses as CollegeCourseModel;
 use support\Request;
 use support\Response;
 
-class CollegeCourses extends Curd
+class CollegeCoursesController extends Curd
 {
     public function __construct()
     {

app/admin/controller/life/CollegeTeacher.php → app/admin/controller/life/CollegeTeacherController.php

@@ -8,7 +8,7 @@ use app\model\CollegeTeacher as TeacherModel;
 use support\Request;
 use support\Response;
 
-class CollegeTeacher extends Curd
+class CollegeTeacherController extends Curd
 {
     public function __construct()
     {

app/admin/controller/life/CollegeTeaching.php → app/admin/controller/life/CollegeTeachingController.php

@@ -8,7 +8,7 @@ use app\model\CollegeTeaching as teachingModel;
 use support\Request;
 use support\Response;
 
-class CollegeTeaching extends Curd
+class CollegeTeachingController extends Curd
 {
     public function __construct()
     {

app/admin/controller/life/FarmLand.php → app/admin/controller/life/FarmLandController.php

@@ -8,7 +8,7 @@ use app\model\FarmLand as FarmLandModel;
 use support\Request;
 use support\Response;
 
-class FarmLand extends Curd
+class FarmLandController extends Curd
 {
     public function __construct()
     {

app/admin/controller/sys_manage/Category.php → app/admin/controller/sys_manage/CategoryController.php

@@ -6,7 +6,7 @@ use app\admin\service\sys_manage\CategoryService;
 use app\admin\validate\sys_manage\CategoryValidate;
 use support\Request;
 
-class Category
+class CategoryController
 {
     /**
      * @Desc 分类列表

app/admin/controller/sys_manage/Config.php → app/admin/controller/sys_manage/ConfigController.php

@@ -6,7 +6,7 @@ use app\admin\service\sys_manage\ConfigService;
 use app\admin\validate\sys_manage\ConfigValidate;
 use support\Request;
 
-class Config
+class ConfigController
 {
     /**
      * @Desc 配置列表

app/admin/controller/sys_manage/Dept.php → app/admin/controller/sys_manage/DeptController.php

@@ -6,7 +6,7 @@ use app\admin\service\sys_manage\DeptService;
 use app\admin\validate\sys_manage\DeptValidate;
 use support\Request;
 
-class Dept
+class DeptController
 {
     /**
      * @Desc 部门列表

app/admin/controller/sys_manage/Field.php → app/admin/controller/sys_manage/FieldController.php

@@ -6,7 +6,7 @@ use app\admin\service\sys_manage\FieldService;
 use app\admin\validate\sys_manage\FieldValidate;
 use support\Request;
 
-class Field
+class FieldController
 {
     /**
      * @Desc 字段列表
@@ -52,6 +52,10 @@ class Field
         if (!$validate->scene('add')->check($request->post())) {
             return json_fail($validate->getError());
         }
+        // 验证数据表是否存在
+        if (!FieldService::checkTableExist($request->post('field_table'))) {
+            return json_fail('数据表不存在');
+        }
         // 验证字段重复
         if (FieldService::checkFieldExist($request->post('field_table'), $request->post('field_column_key'))) {
             return json_fail('字段已存在，请勿重复添加');
@@ -75,7 +79,10 @@ class Field
         if (!$validate->scene('update')->check($request->post())) {
             return json_fail($validate->getError());
         }
-
+        // 验证数据表是否存在
+        if (!FieldService::checkTableExist($request->post('field_table'))) {
+            return json_fail('数据表不存在');
+        }
         return FieldService::updateField($id, $request->post());
     }
 

app/admin/controller/sys_manage/Role.php → app/admin/controller/sys_manage/RoleController.php

@@ -6,7 +6,7 @@ use app\admin\service\sys_manage\RoleService;
 use app\admin\validate\sys_manage\RoleValidate;
 use support\Request;
 
-class Role
+class RoleController
 {
     /**
      * @Desc 角色列表

app/admin/controller/sys_manage/User.php → app/admin/controller/sys_manage/UserController.php

@@ -8,7 +8,7 @@ use app\admin\service\sys_manage\UserService;
 use app\admin\validate\sys_manage\UserValidate;
 use support\Request;
 
-class User
+class UserController
 {
     /**
      * @Desc 用户列表

app/admin/service/sys_manage/FieldService.php

@@ -229,6 +229,15 @@ class FieldService
         return json_success('字段删除成功');
     }
 
+    public static function checkTableExist($table)
+    {
+        try {
+            return Db::table($table)->select(1)->exists();
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
     /**
      * @Desc 验证表字段是否存在
      * @Author Gorden

app/admin/service/sys_manage/UserService.php

@@ -117,7 +117,6 @@ class UserService
                 throw new \Exception('修改用户失败');
             }
         } catch (\Exception $e) {
-            dd($e->getMessage());
             return json_fail('修改用户失败');
         }
 

app/controller/Curd.php

@@ -142,7 +142,7 @@ class Curd
         if (!$allow_column) {
             throw new BusinessException('表不存在');
         }
-        $allow_column = array_column($allow_column, 'Field', 'Field');
+        $allow_column = array_column($allow_column, 'FieldController', 'FieldController');
         if (!in_array($field, $allow_column)) {
             $field = null;
         }
@@ -346,7 +346,7 @@ class Curd
         if (!$allow_column) {
             throw new BusinessException('表不存在', 2);
         }
-        $columns = array_column($allow_column, 'Type', 'Field');
+        $columns = array_column($allow_column, 'Type', 'FieldController');
         foreach ($data as $col => $item) {
             if (!isset($columns[$col])) {
                 unset($data[$col]);

route/api.php

@@ -4,17 +4,17 @@ use Webman\Route;
 
 Route::group('/admin', function () {
     Route::group('/upload',function (){
-        Route::post('/image', [\app\admin\controller\UploadFile::class, 'image']);
-        Route::post('/video', [\app\admin\controller\UploadFile::class, 'video']);
+        Route::post('/image', [\app\admin\controller\UploadFileController::class, 'image']);
+        Route::post('/video', [\app\admin\controller\UploadFileController::class, 'video']);
     })->middleware([
         \app\middleware\AdminAuthCheck::class
     ]);
 
     /* 鉴权 */
     Route::group('/auth', function () {
-        Route::post('/login', [\app\admin\controller\auth\Auth::class, 'login']);
-        Route::get('/userInfo', [\app\admin\controller\auth\Auth::class, 'userInfo']);
-        Route::get('/refreshToken', [\app\admin\controller\auth\Auth::class, 'refreshToken']);
+        Route::post('/login', [\app\admin\controller\auth\AuthController::class, 'login']);
+        Route::get('/userInfo', [\app\admin\controller\auth\AuthController::class, 'userInfo']);
+        Route::get('/refreshToken', [\app\admin\controller\auth\AuthController::class, 'refreshToken']);
     })->middleware([
         \app\middleware\AdminAuthCheck::class
     ]);
@@ -23,70 +23,70 @@ Route::group('/admin', function () {
     Route::group('/sys', function () {
         /* 角色管理 */
         Route::group('/role', function () {
-            Route::get('/list', [\app\admin\controller\sys_manage\Role::class, 'roleList']);
-            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\Role::class, 'roleInfo']);
-            Route::post('/add', [\app\admin\controller\sys_manage\Role::class, 'addRole']);
-            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\Role::class, 'updateRole']);
-            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\Role::class, 'delRole']);
-            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\Role::class, 'updateStatus']);
+            Route::get('/list', [\app\admin\controller\sys_manage\RoleController::class, 'roleList']);
+            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\RoleController::class, 'roleInfo']);
+            Route::post('/add', [\app\admin\controller\sys_manage\RoleController::class, 'addRole']);
+            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\RoleController::class, 'updateRole']);
+            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\RoleController::class, 'delRole']);
+            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\RoleController::class, 'updateStatus']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
 
         /* 部门管理 */
         Route::group('/dept', function () {
-            Route::get('/list', [\app\admin\controller\sys_manage\Dept::class, 'deptList']);
-            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\Dept::class, 'deptInfo']);
-            Route::post('/add', [\app\admin\controller\sys_manage\Dept::class, 'addDept']);
-            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\Dept::class, 'updateDept']);
-            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\Dept::class, 'updateStatus']);
-            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\Dept::class, 'delDept']);
+            Route::get('/list', [\app\admin\controller\sys_manage\DeptController::class, 'deptList']);
+            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\DeptController::class, 'deptInfo']);
+            Route::post('/add', [\app\admin\controller\sys_manage\DeptController::class, 'addDept']);
+            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\DeptController::class, 'updateDept']);
+            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\DeptController::class, 'updateStatus']);
+            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\DeptController::class, 'delDept']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
 
         /* 用户管理 */
         Route::group('/user', function () {
-            Route::get('/list', [\app\admin\controller\sys_manage\User::class, 'userList']);
-            Route::get('/info/{id:\w+}', [\app\admin\controller\sys_manage\User::class, 'userInfo']);
-            Route::post('/add', [\app\admin\controller\sys_manage\User::class, 'addUser']);
-            Route::post('/update/{id:\w+}', [\app\admin\controller\sys_manage\User::class, 'updateUser']);
-            Route::post('/updateStatus/{id:\w+}', [\app\admin\controller\sys_manage\User::class, 'updateStatus']);
-            Route::delete('/delete/{id:\w+}', [\app\admin\controller\sys_manage\User::class, 'delUser']);
+            Route::get('/list', [\app\admin\controller\sys_manage\UserController::class, 'userList']);
+            Route::get('/info/{id:\w+}', [\app\admin\controller\sys_manage\UserController::class, 'userInfo']);
+            Route::post('/add', [\app\admin\controller\sys_manage\UserController::class, 'addUser']);
+            Route::post('/update/{id:\w+}', [\app\admin\controller\sys_manage\UserController::class, 'updateUser']);
+            Route::post('/updateStatus/{id:\w+}', [\app\admin\controller\sys_manage\UserController::class, 'updateStatus']);
+            Route::delete('/delete/{id:\w+}', [\app\admin\controller\sys_manage\UserController::class, 'delUser']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
 
         /* 分类管理 */
         Route::group('/category', function () {
-            Route::get('/list', [\app\admin\controller\sys_manage\Category::class, 'categoryList']);
-            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\Category::class, 'categoryInfo']);
-            Route::post('/add', [\app\admin\controller\sys_manage\Category::class, 'addCategory']);
-            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\Category::class, 'updateCategory']);
-            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\Category::class, 'updateStatus']);
-            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\Category::class, 'delCategory']);
+            Route::get('/list', [\app\admin\controller\sys_manage\CategoryController::class, 'categoryList']);
+            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\CategoryController::class, 'categoryInfo']);
+            Route::post('/add', [\app\admin\controller\sys_manage\CategoryController::class, 'addCategory']);
+            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\CategoryController::class, 'updateCategory']);
+            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\CategoryController::class, 'updateStatus']);
+            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\CategoryController::class, 'delCategory']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
 
         /* 字段管理 */
         Route::group('/field', function () {
-            Route::get('/list', [\app\admin\controller\sys_manage\Field::class, 'fieldList']);
-            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\Field::class, 'fieldInfo']);
-            Route::post('/add', [\app\admin\controller\sys_manage\Field::class, 'addField']);
-            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\Field::class, 'updateField']);
-            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\Field::class, 'updateStatus']);
-            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\Field::class, 'delField']);
+            Route::get('/list', [\app\admin\controller\sys_manage\FieldController::class, 'fieldList']);
+            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\FieldController::class, 'fieldInfo']);
+            Route::post('/add', [\app\admin\controller\sys_manage\FieldController::class, 'addField']);
+            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\FieldController::class, 'updateField']);
+            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\FieldController::class, 'updateStatus']);
+            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\FieldController::class, 'delField']);
         });
 
         /* 配置管理 */
         Route::group('/config', function () {
-            Route::get('/list', [\app\admin\controller\sys_manage\Config::class, 'configList']);
-            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\Config::class, 'configInfo']);
-            Route::post('/add', [\app\admin\controller\sys_manage\Config::class, 'addConfig']);
-            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\Config::class, 'updateConfig']);
-            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\Config::class, 'updateStatus']);
-            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\Config::class, 'delConfig']);
+            Route::get('/list', [\app\admin\controller\sys_manage\ConfigController::class, 'configList']);
+            Route::get('/info/{id:\d+}', [\app\admin\controller\sys_manage\ConfigController::class, 'configInfo']);
+            Route::post('/add', [\app\admin\controller\sys_manage\ConfigController::class, 'addConfig']);
+            Route::post('/update/{id:\d+}', [\app\admin\controller\sys_manage\ConfigController::class, 'updateConfig']);
+            Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\sys_manage\ConfigController::class, 'updateStatus']);
+            Route::delete('/delete/{id:\d+}', [\app\admin\controller\sys_manage\ConfigController::class, 'delConfig']);
         });
     });
 
@@ -94,64 +94,64 @@ Route::group('/admin', function () {
     Route::group('/life', function () {
         /* 演职人员管理 */
         Route::group('/cinemaPerformers', function () {
-            Route::get('/list', [\app\admin\controller\life\CinemaPerformers::class, 'select']);
-            Route::post('/add', [\app\admin\controller\life\CinemaPerformers::class, 'insert']);
-            Route::post('/update', [\app\admin\controller\life\CinemaPerformers::class, 'update']);
-            Route::delete('/delete', [\app\admin\controller\life\CinemaPerformers::class, 'delete']);
+            Route::get('/list', [\app\admin\controller\life\CinemaPerformersController::class, 'select']);
+            Route::post('/add', [\app\admin\controller\life\CinemaPerformersController::class, 'insert']);
+            Route::post('/update', [\app\admin\controller\life\CinemaPerformersController::class, 'update']);
+            Route::delete('/delete', [\app\admin\controller\life\CinemaPerformersController::class, 'delete']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
         /* 影片类型管理 */
         Route::group('/cinemaIlk', function () {
-            Route::get('/list', [\app\admin\controller\life\CinemaIlk::class, 'select']);
-            Route::post('/add', [\app\admin\controller\life\CinemaIlk::class, 'insert']);
-            Route::post('/update', [\app\admin\controller\life\CinemaIlk::class, 'update']);
-            Route::delete('/delete', [\app\admin\controller\life\CinemaIlk::class, 'delete']);
+            Route::get('/list', [\app\admin\controller\life\CinemaIlkController::class, 'select']);
+            Route::post('/add', [\app\admin\controller\life\CinemaIlkController::class, 'insert']);
+            Route::post('/update', [\app\admin\controller\life\CinemaIlkController::class, 'update']);
+            Route::delete('/delete', [\app\admin\controller\life\CinemaIlkController::class, 'delete']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
         /* 影片管理 */
         Route::group('/cinema', function () {
-            Route::get('/list', [\app\admin\controller\life\Cinema::class, 'select']);
-            Route::post('/add', [\app\admin\controller\life\Cinema::class, 'insert']);
-            Route::post('/update', [\app\admin\controller\life\Cinema::class, 'update']);
-            Route::delete('/delete', [\app\admin\controller\life\Cinema::class, 'delete']);
+            Route::get('/list', [\app\admin\controller\life\CinemaController::class, 'select']);
+            Route::post('/add', [\app\admin\controller\life\CinemaController::class, 'insert']);
+            Route::post('/update', [\app\admin\controller\life\CinemaController::class, 'update']);
+            Route::delete('/delete', [\app\admin\controller\life\CinemaController::class, 'delete']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
         /* 教师管理 */
         Route::group('/teacher', function () {
-            Route::get('/list', [\app\admin\controller\life\CollegeTeacher::class, 'select']);
-            Route::post('/add', [\app\admin\controller\life\CollegeTeacher::class, 'insert']);
-            Route::post('/update', [\app\admin\controller\life\CollegeTeacher::class, 'update']);
-            Route::delete('/delete', [\app\admin\controller\life\CollegeTeacher::class, 'delete']);
+            Route::get('/list', [\app\admin\controller\life\CollegeTeacherController::class, 'select']);
+            Route::post('/add', [\app\admin\controller\life\CollegeTeacherController::class, 'insert']);
+            Route::post('/update', [\app\admin\controller\life\CollegeTeacherController::class, 'update']);
+            Route::delete('/delete', [\app\admin\controller\life\CollegeTeacherController::class, 'delete']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
         /* 课程管理 */
         Route::group('/courses', function () {
-            Route::get('/list', [\app\admin\controller\life\CollegeCourses::class, 'select']);
-            Route::post('/add', [\app\admin\controller\life\CollegeCourses::class, 'insert']);
-            Route::post('/update', [\app\admin\controller\life\CollegeCourses::class, 'update']);
-            Route::delete('/delete', [\app\admin\controller\life\CollegeCourses::class, 'delete']);
+            Route::get('/list', [\app\admin\controller\life\CollegeCoursesController::class, 'select']);
+            Route::post('/add', [\app\admin\controller\life\CollegeCoursesController::class, 'insert']);
+            Route::post('/update', [\app\admin\controller\life\CollegeCoursesController::class, 'update']);
+            Route::delete('/delete', [\app\admin\controller\life\CollegeCoursesController::class, 'delete']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
         /* 课程安排管理 */
         Route::group('/teaching', function () {
-            Route::get('/list', [\app\admin\controller\life\CollegeTeaching::class, 'select']);
-            Route::post('/add', [\app\admin\controller\life\CollegeTeaching::class, 'insert']);
-            Route::post('/update', [\app\admin\controller\life\CollegeTeaching::class, 'update']);
-            Route::delete('/delete', [\app\admin\controller\life\CollegeTeaching::class, 'delete']);
+            Route::get('/list', [\app\admin\controller\life\CollegeTeachingController::class, 'select']);
+            Route::post('/add', [\app\admin\controller\life\CollegeTeachingController::class, 'insert']);
+            Route::post('/update', [\app\admin\controller\life\CollegeTeachingController::class, 'update']);
+            Route::delete('/delete', [\app\admin\controller\life\CollegeTeachingController::class, 'delete']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
         /* 地块管理 */
         Route::group('/farmLand', function () {
-            Route::get('/list', [\app\admin\controller\life\FarmLand::class, 'select']);
-            Route::post('/add', [\app\admin\controller\life\FarmLand::class, 'insert']);
-            Route::post('/update', [\app\admin\controller\life\FarmLand::class, 'update']);
-            Route::delete('/delete', [\app\admin\controller\life\FarmLand::class, 'delete']);
+            Route::get('/list', [\app\admin\controller\life\FarmLandController::class, 'select']);
+            Route::post('/add', [\app\admin\controller\life\FarmLandController::class, 'insert']);
+            Route::post('/update', [\app\admin\controller\life\FarmLandController::class, 'update']);
+            Route::delete('/delete', [\app\admin\controller\life\FarmLandController::class, 'delete']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);

support/helpers.php

@@ -85,7 +85,7 @@ function public_path(string $path = ''): string
 }
 
 /**
- * Config path
+ * ConfigController path
  * @param string $path
  * @return string
  */