去掉控制器方法的后缀名

README.md

@@ -3,7 +3,6 @@
 <p align="center">
 <a href="http://www.gdoo.net"><img src="https://img.shields.io/badge/version-beta2.2.x-%23ff0000" alt="Build Status" /></a>
 <a href="http://www.gdoo.net"><img src="https://img.shields.io/badge/laravel-8.0-%23ef3b2d" alt="laravel framework" /></a>
-<a href="http://www.gdoo.net"><img src="https://img.shields.io/badge/gdooFramework-1.0-%234c5ec2" alt="Gdoo快速开发框架" /></a>
 <a href="http://www.gdoo.net"><img src="https://img.shields.io/badge/MYSQL-8.0-%2300758f" alt="License" /></a>
 <a href="http://www.gdoo.net"><img src="https://img.shields.io/badge/Licence-Apache2.0-blue.svg?style=flat" /></a>
 </p>

app/Gdoo/Approach/Controllers/ApproachController.php

@@ -14,7 +14,7 @@ class ApproachController extends WorkflowController
 {
     public $permission = ['dialog', 'reference', 'useCount', 'serviceReview', 'serviceCostList', 'serviceCostDetail', 'product'];
 
-    public function indexAction()
+    public function index()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -92,7 +92,7 @@ class ApproachController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
 
@@ -111,29 +111,29 @@ class ApproachController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $this->layout = 'layouts.print2';
-        print_prince($this->createAction('print'));
+        print_prince($this->create('print'));
     }
 
     // 关闭操作
-    public function closeAction()
+    public function close()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -146,7 +146,7 @@ class ApproachController extends WorkflowController
     }
 
     // 产品明细
