重新修改主业务逻辑的命名规则

app/admin/controller/Ajax.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\controller;
 
-use base\admin\controller\AjaxClass;
+use base\admin\controller\AjaxBase;
 
-class Ajax extends AjaxClass
+class Ajax extends AjaxBase
 {
 }

app/admin/controller/Index.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\controller;
 
-use base\admin\controller\IndexClass;
+use base\admin\controller\IndexBase;
 
-class Index extends IndexClass
+class Index extends IndexBase
 {
 }

app/admin/controller/Login.php

@@ -2,11 +2,11 @@
 
 namespace app\admin\controller;
 
-use base\admin\controller\LoginClass;
+use base\admin\controller\LoginBase;
 
 /**
  * Class Login.
  */
-class Login extends LoginClass
+class Login extends LoginBase
 {
 }

app/admin/controller/debug/Log.php

@@ -3,11 +3,11 @@
 namespace app\admin\controller\debug;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\debug\LogClass;
+use base\admin\controller\debug\LogBase;
 
 /**
  * @ControllerAnnotation(title="debug_log")
  */
-class Log extends LogClass
+class Log extends LogBase
 {
 }

app/admin/controller/mall/Cate.php

@@ -3,12 +3,12 @@
 namespace app\admin\controller\mall;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\mall\CateClass;
+use base\admin\controller\mall\CateBase;
 
 /**
  * Class Admin.
  * @ControllerAnnotation(title="商品分类管理")
  */
-class Cate extends CateClass
+class Cate extends CateBase
 {
 }

app/admin/controller/mall/Goods.php

@@ -3,12 +3,12 @@
 namespace app\admin\controller\mall;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\mall\GoodsClass;
+use base\admin\controller\mall\GoodsBase;
 
 /**
  * Class Goods.
  * @ControllerAnnotation(title="商城商品管理")
  */
-class Goods extends GoodsClass
+class Goods extends GoodsBase
 {
 }

app/admin/controller/mall/Tag.php

@@ -3,11 +3,11 @@
 namespace app\admin\controller\mall;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\mall\TagClass;
+use base\admin\controller\mall\TagBase;
 
 /**
  * @ControllerAnnotation(title="mall_tag")
  */
-class Tag extends TagClass
+class Tag extends TagBase
 {
 }

app/admin/controller/system/Admin.php

@@ -4,7 +4,7 @@ namespace app\admin\controller\system;
 
 use app\admin\service\annotation\ControllerAnnotation;
 use app\admin\service\annotation\NodeAnotation;
-use base\admin\controller\system\AdminClass;
+use base\admin\controller\system\AdminBase;
 
 /**
  * Class Admin.
@@ -12,6 +12,6 @@ use base\admin\controller\system\AdminClass;
  *
  * @NodeAnotation(title="自定义权限标识符",name="customFlag")
  */
-class Admin extends AdminClass
+class Admin extends AdminBase
 {
 }

app/admin/controller/system/Auth.php

@@ -3,12 +3,12 @@
 namespace app\admin\controller\system;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\system\AuthClass;
+use base\admin\controller\system\AuthBase;
 
 /**
  * @ControllerAnnotation(title="角色权限管理")
  * Class Auth
  */
-class Auth extends AuthClass
+class Auth extends AuthBase
 {
 }

app/admin/controller/system/Config.php

@@ -3,12 +3,12 @@
 namespace app\admin\controller\system;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\system\ConfigClass;
+use base\admin\controller\system\ConfigBase;
 
 /**
  * Class Config.
  * @ControllerAnnotation(title="系统配置管理")
  */
-class Config extends ConfigClass
+class Config extends ConfigBase
 {
 }

app/admin/controller/system/Menu.php

@@ -3,12 +3,12 @@
 namespace app\admin\controller\system;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\system\MenuClass;
+use base\admin\controller\system\MenuBase;
 
 /**
  * Class Menu.
  * @ControllerAnnotation(title="菜单管理",auth=true)
  */
-class Menu extends MenuClass
+class Menu extends MenuBase
 {
 }

app/admin/controller/system/Node.php

@@ -3,12 +3,12 @@
 namespace app\admin\controller\system;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\system\NodeClass;
