Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/controller/Action.php

@@ -19,7 +19,7 @@ class Action extends BaseController
     {
         $menuid = $this->request->post('menuid', 0);
 
-        return ActionLogic::List($menuid);
+        return ActionLogic::list($menuid);
     }
 
     //添加权限
@@ -31,7 +31,7 @@ class Action extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return ActionLogic::Add($param);
+        return ActionLogic::add($param);
     }
 
 //    //获取权限详情
@@ -39,7 +39,7 @@ class Action extends BaseController
 //    {
 //        $id = $this->request->post('id/d', 0);
 //
-//        return ActionLogic::Read($id);
+//        return ActionLogic::read($id);
 //    }
 
     //编辑权限
@@ -54,7 +54,7 @@ class Action extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return ActionLogic::Edit($param);
+        return ActionLogic::edit($param);
     }
 
     //删除权限
@@ -62,7 +62,7 @@ class Action extends BaseController
     {
         $id = $this->request->post('id/d', 0);
 
-        return ActionLogic::Delete($id);
+        return ActionLogic::delete($id);
     }
 
     //启禁用权限
@@ -74,7 +74,7 @@ class Action extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return ActionLogic::Status($param);
+        return ActionLogic::status($param);
     }
 
     //获取所有菜单下的所有按钮

app/admin/controller/Card.php

@@ -11,8 +11,8 @@ use think\facade\Validate;
 class Card extends BaseController
 {
 
-//获取卡类型列表
-    public function List()
+    //获取卡类型列表
+    public function list()
     {
         $param = $this->request->only(['page' => 1, 'size' => 10, 'status' => '', 'title' => '',], 'post');
 
@@ -20,11 +20,11 @@ class Card extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return CardLogic::List($param);
+        return CardLogic::list($param);
     }
 
-//添加卡类型
-    public function Add()
+    //添加卡类型
+    public function add()
     {
         $param = $this->request->only(['title'], 'post');
 
@@ -32,46 +32,46 @@ class Card extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return CardLogic::Add($param);
+        return CardLogic::add($param);
 
     }
 
-//获取卡类型详情
-    public function Read()
+    //获取卡类型详情
+    public function read()
     {
-        $id = $this->request->post('id/d',0);
-        return CardLogic::Read($id);
+        $id = $this->request->post('id/d', 0);
+        return CardLogic::read($id);
     }
 
-//编辑卡类型
-    public function Edit()
+    //编辑卡类型
+    public function edit()
     {
-        $param = $this->request->only(['id','title'], 'post');
+        $param = $this->request->only(['id', 'title'], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.cardEdit'));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return CardLogic::Edit($param);
+        return CardLogic::edit($param);
     }
 
-//卡类型启禁用
-    public function Change()
+    //卡类型启禁用
+    public function change()
     {
-        $param = $this->request->only(['id','status'], 'post');
+        $param = $this->request->only(['id', 'status'], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.status'));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return CardLogic::Change($param);
+        return CardLogic::change($param);
     }
 
-//删除卡类型
-    public function Delete()
+    //删除卡类型
+    public function delete()
     {
-        $id = $this->request->post('id/d',0);
-        return CardLogic::Delete($id);
+        $id = $this->request->post('id/d', 0);
+        return CardLogic::delete($id);
     }
 
 }

app/admin/controller/Company.php

@@ -13,7 +13,7 @@ class Company extends BaseController
 {
 
     //获取企业列表
-    public function List()
+    public function list()
     {
         $param = $this->request->only([
             'page' => 1,
@@ -24,11 +24,11 @@ class Company extends BaseController
             'status' => '',
         ], 'post');
 
-        return CompanyLogic::List($param);
+        return CompanyLogic::list($param);
     }
 
     //添加企业
-    public function Add()
+    public function add()
     {
         $param = $this->request->only(['title', 'contacts', 'mobile', 'remark' => '',], 'post');
 
@@ -36,43 +36,43 @@ class Company extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return CompanyLogic::Add($param);
+        return CompanyLogic::add($param);
     }
 
     //读取企业详情
-    public function Read()
+    public function read()
     {
         $id = $this->request->post('id/d', 0);
-        return CompanyLogic::Read($id);
+        return CompanyLogic::read($id);
     }
 
     //编辑企业
-    public function Edit()
+    public function edit()
     {
         $param = $this->request->only(['id', 'title', 'contacts', 'mobile', 'remark' => '',], 'post');
 
         $val = Validate::rule(array_merge(Config::get('validate_rules.CompanyAdd'), ['id' => 'require|number|gt:0']));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
-        return CompanyLogic::Edit($param);
+        return CompanyLogic::edit($param);
     }
 
     //企业启禁用
-    public function Change()
+    public function status()
     {
         $param = $this->request->only(['id', 'status'], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.status'));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
-        return CompanyLogic::Change($param);
+        return CompanyLogic::status($param);
     }
 
     //删除企业
-    public function Delete()
+    public function delete()
     {
         $id = $this->request->post('id/d', 0);
-        return CompanyLogic::Delete($id);
+        return CompanyLogic::delete($id);
     }
 
 }

app/admin/controller/Menu.php

@@ -16,13 +16,13 @@ class Menu extends BaseController
     //获取用户菜单列表
     public function list()
     {
-        return MenuLogic::List();
+        return MenuLogic::list();
     }
 
     //获取全部菜单
     public function all()
     {
-        return MenuLogic::All();
+        return MenuLogic::all();
     }
 
     //添加菜单
@@ -43,7 +43,7 @@ class Menu extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return MenuLogic::Add($param);
+        return MenuLogic::add($param);
     }
 
     //编辑菜单
@@ -66,7 +66,7 @@ class Menu extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return MenuLogic::Edit($param);
+        return MenuLogic::edit($param);
     }
 
     //删除菜单
@@ -74,7 +74,7 @@ class Menu extends BaseController
     {
         $id = $this->request->post('id/d', 0);
 
-        return MenuLogic::Delete($id);
+        return MenuLogic::delete($id);
     }
 
     //启禁用菜单
@@ -86,6 +86,6 @@ class Menu extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return MenuLogic::Status($param);
+        return MenuLogic::status($param);
     }
 }