-    public function productAction()
+    public function product()
     {
         $query = Request::all();
         if (Request::method() == 'POST') {
@@ -161,7 +161,7 @@ class ApproachController extends WorkflowController
     }
 
     // 核销单选择
-    public function serviceReviewAction()
+    public function serviceReview()
     {
         $header = Grid::header([
             'code' => 'approach',
@@ -245,7 +245,7 @@ class ApproachController extends WorkflowController
     }
 
     // 费用申请明细
-    public function serviceCostDetailAction()
+    public function serviceCostDetail()
     {
         $query = Request::all();
         $customer_id = (int)$query['customer_id'];
@@ -330,7 +330,7 @@ class ApproachController extends WorkflowController
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -350,7 +350,7 @@ class ApproachController extends WorkflowController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Approach/Controllers/MarketController.php

@@ -14,7 +14,7 @@ class MarketController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -74,7 +74,7 @@ class MarketController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -87,22 +87,22 @@ class MarketController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');
@@ -111,7 +111,7 @@ class MarketController extends DefaultController
     }
 
     // 对话框
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'approach_market',

app/Gdoo/Approach/Controllers/ReviewController.php

@@ -15,7 +15,7 @@ class ReviewController extends WorkflowController
 {
     public $permission = ['dialog', 'reference', 'useCount', 'feeDetail'];
 
-    public function indexAction()
+    public function index()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -78,7 +78,7 @@ class ReviewController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
 
@@ -102,29 +102,29 @@ class ReviewController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $this->layout = 'layouts.print2';
-        print_prince($this->createAction('print'));
+        print_prince($this->create('print'));
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -145,7 +145,7 @@ class ReviewController extends WorkflowController
     }
 
     // 兑现明细
-    public function feeDetailAction()
+    public function feeDetail()
     {
         $query = Request::all();
         if (Request::method() == 'POST') {
@@ -155,7 +155,7 @@ class ReviewController extends WorkflowController
         return $this->render(['query' => $query]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Article/Controllers/ArticleController.php

@@ -23,7 +23,7 @@ class ArticleController extends DefaultController
 {
     public $permission = [];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'article',
@@ -101,7 +101,7 @@ class ArticleController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'article', 'id' => $id]);
@@ -110,12 +110,12 @@ class ArticleController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
         $id = (int)Request::get('id');
 
@@ -156,7 +156,7 @@ class ArticleController extends DefaultController
     /**
      * 阅读记录
      */
-    public function readerAction()
+    public function reader()
     {
         $id = Request::get('id', 0);
 
@@ -190,7 +190,7 @@ class ArticleController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Article/Controllers/WidgetController.php

@@ -14,7 +14,7 @@ class WidgetController extends DefaultController
     /**
      * 公告部件
      */
-    public function indexAction()
+    public function index()
     {
         if (Request::isJson()) {
             $model = DB::table('article')
@@ -42,7 +42,7 @@ class WidgetController extends DefaultController
     /**
      * 公告信息
      */
-    public function infoAction()
+    public function info()
     {
         $config = InfoService::getInfo('article');
 

app/Gdoo/Calendar/Controllers/CalendarController.php

@@ -17,7 +17,7 @@ class CalendarController extends DefaultController
     /**
      * 日历首页
      */
-    public function indexAction()
+    public function index()
     {
         $user_id = Request::get('user_id', Auth::id());
 
@@ -40,7 +40,7 @@ class CalendarController extends DefaultController
     /**
      * 日历列表
      */
-    public function calendarsAction()
+    public function calendars()
     {
         $user_id = Request::get('user_id', Auth::id());
         $calendars = CalendarService::getCalendars($user_id);
@@ -71,7 +71,7 @@ class CalendarController extends DefaultController
         ], true);
     }
 
-    public function activeAction()
+    public function active()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -96,7 +96,7 @@ class CalendarController extends DefaultController
         }
     }
 
-    public function addAction()
+    public function add()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -114,12 +114,12 @@ class CalendarController extends DefaultController
     }
 
     // 帮助信息
-    public function helpAction()
+    public function help()
     {
         return $this->render();
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $id = Request::get('id');
         if ($id > 0) {

app/Gdoo/Calendar/Controllers/EventController.php

@@ -20,7 +20,7 @@ class EventController extends DefaultController
     public $permission = ['share', 'items'];
 
     // 事件列表
-    public function indexAction()
+    public function index()
     {
         $gets = Request::all();
         $calendars = CalendarService::getCalendars($gets['user_id']);
@@ -61,7 +61,7 @@ class EventController extends DefaultController
     }
 
     // 客户端显示事件列表
-    public function itemsAction()
+    public function items()
     {
         $gets = Request::all();
         $start = strtotime($gets['start']);
@@ -124,7 +124,7 @@ class EventController extends DefaultController
     }
 
     // 调整事件
-    public function resizeAction()
+    public function resize()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -156,7 +156,7 @@ class EventController extends DefaultController
     }
 
     // 移动事件
-    public function moveAction()
+    public function move()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -204,7 +204,7 @@ class EventController extends DefaultController
         }
     }
 
-    public function addAction()
+    public function add()
     {
         $gets = Request::all();
         // 更新数据
@@ -298,7 +298,7 @@ class EventController extends DefaultController
     }
 
     // 编辑事件
-    public function editAction()
+    public function edit()
     {
         $gets = Request::all();
 
@@ -609,7 +609,7 @@ class EventController extends DefaultController
         }
     }
 
-    public function viewAction()
+    public function view()
     {
         $id = (int)Request::get('id');
         $event = CalendarService::getEvent($id);
@@ -686,7 +686,7 @@ class EventController extends DefaultController
         ));
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $id = Request::get('id');
         if ($id > 0) {

app/Gdoo/Calendar/Sabre/CalDAV/Plugin.php

@@ -1320,7 +1320,7 @@ class Plugin extends DAV\ServerPlugin {
      * @param array $postVars
      * @return bool
      */
-    public function browserPostAction($uri, $action, array $postVars) {
+    public function browserPost($uri, $action, array $postVars) {
 
         if ($action!=='mkcalendar')
             return;

app/Gdoo/Calendar/Sabre/CardDAV/Plugin.php

@@ -688,7 +688,7 @@ class Plugin extends DAV\ServerPlugin {
      * @param array $postVars
      * @return bool
      */
-    public function browserPostAction($uri, $action, array $postVars) {
+    public function browserPost($uri, $action, array $postVars) {
 
         if ($action!=='mkaddressbook')
             return;

app/Gdoo/Chat/Controllers/ChatController.php

@@ -45,7 +45,7 @@ class ChatController extends Controller
         });
     }
 
-    public function startAction() 
+    public function start() 
     {
         return $this->return_json([
             'title' => $this->setting['title'],
@@ -53,19 +53,19 @@ class ChatController extends Controller
         ]);
     }
 
-    public function indexAction() 
+    public function index() 
     {
         return $this->render([
             'user' => $this->user,
         ]);
     }
 
-    public function getServerURLAction() 
+    public function getServerURL() 
     {
         return ChatService::getServerURL($this->user);
     }
 
-    public function uploadAction(Request $request) 
+    public function upload(Request $request) 
     {
         if ($request->method() == 'POST') {
             $user = $this->user;
@@ -124,19 +124,19 @@ class ChatController extends Controller
         }
     }
 
-    public function getHistoryAction() 
+    public function getHistory() 
     {
         $auth_id = $this->user['id'];
         $json = ChatService::getHistory($auth_id);
         return $this->return_json($json);
     }
 
-    public function getMaxUploadAction() 
+    public function getMaxUpload() 
     {
         return $this->return_json(['maxUpload' => $this->setting['upload_max']]);
     }
 
-    public function getGroupUserAction(Request $request) 
+    public function getGroupUser(Request $request) 
     {
         $gets = $request->all();
         $auth_id = $this->user['id'];
@@ -144,7 +144,7 @@ class ChatController extends Controller
         return $this->return_json($json);
     }
 
-    public function clearRecordAction(Request $request) 
+    public function clearRecord(Request $request) 
     {
         $gets = $request->all();
         $auth_id = $this->user['id'];
@@ -152,14 +152,14 @@ class ChatController extends Controller
         return $this->return_json('删除成功');
     }
 
-    public function inviteUserAction(Request $request) 
+    public function inviteUser(Request $request) 
     {
         $gets = $request->all();
         ChatService::inviteUser($this->user, $gets['gid'], $gets['val']);
         return $this->return_json('邀请成功');
     }
 
-    public function getReceiverAction(Request $request) 
+    public function getReceiver(Request $request) 
     {
         $gets = $request->all();
         $auth_id = $this->user['id'];
@@ -167,7 +167,7 @@ class ChatController extends Controller
         return $this->return_json(['receinfor' => $json]);
     }
 
-    public function exitGroupAction(Request $request) 
+    public function exitGroup(Request $request) 
     {
         $gets = $request->all();
         $auth_id = $this->user['id'];
@@ -175,7 +175,7 @@ class ChatController extends Controller
         return $this->return_json('退出会话成功');
     }
 
-    public function createGroupAction(Request $request) 
+    public function createGroup(Request $request) 
     {
         $gets = $request->all();
         $auth_id = $this->user['id'];
@@ -190,7 +190,7 @@ class ChatController extends Controller
         return $this->return_json('创建会话成功');
     }
 
-    public function clearHistoryAction(Request $request) 
+    public function clearHistory(Request $request) 
     {
         $gets = $request->all();
         $auth_id = $this->user['id'];
@@ -198,7 +198,7 @@ class ChatController extends Controller
         return $this->return_json('退出会话成功');
     }
 
-	public function getDepartmentUserDataAction()
+	public function getDepartmentUserData()
 	{
 		$roles = DB::table('role')->get()->toNested();
         $departments = DB::table('department')
@@ -244,7 +244,7 @@ class ChatController extends Controller
         return $this->return_json($json);
     }
     
-    public function loginAction(Request $request) 
+    public function login(Request $request) 
     {
         if ($request->method() == 'POST') {
             $gets = $request->all();
@@ -262,7 +262,7 @@ class ChatController extends Controller
         return $this->render();
     }
 
-    public function logoutAction() 
+    public function logout() 
     {
         Auth::logout();
         Session::flush();
@@ -272,7 +272,7 @@ class ChatController extends Controller
     /**
 	* 撤回消息功能
 	*/
-    public function recallMessageAction(Request $request) 
+    public function recallMessage(Request $request) 
     {
         $auth_id = $this->user['id'];
         $gets = $request->all();
@@ -280,7 +280,7 @@ class ChatController extends Controller
         return $this->return_json($json);
     }
 
-    public function sendMessageAction(Request $request) 
+    public function sendMessage(Request $request) 
     {
         $gets = $request->all();
         $auth = $this->user;
@@ -291,7 +291,7 @@ class ChatController extends Controller
         return $this->return_json($json);
     }
     
-    public function getRecordAction(Request $request) 
+    public function getRecord(Request $request) 
     {
         $auth = $this->user;
         $auth_id = (int)$auth['id'];
@@ -498,7 +498,7 @@ class ChatController extends Controller
         return $this->return_json($json);
     }
 
-    public function initAction(Request $request)
+    public function init(Request $request)
     {
         $auth_id = $this->user['id'];
         $roles = DB::table('role')->get()->toNested();

app/Gdoo/Customer/Controllers/BusinessController.php

@@ -16,7 +16,7 @@ class BusinessController extends DefaultController
     public $permission = [];
 
     // 商机列表
-    public function indexAction()
+    public function index()
     {
     }
 }

app/Gdoo/Customer/Controllers/ComplaintController.php

@@ -16,7 +16,7 @@ class ComplaintController extends WorkflowController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -78,7 +78,7 @@ class ComplaintController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -100,22 +100,22 @@ class ComplaintController extends WorkflowController
         return $this->display(['form' => $form], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
-        return $this->createAction('print');
+        return $this->create('print');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $id = Request::get('id');

app/Gdoo/Customer/Controllers/ContactController.php

@@ -15,7 +15,7 @@ class ContactController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_contact',
@@ -74,7 +74,7 @@ class ContactController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'customer_contact','id' => $id, 'action' => $action]);
@@ -83,17 +83,17 @@ class ContactController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');
@@ -101,7 +101,7 @@ class ContactController extends DefaultController
         }
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'customer_contact',

app/Gdoo/Customer/Controllers/CustomerApplyController.php

@@ -15,7 +15,7 @@ class CustomerApplyController extends WorkflowController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_apply',
@@ -85,7 +85,7 @@ class CustomerApplyController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'create')
+    public function create($action = 'create')
     {
         $id = (int)Request::get('id');
 
@@ -103,22 +103,22 @@ class CustomerApplyController extends WorkflowController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Customer/Controllers/CustomerClassController.php

@@ -15,7 +15,7 @@ class CustomerClassController extends DefaultController
 {
     public $permission = ['dialog'];
     
-    public function indexAction()
+    public function index()
     {
         $display = $this->access;
 
@@ -71,7 +71,7 @@ class CustomerClassController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'customer_class', 'id' => $id]);
@@ -80,12 +80,12 @@ class CustomerClassController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form([], [
             ['text','customer_class.name','名称'],
@@ -108,7 +108,7 @@ class CustomerClassController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $id = Request::get('id');

app/Gdoo/Customer/Controllers/CustomerController.php

@@ -16,7 +16,7 @@ class CustomerController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer',
@@ -101,7 +101,7 @@ class CustomerController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'create')
+    public function create($action = 'create')
     {
         $id = (int)Request::get('id');
 
@@ -125,12 +125,12 @@ class CustomerController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -150,7 +150,7 @@ class CustomerController extends DefaultController
         ]);
     }
 
-    public function priceEditAction()
+    public function priceEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -188,13 +188,13 @@ class CustomerController extends DefaultController
         ]);
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
     // 数据导入
-    public function importAction()
+    public function import()
     {
         if (Request::method() == 'POST') {
             return Form::import(['table' => 'customer', 'keys' => ['code', 'username']]);
@@ -203,7 +203,7 @@ class CustomerController extends DefaultController
         return $this->render(['tips' => $tips], 'layouts.import');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');
@@ -211,7 +211,7 @@ class CustomerController extends DefaultController
         }
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form(
             ['advanced' => ''], [

app/Gdoo/Customer/Controllers/DeliveryAddressController.php

@@ -15,7 +15,7 @@ class DeliveryAddressController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_delivery_address',
@@ -73,7 +73,7 @@ class DeliveryAddressController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'customer_delivery_address','id' => $id, 'action' => $action]);
@@ -82,17 +82,17 @@ class DeliveryAddressController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');
@@ -100,7 +100,7 @@ class DeliveryAddressController extends DefaultController
         }
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'customer_delivery_address',

app/Gdoo/Customer/Controllers/PriceController.php

@@ -18,7 +18,7 @@ class PriceController extends DefaultController
 {
     public $permission = ['dialog', 'list', 'referCustomer'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_price',
@@ -84,7 +84,7 @@ class PriceController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'customer_price', 'id' => $id, 'action' => $action]);
@@ -93,17 +93,17 @@ class PriceController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function listAction()
+    public function list()
     {
         $gets = Request::all();
         if ($gets['customer_id']) {
@@ -129,7 +129,7 @@ class PriceController extends DefaultController
         return $this->json($rows, true);
     }
 
-    public function referCustomerAction()
+    public function referCustomer()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -179,7 +179,7 @@ class PriceController extends DefaultController
         ]);
     }
 
-    public function importAction()
+    public function import()
     {
         if (Request::method() == 'POST') {
             return Form::import(['table' => 'customer_price', 'keys' => ['customer_id', 'product_id']]);
@@ -188,7 +188,7 @@ class PriceController extends DefaultController
         return $this->render(['tips' => $tips], 'layouts.import');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Customer/Controllers/RegionController.php

@@ -15,7 +15,7 @@ class RegionController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_region',
@@ -79,7 +79,7 @@ class RegionController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
 
@@ -96,12 +96,12 @@ class RegionController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form([], [
             ['text','customer_region.name','名称'],
@@ -147,7 +147,7 @@ class RegionController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Customer/Controllers/RegionTaskController.php

@@ -15,7 +15,7 @@ class RegionTaskController extends AuditController
 {
     public $permission = [];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_region_task',
@@ -84,7 +84,7 @@ class RegionTaskController extends AuditController
         ]);
     }
 
-    public function createAction($action = 'create')
+    public function create($action = 'create')
     {
         $id = (int)Request::get('id');
 
@@ -104,20 +104,20 @@ class RegionTaskController extends AuditController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
     /**
      * 区域进度
      */
-    public function progressAction()
+    public function progress()
     {
         $year = date('Y');
         $search = search_form([], [[
@@ -293,7 +293,7 @@ class RegionTaskController extends AuditController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Customer/Controllers/ReportController.php

@@ -18,7 +18,7 @@ class ReportController extends DefaultController
     public $permission = [];
 
     // 客户对账单
-    public function accountStatementAction()
+    public function accountStatement()
     {
         $sdate = date('Y-01-01');
         $edate = date('Y-m-d');

app/Gdoo/Customer/Controllers/TaskController.php

@@ -15,7 +15,7 @@ class TaskController extends AuditController
 {
     public $permission = ['importExcel'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_task',
@@ -75,7 +75,7 @@ class TaskController extends AuditController
         ]);
     }
 
-    public function createAction($action = 'create')
+    public function create($action = 'create')
     {
         $id = (int)Request::get('id');
         $form = Form::make([
@@ -94,20 +94,20 @@ class TaskController extends AuditController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
     /**
      * 区域进度
      */
-    public function progressAction()
+    public function progress()
     {
         $year = date('Y');
         $search = search_form([], [[
@@ -311,7 +311,7 @@ class TaskController extends AuditController
         ]);
     }
 
-    public function importExcelAction()
+    public function importExcel()
     {
         if (Request::method() == 'POST') {
             $file = Request::file('file');
@@ -358,7 +358,7 @@ class TaskController extends AuditController
         return view('importExcel');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Customer/Controllers/TaxController.php

@@ -15,7 +15,7 @@ class TaxController extends AuditController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_tax',
@@ -81,7 +81,7 @@ class TaxController extends AuditController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'customer_tax', 'id' => $id, 'action' => $action]);
@@ -90,17 +90,17 @@ class TaxController extends AuditController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -143,7 +143,7 @@ class TaxController extends AuditController
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -163,7 +163,7 @@ class TaxController extends AuditController
         ]);
     }
     
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Customer/Controllers/TypeController.php

@@ -15,7 +15,7 @@ class TypeController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_type',
@@ -67,7 +67,7 @@ class TypeController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'customer_type', 'id' => $id]);
@@ -76,12 +76,12 @@ class TypeController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form([], [
             ['text','customer_type.name','名称'],
@@ -103,7 +103,7 @@ class TypeController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Customer/Controllers/WidgetController.php

@@ -10,7 +10,7 @@ class WidgetController extends DefaultController
     public $permission = ['birthday'];
 
     // 生日提醒
-    public function birthdayAction()
+    public function birthday()
     {
         if (Request::method() == 'POST') {
 

app/Gdoo/Customer/views/complaint/progress.blade.php

@@ -87,7 +87,7 @@
 
     gdoo.grids[table] = {grid: grid};
 
-    var action = new gridAction(table, '客户销售进度');
+    var action = new grid(table, '客户销售进度');
     var panel = $('#' + table + '-controller');
 
     panel.on('click', '[data-toggle="' + table + '"]', function() {

app/Gdoo/Customer/views/regionTask/progress.blade.php

@@ -73,7 +73,7 @@
 
     gdoo.grids[table] = {grid: grid};
 
-    var action = new gridAction(table, '区域销售进度');
+    var action = new grid(table, '区域销售进度');
     var panel = $('#' + table + '-controller');
 
     panel.on('click', '[data-toggle="' + table + '"]', function() {

app/Gdoo/Customer/views/task/progress.blade.php

@@ -88,7 +88,7 @@
 
     gdoo.grids[table] = {grid: grid};
 
-    var action = new gridAction(table, '客户销售进度');
+    var action = new grid(table, '客户销售进度');
     var panel = $('#' + table + '-controller');
 
     panel.on('click', '[data-toggle="' + table + '"]', function() {

app/Gdoo/CustomerCost/Controllers/AdjustController.php

@@ -17,7 +17,7 @@ class AdjustController extends AuditController
 {
     public $permission = [];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_cost_adjust',
@@ -82,7 +82,7 @@ class AdjustController extends AuditController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
 
@@ -100,17 +100,17 @@ class AdjustController extends AuditController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/CustomerCost/Controllers/CategoryController.php

@@ -15,7 +15,7 @@ class CategoryController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_cost_category',
@@ -64,7 +64,7 @@ class CategoryController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'customer_cost_category', 'id' => $id]);
@@ -73,12 +73,12 @@ class CategoryController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-   public function dialogAction()
+   public function dialog()
     {
         $search = search_form([], [
             ['text','customer_cost_category.name','名称'],
@@ -101,7 +101,7 @@ class CategoryController extends DefaultController
     }
 
     // 删除
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/CustomerCost/Controllers/CompenController.php

@@ -17,7 +17,7 @@ class CompenController extends AuditController
 {
     public $permission = ['importExcel'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_cost_compen',
@@ -78,7 +78,7 @@ class CompenController extends AuditController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
 
@@ -96,17 +96,17 @@ class CompenController extends AuditController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function importExcelAction()
+    public function importExcel()
     {
         if (Request::method() == 'POST') {
             $file = Request::file('file');
@@ -150,7 +150,7 @@ class CompenController extends AuditController
         return view('importExcel');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/CustomerCost/Controllers/CostController.php

@@ -17,7 +17,7 @@ class CostController extends AuditController
 {
     public $permission = ['dialog', 'serviceSaleOrder', 'useCount'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_cost',
@@ -88,7 +88,7 @@ class CostController extends AuditController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
 
@@ -106,18 +106,18 @@ class CostController extends AuditController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
     // 费用参照到订单
-    public function serviceSaleOrderAction() 
+    public function serviceSaleOrder() 
     {
         $header = Grid::header([
             'code' => 'customer_cost',
@@ -183,7 +183,7 @@ class CostController extends AuditController
     }
 
     // 可用列表
-    public function useCountAction()
+    public function useCount()
     {
         $customer_id = Request::get('customer_id');
         $count = DB::table('customer_cost_data')
@@ -194,7 +194,7 @@ class CostController extends AuditController
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -215,7 +215,7 @@ class CostController extends AuditController
     }
 
     // 费用关闭
-    public function closeAction()
+    public function close()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -233,7 +233,7 @@ class CostController extends AuditController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/CustomerCost/Controllers/RebateController.php

@@ -17,7 +17,7 @@ class RebateController extends AuditController
 {
     public $permission = ['importExcel'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_cost_rebate',
@@ -78,7 +78,7 @@ class RebateController extends AuditController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
 
@@ -96,17 +96,17 @@ class RebateController extends AuditController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function importExcelAction()
+    public function importExcel()
     {
         if (Request::method() == 'POST') {
             $file = Request::file('file');
@@ -146,7 +146,7 @@ class RebateController extends AuditController
         return view('importExcel');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/CustomerCost/Controllers/ReportController.php

@@ -12,7 +12,7 @@ class ReportController extends DefaultController
     /**
      * 费用使用统计
      */
-    public function saleOrderDetailAction()
+    public function saleOrderDetail()
     {
         $sdate = date('Y-m-01');
         $edate = date('Y-m-d');

app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php

@@ -60,7 +60,7 @@
 
     gdoo.grids[table] = {grid: grid};
 
-    var action = new gridAction(table, '销售订单费用明细表');
+    var action = new grid(table, '销售订单费用明细表');
     var panel = $('#' + table + '-controller');
 
     panel.on('click', '[data-toggle="' + table + '"]', function() {

app/Gdoo/File/Controllers/AttachmentController.php

@@ -26,7 +26,7 @@ class AttachmentController extends DefaultController
         parent::__construct();
     }
     
-    public function draftAction()
+    public function draft()
     {
         set_time_limit(0);
 
@@ -67,7 +67,7 @@ class AttachmentController extends DefaultController
         return 0;
     }
 
-    public function fileinfoAction()
+    public function fileinfo()
     {
         $id = Request::get('id', 0);
         $type = Request::get('type', 0);
@@ -113,7 +113,7 @@ class AttachmentController extends DefaultController
         }
     }
 
-    public function removeAction()
+    public function remove()
     {
         $id = Request::get('id', 0);
         if ($id > 0) {
@@ -130,7 +130,7 @@ class AttachmentController extends DefaultController
         return 0;
     }
 
-    public function uploaderAction()
+    public function uploader()
     {
         set_time_limit(0);
 
@@ -187,7 +187,7 @@ class AttachmentController extends DefaultController
         ]);
     }
 
-    public function addAction()
+    public function add()
     {
         set_time_limit(0);
 
@@ -234,7 +234,7 @@ class AttachmentController extends DefaultController
         }
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $gets = Request::all();
         if ($gets['id'] > 0) {
@@ -254,7 +254,7 @@ class AttachmentController extends DefaultController
     }
 
     // 预览文件
-    public function showAction()
+    public function show()
     {
         $id = (int)Request::get('id');
         $model = Request::get('model');
@@ -284,7 +284,7 @@ class AttachmentController extends DefaultController
     /**
      * 预览文件
      */
-    public function previewAction()
+    public function preview()
     {
         $id = Request::get('id');
         $file = Attachment::where('id', $id)->first();
@@ -301,7 +301,7 @@ class AttachmentController extends DefaultController
     }
 
     // 下载文件
-    public function downloadAction()
+    public function download()
     {
         $id = (int)Request::get('id');
         $row = DB::table('attachment')->where('id', $id)->first();

app/Gdoo/File/Controllers/CertificateController.php

@@ -13,7 +13,7 @@ use Illuminate\Support\Str;
 
 class CertificateController extends DefaultController
 {
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'file_certificate',
@@ -67,7 +67,7 @@ class CertificateController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         if (Request::method() == 'POST') {
             $file = Request::file('file');
@@ -104,7 +104,7 @@ class CertificateController extends DefaultController
         return $this->render();
     }
 
-    public function downloadAction()
+    public function download()
     {
         $id = (int) Request::get('id', 0);
         $row = DB::table('file_certificate')->where('id', $id)->first();
@@ -131,7 +131,7 @@ class CertificateController extends DefaultController
         }
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $id = (array)Request::get('id');
         $rows = DB::table('file_certificate')->whereIn('id', $id)->get();

app/Gdoo/File/Controllers/FileController.php

@@ -21,7 +21,7 @@ class FileController extends DefaultController
             ['id' => 'receive','name' => '我收到的'],
         ];
 
-    public function index1Action()
+    public function index1()
     {
         $rows = [
             ['id' => 'common', 'name' => '公共云盘'],
@@ -35,7 +35,7 @@ class FileController extends DefaultController
     }
 
     // 新建文件夹
-    public function folderAction()
+    public function folder()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -53,7 +53,7 @@ class FileController extends DefaultController
     }
 
     // 共享操作
-    public function sharingAction()
+    public function sharing()
     {
         $gets = Request::all();
 
@@ -86,7 +86,7 @@ class FileController extends DefaultController
     }
 
     // 上传文件
-    public function uploadAction()
+    public function upload()
     {
         $parent_id = Request::get('parent_id', 0);
         
@@ -131,7 +131,7 @@ class FileController extends DefaultController
     }
 
     // 个人云盘
-    public function indexAction()
+    public function index()
     {
         $user_id = auth()->id();
         $parent_id = Request::get('parent_id', 0);
@@ -170,7 +170,7 @@ class FileController extends DefaultController
     }
 
     // 共享给我的
-    public function receiveAction()
+    public function receive()
     {
         $user_id = auth()->id();
         $shares = Share::getItemsSourceBy(['folder', 'file'], $user_id)->pluck('created_id');
@@ -181,7 +181,7 @@ class FileController extends DefaultController
     }
 
     // 共享给我的
-    public function receivedataAction()
+    public function receivedata()
     {
         $user_id = Request::get('user_id');
         $parent_id = Request::get('parent_id');
@@ -250,7 +250,7 @@ class FileController extends DefaultController
     }
 
     // 我共享的
-    public function shareAction()
+    public function share()
     {
         $user_id = Request::get('user_id', auth()->id());
 
@@ -318,7 +318,7 @@ class FileController extends DefaultController
     }
 
     // 公共网盘
-    public function commonAction()
+    public function common()
     {
         $folder_id = Request::get('folder_id', 0);
         $files = DB::table('file')
@@ -340,7 +340,7 @@ class FileController extends DefaultController
         ]);
     }
 
-    public function downAction()
+    public function down()
     {
         $id = (int) Request::get('id', 0);
         $row = DB::table('file')->where('id', $id)->first();
@@ -372,7 +372,7 @@ class FileController extends DefaultController
         }
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $id = (array)Request::get('id');

app/Gdoo/File/Controllers/InspectReportController.php

@@ -13,7 +13,7 @@ use Illuminate\Support\Str;
 
 class InspectReportController extends DefaultController
 {
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'file_inspect_report',
@@ -67,7 +67,7 @@ class InspectReportController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         if (Request::method() == 'POST') {
             $file = Request::file('file');
@@ -104,7 +104,7 @@ class InspectReportController extends DefaultController
         return $this->render();
     }
 
-    public function downloadAction()
+    public function download()
     {
         $id = (int) Request::get('id', 0);
         $row = DB::table('file_inspect_report')->where('id', $id)->first();
@@ -131,7 +131,7 @@ class InspectReportController extends DefaultController
         }
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $id = (array)Request::get('id');
         $rows = DB::table('file_inspect_report')->whereIn('id', $id)->get();

app/Gdoo/Forum/Controllers/CategoryController.php

@@ -7,7 +7,7 @@ use Gdoo\Index\Controllers\DefaultController;
 
 class CategoryController extends DefaultController
 {
-    public function indexAction()
+    public function index()
     {
         // 更新排序
         if ($post = $this->post('sort')) {
@@ -29,7 +29,7 @@ class CategoryController extends DefaultController
         ]);
     }
 
-    public function addAction()
+    public function add()
     {
         $id = (int)Request::get('id');
 
@@ -55,7 +55,7 @@ class CategoryController extends DefaultController
         ));
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if ($id = Request::get('id')) {
             DB::table('forum')->where('id', $id)->delete();

app/Gdoo/Forum/Controllers/PostController.php

@@ -11,7 +11,7 @@ use Gdoo\Index\Controllers\DefaultController;
 class PostController extends DefaultController
 {
     // 板块列表
-    public function indexAction()
+    public function index()
     {
         $forum = Forum::where('forum.state', 1);
 
@@ -47,7 +47,7 @@ class PostController extends DefaultController
     }
 
     // 论坛类别帖子列表
-    public function forumAction()
+    public function forum()
     {
         $id = Request::get('id');
 
@@ -95,7 +95,7 @@ class PostController extends DefaultController
         ]);
     }
 
-    public function addAction()
+    public function add()
     {
         $id = Request::get('id');
         $forum_id = Request::get('forum_id');
@@ -140,7 +140,7 @@ class PostController extends DefaultController
         ]);
     }
 
-    public function commentAction()
+    public function comment()
     {
         $id = Request::get('id');
         $parent_id = Request::get('parent_id');
@@ -177,7 +177,7 @@ class PostController extends DefaultController
         ]);
     }
 
-    public function viewAction()
+    public function view()
     {
         $id = (int)Request::get('id');
 
@@ -211,7 +211,7 @@ class PostController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $id = (int)Request::get('id');
 

app/Gdoo/Index/Controllers/ApiController.php

@@ -14,7 +14,7 @@ class ApiController extends Controller
     /**
      * 初始化JS输出
      */
-    public function commonAction()
+    public function common()
     {
         $settings['public_url'] = URL::to('/');
         $settings['upload_file_type'] = $this->setting['upload_type'];
@@ -31,7 +31,7 @@ class ApiController extends Controller
     /**
      * 任务调用
      */
-    public function taskAction()
+    public function task()
     {
         $rows = DB::table('cron')->where('status', 1)->get();
         if ($rows) {
@@ -56,7 +56,7 @@ class ApiController extends Controller
     /**
      * 获取单据编号
      */
-    public function billSeqNoAction()
+    public function billSeqNo()
     {
         $bill_id = Request::get('bill_id');
         $date = Request::get('date');
@@ -76,7 +76,7 @@ class ApiController extends Controller
     /**
      * 汉字转拼音
      */
-    public function pinyinAction()
+    public function pinyin()
     {
         $word = Request::get('name');
         $type = Request::get('type');
@@ -95,7 +95,7 @@ class ApiController extends Controller
     /**
      * 显示位置信息
      */
-    public function locationAction()
+    public function location()
     {
         $gets = Request::all();
         return $this->render(array(
@@ -106,7 +106,7 @@ class ApiController extends Controller
     /**
      * 系统字典
      */
-    public function dictAction()
+    public function dict()
     {
         $key = Request::get('key');
         $rows = option($key);
@@ -116,7 +116,7 @@ class ApiController extends Controller
     /**
      * 系统选项
      */
-    public function optionAction()
+    public function option()
     {
         $key = Request::get('key');
         $rows = option($key);
@@ -126,7 +126,7 @@ class ApiController extends Controller
     /**
      * 不支持浏览器提示
      */
-    public function unsupportedBrowserAction()
+    public function unsupportedBrowser()
     {
         return $this->render();
     }
@@ -134,7 +134,7 @@ class ApiController extends Controller
     /*
      * 显示用户列表
      */
-    public function dialogAction()
+    public function dialog()
     {
         $gets = Request::all();
         return $this->render([
@@ -145,7 +145,7 @@ class ApiController extends Controller
     /*
      * 调用省市县显示
      */
-    public function regionAction()
+    public function region()
     {
         $parent_id = Request::get('parent_id', 0);
         $layer = Request::get('layer', 1);

app/Gdoo/Index/Controllers/AttachmentController.php

@@ -16,7 +16,7 @@ class AttachmentController extends DefaultController
     /**
      * 上传文件
      */
-    public function uploaderAction()
+    public function uploader()
     {
         if (Request::method() == 'POST') {
             $file = Request::file('file');
@@ -71,7 +71,7 @@ class AttachmentController extends DefaultController
     /**
      * 新建文件
      */
-    public function createAction()
+    public function create()
     {
         set_time_limit(0);
 
@@ -110,7 +110,7 @@ class AttachmentController extends DefaultController
     /**
      * 二维码上传
      */
-    public function qrcodeAction()
+    public function qrcode()
     {
         $key = Request::get('key');
         $path = Request::get('path');
@@ -127,7 +127,7 @@ class AttachmentController extends DefaultController
     /**
      * 获取文件列表
      */
-    public function listAction()
+    public function list()
     {
         $id = Request::get('id');
         $rows = AttachmentService::get($id);
@@ -137,7 +137,7 @@ class AttachmentController extends DefaultController
     /**
      * 获取草稿列表
      */
-    public function draftAction()
+    public function draft()
     {
         $key = Request::get('key');
         $rows = AttachmentService::draft($key);
@@ -147,7 +147,7 @@ class AttachmentController extends DefaultController
     /**
     * 预览文件
     */
-    public function showAction()
+    public function show()
     {
         $id = Request::get('id');
 
@@ -170,7 +170,7 @@ class AttachmentController extends DefaultController
     /**
      * 预览文件
      */
-    public function previewAction()
+    public function preview()
     {
         $id = Request::get('id');
         $file = AttachmentService::get($id)[0];
@@ -194,7 +194,7 @@ class AttachmentController extends DefaultController
     /**
      * 下载文件
      */
-    public function downloadAction()
+    public function download()
     {
         $id = Request::get('id');
         if ($id) {
@@ -204,7 +204,7 @@ class AttachmentController extends DefaultController
         }
     }
     
-    public function deleteAction()
+    public function delete()
     {
         $gets = Request::all();
         if ($gets['id']) {

app/Gdoo/Index/Controllers/AuditController.php

@@ -24,7 +24,7 @@ class AuditController extends DefaultController
     /**
      * 审核
      */
-    public function auditAction()
+    public function audit()
     {
         if (Request::method() == 'POST') {
             $key = Request::get('key');
@@ -48,7 +48,7 @@ class AuditController extends DefaultController
     /**
      * 弃审
      */
-    public function abortAction()
+    public function abort()
     {
         if (Request::method() == 'POST') {
             $key = Request::get('key');

app/Gdoo/Index/Controllers/DashboardController.php

@@ -10,7 +10,7 @@ class DashboardController extends DefaultController
 {
     public $permission = ['index', 'config', 'quickMenu', 'settingWidget', 'settingInfo'];
 
-    public function indexAction()
+    public function index()
     {
         $auth = auth()->user();
 
@@ -110,7 +110,7 @@ class DashboardController extends DefaultController
     }
 
     // 仪表板设置
-    public function configAction()
+    public function config()
     {
         $auth = auth()->user();
 
@@ -250,7 +250,7 @@ class DashboardController extends DefaultController
     }
 
     // 添加快捷菜单
-    public function quickMenuAction()
+    public function quickMenu()
     {
         $menus = DB::table('menu')->orderBy('lft', 'asc')->get();
         $menus = array_nest($menus);
@@ -261,7 +261,7 @@ class DashboardController extends DefaultController
     }
 
     // 设置单个组件
-    public function settingInfoAction()
+    public function settingInfo()
     {
         // 定义权限
         $permissions = option('role.access')->pluck('name', 'id');
@@ -298,7 +298,7 @@ class DashboardController extends DefaultController
     }
 
     // 设置单个组件
-    public function settingWidgetAction()
+    public function settingWidget()
     {
         $widget_id = Request::input('widget_id');
         $row = UserWidget::where('id', $widget_id)->first();

app/Gdoo/Index/Controllers/DefaultController.php

@@ -48,7 +48,7 @@ class DefaultController extends Controller
     /**
      * 保存表单
      */
-    public function storeAction()
+    public function store()
     {
         $gets = Request::all();
         $master = $gets['master'];
@@ -81,7 +81,7 @@ class DefaultController extends Controller
     /**
      * 关闭行数据
      */
-    public function closeRowAction()
+    public function closeRow()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -103,7 +103,7 @@ class DefaultController extends Controller
     /**
      * 关闭所有行数据
      */
-    public function closeAllRowAction()
+    public function closeAllRow()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {

app/Gdoo/Index/Controllers/DemoController.php

@@ -7,12 +7,12 @@ use Request;
 class DemoController extends Controller
 {
     #[Attribute(Attribute::TARGET_FUNCTION)]
-    public function vouchAction()
+    public function vouch()
     {
         return $this->display();
     }
 
-    public function helloAction()
+    public function hello()
     {
     }
 }

app/Gdoo/Index/Controllers/IndexController.php

@@ -18,7 +18,7 @@ class IndexController extends DefaultController
         'support',
     ];
 
-    public function indexAction()
+    public function index()
     {
         $user = auth()->user();
         return $this->render([
@@ -27,7 +27,7 @@ class IndexController extends DefaultController
     }
 
     // 技术支持
-    public function supportAction()
+    public function support()
     {
         return $this->render();
     }
@@ -35,7 +35,7 @@ class IndexController extends DefaultController
     /*
      * 通用对话框
      */
-    public function dialogAction()
+    public function dialog()
     {
         $gets = Request::all();
         return $this->render([
@@ -44,7 +44,7 @@ class IndexController extends DefaultController
     }
 
     // 获取单个待办数量
-    public function badgeAction()
+    public function badge()
     {
         $key = Request::input('key');
         if ($key) {
@@ -57,7 +57,7 @@ class IndexController extends DefaultController
     }
 
     // 获取全部待办数量
-    public function badgesAction()
+    public function badges()
     {
         $badges = ModuleService::badges();
         $json = [];

app/Gdoo/Index/Controllers/WorkflowController.php

@@ -46,7 +46,7 @@ class WorkflowController extends DefaultController
     /**
      * 流程审核
      */
-    public function flowAuditAction()
+    public function flowAudit()
     {
         $gets = Request::all();
 
@@ -220,7 +220,7 @@ class WorkflowController extends DefaultController
     /**
      * 撤回流程
      */
-    public function recallAction()
+    public function recall()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -332,7 +332,7 @@ class WorkflowController extends DefaultController
     /**
      * 弃审流程
      */
-    public function abortAction()
+    public function abort()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -416,7 +416,7 @@ class WorkflowController extends DefaultController
     /**
      * 标记已阅读
      */
-    public function flowReadAction()
+    public function flowRead()
     {
         if (Request::method() == 'POST') {
             $gets = Request::get('master');
@@ -430,7 +430,7 @@ class WorkflowController extends DefaultController
     /**
      * 流程清除重置
      */
-    public function flowResetAction()
+    public function flowReset()
     {
         if (Request::method() == 'POST') {
             $master = Request::get('master');
@@ -460,7 +460,7 @@ class WorkflowController extends DefaultController
     /**
      * 保存草稿
      */
-    public function flowDraftAction()
+    public function flowDraft()
     {
         $gets = Request::all();
         $master = $gets['master'];
@@ -498,7 +498,7 @@ class WorkflowController extends DefaultController
     /**
      * 获取办理步骤
      */
-    public function flowStepAction()
+    public function flowStep()
     {
         $gets = Request::all();
         $master = $gets['master'];
@@ -668,7 +668,7 @@ class WorkflowController extends DefaultController
     /**
      * 审批记录
      */
-    public function flowLogAction()
+    public function flowLog()
     {
         $key = Request::get('key');
         $keys = AES::decrypt($key, config('app.key'));
@@ -745,7 +745,7 @@ class WorkflowController extends DefaultController
     /**
      * 回退已经生效的流程
      */
-    public function flowReturnAction()
+    public function flowReturn()
     {
         $gets = Request::all();
         $run_id = $gets['run_id'];
@@ -838,7 +838,7 @@ class WorkflowController extends DefaultController
     /**
      * 流程修正
      */
-    public function flowReviseAction()
+    public function flowRevise()
     {
         $gets = Request::all();
         $keys = AES::decrypt($gets['key'], config('app.key'));
@@ -988,7 +988,7 @@ class WorkflowController extends DefaultController
     /**
      * 统计待办流程数量
      */
-    public function flowCountAction()
+    public function flowCount()
     {
         $rows = DB::table('model_step_log')->where('user_id', auth()->id())
         ->where('status', 0)

app/Gdoo/Model/Controllers/BillController.php

@@ -14,7 +14,7 @@ use Gdoo\Index\Controllers\DefaultController;
 
 class BillController extends DefaultController
 {
-    public function indexAction()
+    public function index()
     {
         $search = search_form([
             'advanced' => '',
@@ -211,7 +211,7 @@ class BillController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -245,17 +245,17 @@ class BillController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function storeAction()
+    public function store()
     {
-        return $this->editAction();
+        return $this->edit();
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $ids = (array)Request::get('id');
         if (count($ids) > 0) {

app/Gdoo/Model/Controllers/FieldController.php

@@ -22,7 +22,7 @@ class FieldController extends DefaultController
 {
     public $permission = ['getColumns', 'getEnums'];
 
-    public function indexAction()
+    public function index()
     {
         $model_id = Request::get('model_id');
 
@@ -61,7 +61,7 @@ class FieldController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $model_id = (int)Request::get('model_id');
         $id = (int)Request::get('id');
@@ -384,7 +384,7 @@ class FieldController extends DefaultController
     /**
      * 获取字段类型
      */
-    public function typeAction()
+    public function type()
     {
         $type = Request::get('type');
         $model_id = Request::get('model_id');
@@ -396,7 +396,7 @@ class FieldController extends DefaultController
     /**
      * 字段关联对象
      */
-    public function getColumnsAction()
+    public function getColumns()
     {
         $table = Request::get('table');
 
@@ -416,13 +416,13 @@ class FieldController extends DefaultController
         return $this->json($rows, true);
     }
 
-    public function getEnumsAction()
+    public function getEnums()
     {
         $enums = Option::where('parent_id', 0)->orderBy('sort', 'asc')->orderBy('id', 'asc')->get();
         return $enums;
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $model_id = Request::get('model_id');
         $id = Request::get('id');

app/Gdoo/Model/Controllers/ModelController.php

@@ -20,7 +20,7 @@ use Gdoo\Index\Controllers\DefaultController;
 
 class ModelController extends DefaultController
 {
-    public function indexAction()
+    public function index()
     {
         $header = [
             'master_name' => '模型',
@@ -167,7 +167,7 @@ class ModelController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -200,17 +200,17 @@ class ModelController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function storeAction()
+    public function store()
     {
-        return $this->editAction();
+        return $this->edit();
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $ids = (array)Request::get('id');
         if (count($ids) > 0) {

app/Gdoo/Model/Controllers/ModuleController.php

@@ -16,7 +16,7 @@ class ModuleController extends DefaultController
 {
     public $permission = ['refresh'];
 
-    public function indexAction()
+    public function index()
     {
         $header = [
             'master_name' => '模块',
@@ -148,7 +148,7 @@ class ModuleController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $id = Request::get('id');
@@ -160,7 +160,7 @@ class ModuleController extends DefaultController
     /**
      * 更新模块列表
      */
-    public function refreshAction()
+    public function refresh()
     {
         if (Request::method() == 'POST') {
             $modules = ModuleService::details();

app/Gdoo/Model/Controllers/PermissionController.php

@@ -18,7 +18,7 @@ class PermissionController extends DefaultController
 {
     public $permission = ['index','create','delete'];
 
-    public function indexAction()
+    public function index()
     {
         if (Request::method() == 'POST') {
             $sorts = Request::get('sort');
@@ -41,7 +41,7 @@ class PermissionController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -103,7 +103,7 @@ class PermissionController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $id = Request::get('id');
         if ($id > 0) {

app/Gdoo/Model/Controllers/StepController.php

@@ -20,7 +20,7 @@ class StepController extends DefaultController
 {
     public $permission = ['condition', 'steps', 'index2', 'save', 'add', 'show'];
 
-    public function indexAction()
+    public function index()
     {
         // 更新排序
         if (Request::method() == 'POST') {
@@ -58,7 +58,7 @@ class StepController extends DefaultController
         ]);
     }
 
-    public function index2Action()
+    public function index2()
     {
         // 更新排序
         if (Request::method() == 'POST') {
@@ -122,7 +122,7 @@ class StepController extends DefaultController
     }
 
     // 克隆步骤
-    public function addAction()
+    public function add()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -139,14 +139,14 @@ class StepController extends DefaultController
         }
     }
 
-    public function showAction()
+    public function show()
     {
         $gets = Request::all();
         $row = DB::table('model_step')->where('id', $gets['id'])->first();
         return $this->json($row, true);
     }
 
-    public function saveAction()
+    public function save()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -167,7 +167,7 @@ class StepController extends DefaultController
     /**
      * 节点条件
      */
-    public function conditionAction()
+    public function condition()
     {
         $id = Request::get('id');
         $bill_id = Request::get('bill_id');
@@ -240,7 +240,7 @@ class StepController extends DefaultController
     /**
      * 创建步骤
      */
-    public function createAction()
+    public function create()
     {
         $id = Request::get('id');
         $bill_id = Request::get('bill_id');
@@ -303,7 +303,7 @@ class StepController extends DefaultController
     /**
      * 流程移交
      */
-    public function moveAction()
+    public function move()
     {
         $id = Request::get('id');
         $bill_id = Request::get('bill_id');
@@ -364,7 +364,7 @@ class StepController extends DefaultController
         ]);
     }
 
-    public function stepsAction()
+    public function steps()
     {
         $table = Request::get('table');
         $model = Model::where('table', $table)->first();
@@ -376,7 +376,7 @@ class StepController extends DefaultController
         return json_encode($rows);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $id = Request::get('id');
         if ($id > 0) {

app/Gdoo/Model/Controllers/TemplateController.php

@@ -17,7 +17,7 @@ class TemplateController extends DefaultController
 {
     public $permission = ['create', 'create2', 'create3'];
 
-    public function indexAction()
+    public function index()
     {
         if (Request::method() == 'POST') {
             $sorts = Request::get('sort');
@@ -45,7 +45,7 @@ class TemplateController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $gets = Request::all();
 
@@ -147,7 +147,7 @@ class TemplateController extends DefaultController
         ]);
     }
 
-    public function create2Action()
+    public function create2()
     {
         $gets = Request::all();
 
@@ -245,7 +245,7 @@ class TemplateController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         $id = Request::get('id');
         if ($id > 0) {

app/Gdoo/Model/Controllers/TodoController.php

@@ -13,7 +13,7 @@ class TodoController extends DefaultController
     /**
      * 流程待办
      */
-    public function widgetAction(Request $request)
+    public function widget(Request $request)
     {
         if ($request->method() == 'POST') {
             $bill_id = $request->get('bill_id');

app/Gdoo/Model/Grid.php

@@ -1145,7 +1145,7 @@ class Grid
         ];
         
         $js = "gdoo.grids.$table = ".json_encode($search, JSON_UNESCAPED_UNICODE).";";
-        $js .= "gdoo.grids.$table.action = new gridAction('".$table."', '".$header['master_name']."');";
+        $js .= "gdoo.grids.$table.action = new grid('".$table."', '".$header['master_name']."');";
         $js .= "gdoo.grids.$table.action.routes = ".json_encode($routes, JSON_UNESCAPED_UNICODE).';';
         $js .= "gdoo.grids.$table.action.bill_url = '{$mc}';";
         $res = '<script>'.$js.'</script>';

app/Gdoo/Order/Controllers/LogisticsController.php

@@ -17,7 +17,7 @@ class LogisticsController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'logistics',
@@ -66,7 +66,7 @@ class LogisticsController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'logistics', 'id' => $id, 'action' => $action]);
@@ -75,17 +75,17 @@ class LogisticsController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');
@@ -93,7 +93,7 @@ class LogisticsController extends DefaultController
         }
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form([
             'advanced' => '',

app/Gdoo/Order/Controllers/OrderController.php

@@ -45,7 +45,7 @@ class OrderController extends WorkflowController
         'serviceCustomerMoney',
     ];
 
-    public function indexAction()
+    public function index()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -277,7 +277,7 @@ class OrderController extends WorkflowController
     /**
      * 订单明细列表
      */
-    public function detailAction()
+    public function detail()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -401,7 +401,7 @@ class OrderController extends WorkflowController
     /**
      * 发货计划
      */
-    public function deliveryAction()
+    public function delivery()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -600,7 +600,7 @@ class OrderController extends WorkflowController
     /**
      * 获取发货计划明细
      */
-    public function deliveryPlanAction()
+    public function deliveryPlan()
     {
         $query = Request::all();
         if (Request::method() == 'POST') {
@@ -615,7 +615,7 @@ class OrderController extends WorkflowController
     /**
      *  修改运费支付方式
      */
-    public function deliveryEditAction()
+    public function deliveryEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -634,7 +634,7 @@ class OrderController extends WorkflowController
     /**
      *  修改物流信息
      */
-    public function logisticsPlanAction()
+    public function logisticsPlan()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -661,7 +661,7 @@ class OrderController extends WorkflowController
     /**
      * 修改发货计划日期
      */
-    public function deliveryPlanDateAction()
+    public function deliveryPlanDate()
     {
         $query = Request::all();
         if (Request::method() == 'POST') {
@@ -672,7 +672,7 @@ class OrderController extends WorkflowController
         }
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -694,23 +694,23 @@ class OrderController extends WorkflowController
         return $this->display(['form' => $form], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -730,7 +730,7 @@ class OrderController extends WorkflowController
         ]);
     }
 
-    public function printAction()
+    public function print()
     {
         $id = Request::get('id');
         $template_id = Request::get('template_id');
@@ -764,11 +764,11 @@ class OrderController extends WorkflowController
             ]);
         }
 
-        $tpl = $this->createAction('print');
+        $tpl = $this->create('print');
         return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'customer_order',
@@ -833,7 +833,7 @@ class OrderController extends WorkflowController
     /**
      * 参照到促销申请
      */
-    public function servicePromotionAction()
+    public function servicePromotion()
     {
         $search = search_form([], [
             ['text','customer.name','客户名称'],
@@ -921,7 +921,7 @@ class OrderController extends WorkflowController
     }
 
     // 发货参照订单
-    public function serviceDeliveryAction()
+    public function serviceDelivery()
     {
         $date = date("Y-m-d", strtotime("+1 day"));
         $search = search_form(
@@ -978,7 +978,7 @@ class OrderController extends WorkflowController
     }
 
     // 未发货订单(参照)
-    public function serviceNotDeliveryAction()
+    public function serviceNotDelivery()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -1032,7 +1032,7 @@ class OrderController extends WorkflowController
     }
 
     // 订单退货(参照)
-    public function serviceCancelOrderAction()
+    public function serviceCancelOrder()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -1101,7 +1101,7 @@ class OrderController extends WorkflowController
         ]);
     }
 
-    public function serviceCustomerMoneyAction()
+    public function serviceCustomerMoney()
     {
         $tax_id = Request::get('tax_id');
         $tax = DB::table('customer_tax')->where('id', $tax_id)->first();
@@ -1130,7 +1130,7 @@ class OrderController extends WorkflowController
         return $data;
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $id = Request::get('id');

app/Gdoo/Order/Controllers/PlanController.php

@@ -25,7 +25,7 @@ class PlanController extends DefaultController
     /**
      * 生产计划总表
      */
-    public function indexAction()
+    public function index()
     {
         // 开始天
         $sdate = date('Y-m-d', strtotime("-1 day"));
@@ -94,7 +94,7 @@ class PlanController extends DefaultController
     /**
      * 外销销售进度表
      */
-    public function export_saleAction()
+    public function export_sale()
     {
         // 开始天
         $sdate = date('Y-m-01');
@@ -217,7 +217,7 @@ class PlanController extends DefaultController
     /**
      * 生产计划
      */
-    public function produceAction()
+    public function produce()
     {
         // 开始天
         $sdate = date('Y-m-d', strtotime("-1 day"));
@@ -322,7 +322,7 @@ class PlanController extends DefaultController
     /**
      * 获取发货计划明细
      */
-    public function producePlanAction()
+    public function producePlan()
     {
         $query = Request::all();
         if (Request::method() == 'POST') {
@@ -362,7 +362,7 @@ class PlanController extends DefaultController
     }
 
     // 保存生产计划
-    public function produce_saveAction()
+    public function produce_save()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -391,7 +391,7 @@ class PlanController extends DefaultController
     }
 
     // 提交生产计划
-    public function produce_submitAction()
+    public function produce_submit()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();

app/Gdoo/Order/Controllers/ReportController.php

@@ -40,7 +40,7 @@ class ReportController extends DefaultController
     }
 
     // 销售曲线图分析
-    public function indexAction()
+    public function index()
     {
         // 本年时间
         $now_year = date('Y');
@@ -216,7 +216,7 @@ class ReportController extends DefaultController
     }
 
     // 全国数据分类方法
-    public function categoryAction()
+    public function category()
     {
         $customer_type = Request::get('customer_type', 0);
 
@@ -480,7 +480,7 @@ class ReportController extends DefaultController
     }
 
     // 客户销售排序
-    public function rankingAction()
+    public function ranking()
     {
         // 客户名称
         $customer_name = Request::get('customer_name');
@@ -673,7 +673,7 @@ class ReportController extends DefaultController
     }
 
     // 单品查询
-    public function singleAction()
+    public function single()
     {
         // 客户权限
         $selects = regionCustomer('customer');
@@ -817,7 +817,7 @@ class ReportController extends DefaultController
     }
 
     // 城市数据分析
-    public function cityAction()
+    public function city()
     {
         // 当前年月日
         $now_sdate = Request::get('date1', date("Y").'-01-01');
@@ -1061,7 +1061,7 @@ class ReportController extends DefaultController
     }
 
     // 单区域数据分析
-    public function citydataAction()
+    public function citydata()
     {
         // 获得销售员登录名
         $year = Request::get('year');
@@ -1139,7 +1139,7 @@ class ReportController extends DefaultController
     }
 
     // 单品客户数据分析
-    public function clientAction()
+    public function client()
     {
         $now_year = Request::get('year', date('Y'));
         // 获得前一年的年份
@@ -1320,7 +1320,7 @@ class ReportController extends DefaultController
     }
 
     // 客户数据分析
-    public function clientdataAction()
+    public function clientdata()
     {
         $year = Request::get('year');
         $product_id = Request::get('product_id');
@@ -1404,7 +1404,7 @@ class ReportController extends DefaultController
      * 新客户分析
      * 计算本年度有订单去年无订单为新客户
      */
-    public function newclientAction()
+    public function newclient()
     {
         // 筛选专用函数
         $selects = regionCustomer('customer');
@@ -1530,7 +1530,7 @@ class ReportController extends DefaultController
     /**
      * 连续3个月未进货的客户
      */
-    public function stockmonthAction()
+    public function stockmonth()
     {
         // 筛选专用函数
         $selects = regionCustomer('customer');

app/Gdoo/Order/Controllers/SampleApplyController.php

@@ -20,7 +20,7 @@ class SampleApplyController extends WorkflowController
 {
     public $permission = ['dialog', 'serviceDelivery'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'sample_apply',
@@ -112,7 +112,7 @@ class SampleApplyController extends WorkflowController
         ]);
     }
 
-    public function detailAction()
+    public function detail()
     {
         $header = Grid::header([
             'code' => 'sample_apply',
@@ -172,7 +172,7 @@ class SampleApplyController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -186,29 +186,29 @@ class SampleApplyController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $this->layout = 'layouts.print2';
-        print_prince($this->createAction('print'));
+        print_prince($this->create('print'));
     }
 
     // 关闭
-    public function closeAction()
+    public function close()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -225,7 +225,7 @@ class SampleApplyController extends WorkflowController
     }
 
     // 样品出库
-    public function serviceDeliveryAction()
+    public function serviceDelivery()
     {
         $header = Grid::header([
             'code' => 'sample_apply',
@@ -272,7 +272,7 @@ class SampleApplyController extends WorkflowController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Order/Controllers/TypeController.php

@@ -15,7 +15,7 @@ class TypeController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'customer_order_type',
@@ -66,7 +66,7 @@ class TypeController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'customer_order_type', 'id' => $id]);
@@ -75,12 +75,12 @@ class TypeController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'customer_order_type',
@@ -118,7 +118,7 @@ class TypeController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Order/Controllers/WidgetController.php

@@ -10,7 +10,7 @@ class WidgetController extends DefaultController
 {
     public $permission = ['index', 'goods'];
 
-    public function indexAction()
+    public function index()
     {
         if (Request::method() == 'POST') {
 
@@ -206,7 +206,7 @@ class WidgetController extends DefaultController
     /**
      * 明日预计到货列表
      */
-    public function goodsAction()
+    public function goods()
     {
         if (Request::method() == 'POST') {
 

app/Gdoo/Order/views/plan/export_sale.blade.php

@@ -56,7 +56,7 @@
 
     gdoo.grids[table] = {grid: grid};
 
-    var action = new gridAction(table, '外销生产进度表');
+    var action = new grid(table, '外销生产进度表');
     var panel = $('#' + table + '-controller');
 
     // 过滤数据

app/Gdoo/Order/views/plan/index.blade.php

@@ -63,7 +63,7 @@
 
     gdoo.grids[table] = {grid: grid};
 
-    var action = new gridAction(table, '生产计划总表');
+    var action = new grid(table, '生产计划总表');
     var panel = $('#' + table + '-controller');
 
     panel.on('click', '[data-toggle="' + table + '"]', function() {

app/Gdoo/Order/views/plan/produce.blade.php

@@ -85,7 +85,7 @@
 
     gdoo.grids[table] = {grid: grid};
 
-    var action = new gridAction(table, '生产计划');
+    var action = new grid(table, '生产计划');
     var panel = $('#' + table + '-controller');
 
     var producePlan = function() {

app/Gdoo/Produce/Controllers/MaterialController.php

@@ -20,7 +20,7 @@ class MaterialController extends DefaultController
 {
     public $permission = ['dialog', 'config', 'configSave', 'planProduct', 'planTotal'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'product_material',
@@ -73,7 +73,7 @@ class MaterialController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'product_material', 'id' => $id, 'action' => $action]);
@@ -82,13 +82,13 @@ class MaterialController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
     // 配方
-    public function configAction()
+    public function config()
     {
         $id = (int)Request::get('id');
         if (Request::method() == 'POST') {
@@ -108,7 +108,7 @@ class MaterialController extends DefaultController
     }
 
     // 用料计划
-    public function planAction()
+    public function plan()
     {
         $search = search_form([
             'advanced' => 0,
@@ -164,7 +164,7 @@ class MaterialController extends DefaultController
     }
 
     // 用料计划产品
-    public function planProductAction()
+    public function planProduct()
     {
         $search = search_form([], [], 'model');
         $query = $search['query'];
@@ -208,7 +208,7 @@ class MaterialController extends DefaultController
     }
 
     // 用料计划总量
-    public function planTotalAction()
+    public function planTotal()
     {
         $search = search_form([], [], 'model');
         $query = $search['query'];
@@ -243,7 +243,7 @@ class MaterialController extends DefaultController
     }
 
     // 配方保存
-    public function configSaveAction()
+    public function configSave()
     {
         $gets = Request::all();
         $id = $gets['id'];
@@ -269,7 +269,7 @@ class MaterialController extends DefaultController
         return $this->json('配方保存成功。', true);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');
@@ -277,7 +277,7 @@ class MaterialController extends DefaultController
         }
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form([
             'advanced' => '',

app/Gdoo/Produce/Controllers/PlanController.php

@@ -20,7 +20,7 @@ class PlanController extends WorkflowController
 {
     public $permission = ['dialog', 'orderPlan', 'planExport'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'produce_plan',
@@ -71,7 +71,7 @@ class PlanController extends WorkflowController
     }
 
     // 生产计划导出
-    public function planExportAction()
+    public function planExport()
     {
         $search = search_form([
             'advanced' => 0,
@@ -164,7 +164,7 @@ class PlanController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'produce_plan', 'id' => $id, 'action' => $action]);
@@ -173,23 +173,23 @@ class PlanController extends WorkflowController
         ], 'create');
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
     // 参照订单计划
-    public function orderPlanAction()
+    public function orderPlan()
     {
         $plan_date = Request::get('plan_date');
         $rows = [];
@@ -204,7 +204,7 @@ class PlanController extends WorkflowController
         return $this->json($rows, true);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Product/Controllers/CategoryController.php

@@ -15,7 +15,7 @@ class CategoryController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'product_category',
@@ -71,7 +71,7 @@ class CategoryController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'product_category', 'id' => $id]);
@@ -80,12 +80,12 @@ class CategoryController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');
@@ -93,7 +93,7 @@ class CategoryController extends DefaultController
         }
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form([], [
             ['text','product_category.name','名称'],

app/Gdoo/Product/Controllers/ProductController.php

@@ -22,7 +22,7 @@ class ProductController extends DefaultController
 {
     public $permission = ['dialog', 'show', 'category', 'serviceCustomer'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'product',
@@ -89,7 +89,7 @@ class ProductController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'product', 'id' => $id]);
@@ -98,12 +98,12 @@ class ProductController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'product', 'id' => $id, 'action' => 'show']);
@@ -113,7 +113,7 @@ class ProductController extends DefaultController
     }
 
     // 数据导入
-    public function importAction()
+    public function import()
     {
         if (Request::method() == 'POST') {
             return Form::import(['table' => 'product', 'keys' => ['code', 'category_id', 'unit_id']]);
@@ -122,7 +122,7 @@ class ProductController extends DefaultController
         return $this->render(['tips' => $tips], 'layouts.import');
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'product',
@@ -175,7 +175,7 @@ class ProductController extends DefaultController
     /**
      * 以客户产品列表
      */
-    public function serviceCustomerAction()
+    public function serviceCustomer()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -248,7 +248,7 @@ class ProductController extends DefaultController
         ]);
     }
 
-    public function categoryAction()
+    public function category()
     {
         if (Request::method() == 'POST') {
             $model = ProductCategory::orderBy('lft', 'asc');
@@ -259,7 +259,7 @@ class ProductController extends DefaultController
         }
     }
     
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Product/Controllers/UnitController.php

@@ -14,7 +14,7 @@ class UnitController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'product_unit',
@@ -63,7 +63,7 @@ class UnitController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'product_unit', 'id' => $id]);
@@ -72,12 +72,12 @@ class UnitController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-   public function dialogAction()
+   public function dialog()
     {
         $search = search_form([], [
             ['text','product_unit.name','名称'],
@@ -99,7 +99,7 @@ class UnitController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Project/Controllers/CommentController.php

@@ -19,7 +19,7 @@ class CommentController extends DefaultController
     public $permission = [];
     
     // 添加评论
-    public function addAction(Request $request)
+    public function add(Request $request)
     {
         if ($request->method() == 'POST') {
             $gets = $request->input();
@@ -49,7 +49,7 @@ class CommentController extends DefaultController
     }
 
     // 编辑评论
-    public function editAction(Request $request)
+    public function edit(Request $request)
     {
         if ($request->method() == 'POST') {
             $gets = $request->input();
@@ -74,7 +74,7 @@ class CommentController extends DefaultController
     }
 
     // 删除评论
-    public function deleteAction(Request $request)
+    public function delete(Request $request)
     {
         if ($request->method() == 'POST') {
             $id = $request->input('id');

app/Gdoo/Project/Controllers/ProjectController.php

@@ -20,7 +20,7 @@ class ProjectController extends DefaultController
 {
     public $permission = [];
     
-    public function indexAction()
+    public function index()
     {
         $search = search_form([
             'referer' => 1,
@@ -76,13 +76,13 @@ class ProjectController extends DefaultController
     }
 
     // 项目详情
-    public function showAction(Request $request)
+    public function show(Request $request)
     {
         return $this->display([]);
     }
 
     // 添加项目
-    public function addAction(Request $request)
+    public function add(Request $request)
     {
         if ($request->method() == 'POST') {
             $gets = $request->input();
@@ -105,7 +105,7 @@ class ProjectController extends DefaultController
     }
 
     // 编辑项目
-    public function editAction(Request $request)
+    public function edit(Request $request)
     {
         if ($request->method() == 'POST') {
             $gets = $request->input();
@@ -134,7 +134,7 @@ class ProjectController extends DefaultController
     }
 
     // 删除项目
-    public function deleteAction(Request $request)
+    public function delete(Request $request)
     {
         $id = $request->input('id');
         $id = array_filter((array)$id);

app/Gdoo/Project/Controllers/TaskController.php

@@ -24,7 +24,7 @@ class TaskController extends DefaultController
 {
     public $permission = ['drag', 'sort'];
     
-    public function indexAction(Request $request)
+    public function index(Request $request)
     {
         $search = search_form([
             'project_id' => '',
@@ -76,7 +76,7 @@ class TaskController extends DefaultController
     }
 
     // 显示任务
-    public function showAction(Request $request)
+    public function show(Request $request)
     {
         $search = search_form([
             'project_id' => ''
@@ -95,7 +95,7 @@ class TaskController extends DefaultController
     }
 
     // 移动任务
-    public function dragAction(Request $request)
+    public function drag(Request $request)
     {
         $gets = $request->input();
 
@@ -110,7 +110,7 @@ class TaskController extends DefaultController
     }
 
     // 移动任务
-    public function sortAction(Request $request)
+    public function sort(Request $request)
     {
         $gets = $request->input();
 
@@ -129,7 +129,7 @@ class TaskController extends DefaultController
     }
 
     // 添加任务
-    public function addAction(Request $request)
+    public function add(Request $request)
     {
         if ($request->method() == 'POST') {
             $gets = $request->input();
@@ -189,7 +189,7 @@ class TaskController extends DefaultController
     }
 
     // 编辑任务
-    public function editAction(Request $request)
+    public function edit(Request $request)
     {
         if ($request->method() == 'POST') {
             $gets = $request->input();
@@ -311,7 +311,7 @@ class TaskController extends DefaultController
     }
 
     // 删除任务
-    public function deleteAction(Request $request)
+    public function delete(Request $request)
     {
         if ($request->method() == 'POST') {
             $id = $request->input('id');

app/Gdoo/Project/Controllers/WidgetController.php

@@ -13,7 +13,7 @@ class WidgetController extends DefaultController
     /**
      * 项目任务信息
      */
-    public function infoAction()
+    public function info()
     {
         $config = InfoService::getInfo('project_task');
 

app/Gdoo/Promotion/Controllers/MaterialController.php

@@ -20,7 +20,7 @@ class MaterialController extends DefaultController
 {
     public $permission = ['detail', 'dialog', 'store', 'archive', 'download'];
     
-    public function indexAction()
+    public function index()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -101,7 +101,7 @@ class MaterialController extends DefaultController
         ]);
     }
 
-    public function detailAction()
+    public function detail()
     {
         $search = search_form([
             'status' => '',
@@ -167,7 +167,7 @@ class MaterialController extends DefaultController
         ]);
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $user = auth()->user();
 
@@ -186,7 +186,7 @@ class MaterialController extends DefaultController
         return $this->json($rows, true);
     }
     
-    public function showAction()
+    public function show()
     {
         $id = Request::get('id');
         $row = Material::with('promotion')
@@ -215,7 +215,7 @@ class MaterialController extends DefaultController
         ]);
     }
 
-    public function auditAction()
+    public function audit()
     {
         $id = (array)Request::get('id');
         $status = Request::get('status');
@@ -231,7 +231,7 @@ class MaterialController extends DefaultController
         return $this->json('操作成功。', true);
     }
 
-    public function archiveAction()
+    public function archive()
     {
         $id = (array)Request::get('id');
 
@@ -256,7 +256,7 @@ class MaterialController extends DefaultController
         return $this->json('', true);
     }
 
-    public function downloadAction()
+    public function download()
     {
         $sn = Request::get('sn');
         if(empty($sn)) {
@@ -265,7 +265,7 @@ class MaterialController extends DefaultController
         return response()->download(upload_path('promotion/material/archive.zip'), $sn.'_'.date('Y-m-d').'.zip');
     }
 
-    public function storeAction()
+    public function store()
     {
         // 上传文件
         if (Request::method() == 'POST') {
@@ -320,7 +320,7 @@ class MaterialController extends DefaultController
         }
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $var1 = (array)Request::get('id');

app/Gdoo/Promotion/Controllers/PromotionController.php

@@ -19,7 +19,7 @@ class PromotionController extends WorkflowController
 {
     public $permission = ['dialog', 'serviceSaleOrder', 'useCount', 'product'];
 
-    public function indexAction()
+    public function index()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -109,7 +109,7 @@ class PromotionController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -136,22 +136,22 @@ class PromotionController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $id = (int) Request::get('id');
         $template_id = (int) Request::get('template_id');
@@ -168,7 +168,7 @@ class PromotionController extends WorkflowController
     }
 
     // 赠品促销参照到订单
-    public function serviceSaleOrderAction()
+    public function serviceSaleOrder()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -320,7 +320,7 @@ class PromotionController extends WorkflowController
     }
 
     // 产品明细
-    public function productAction()
+    public function product()
     {
         $query = Request::all();
         if (Request::method() == 'POST') {
@@ -334,7 +334,7 @@ class PromotionController extends WorkflowController
         return $this->render(['query' => $query]);
     }
 
-    public function closeAction()
+    public function close()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -347,7 +347,7 @@ class PromotionController extends WorkflowController
     }
     
     // 可用列表
-    public function useCountAction()
+    public function useCount()
     {
         $customer_id = Request::get('customer_id');
 
@@ -359,7 +359,7 @@ class PromotionController extends WorkflowController
         return $this->json($count, true);
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -474,7 +474,7 @@ class PromotionController extends WorkflowController
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -494,7 +494,7 @@ class PromotionController extends WorkflowController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Promotion/Controllers/ReviewController.php

@@ -16,7 +16,7 @@ class ReviewController extends WorkflowController
 {
     public $permission = ['dialog', 'reference', 'useCount', 'feeDetail'];
 
-    public function indexAction()
+    public function index()
     {
         // 客户权限
         $region = regionCustomer('customer_id_customer');
@@ -79,7 +79,7 @@ class ReviewController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
 
@@ -103,29 +103,29 @@ class ReviewController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $this->layout = 'layouts.print2';
-        print_prince($this->createAction('print'));
+        print_prince($this->create('print'));
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -146,7 +146,7 @@ class ReviewController extends WorkflowController
     }
 
     // 兑现明细
-    public function feeDetailAction()
+    public function feeDetail()
     {
         $query = Request::all();
         if (Request::method() == 'POST') {
@@ -156,7 +156,7 @@ class ReviewController extends WorkflowController
         return $this->render(['query' => $query]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Purchase/Controllers/OrderController.php

@@ -17,7 +17,7 @@ class OrderController extends WorkflowController
 {
     public $permission = ['dialog', 'serviceRecord01'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'purchase_order',
@@ -67,7 +67,7 @@ class OrderController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'purchase_order', 'id' => $id, 'action' => $action]);
@@ -76,23 +76,23 @@ class OrderController extends WorkflowController
         ], 'create');
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
     // 参照其他入库单
-    public function serviceRecord01Action()
+    public function serviceRecord01()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -185,7 +185,7 @@ class OrderController extends WorkflowController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Purchase/Controllers/SupplierController.php

@@ -17,7 +17,7 @@ class SupplierController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'supplier',
@@ -68,7 +68,7 @@ class SupplierController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'supplier', 'id' => $id, 'action' => $action]);
@@ -77,22 +77,22 @@ class SupplierController extends DefaultController
         ], 'create');
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction('edit');
+        return $this->create('edit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $search = search_form(
             ['advanced' => ''], [
@@ -128,7 +128,7 @@ class SupplierController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/StiReport/Controllers/StiReportController.php

@@ -11,7 +11,7 @@ class StiReportController extends DefaultController
 {
     public $permission = ['viewer', 'designer', 'saveReport', 'license', 'render'];
 
-    public function designerAction()
+    public function designer()
     {
         $template_id = (int)Request::get('template_id');
         $template = DB::table('model_template')->where('id', $template_id)->first();
@@ -24,17 +24,17 @@ class StiReportController extends DefaultController
         return $this->render(['report_name' => $report_name, 'report_file' => $report_file]);
     }
 
-    public function viewerAction()
+    public function viewer()
     {
         return $this->render();
     }
 
-    public function renderAction()
+    public function render()
     {
         return $this->render();
     }
 
-    public function saveReportAction()
+    public function saveReport()
     {
         $gets = Request::all();
         $fileName = $gets['fileName'];

app/Gdoo/Stock/Controllers/AllocationController.php

@@ -18,7 +18,7 @@ class AllocationController extends WorkflowController
 {
     public $permission = ['dialog', 'logistics', 'stockSelect'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_allocation',
@@ -69,7 +69,7 @@ class AllocationController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -83,22 +83,22 @@ class AllocationController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $id = Request::get('id');
         $template_id = Request::get('template_id');
@@ -139,7 +139,7 @@ class AllocationController extends WorkflowController
     }
 
     // 选择库存
-    public function stockSelectAction()
+    public function stockSelect()
     {
         $search = search_form(['advanced' => ''], [
             ['form_type' => 'text', 'name' => '产品名称', 'field' => 'name'],
@@ -167,7 +167,7 @@ class AllocationController extends WorkflowController
     }
 
     // 物流信息
-    public function logisticsAction()
+    public function logistics()
     {
         if (Request::method() == 'POST') {
             $gets = Request::get('stock_allocation');
@@ -195,7 +195,7 @@ class AllocationController extends WorkflowController
     }
 
     // 删除
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/CancelController.php

@@ -16,7 +16,7 @@ class CancelController extends WorkflowController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_cancel',
@@ -71,7 +71,7 @@ class CancelController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -85,22 +85,22 @@ class CancelController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $id = Request::get('id'); 
         $template_id = Request::get('template_id');
@@ -146,7 +146,7 @@ class CancelController extends WorkflowController
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -166,7 +166,7 @@ class CancelController extends WorkflowController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/CategoryController.php

@@ -15,7 +15,7 @@ class CategoryController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_type',
@@ -65,7 +65,7 @@ class CategoryController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'stock_type', 'id' => $id]);
@@ -74,12 +74,12 @@ class CategoryController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'stock_type',
@@ -112,7 +112,7 @@ class CategoryController extends DefaultController
         ], 'dialog');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/DeliveryController.php

@@ -33,7 +33,7 @@ class DeliveryController extends WorkflowController
         'autoSave'
     ];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_delivery',
@@ -111,7 +111,7 @@ class DeliveryController extends WorkflowController
         ]);
     }
 
-    public function detailAction()
+    public function detail()
     {
         $header = Grid::header([
             'code' => 'stock_delivery',
@@ -178,7 +178,7 @@ class DeliveryController extends WorkflowController
         ]);
     }
 
-    public function autoSaveAction()
+    public function autoSave()
     {
         $gets = Request::all();
         $master = $gets['master'];
@@ -234,10 +234,10 @@ class DeliveryController extends WorkflowController
             $url = url($master['uri'].'/show', ['id' => $id, 'client' => $master['client']]);
             return $this->json($bill['name'].'保存成功', $url);
         }
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -260,23 +260,23 @@ class DeliveryController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
     // 批量编辑
-    public function batchEditAction()
+    public function batchEdit()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -296,7 +296,7 @@ class DeliveryController extends WorkflowController
         ]);
     }
 
-    public function printAction()
+    public function print()
     {
         $id = Request::get('id'); 
         $template_id = Request::get('template_id');
@@ -333,12 +333,12 @@ class DeliveryController extends WorkflowController
         }
 
         // 默认模板
-        $tpl = $this->createAction('print');
+        $tpl = $this->create('print');
         return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
     }
 
     // 物流信息
-    public function logisticsAction()
+    public function logistics()
     {
         if (Request::method() == 'POST') {
             $gets = Request::get('stock_delivery');
@@ -367,7 +367,7 @@ class DeliveryController extends WorkflowController
     }
 
     // 获取库存
-    public function getBatchSelectAction()
+    public function getBatchSelect()
     {
         $search = search_form(['advanced' => ''], [
             ['form_type' => 'text', 'name' => '产品名称', 'field' => 'name'],
@@ -384,7 +384,7 @@ class DeliveryController extends WorkflowController
     }
 
     // 获取库存(直营)
-    public function getBatchSelectZYAction()
+    public function getBatchSelectZY()
     {
         $search = search_form(['advanced' => ''], [
             ['form_type' => 'text', 'name' => '产品名称', 'field' => 'name'],
@@ -401,7 +401,7 @@ class DeliveryController extends WorkflowController
     }
 
     // 获取库存(全部)
-    public function getBatchSelectAllAction()
+    public function getBatchSelectAll()
     {
         $search = search_form(['advanced' => ''], [
             ['form_type' => 'text', 'name' => '产品名称', 'field' => 'name'],
@@ -417,7 +417,7 @@ class DeliveryController extends WorkflowController
         ], 'getBatchSelect');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/DirectController.php

@@ -16,7 +16,7 @@ class DirectController extends WorkflowController
 {
     public $permission = ['dialog', 'importExcel'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_direct',
@@ -66,7 +66,7 @@ class DirectController extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -80,22 +80,22 @@ class DirectController extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $id = Request::get('id'); 
         $template_id = Request::get('template_id');
@@ -153,7 +153,7 @@ class DirectController extends WorkflowController
         ], 'print/'.$template_id);
     }
 
-    public function importExcelAction()
+    public function importExcel()
     {
         if (Request::method() == 'POST') {
             $customer_id = Request::get('customer_id');
@@ -228,7 +228,7 @@ class DirectController extends WorkflowController
         return view('importExcel');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/LocationController.php

@@ -15,7 +15,7 @@ class LocationController extends DefaultController
 {
     public $permission = ['dialog', 'dialog2', 'serviceWarehouse'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'warehouse_location',
@@ -65,7 +65,7 @@ class LocationController extends DefaultController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'warehouse_location', 'id' => $id, 'action' => $action]);
@@ -74,12 +74,12 @@ class LocationController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'warehouse_location',
@@ -115,7 +115,7 @@ class LocationController extends DefaultController
     /**
      * 获取现存量
      */
-    public function dialog2Action()
+    public function dialog2()
     {
         $header = Grid::header([
             'code' => 'warehouse_location',
@@ -151,7 +151,7 @@ class LocationController extends DefaultController
     /**
      * 获取仓库货位
      */
-    public function serviceWarehouseAction()
+    public function serviceWarehouse()
     {
         $warehouse_id = Request::get('warehouse_id');
         if (Request::method() == 'POST') {
@@ -163,7 +163,7 @@ class LocationController extends DefaultController
         }
     }
     
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/Record01Controller.php

@@ -16,7 +16,7 @@ class Record01Controller extends AuditController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_record01',
@@ -67,7 +67,7 @@ class Record01Controller extends AuditController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -81,23 +81,23 @@ class Record01Controller extends AuditController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $this->layout = 'layouts.print2';
-        print_prince($this->createAction('print'));
+        print_prince($this->create('print'));
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/Record08Controller.php

@@ -16,7 +16,7 @@ class Record08Controller extends AuditController
 {
     public $permission = ['dialog', 'importExcel'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_record08',
@@ -67,7 +67,7 @@ class Record08Controller extends AuditController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -81,23 +81,23 @@ class Record08Controller extends AuditController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $this->layout = 'layouts.print2';
-        print_prince($this->createAction('print'));
+        print_prince($this->create('print'));
     }
 
-    public function importExcelAction()
+    public function importExcel()
     {
         if (Request::method() == 'POST') {
             $file = Request::file('file');
@@ -148,7 +148,7 @@ class Record08Controller extends AuditController
         return view('importExcel');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/Record09Controller.php

@@ -16,7 +16,7 @@ class Record09Controller extends WorkflowController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_record09',
@@ -67,7 +67,7 @@ class Record09Controller extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -81,22 +81,22 @@ class Record09Controller extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $id = Request::get('id');
         $template_id = Request::get('template_id');
@@ -138,7 +138,7 @@ class Record09Controller extends WorkflowController
         return $tpl;
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/Record10Controller.php

@@ -16,7 +16,7 @@ class Record10Controller extends WorkflowController
 {
     public $permission = ['dialog', 'print3'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_record10',
@@ -67,7 +67,7 @@ class Record10Controller extends WorkflowController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -82,30 +82,30 @@ class Record10Controller extends WorkflowController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function auditAction()
+    public function audit()
     {
-        return $this->createAction('audit');
+        return $this->create('audit');
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function print2Action()
+    public function print2()
     {
         $this->layout = 'layouts.print2';
-        $view = $this->createAction('print');
+        $view = $this->create('print');
         $viewData = $view->getData();
-        print_prince($this->createAction('print'));
+        print_prince($this->create('print'));
     }
 
-    public function printAction()
+    public function print()
     {
         $id = Request::get('id');
         $template_id = Request::get('template_id');
@@ -149,12 +149,12 @@ class Record10Controller extends WorkflowController
 
         } else {
             $this->layout = 'layouts.print2';
-            $tpl = $this->createAction('print');
+            $tpl = $this->create('print');
             print_prince($tpl);
         }
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/Record11Controller.php

@@ -16,7 +16,7 @@ class Record11Controller extends AuditController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'stock_record11',
@@ -66,7 +66,7 @@ class Record11Controller extends AuditController
         ]);
     }
 
-    public function createAction($action = 'edit')
+    public function create($action = 'edit')
     {
         $id = (int) Request::get('id');
         $header['action'] = $action;
@@ -80,17 +80,17 @@ class Record11Controller extends AuditController
         ], $tpl);
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function showAction()
+    public function show()
     {
-        return $this->createAction('show');
+        return $this->create('show');
     }
 
-    public function printAction()
+    public function print()
     {
         $id = Request::get('id');
         $template_id = Request::get('template_id');
@@ -135,12 +135,12 @@ class Record11Controller extends AuditController
 
         } else {
             $this->layout = 'layouts.print2';
-            $tpl = $this->createAction('print');
+            $tpl = $this->create('print');
             print_prince($tpl);
         }
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/ReportController.php

@@ -21,7 +21,7 @@ class ReportController extends DefaultController
     public $permission = [];
 
     // 库存明细表
-    public function stockDetailAction()
+    public function stockDetail()
     {
         $sdate = date('Y-m-01');
         $edate = date('Y-m-d');
@@ -77,7 +77,7 @@ class ReportController extends DefaultController
     }
 
     // 库存汇总表
-    public function stockTotalAction()
+    public function stockTotal()
     {
         $search = search_form([
             'advanced' => 0,
@@ -120,7 +120,7 @@ class ReportController extends DefaultController
     }
 
     // 进销存库存汇总表
-    public function stockInOutAction()
+    public function stockInOut()
     {
         $sdate = date('Y-m-01');
         $edate = date('Y-m-d');

app/Gdoo/Stock/Controllers/TypeController.php

@@ -15,7 +15,7 @@ class TypeController extends DefaultController
 {
     public $permission = ['dialog'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'sale_type',
@@ -66,7 +66,7 @@ class TypeController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'sale_type', 'id' => $id]);
@@ -75,12 +75,12 @@ class TypeController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'sale_type',
@@ -113,7 +113,7 @@ class TypeController extends DefaultController
         ], 'dialog');
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/Stock/Controllers/WarehouseController.php

@@ -15,7 +15,7 @@ class WarehouseController extends DefaultController
 {
     public $permission = ['dialog', 'permission'];
 
-    public function indexAction()
+    public function index()
     {
         $header = Grid::header([
             'code' => 'warehouse',
@@ -67,7 +67,7 @@ class WarehouseController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
         $id = (int)Request::get('id');
         $form = Form::make(['code' => 'warehouse', 'id' => $id]);
@@ -76,12 +76,12 @@ class WarehouseController extends DefaultController
         ], 'create');
     }
 
-    public function editAction()
+    public function edit()
     {
-        return $this->createAction();
+        return $this->create();
     }
 
-    public function dialogAction()
+    public function dialog()
     {
         $header = Grid::header([
             'code' => 'warehouse',
@@ -127,7 +127,7 @@ class WarehouseController extends DefaultController
     /**
      * 权限设置
      */
-    public function permissionAction()
+    public function permission()
     {
         $gets = Request::all();
         if (Request::method() == 'POST') {
@@ -159,7 +159,7 @@ class WarehouseController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $ids = Request::get('id');

app/Gdoo/System/Controllers/LogController.php

@@ -16,7 +16,7 @@ class LogController extends DefaultController
     /**
      * 系统日志
      */
-    public function indexAction()
+    public function index()
     {
         $header = [
             'master_name' => '系统日志',
@@ -189,7 +189,7 @@ class LogController extends DefaultController
         ]);
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $id = Request::get('id');

app/Gdoo/System/Controllers/MailController.php

@@ -18,7 +18,7 @@ class MailController extends DefaultController
     /**
      * 邮件设置
      */
-    public function indexAction()
+    public function index()
     {
         $header = [
             'master_name' => '邮件',
@@ -179,12 +179,12 @@ class MailController extends DefaultController
         ]);
     }
 
-    public function createAction()
+    public function create()
     {
-        return $this->editAction();
+        return $this->edit();
     }
 
-    public function editAction()
+    public function edit()
     {
         $id  = (int)Request::get('id');
         $row = DB::table('mail')->where('id', $id)->first();
@@ -193,7 +193,7 @@ class MailController extends DefaultController
         ], 'edit');
     }
 
-    public function storeAction()
+    public function store()
     {
         if (Request::method() == 'POST') {
             $gets = Request::all();
@@ -218,7 +218,7 @@ class MailController extends DefaultController
         }
     }
 
-    public function deleteAction()
+    public function delete()
     {
         if (Request::method() == 'POST') {
             $id = Request::get('id');
@@ -230,7 +230,7 @@ class MailController extends DefaultController
     /**
      * 邮件测试
      */
-    public function testAction()
+    public function test()
     {
         $mail_to = Request::get('mail_to');
         if (Request::method() == 'POST') {