修正代码生成器linux下文件路径问题

Author: HGthecode

src/exception/ErrorException.php

@@ -25,6 +25,7 @@ class ErrorException extends HttpException
         'file already exists' => ['code' => 5004, 'msg' => '${filepath}文件已存在'],
         'file not exists' => ['code' => 5005, 'msg' => '${filepath}文件不存在'],
         'datatable already exists' => ['code' => 5004, 'msg' => '数据表${table}已存在'],
+        'datatable not exists' => ['code' => 5004, 'msg' => '数据表${table}不存在'],
 
     ];
 

src/generator/Index.php

@@ -101,7 +101,7 @@ protected function checkFilesAndHandleParams($generatorItem,$params,$currentApps
                 ];
 
                 // 验证模板是否存在
-                $templatePath = App::getRootPath() . $template;
+                $templatePath =Utils::formatPath( App::getRootPath() . $template,"/");
                 if (is_readable($templatePath) == false) {
                     throw new ErrorException("template not found", 412, [
                         'template' => $template
@@ -130,6 +130,7 @@ protected function checkFilesAndHandleParams($generatorItem,$params,$currentApps
                 $createFiles[] = [
                     'fileFullPath' => $fileFullPath,
                     'template' => $template,
+                    'templatePath'=>$templatePath,
                     'type' => $type
                 ];
 
@@ -166,7 +167,7 @@ protected function checkModels($generatorItem,$tplParams){
                     $path = $tableConfig['items'][$k]['path'];
 
                     // 验证模板是否存在
-                    $templatePath = App::getRootPath() . $template;
+                    $templatePath = Utils::formatPath(App::getRootPath() . $template,"/");
                     if (is_readable($templatePath) == false) {
                         throw new ErrorException("template not found", 412, [
                             'template' => $template
@@ -223,7 +224,7 @@ protected function createFiles($createFiles,$tplParams){
 
         if (!empty($createFiles) && count($createFiles)>0){
             foreach ($createFiles as $fileItem) {
-                $html = (new ParseTemplate())->compile($fileItem['template'],$tplParams);
+                $html = (new ParseTemplate())->compile($fileItem['templatePath'],$tplParams);
                 if ($fileItem['type'] === "file"){
                     // 路径为文件，则添加到该文件
                     $pathFileContent = Utils::getFileContent($fileItem['fileFullPath']);
@@ -248,7 +249,7 @@ protected function createModels($createModels,$tplParams){
                 $table = $item['table'];
                 if (!empty($table['model_name'])){
                     $tplParams['tables'][$k]['class_name'] =$table['model_name'];
-                    $html = (new ParseTemplate())->compile($item['template'],$tplParams);
+                    $html = (new ParseTemplate())->compile($item['templatePath'],$tplParams);
                     Utils::createFile($item['fileFullPath'],$html);
                 }
                 if ($table['table_name']){
@@ -307,21 +308,27 @@ protected function createTable($table){
 
         $tp_version = \think\facade\App::version();
         if (substr($tp_version, 0, 2) == '5.'){
-            Db5::query($sql);
+            Db5::startTrans();
+            try {
+                Db5::query($sql);
+                Db5::commit();
+                return true;
+            } catch (\Exception $e) {
+                Db5rollback();
+                return $e->getMessage();
+            }
         }else{
-            Db::query($sql);
+            Db::startTrans();
+            try {
+                Db::query($sql);
+                Db::commit();
+                return true;
+            } catch (\Exception $e) {
+                Db::rollback();
+                return $e->getMessage();
+            }
         }
-        return true;
-//
-//        Db::startTrans();
-//        try {
-//            Db::query($sql);
-//            Db::commit();
-//            return true;
-//        } catch (\Exception $e) {
-//            Db::rollback();
-//            return $e->getMessage();
-//        }
+
 
     }
 }

src/generator/ParseTemplate.php

@@ -10,7 +10,7 @@ class ParseTemplate
 
     public function compile($path,$params)
     {
-        $filePath    = App::getRootPath() . $path;
+        $filePath    =  $path;
         $tplContent = Utils::getFileContent($filePath);
         $tplContent = $this->replaceForeach($tplContent,$params);
         $tplContent = $this->replaceParams($tplContent,$params);

src/parseApi/ParseModel.php

@@ -4,6 +4,7 @@
 namespace hg\apidoc\parseApi;
 
 use Doctrine\Common\Annotations\Reader;
+use hg\apidoc\exception\ErrorException;
 use think\Db as Db5;
 use think\facade\Db;
 use hg\apidoc\annotation\Field;
@@ -179,12 +180,20 @@ public function getTableDocument($model,array $propertys):array
 
         $tp_version = \think\facade\App::version();
         if (substr($tp_version, 0, 2) == '5.'){
-            $createSQL = Db5::query("show create table " . $model->getTable())[0]['Create Table'];
+            $createSQL = Db5::query("show create table " . $model->getTable())[0];
         }else{
-            $createSQL = Db::query("show create table " . $model->getTable())[0]['Create Table'];
+            $createSQL = Db::query("show create table " . $model->getTable())[0];
         }
-//        $createSQL = Db::query("show create table " . $model->getTable())[0]['Create Table'];
-        preg_match_all("#[^KEY]`(.*?)` (.*?) (.*?),\n#", $createSQL, $matches);
+
+        $createTable = "";
+        if (!empty($createSQL['Create Table'])){
+            $createTable = $createSQL['Create Table'];
+        }else  if(!empty($createSQL['create table'])){
+            $createTable = $createSQL['create table'];
+        }else{
+            throw new ErrorException("datatable not exists", 412, $createSQL);
+        }
+        preg_match_all("#[^KEY]`(.*?)` (.*?) (.*?),\n#", $createTable, $matches);
         $fields       = $matches[1];
         $types        = $matches[2];
         $contents     = $matches[3];