修复5.0.9

增加清除缓存时将注册路由缓存一并清除修复模型注解对自定义解析无效问题
HGthecode · May 2, 2023 · 34c3a9f · 34c3a9f
1 parent c09c9f4
commit 34c3a9f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Controller.php b/src/Controller.php
@@ -205,8 +205,9 @@ public function createGenerator(){
     public function cancelAllCache(){
         $this->init(true);
         $config = $this->config;
-        $res = DirAndFile::deleteDir(APIDOC_STORAGE_PATH . $config['cache']['folder'].'/'.'apis');
-        return Helper::showJson(0,"",$res);
+        $path = APIDOC_STORAGE_PATH . $config['cache']['folder'];
+        $res = DirAndFile::deleteDir($path);
+        return Helper::showJson(0,"",$path);
     }
 
     public function createAllCache(){

diff --git a/src/parses/ParseModel.php b/src/parses/ParseModel.php
@@ -62,6 +62,13 @@ public function parseModelTable($model,$classReflect,$methodName=""){
                     if (!empty($fieldItem['md'])){
                         $fieldItem['md'] = ParseMarkdown::getContent("",$fieldItem['md']);
                     }
+                    // 自定义解析
+                    if (!empty($config['parsesAnnotation'])){
+                        $callback = $config['parsesAnnotation']($fieldItem);
+                        if (!empty($callback)){
+                            $fieldItem = $callback;
+                        }
+                    }
                     $addFieldList[]=$fieldItem;
                 }
                 $table = Helper::arrayMergeAndUnique("name",$table,$addFieldList);