完善代码编译

.gitignore

@@ -4,16 +4,11 @@
 .env
 config/install/lock/install.lock
 public/upload
-public/docs
-public/conf
-public/WowOss.exe
-app/index/controller/Test.php
 composer.phar
 app/test/
 vendor
 runtime
 ul.db
 /app/tools/controller/Install.php
-/app/common/command/curd/migrate_output.php
+/build
-/dist
+/composer.lock
-/temp

app/common/command/build/Dist.php

@@ -87,11 +87,11 @@ class Dist extends Command
 
         $app_path = App::getRootPath();
 
-        $dist_path = $app_path . 'dist';
+        $dist_path = $app_path . 'build/dist';
         PathTools::intiDir($dist_path . '.temp');
 
 
-        $temp_path = $app_path . 'temp';
+        $temp_path = $app_path . 'build/temp';
         PathTools::intiDir($temp_path . '.temp');
 
 
@@ -114,20 +114,11 @@ class Dist extends Command
         $this->tempFilesystem = $temp_filesystem;
 
 
-        $list_dist = $dist_filesystem->listContents();
+        $this->clearDistDir();
-
+        $this->clearTempDir();
-        foreach ($list_dist as  $file_info) {
-            if ($file_info['type'] == 'file') {
-                $dist_filesystem->delete($file_info['path']);
-            } else {
-                $dist_filesystem->deleteDir($file_info['path']);
-            }
-        }
 
         $this->packEnv();
 
-        return ;
-
         $list_content = $temp_filesystem->listContents('', true);
         foreach ($list_content as  $file_info) {
             if ($file_info['type'] == 'dir') {
@@ -194,7 +185,19 @@ class Dist extends Command
 
         $output->info('打包完成');
     }
+    public function clearDistDir()
+    {
 
+        $list_dist = $this->distFilesystem->listContents();
+
+        foreach ($list_dist as  $file_info) {
+            if ($file_info['type'] == 'file') {
+                $this->distFilesystem->delete($file_info['path']);
+            } else {
+                $this->distFilesystem->deleteDir($file_info['path']);
+            }
+        }
+    }
     public function clearTempDir()
     {
         $list_dist = $this->tempFilesystem->listContents();
@@ -259,7 +262,7 @@ class Dist extends Command
             $this->tempFilesystem->put($path, $result_content);
         }
 
-        if($this->tempFilesystem->has('.env')){
+        if ($this->tempFilesystem->has('.env')) {
             $this->tempFilesystem->delete('.env');
         }
     }
@@ -650,7 +653,7 @@ class Dist extends Command
 
 
             if (!empty($extend_name)) {
-                $try_namse_extend_name = $class_item['namespace_name'] . '\\' . $extend_name;
+                $try_namse_extend_name = $extend_name;
 
                 if (isset($this->packList[$try_namse_extend_name])) {
                     $this->insertToNewPackList($try_namse_extend_name, $this->packList[$try_namse_extend_name]);
@@ -658,10 +661,6 @@ class Dist extends Command
             }
         }
 
-
-
-
-
         $this->newPackList[$class_name] = $class_item;
     }
 

app/common/service/MenuService.php

@@ -90,6 +90,7 @@ class MenuService
                 ['pid', '<>', MenuConstant::HOME_PID],
             ])
             ->order([
+                'pid' => 'asc',
                 'sort' => 'desc',
                 'id'   => 'asc',
             ])