+use base\admin\controller\system\NodeBase;
 
 /**
  * @ControllerAnnotation(title="系统节点管理")
  * Class Node
  */
-class Node extends NodeClass
+class Node extends NodeBase
 {
 }

app/admin/controller/system/Quick.php

@@ -3,12 +3,12 @@
 namespace app\admin\controller\system;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\system\QuickClass;
+use base\admin\controller\system\QuickBase;
 
 /**
  * @ControllerAnnotation(title="快捷入口管理")
  * Class Quick
  */
-class Quick extends QuickClass
+class Quick extends QuickBase
 {
 }

app/admin/controller/system/Uploadfile.php

@@ -3,12 +3,12 @@
 namespace app\admin\controller\system;
 
 use app\admin\service\annotation\ControllerAnnotation;
-use base\admin\controller\system\UploadfileClass;
+use base\admin\controller\system\UploadfileBase;
 
 /**
  * @ControllerAnnotation(title="上传文件管理")
  * Class Uploadfile
  */
-class Uploadfile extends UploadfileClass
+class Uploadfile extends UploadfileBase
 {
 }

app/admin/middleware/CsrfMiddleware.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\middleware;
 
-use base\admin\middleware\CsrfMiddlewareClass;
+use base\admin\middleware\CsrfMiddlewareBase;
 
-class CsrfMiddleware extends CsrfMiddlewareClass
+class CsrfMiddleware extends CsrfMiddlewareBase
 {
 }

app/admin/middleware/SystemLog.php

@@ -2,12 +2,12 @@
 
 namespace app\admin\middleware;
 
-use base\admin\middleware\SystemLogClass;
+use base\admin\middleware\SystemLogBase;
 
 /**
  * 系统操作日志中间件
  * Class SystemLog.
  */
-class SystemLog extends SystemLogClass
+class SystemLog extends SystemLogBase
 {
 }

app/admin/model/DebugLog.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\DebugLogClass;
+use base\admin\model\DebugLogBase;
 
-class DebugLog extends DebugLogClass
+class DebugLog extends DebugLogBase
 {
 }

app/admin/model/MallCate.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\MallCateClass;
+use base\admin\model\MallCateBase;
 
-class MallCate extends MallCateClass
+class MallCate extends MallCateBase
 {
 }

app/admin/model/MallGoods.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\MallGoodsClass;
+use base\admin\model\MallGoodsBase;
 
-class MallGoods extends MallGoodsClass
+class MallGoods extends MallGoodsBase
 {
 }

app/admin/model/MallTag.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\MallTagClass;
+use base\admin\model\MallTagBase;
 
-class MallTag extends MallTagClass
+class MallTag extends MallTagBase
 {
 }

app/admin/model/SystemAdmin.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\SystemAdminClass;
+use base\admin\model\SystemAdminBase;
 
-class SystemAdmin extends SystemAdminClass
+class SystemAdmin extends SystemAdminBase
 {
 }

app/admin/model/SystemAuth.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\SystemAuthClass;
+use base\admin\model\SystemAuthBase;
 
-class SystemAuth extends SystemAuthClass
+class SystemAuth extends SystemAuthBase
 {
 }

app/admin/model/SystemAuthNode.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\SystemAuthNodeClass;
+use base\admin\model\SystemAuthNodeBase;
 
-class SystemAuthNode extends SystemAuthNodeClass
+class SystemAuthNode extends SystemAuthNodeBase
 {
 }

app/admin/model/SystemConfig.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\SystemConfigClass;
+use base\admin\model\SystemConfigBase;
 
-class SystemConfig extends SystemConfigClass
+class SystemConfig extends SystemConfigBase
 {
 }

app/admin/model/SystemMenu.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\SystemMenuClass;
+use base\admin\model\SystemMenuBase;
 
-class SystemMenu extends SystemMenuClass
+class SystemMenu extends SystemMenuBase
 {
 }

app/admin/model/SystemNode.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\SystemNodeClass;
+use base\admin\model\SystemNodeBase;
 
-class SystemNode extends SystemNodeClass
+class SystemNode extends SystemNodeBase
 {
 }

app/admin/model/SystemQuick.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\SystemQuickClass;
+use base\admin\model\SystemQuickBase;
 
