更新3.1.8

Author: HGthecode

src/Controller.php

@@ -86,8 +86,8 @@ public function getConfig(){
             if ($this->tp_version === 5){
                 Lang::setLangCookieVar($params['lang']);
             }else{
-                Lang::setLangSet($params['lang']);
                 \think\facade\App::loadLangPack($params['lang']);
+                Lang::setLangSet($params['lang']);
             }
 
         }
@@ -150,7 +150,8 @@ public function getApidoc(){
             if ($this->tp_version === 5){
                 Lang::setLangCookieVar($lang);
             }else{
-                \think\facade\App::loadLangPack($lang);
+                \think\facade\App::loadLangPack($params['lang']);
+                Lang::setLangSet($params['lang']);
             }
 
         }
@@ -211,8 +212,8 @@ public function getMdMenus(){
             if ($this->tp_version === 5){
                 Lang::setLangCookieVar($params['lang']);
             }else{
-                Lang::setLangSet($params['lang']);
                 \think\facade\App::loadLangPack($params['lang']);
+                Lang::setLangSet($params['lang']);
             }
         }
         if (!empty($params['appKey'])){
@@ -241,8 +242,8 @@ public function getMdDetail(){
             if ($this->tp_version === 5){
                 Lang::setLangCookieVar($params['lang']);
             }else{
-                Lang::setLangSet($params['lang']);
                 \think\facade\App::loadLangPack($params['lang']);
+                Lang::setLangSet($params['lang']);
             }
         }
         try {

src/generator/Index.php

@@ -294,7 +294,7 @@ protected function createTable($table){
             if (!empty($item['incremental']) && !empty($item['main_key'])){
                 $table_field.=" AUTO_INCREMENT";
             }
-            if (!empty($item['default'])){
+            if (!empty($item['default']) || $item['default']=="0"){
                 $table_field.=" DEFAULT '".$item['default']."'";
             }else if (!empty($item['main_key']) && !$item['not_null']){
                 $table_field.=" DEFAULT NULL";

src/parseApi/ParseAnnotation.php

@@ -52,6 +52,11 @@ public function __construct()
     {
         $this->reader = new AnnotationReader();
         $this->config = Config::get('apidoc')?Config::get('apidoc'):Config::get('apidoc.');
+        if (!empty($this->config['ignored_annitation'])){
+            foreach ($this->config['ignored_annitation'] as $item) {
+                AnnotationReader::addGlobalIgnoredName($item);
+            }
+        }
         $this->controller_layer = Config::get('route.controller_layer',"controller");
     }