'目录变更'

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

@@ -1,10 +1,9 @@
 <?php
 
-namespace app\admin\controller\user;
+namespace app\admin\controller\auth;
 
-use app\admin\service\user\AuthService;
-use app\admin\validate\user\AuthValidate;
-use app\admin\validate\user\UserValidate;
+use app\admin\service\auth\AuthService;
+use app\admin\validate\auth\AuthValidate;
 use support\Request;
 
 class Auth

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

@@ -1,10 +1,9 @@
 <?php
 
-namespace app\admin\controller\dept;
+namespace app\admin\controller\sys_manage;
 
-use app\admin\service\dept\DeptService;
-use app\admin\validate\dept\DeptValidate;
-use app\model\SysDept;
+use app\admin\service\sys_manage\DeptService;
+use app\admin\validate\sys_manage\DeptValidate;
 use support\Request;
 
 class Dept

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

@@ -1,9 +1,9 @@
 <?php
 
-namespace app\admin\controller\role;
+namespace app\admin\controller\sys_manage;
 
-use app\admin\service\role\RoleService;
-use app\admin\validate\role\RoleValidate;
+use app\admin\service\sys_manage\RoleService;
+use app\admin\validate\sys_manage\RoleValidate;
 use support\Request;
 
 class Role

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

@@ -1,12 +1,11 @@
 <?php
 
-namespace app\admin\controller\user;
+namespace app\admin\controller\sys_manage;
 
-use app\admin\service\dept\DeptService;
-use app\admin\service\role\RoleService;
-use app\admin\service\user\UserService;
-use app\admin\validate\user\UserValidate;
-use app\model\Serial;
+use app\admin\service\sys_manage\DeptService;
+use app\admin\service\sys_manage\RoleService;
+use app\admin\service\sys_manage\UserService;
+use app\admin\validate\sys_manage\UserValidate;
 use support\Request;
 
 class User

app/admin/service/user/AuthService.php → app/admin/service/auth/AuthService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\admin\service\user;
+namespace app\admin\service\auth;
 
 use app\model\SysUser;
 use support\Db;

app/admin/service/dept/DeptService.php → app/admin/service/sys_manage/DeptService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\admin\service\dept;
+namespace app\admin\service\sys_manage;
 
 use app\model\SysDept;
 use support\Db;

app/admin/service/role/RoleService.php → app/admin/service/sys_manage/RoleService.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace app\admin\service\role;
+namespace app\admin\service\sys_manage;
 
 use app\model\SysRole;
-use support\Db;
 
 class RoleService
 {

app/admin/service/user/UserService.php → app/admin/service/sys_manage/UserService.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace app\admin\service\user;
+namespace app\admin\service\sys_manage;
 
 use app\model\SysUser;
-use Illuminate\Support\Facades\Hash;
 
 class UserService
 {

app/admin/validate/user/AuthValidate.php → app/admin/validate/auth/AuthValidate.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace app\admin\validate\user;
+namespace app\admin\validate\auth;
 
 use think\Validate;
 

app/admin/validate/dept/DeptValidate.php → app/admin/validate/sys_manage/DeptValidate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\admin\validate\dept;
+namespace app\admin\validate\sys_manage;
 
 use think\Validate;
 

app/admin/validate/role/RoleValidate.php → app/admin/validate/sys_manage/RoleValidate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\admin\validate\role;
+namespace app\admin\validate\sys_manage;
 
 use think\Validate;
 

app/admin/validate/user/UserValidate.php → app/admin/validate/sys_manage/UserValidate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\admin\validate\user;
+namespace app\admin\validate\sys_manage;
 
 use think\Validate;
 

app/model/Serial.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace app\model;
-
-use support\Db;
-use support\Model;
-
-class Serial extends Model
-{
-    public $table = 'serial';
-
-    protected $primaryKey = 'serial';
-
-    public static function getSerial()
-    {
-        Db::insert('insert into `app_serial` value(default)');
-    }
-}

app/model/SysCategory.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace app\model;
+
+use support\Model;
+
+class SysCategory extends Model
+{
+    public $table = 'sys_category';
+
+    public $primaryKey = 'category_id';
+}

app/model/SysField.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace app\model;
+
+use support\Model;
+
+class SysField extends Model
+{
+    public $table = 'sys_field';
+
+    public $primaryKey = 'field_id';
+}

app/model/Test.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace app\model;
-
-use support\Model;
-
-class Test extends Model
-{
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = 'test';
-
-    /**
-     * The primary key associated with the table.
-     *
-     * @var string
-     */
-    protected $primaryKey = 'id';
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var bool
-     */
-    public $timestamps = false;
-}

route/api.php

@@ -5,45 +5,45 @@ use Webman\Route;
 Route::group('/admin', function () {
     /* 鉴权 */
     Route::group('/auth', function () {
-        Route::post('/login', [\app\admin\controller\user\Auth::class, 'login']);
-        Route::get('/userInfo', [\app\admin\controller\user\Auth::class, 'userInfo']);
-        Route::get('/refreshToken', [\app\admin\controller\user\Auth::class, 'refreshToken']);
+        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']);
     })->middleware([
         \app\middleware\AdminAuthCheck::class
     ]);
 
     /* 角色管理 */
-    Route::group('/role', function () {
-        Route::get('/list', [\app\admin\controller\role\Role::class, 'roleList']);
-        Route::get('/info/{id:\d+}', [\app\admin\controller\role\Role::class, 'roleInfo']);
-        Route::post('/add', [\app\admin\controller\role\Role::class, 'addRole']);
-        Route::post('/update/{id:\d+}', [\app\admin\controller\role\Role::class, 'updateRole']);
-        Route::delete('/delete/{id:\d+}', [\app\admin\controller\role\Role::class, 'delRole']);
-        Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\role\Role::class, 'updateStatus']);
+    Route::group('/sys/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']);
     })->middleware([
         \app\middleware\AdminAuthCheck::class
     ]);
 
     /* 部门管理 */
-    Route::group('/dept', function () {
-        Route::get('/list', [\app\admin\controller\dept\Dept::class, 'deptList']);
-        Route::get('/info/{id:\d+}', [\app\admin\controller\dept\Dept::class, 'deptInfo']);
-        Route::post('/add', [\app\admin\controller\dept\Dept::class, 'addDept']);
-        Route::post('/update/{id:\d+}', [\app\admin\controller\dept\Dept::class, 'updateDept']);
-        Route::post('/updateStatus/{id:\d+}', [\app\admin\controller\dept\Dept::class, 'updateStatus']);
-        Route::delete('/delete/{id:\d+}', [\app\admin\controller\dept\Dept::class, 'delDept']);
+    Route::group('/sys/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']);
     })->middleware([
         \app\middleware\AdminAuthCheck::class
     ]);
 
     /* 用户管理 */
-    Route::group('/user', function () {
-        Route::get('/list', [\app\admin\controller\user\User::class, 'userList']);
-        Route::get('/info/{id:\w+}', [\app\admin\controller\user\User::class, 'userInfo']);
-        Route::post('/add', [\app\admin\controller\user\User::class, 'addUser']);
-        Route::post('/update/{id:\w+}', [\app\admin\controller\user\User::class, 'updateUser']);
-        Route::post('/updateStatus/{id:\w+}', [\app\admin\controller\user\User::class, 'updateStatus']);
-        Route::delete('/delete/{id:\w+}', [\app\admin\controller\user\User::class, 'delUser']);
+    Route::group('/sys/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']);
     })->middleware([
         \app\middleware\AdminAuthCheck::class
     ]);