app/admin/controller/Role.php

@@ -12,7 +12,7 @@ use think\facade\Validate;
 class Role extends BaseController
 {
     //获取角色列表
-    public function List()
+    public function list()
     {
         $param = $this->request->only([
             'page'=>1,
@@ -26,11 +26,11 @@ class Role extends BaseController
 
         if(!$val->check($param)) throw new ValidateException($val->getError());
 
-        return RoleLogic::List($param);
+        return RoleLogic::list($param);
     }
 
     //添加角色
-    public function Add()
+    public function add()
     {
         $param = $this->request->only(['name','level','remark','action_data'],'post');
 
@@ -38,18 +38,18 @@ class Role extends BaseController
 
         if(!$val->check($param)) throw new ValidateException($val->getError());
 
-        return RoleLogic::Add($param);
+        return RoleLogic::add($param);
     }
 
     //获取角色详情
-    public function Read()
+    public function read()
     {
         $id=$this->request->post('id/d',0);
-        return RoleLogic::Read($id);
+        return RoleLogic::read($id);
     }
 
     //编辑角色
-    public function Edit()
+    public function edit()
     {
         $param = $this->request->only(['id','name','level','remark','action_data'],'post');
 
@@ -57,20 +57,20 @@ class Role extends BaseController
 
         if(!$val->check($param)) throw new ValidateException($val->getError());
 
-        return RoleLogic::Edit($param);
+        return RoleLogic::edit($param);
 
     }
 
     //删除角色
-    public function Delete()
+    public function delete()
     {
         $id = $this->request->post('id/d', 0);
 
-        return RoleLogic::Delete($id);
+        return RoleLogic::delete($id);
     }
 
     //启禁用角色
-    public function Status()
+    public function status()
     {
         $param = $this->request->only(['id', 'status'], 'post');
 
@@ -78,7 +78,7 @@ class Role extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return RoleLogic::Status($param);
+        return RoleLogic::status($param);
     }
 
 }

app/admin/controller/Video.php

@@ -13,7 +13,7 @@ class Video extends BaseController
 {
 
     //获取视频列表
-    public function List()
+    public function list()
     {
         $param = $this->request->only([
             'page' => 1,
@@ -24,11 +24,11 @@ class Video extends BaseController
             'video_url' => '',
         ], 'post');
 
-        return VideoLogic::List($param);
+        return VideoLogic::list($param);
     }
 
     //添加视频
-    public function Add()
+    public function add()
     {
 
         $param = $this->request->only([
@@ -42,18 +42,18 @@ class Video extends BaseController
         $val = Validate::rule(Config::get('validate_rules.videoAdd'));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
-        return VideoLogic::Add($param);
+        return VideoLogic::add($param);
     }
 
     //读取视频详情
-    public function Read()
+    public function read()
     {
         $id = $this->request->post('id/d', 0);
-        return VideoLogic::Read($id);
+        return VideoLogic::read($id);
     }
 
     //编辑视频
-    public function Edit()
+    public function edit()
     {
         $param = $this->request->only([
             'id',
@@ -67,25 +67,25 @@ class Video extends BaseController
         $val = Validate::rule(Config::get('validate_rules.videoEdit'));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
-        return VideoLogic::Edit($param);
+        return VideoLogic::edit($param);
     }
 
     //视频启禁用
-    public function Change()
+    public function change()
     {
         $param = $this->request->only(['id', 'status',], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.status'));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
-        return VideoLogic::Change($param);
+        return VideoLogic::change($param);
     }
 
     //删除视频
-    public function Delete()
+    public function delete()
     {
         $id = $this->request->post('id/d', 0);
-        return VideoLogic::Delete($id);
+        return VideoLogic::delete($id);
     }
 
 }

app/admin/logic/ActionLogic.php

@@ -11,7 +11,7 @@ use think\response\Json;
 class ActionLogic extends BaseLogic
 {
     //获取权限列表
-    public static function List(int $menuid = 0): Json
+    public static function list(int $menuid = 0): Json
     {
         $data = ActionModel::alias('a')
             ->field('a.*,action_name')
@@ -23,7 +23,7 @@ class ActionLogic extends BaseLogic
     }
 
     //添加权限
-    public static function Add(array $data = []): Json
+    public static function add(array $data = []): Json
     {
         $rs = ActionModel::field('id')
             ->where(['menuid' => $data['menuid'], 'action_code' => $data['action_code']])
@@ -40,7 +40,7 @@ class ActionLogic extends BaseLogic
     }
 
     //获取权限详情
-    public static function Read(int $id = 0): Json
+    public static function read(int $id = 0): Json
     {
         $menu = ActionModel::alias('a')
             ->field('a.*,action_name')
@@ -55,7 +55,7 @@ class ActionLogic extends BaseLogic
     }
 
     //编辑权限
-    public static function Edit(array $data = []): Json
+    public static function edit(array $data = []): Json
     {
         $rs = ActionModel::field(true)
             ->where('id', $data['id'])
@@ -80,14 +80,14 @@ class ActionLogic extends BaseLogic
     }
 
     //删除权限
-    public static function Delete(int $id = 0): Json
+    public static function delete(int $id = 0): Json
     {
         $rs = ActionModel::where('id', $id)->delete();
         return $rs ? json_show(CommonModel::$success, '删除成功') : json_show(CommonModel::$error_param, '删除失败');
     }
 
     //启禁用权限
-    public static function Status(array $data = []): Json
+    public static function status(array $data = []): Json
     {
         $rs = ActionModel::where(['id' => $data['id']])
             ->where('status', '<>', $data['status'])

app/admin/logic/CardLogic.php

@@ -10,7 +10,7 @@ use think\response\Json;
 class CardLogic extends BaseLogic
 {
     //获取卡类型列表
-    public static function List(array $data = []): Json
+    public static function list(array $data = []): Json
     {
         $db = CardModel::where('is_del', CommonModel::$del_normal);
         if ($data['title'] != '') $db->whereLike('title', '%' . $data['title'] . '%');
@@ -29,7 +29,7 @@ class CardLogic extends BaseLogic
     }
 
     //添加卡类型
-    public static function Add(array $data = []): Json
+    public static function add(array $data = []): Json
     {
         $rs = CardModel::field('id')
             ->where(['is_del' => CommonModel::$del_normal, 'title' => $data['title']])
@@ -52,7 +52,7 @@ class CardLogic extends BaseLogic
     }
 
     //获取卡类型详情
-    public static function Read(int $id = 0): Json
+    public static function read(int $id = 0): Json
     {
         $rs = CardModel::field(true)
             ->where(['id' => $id, 'is_del' => CommonModel::$del_normal])
@@ -62,7 +62,7 @@ class CardLogic extends BaseLogic
     }
 
     //编辑卡类型
-    public static function Edit(array $data = []): Json
+    public static function edit(array $data = []): Json
     {
         $rs = CardModel::field('id,title')
             ->where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
@@ -91,7 +91,7 @@ class CardLogic extends BaseLogic
     }
 
     //卡类型启禁用
-    public static function Change(array $data = []): Json
+    public static function change(array $data = []): Json
     {
         $where = [
             ['id', '=', $data['id']],
@@ -111,7 +111,7 @@ class CardLogic extends BaseLogic
     }
 
     //删除卡类型
-    public static function Delete(int $id = 0): Json
+    public static function delete(int $id = 0): Json
     {
         $rs = CardModel::where(['id' => $id, 'is_del' => CommonModel::$del_normal])
             ->save(['is_del' => CommonModel::$del_deleted, 'updatetime' => date('Y-m-d H:i:s')]);

app/admin/logic/CompanyLogic.php

@@ -10,7 +10,7 @@ use think\response\Json;
 class CompanyLogic extends BaseLogic
 {
     //获取企业列表
-    public static function List(array $data = []): Json
+    public static function list(array $data = []): Json
     {
         $db = CompanyModel::where('is_del', CommonModel::$del_normal);
         if ($data['status'] != '') $db->where('status', $data['status']);
@@ -31,7 +31,7 @@ class CompanyLogic extends BaseLogic
     }
 
     //添加企业
-    public static function Add(array $data = []): Json
+    public static function add(array $data = []): Json
     {
         $rs = CompanyModel::field('id')
             ->where(['is_del' => CommonModel::$del_normal, 'title' => $data['title']])
@@ -57,7 +57,7 @@ class CompanyLogic extends BaseLogic
     }
 
     //读取企业详情
-    public static function Read(int $id = 0): Json
+    public static function read(int $id = 0): Json
     {
         $rs = CompanyModel::field(true)
             ->where(['id' => $id, 'is_del' => CommonModel::$del_normal])
@@ -67,7 +67,7 @@ class CompanyLogic extends BaseLogic
     }
 
     //编辑企业
-    public static function Edit(array $data = []): Json
+    public static function edit(array $data = []): Json
     {
         $rs = CompanyModel::field('id,title')
             ->where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
@@ -97,7 +97,7 @@ class CompanyLogic extends BaseLogic
     }
 
     //企业启禁用
-    public static function Change(array $data = []): Json
+    public static function status(array $data = []): Json
 
     {
         $where = [
@@ -125,7 +125,7 @@ class CompanyLogic extends BaseLogic
     }
 
     //删除企业
-    public static function Delete(int $id = 0): Json
+    public static function delete(int $id = 0): Json
     {
         $rs = CompanyModel::where(['id' => $id, 'is_del' => CommonModel::$del_normal])
             ->save(['is_del' => CommonModel::$del_deleted]);

app/admin/logic/MenuLogic.php

@@ -11,7 +11,7 @@ class MenuLogic extends BaseLogic
 {
 
     //获取用户菜单列表
-    public static function List(): Json
+    public static function list(): Json
     {
         //menu_action是一个视图
         $data = Db::name('menu_action')
@@ -53,7 +53,7 @@ class MenuLogic extends BaseLogic
     }
 
     //获取全部菜单
-    public static function All(): Json
+    public static function all(): Json
     {
         $list = AdminMenuModel::field('id,menu_name,menu_type,menu_img,menu_route,menu_url,status,weight,addtime,is_private private')
             ->where(['pid' => 0, 'is_show' => AdminMenuModel::$show])
@@ -74,7 +74,7 @@ class MenuLogic extends BaseLogic
     }
 
     //添加菜单
-    public static function Add(array $data = []): Json
+    public static function add(array $data = []): Json
     {
 
         $data = array_merge($data, [
@@ -90,7 +90,7 @@ class MenuLogic extends BaseLogic
     }
 
     //编辑菜单
-    public static function Edit(array $data = []): Json
+    public static function edit(array $data = []): Json
     {
         $rs = AdminMenuModel::field('id')
             ->where(['id' => $data['id']])
@@ -106,7 +106,7 @@ class MenuLogic extends BaseLogic
     }
 
     //删除菜单
-    public static function Delete(int $id = 0): Json
+    public static function delete(int $id = 0): Json
     {
         $rs = AdminMenuModel::field('id')
             ->where(['id' => $id, 'is_show' => AdminMenuModel::$show, 'status' => AdminMenuModel::$status_normal])
@@ -126,7 +126,7 @@ class MenuLogic extends BaseLogic
     }
 
     //启禁用菜单
-    public static function Status(array $data = []): Json
+    public static function status(array $data = []): Json
     {
         $rs = AdminMenuModel::field('id')
             ->where('id', $data['id'])

app/admin/logic/RoleLogic.php

@@ -11,7 +11,7 @@ use think\response\Json;
 class RoleLogic extends BaseLogic
 {
     //获取角色列表
-    public static function List(array $data = []): Json
+    public static function list(array $data = []): Json
     {
         $db = RoleModel::where('is_del', CommonModel::$del_normal);
         if ($data['name'] != '') $db->whereLike('name', '%' . $data['name'] . '%');
@@ -30,7 +30,7 @@ class RoleLogic extends BaseLogic
     }
 
     //添加角色
-    public static function Add(array $data = []): Json
+    public static function add(array $data = []): Json
     {
         Db::startTrans();
         try {
@@ -73,7 +73,7 @@ class RoleLogic extends BaseLogic
     }
 
     //获取角色详情
-    public static function Read(int $id = 0): Json
+    public static function read(int $id = 0): Json
     {
         $rs = RoleModel::field(true)
             ->where(['id' => $id, 'is_del' => CommonModel::$del_normal])
@@ -84,7 +84,7 @@ class RoleLogic extends BaseLogic
     }
 
     //编辑角色
-    public static function Edit(array $data = []): Json
+    public static function edit(array $data = []): Json
     {
         Db::startTrans();
         try {
@@ -128,7 +128,7 @@ class RoleLogic extends BaseLogic
     }
 
     //删除角色
-    public static function Delete(int $id = 0): Json
+    public static function delete(int $id = 0): Json
     {
         Db::startTrans();
         try {
@@ -161,7 +161,7 @@ class RoleLogic extends BaseLogic
     }
 
     //启禁用菜单
-    public static function Status(array $data = []): Json
+    public static function status(array $data = []): Json
     {
         Db::startTrans();
         try {

app/admin/route/app.php

@@ -26,35 +26,35 @@ Route::rule('menuActionDel', 'admin/Action/delete');//删除菜单下按钮
 Route::rule('menuActionlist', 'admin/Action/index');//获取所有菜单下的所有按钮
 
 //【角色】
-Route::rule('roleList', 'admin/Role/List');//获取角色列表
-Route::rule('roleAdd', 'admin/Role/Add');//添加角色
-Route::rule('roleRead', 'admin/Role/Read');//获取角色详情
-Route::rule('roleEdit', 'admin/Role/Edit');//编辑角色
-Route::rule('roleDelete', 'admin/Role/Delete');//删除角色
-Route::rule('roleStatus', 'admin/Role/Status');//启禁用角色
+Route::rule('roleList', 'admin/Role/list');//获取角色列表
+Route::rule('roleAdd', 'admin/Role/add');//添加角色
+Route::rule('roleRead', 'admin/Role/read');//获取角色详情
+Route::rule('roleEdit', 'admin/Role/edit');//编辑角色
+Route::rule('roleDelete', 'admin/Role/delete');//删除角色
+Route::rule('roleStatus', 'admin/Role/status');//启禁用角色
 
 
 //【视频】
-Route::rule('videoList', 'admin/Video/List');//获取视频列表
-Route::rule('videoAdd', 'admin/Video/Add');//添加视频
-Route::rule('videoRead', 'admin/Video/Read');//获取视频详情
-Route::rule('videoEdit', 'admin/Video/Edit');//编辑视频
-Route::rule('videoChange', 'admin/Video/Change');//视频启禁用
-Route::rule('videoDelete', 'admin/Video/Delete');//删除视频
+Route::rule('videoList', 'admin/Video/list');//获取视频列表
+Route::rule('videoAdd', 'admin/Video/add');//添加视频
+Route::rule('videoRead', 'admin/Video/read');//获取视频详情
+Route::rule('videoEdit', 'admin/Video/rdit');//编辑视频
+Route::rule('videoChange', 'admin/Video/change');//视频启禁用
+Route::rule('videoDelete', 'admin/Video/delete');//删除视频
 
 //【卡类型】
-Route::rule('cardList', 'admin/Card/List');//获取卡类型列表
-Route::rule('cardAdd', 'admin/Card/Add');//添加卡类型
-Route::rule('cardRead', 'admin/Card/Read');//获取卡类型详情
-Route::rule('cardEdit', 'admin/Card/Edit');//编辑卡类型
-Route::rule('cardChange', 'admin/Card/Change');//卡类型启禁用
-Route::rule('cardDelete', 'admin/Card/Delete');//删除卡类型
+Route::rule('cardList', 'admin/Card/list');//获取卡类型列表
+Route::rule('cardAdd', 'admin/Card/add');//添加卡类型
+Route::rule('cardRead', 'admin/Card/read');//获取卡类型详情
+Route::rule('cardEdit', 'admin/Card/edit');//编辑卡类型
+Route::rule('cardChange', 'admin/Card/change');//卡类型启禁用
+Route::rule('cardDelete', 'admin/Card/delete');//删除卡类型
 
 //【企业】
-Route::rule('companyList', 'admin/Company/List');//获取企业列表
-Route::rule('companyAdd', 'admin/Company/Add');//添加企业
-Route::rule('companyRead', 'admin/Company/Read');//获取企业详情
-Route::rule('companyEdit', 'admin/Company/Edit');//编辑企业
-Route::rule('companyChange', 'admin/Company/Change');//企业启禁用
-Route::rule('companyDelete', 'admin/Company/Delete');//删除企业
+Route::rule('companyList', 'admin/Company/list');//获取企业列表
+Route::rule('companyAdd', 'admin/Company/add');//添加企业
+Route::rule('companyRead', 'admin/Company/read');//获取企业详情
+Route::rule('companyEdit', 'admin/Company/edit');//编辑企业
+Route::rule('companyChange', 'admin/Company/status');//企业启禁用
+Route::rule('companyDelete', 'admin/Company/delete');//删除企业