-class SystemQuick extends SystemQuickClass
+class SystemQuick extends SystemQuickBase
 {
 }

app/admin/model/SystemUploadfile.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-use base\admin\model\SystemUploadfileClass;
+use base\admin\model\SystemUploadfileBase;
 
-class SystemUploadfile extends SystemUploadfileClass
+class SystemUploadfile extends SystemUploadfileBase
 {
 }

app/admin/service/InitAdminService.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\service;
 
-use base\admin\service\InitAdminServiceClass;
+use base\admin\service\InitAdminServiceBase;
 
-class InitAdminService extends InitAdminServiceClass
+class InitAdminService extends InitAdminServiceBase
 {
 }

app/admin/service/NodeService.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\service;
 
-use base\admin\service\NodeServiceClass;
+use base\admin\service\NodeServiceBase;
 
-class NodeService extends NodeServiceClass
+class NodeService extends NodeServiceBase
 {
 }

app/admin/service/TriggerService.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\service;
 
-use base\admin\service\TriggerServiceClass;
+use base\admin\service\TriggerServiceBase;
 
-class TriggerService extends TriggerServiceClass
+class TriggerService extends TriggerServiceBase
 {
 }

app/admin/service/annotation/ControllerAnnotation.php

@@ -12,7 +12,7 @@
 
 namespace app\admin\service\annotation;
 
-use base\admin\service\annotation\ControllerAnnotationClass;
+use base\admin\service\annotation\ControllerAnnotationBase;
 use Doctrine\Common\Annotations\Annotation\Attributes;
 use Doctrine\Common\Annotations\Annotation\Target;
 
@@ -27,6 +27,6 @@ use Doctrine\Common\Annotations\Annotation\Target;
  *
  * @since 2.0
  */
-final class ControllerAnnotation extends ControllerAnnotationClass
+final class ControllerAnnotation extends ControllerAnnotationBase
 {
 }

app/admin/service/annotation/NodeAnotation.php

@@ -12,7 +12,7 @@
 
 namespace app\admin\service\annotation;
 
-use base\admin\service\annotation\NodeAnotationClass;
+use base\admin\service\annotation\NodeAnotationBase;
 use Doctrine\Common\Annotations\Annotation\Attributes;
 
 /**
@@ -24,6 +24,6 @@ use Doctrine\Common\Annotations\Annotation\Attributes;
  *   @Attribute("time", type = "int")
  * })
  */
-final class NodeAnotation extends NodeAnotationClass
+final class NodeAnotation extends NodeAnotationBase
 {
 }

app/admin/service/curd/BuildCurdService.php

@@ -2,12 +2,12 @@
 
 namespace app\admin\service\curd;
 
-use base\admin\service\curd\BuildCurdServiceClass;
+use base\admin\service\curd\BuildCurdServiceBase;
 
 /**
  * 快速构建系统CURD
  * Class BuildCurd.
  */
-class BuildCurdService extends BuildCurdServiceClass
+class BuildCurdService extends BuildCurdServiceBase
 {
 }

app/admin/service/curd/exceptions/CurdException.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\service\curd\exceptions;
 
-use base\admin\service\curd\exceptions\CurdExceptionClass;
+use base\admin\service\curd\exceptions\CurdExceptionBase;
 
-class CurdException extends CurdExceptionClass
+class CurdException extends CurdExceptionBase
 {
 }

app/admin/service/curd/exceptions/FileException.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\service\curd\exceptions;
 
-use base\admin\service\curd\exceptions\FileExceptionClass;
+use base\admin\service\curd\exceptions\FileExceptionBase;
 
-class FileException extends FileExceptionClass
+class FileException extends FileExceptionBase
 {
 }

app/admin/service/curd/exceptions/TableException.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\service\curd\exceptions;
 
-use base\admin\service\curd\exceptions\TableExceptionClass;
+use base\admin\service\curd\exceptions\TableExceptionBase;
 
-class TableException extends TableExceptionClass
+class TableException extends TableExceptionBase
 {
 }

app/admin/service/node/Node.php

@@ -12,12 +12,12 @@
 
 namespace app\admin\service\node;
 
-use base\admin\service\node\NodeClass;
+use base\admin\service\node\NodeBase;
 
 /**
  * 节点处理类
  * Class Node.
  */
