升级3.1.0

Author: HGthecode

src/Controller.php

@@ -50,6 +50,16 @@ public function __construct(App $app)
             $defaultAppConfig = ['title'=>$default_app,'path'=>$path,'folder'=>$default_app];
             $config['apps'] = [$defaultAppConfig];
         }
+        // 过滤关闭的生成器
+        if (!empty($config['generator']) && count($config['generator'])){
+            $generatorList =[];
+            foreach ($config['generator'] as $item) {
+                if (!isset($item['enable']) || (isset($item['enable']) && $item['enable']===true)){
+                    $generatorList[]=$item;
+                }
+            }
+            $config['generator'] = $generatorList;
+        }
 
 
         Config::set(['apidoc'=>$config]);
@@ -152,7 +162,6 @@ public function getApidoc(){
             // 获取默认控制器
             $default_app = $config = Config::get("app.default_app");
             $appKey = $default_app;
-
         }
         $currentApps = (new Utils())->getCurrentApps($appKey);
         $currentApp  = $currentApps[count($currentApps) - 1];
@@ -206,6 +215,16 @@ public function getMdMenus(){
                 \think\facade\App::loadLangPack($params['lang']);
             }
         }
+        if (!empty($params['appKey'])){
+            // 获取指定应用
+            $appKey = $params['appKey'];
+        }else{
+            // 获取默认控制器
+            $default_app = $config = Config::get("app.default_app");
+            $appKey = $default_app;
+        }
+        (new Auth())->checkAuth($appKey);
+
         $docs = (new ParseMarkdown())->getDocsMenu($lang);
         return Utils::showJson(0,"",$docs);
 
@@ -250,6 +269,14 @@ public function getMdDetail(){
     }
 
 
+    public function createGenerator(){
+        $request = Request::instance();
+        $params = $request->param();
+        $res = (new generator\Index())->create($params);
+        return Utils::showJson(0,"",$res);
+    }
+
+
 
 
 

src/Service.php

@@ -21,6 +21,7 @@ public function boot()
                 Route::get('mdMenus'     , $controller_namespace . 'getMdMenus');
                 Route::get('mdDetail'     , $controller_namespace . 'getMdDetail');
                 Route::post('verifyAuth'     , $controller_namespace . 'verifyAuth');
+                Route::post('generator'     , $controller_namespace . 'createGenerator');
             };
             if (!empty($apidocConfig['allowCrossDomain'])){
                 Route::group($route_prefix, $routes)->allowCrossDomain();

src/Utils.php

@@ -224,7 +224,7 @@ public static function getArrayFind(array $array, $query)
     }
 
     /**
-     * 根据条件获取数组中的值
+     * 根据条件获取数组中的index
      * @param array $array
      * @param $query
      * @return mixed|null
@@ -492,6 +492,38 @@ public static function arraySortByKey($array, $field="sort",$order=SORT_ASC){
     }
 
 
+    /**
+     * 格式化路径
+     * @param $path
+     * @param string $type
+     * @return array|string|string[]
+     */
+    public static function formatPath($path,$type="/"){
+        if ($type==="/"){
+            $path = str_replace("\\","/",$path);
+        }else{
+            $path = str_replace("/","\\",$path);
+            $path = str_replace("\\\\","\\",$path);
+            $endStr = substr($path, -1);
+            if ($endStr=='\\'){
+                $path = substr($path,0,strlen($path)-1);
+            }
+        }
+       return $path;
+    }
+
+    /**
+     * 过滤所有空格换行符
+     * @param $str
+     * @return array|string|string[]
+     */
+    public static function trimEmpty($str){
+        $search = array(" ","　","\n","\r","\t");
+        $replace = array("","","","","");
+        return str_replace($search, $replace, $str);
+    }
+
+
 
 
 

src/exception/ErrorException.php

@@ -23,6 +23,8 @@ class ErrorException extends HttpException
         'no config crud'       => ['code' => 5002, 'msg' => 'crud未配置'],
         'datatable crud error' => ['code' => 5003, 'msg' => '数据表创建失败，请检查配置'],
         'file already exists' => ['code' => 5004, 'msg' => '${filepath}文件已存在'],
+        'file not exists' => ['code' => 5005, 'msg' => '${filepath}文件不存在'],
+        'datatable already exists' => ['code' => 5004, 'msg' => '数据表${table}已存在'],
 
     ];