浏览代码

!189 Api模块lang目录下文件/控制器若定义为_分割,后台一键生成Api文档,无法忽略控制器和方法
Merge pull request !189 from twhmr/master

Karson 5 年之前
父节点
当前提交
d3a1c3978e
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      application/admin/command/Api/library/Builder.php
  2. 1 1
      application/common/controller/Api.php

+ 1 - 1
application/admin/command/Api/library/Builder.php

@@ -220,7 +220,7 @@ class Builder
             $methods = array_merge(array_flip(array_keys($methodSectorArr)), $methods);
         }
         $docslist = array_merge(array_flip(array_keys($sectorArr)), $docslist);
-
+        $docslist = array_filter($docslist , function($v) {return is_array($v) ; }) ;
         return $docslist;
     }
 

+ 1 - 1
application/common/controller/Api.php

@@ -116,7 +116,7 @@ class Api
         $this->auth = Auth::instance();
 
         $modulename = $this->request->module();
-        $controllername = strtolower($this->request->controller());
+        $controllername = Loader::parseName($this->request->controller());
         $actionname = strtolower($this->request->action());
 
         // token