-class Node extends NodeClass
+class Node extends NodeBase
 {
 }

app/admin/traits/Curd.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\traits;
 
-use base\admin\traits\CurdTraitClass;
+use base\admin\traits\CurdTraitBase;
 
 /**
  * 后台CURD复用
@@ -10,5 +10,5 @@ use base\admin\traits\CurdTraitClass;
  */
 trait Curd
 {
-    use CurdTraitClass;
+    use CurdTraitBase;
 }

composer.json

@@ -41,7 +41,7 @@
         "psr-4": {
             "app\\": "app",
             "trait\\": "extend/trait",
-            "class\\": "extend/class",
+            "base\\": "extend/base",
             "Phinx\\": "extend/phinx"
         },
         "psr-0": {

dev.php

@@ -0,0 +1,23 @@
+<?php
+
+// 递归处理多级目录extend\base\admin，将所有以 Class.php 结尾的文件重命名为 Base.php
+
+$dir = './extend/base/admin';
+
+// 递归获取所有的文件
+function scan_dir($dir)
+{
+    $files = array_diff(scandir($dir), ['..', '.']);
+    foreach ($files as $file) {
+        if (is_dir($dir . DIRECTORY_SEPARATOR . $file)) {
+            scan_dir($dir . DIRECTORY_SEPARATOR . $file);
+        } else {
+            if (str_ends_with($file, 'Class.php')) {
+                $file_path = $dir . DIRECTORY_SEPARATOR . $file;
+                $new_path = str_replace('Class.php', 'Base.php', $file_path);
+                rename($file_path, $new_path);
+            }
+        }
+    }
+}
+scan_dir($dir);

extend/base/admin/controller/AjaxBase.php

@@ -9,7 +9,7 @@ use app\common\service\UploadService;
 use think\db\Query;
 use think\facade\Cache;
 
-class AjaxClass extends AdminController
+class AjaxBase extends AdminController
 {
     /**
      * 初始化后台接口地址

extend/base/admin/controller/IndexBase.php

@@ -6,7 +6,7 @@ use app\admin\model\SystemAdmin;
 use app\admin\model\SystemQuick;
 use app\common\controller\AdminController;
 
-class IndexClass extends AdminController
+class IndexBase extends AdminController
 {
     /**
      * 后台主页.

extend/base/admin/controller/LoginBase.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace base\admin\controller;
+
+use app\admin\model\SystemAdmin;
+use app\common\controller\AdminController;
+use think\captcha\facade\Captcha;
+use think\facade\Env;
+use think\facade\Event;
+
+/**
+ * Class Login.
+ */
+class LoginBase extends AdminController
+{
+    /**
+     * 初始化方法.
+     */
+    public function initialize()
+    {
+        parent::initialize();
+        $action = $this->request->action();
+        if (!empty(session('admin')) && !in_array($action, ['out'])) {
+            $adminModuleName = config('app.admin_alias_name');
+            $this->success('已登录，无需再次登录', [], __url("@{$adminModuleName}"));
+        }
+    }
+
+    /**
+     * 用户登录.
+     * @return string
+     * @throws \Exception
+     */
+    public function index()
+    {
+        event_response('AdminLoginIndex', [
+            'controller' => $this,
+        ]);
+
+        $captcha = Env::get('adminsystem.captcha', 1);
+        if ($this->request->isPost()) {
+            $post = $this->request->post();
+            $rule = [
+                'username|用户名' => 'require',
+                'password|密码' => 'require',
+                'keep_login|是否保持登录' => 'require',
+            ];
+            $captcha == 1 && $rule['captcha|验证码'] = 'require|captcha';
+            $this->validate($post, $rule);
+            $admin = SystemAdmin::where(['username' => $post['username']])->find();
+            if (empty($admin)) {
+                $this->error('用户不存在');
+            }
+            if (password($post['password']) != $admin->password) {
+                $this->error('密码输入有误');
+            }
+            if ($admin->status == 0) {
+                $this->error('账号已被禁用');
+            }
+            $admin->login_num += 1;
+            $admin->save();
+
+            Event::trigger('AdminLoginSuccess', $admin);
+
+            $admin = $admin->toArray();
+            unset($admin['password']);
+            $admin['expire_time'] = $post['keep_login'] == 1 ? true : time() + 7200;
+            session('admin', $admin);
+
+            $this->success('登录成功');
+        }
+        $this->assign('captcha', $captcha);
+        $this->assign('demo', $this->isDemo);
+
+        return $this->fetch();
+    }
+
+    /**
+     * 用户退出.
+     * @return mixed
+     */
+    public function out()
+    {
+        session('admin', null);
+        $this->success('退出登录成功');
+    }
+
+    /**
+     * 验证码
+     * @return \think\Response
+     */
+    public function captcha()
+    {
+        return Captcha::create();
+    }
+}

extend/base/admin/controller/LoginClass.php

@@ -11,7 +11,7 @@ use think\facade\Event;
 /**
  * Class Login.
  */
-class LoginClass extends AdminController
+class LoginBase extends AdminController
 {
     /**
      * 初始化方法.

extend/base/admin/controller/debug/LogBase.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace base\admin\controller\debug;
+
+use app\admin\service\annotation\ControllerAnnotation;
+use app\common\controller\AdminController;
+use think\App;
+
+/**
+ * @ControllerAnnotation(title="debug_log")
+ */
+class LogBase extends AdminController
+{
+    protected $sort = [
+        'uid' => 'desc',
+        'id' => 'asc',
+    ];
+
+    use \app\admin\traits\Curd;
+
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+
+        $this->model = new \app\admin\model\DebugLog();
+    }
+}

extend/base/admin/controller/debug/LogClass.php

@@ -9,7 +9,7 @@ use think\App;
 /**
  * @ControllerAnnotation(title="debug_log")
  */
-class LogClass extends AdminController
+class LogBase extends AdminController
 {
     protected $sort = [
         'uid' => 'desc',

extend/base/admin/controller/mall/CateBase.php

@@ -12,7 +12,7 @@ use think\App;
  * Class Admin.
  * @ControllerAnnotation(title="商品分类管理")
  */
-class CateClass extends AdminController
+class CateBase extends AdminController
 {
     use Curd;
 

extend/base/admin/controller/mall/GoodsBase.php

@@ -14,7 +14,7 @@ use think\App;
  * Class Goods.
  * @ControllerAnnotation(title="商城商品管理")
  */
-class GoodsClass extends AdminController
+class GoodsBase extends AdminController
 {
     use Curd;
 

extend/base/admin/controller/mall/TagBase.php

@@ -9,7 +9,7 @@ use think\App;
 /**
  * @ControllerAnnotation(title="mall_tag")
  */
-class TagClass extends AdminController
+class TagBase extends AdminController
 {
     use \app\admin\traits\Curd;
 

extend/base/admin/controller/system/AdminBase.php

@@ -18,7 +18,7 @@ use think\validate\ValidateRule;
  *
  * @NodeAnotation(title="自定义权限标识符",name="customFlag")
  */
-class AdminClass extends AdminController
+class AdminBase extends AdminController
 {
     use \app\admin\traits\Curd;
 

extend/base/admin/controller/system/AuthBase.php

@@ -14,7 +14,7 @@ use think\App;
  * @ControllerAnnotation(title="角色权限管理")
  * Class Auth
  */
-class AuthClass extends AdminController
+class AuthBase extends AdminController
 {
     use \app\admin\traits\Curd;
 

extend/base/admin/controller/system/ConfigBase.php

@@ -13,7 +13,7 @@ use think\App;
  * Class Config.
  * @ControllerAnnotation(title="系统配置管理")
  */
-class ConfigClass extends AdminController
+class ConfigBase extends AdminController
 {
     public function __construct(App $app)
     {

extend/base/admin/controller/system/MenuBase.php

@@ -15,7 +15,7 @@ use think\App;
  * Class Menu.
  * @ControllerAnnotation(title="菜单管理",auth=true)
  */
-class MenuClass extends AdminController
+class MenuBase extends AdminController
 {
     use \app\admin\traits\Curd;
 

extend/base/admin/controller/system/NodeBase.php

@@ -14,7 +14,7 @@ use think\App;
  * @ControllerAnnotation(title="系统节点管理")
  * Class Node
  */
-class NodeClass extends AdminController
+class NodeBase extends AdminController
 {
     use \app\admin\traits\Curd;
 

extend/base/admin/controller/system/QuickBase.php

@@ -11,7 +11,7 @@ use think\App;
  * @ControllerAnnotation(title="快捷入口管理")
  * Class Quick
  */
-class QuickClass extends AdminController
+class QuickBase extends AdminController
 {
     use \app\admin\traits\Curd;
 

extend/base/admin/controller/system/UploadfileBase.php

@@ -11,7 +11,7 @@ use think\App;
  * @ControllerAnnotation(title="上传文件管理")
  * Class Uploadfile
  */
-class UploadfileClass extends AdminController
+class UploadfileBase extends AdminController
 {
     use \app\admin\traits\Curd;
 

extend/base/admin/middleware/CsrfMiddlewareBase.php

@@ -4,7 +4,7 @@ namespace base\admin\middleware;
 
 use think\Request;
 
-class CsrfMiddlewareClass
+class CsrfMiddlewareBase
 {
     use \app\common\traits\JumpTrait;
 

extend/base/admin/middleware/SystemLogBase.php

@@ -10,7 +10,7 @@ use think\Request;
  * 系统操作日志中间件
  * Class SystemLog.
  */
-class SystemLogClass
+class SystemLogBase
 {
     /**
      * 敏感信息字段，日志记录时需要加密.

extend/base/admin/model/DebugLogBase.php

@@ -4,7 +4,7 @@ namespace base\admin\model;
 
 use app\common\model\TimeModel;
 
-class DebugLogClass extends TimeModel
+class DebugLogBase extends TimeModel
 {
     protected $name = 'debug_log';
 

extend/base/admin/model/MallCateBase.php

@@ -4,7 +4,7 @@ namespace base\admin\model;
 
 use app\common\model\TimeModel;
 
-class MallCateClass extends TimeModel
+class MallCateBase extends TimeModel
 {
     protected $deleteTime = 'delete_time';
 }

extend/base/admin/model/MallGoodsBase.php

@@ -5,7 +5,7 @@ namespace base\admin\model;
 use app\admin\model\MallTag;
 use app\common\model\TimeModel;
 
-class MallGoodsClass extends TimeModel
+class MallGoodsBase extends TimeModel
 {
     protected $deleteTime = 'delete_time';
 

extend/base/admin/model/MallTagBase.php

@@ -4,7 +4,7 @@ namespace base\admin\model;
 
 use app\common\model\TimeModel;
 
-class MallTagClass extends TimeModel
+class MallTagBase extends TimeModel
 {
     protected $name = 'mall_tag';
 

extend/base/admin/model/SystemAdminBase.php

@@ -5,7 +5,7 @@ namespace base\admin\model;
 use app\admin\model\SystemAuth;
 use app\common\model\TimeModel;
 
-class SystemAdminClass extends TimeModel
+class SystemAdminBase extends TimeModel
 {
     protected $deleteTime = 'delete_time';
 

extend/base/admin/model/SystemAuthBase.php

@@ -6,7 +6,7 @@ use app\admin\model\SystemAuthNode;
 use app\admin\model\SystemNode;
 use app\common\model\TimeModel;
 
-class SystemAuthClass extends TimeModel
+class SystemAuthBase extends TimeModel
 {
     protected $deleteTime = 'delete_time';
 

extend/base/admin/model/SystemAuthNodeBase.php

@@ -4,7 +4,7 @@ namespace base\admin\model;
 
 use app\common\model\TimeModel;
 
-class SystemAuthNodeClass extends TimeModel
+class SystemAuthNodeBase extends TimeModel
 {
     protected $autoWriteTimestamp = false;
 

extend/base/admin/model/SystemConfigBase.php

@@ -4,7 +4,7 @@ namespace base\admin\model;
 
 use app\common\model\TimeModel;
 
-class SystemConfigClass extends TimeModel
+class SystemConfigBase extends TimeModel
 {
     protected $deleteTime = false;
 }

extend/base/admin/model/SystemMenuBase.php

@@ -5,7 +5,7 @@ namespace base\admin\model;
 use app\common\constants\MenuConstant;
 use app\common\model\TimeModel;
 
-class SystemMenuClass extends TimeModel
+class SystemMenuBase extends TimeModel
 {
     protected $deleteTime = 'delete_time';
 

extend/base/admin/model/SystemNodeBase.php

@@ -4,7 +4,7 @@ namespace base\admin\model;
 
 use app\common\model\TimeModel;
 
-class SystemNodeClass extends TimeModel
+class SystemNodeBase extends TimeModel
 {
     protected $deleteTime = false;
 

extend/base/admin/model/SystemQuickBase.php

@@ -4,7 +4,7 @@ namespace base\admin\model;
 
 use app\common\model\TimeModel;
 
-class SystemQuickClass extends TimeModel
+class SystemQuickBase extends TimeModel
 {
     protected $deleteTime = 'delete_time';
 

extend/base/admin/model/SystemUploadfileBase.php

@@ -4,6 +4,6 @@ namespace base\admin\model;
 
 use app\common\model\TimeModel;
 
-class SystemUploadfileClass extends TimeModel
+class SystemUploadfileBase extends TimeModel
 {
 }

extend/base/admin/service/InitAdminServiceBase.php

@@ -14,7 +14,7 @@ use app\admin\model\SystemNode;
 use app\admin\model\SystemQuick;
 use app\common\constants\AdminConstant;
 
-class InitAdminServiceClass
+class InitAdminServiceBase
 {
     protected $output = null;
 

extend/base/admin/service/NodeServiceBase.php

@@ -4,7 +4,7 @@ namespace base\admin\service;
 
 use app\admin\service\node\Node;
 
-class NodeServiceClass
+class NodeServiceBase
 {
     /**
      * 获取节点服务

extend/base/admin/service/TriggerServiceBase.php

@@ -4,7 +4,7 @@ namespace base\admin\service;
 
 use think\facade\Cache;
 
-class TriggerServiceClass
+class TriggerServiceBase
 {
     /**
      * 更新菜单缓存.

extend/base/admin/service/annotation/ControllerAnnotationBase.php

@@ -27,7 +27,7 @@ use Doctrine\Common\Annotations\Annotation\Target;
  *
  * @since 2.0
  */
-class ControllerAnnotationClass
+class ControllerAnnotationBase
 {
     /**
      * Route group prefix for the controller.

extend/base/admin/service/annotation/NodeAnotationBase.php

@@ -23,7 +23,7 @@ use Doctrine\Common\Annotations\Annotation\Attributes;
  *   @Attribute("time", type = "int")
  * })
  */
-class NodeAnotationClass
+class NodeAnotationBase
 {
     /**
      * 节点名称.

extend/base/admin/service/curd/BuildCurdServiceBase.php

@@ -11,7 +11,7 @@ use think\helper\Str;
  * 快速构建系统CURD
  * Class BuildCurd.
  */
-class BuildCurdServiceClass
+class BuildCurdServiceBase
 {
     /**
      * 当前目录.

extend/base/admin/service/curd/exceptions/CurdExceptionBase.php

@@ -2,6 +2,6 @@
 
 namespace base\admin\service\curd\exceptions;
 
-class CurdExceptionClass extends \Exception
+class CurdExceptionBase extends \Exception
 {
 }

extend/base/admin/service/curd/exceptions/FileExceptionBase.php

@@ -2,6 +2,6 @@
 
 namespace base\admin\service\curd\exceptions;
 
-class FileExceptionClass extends \Exception
+class FileExceptionBase extends \Exception
 {
 }

extend/base/admin/service/curd/exceptions/TableExceptionBase.php

@@ -2,6 +2,6 @@
 
 namespace base\admin\service\curd\exceptions;
 
-class TableExceptionClass extends \Exception
+class TableExceptionBase extends \Exception
 {
 }

extend/base/admin/service/node/NodeBase.php

@@ -23,7 +23,7 @@ use think\helper\Str;
  * 节点处理类
  * Class Node.
  */
-class NodeClass
+class NodeBase
 {
     /**
      * @var string 当前文件夹

extend/base/admin/traits/CurdTraitBase.php

@@ -8,7 +8,7 @@ use app\admin\service\annotation\NodeAnotation;
  * 后台CURD复用
  * Trait Curd.
  */
-trait CurdTraitClass
+trait CurdTraitBase
 {
     /**
      * @NodeAnotation(title="列表")