Fixed --env option, optimize dashboard

hhxsv5 · Dec 30, 2020 · e483012 · e483012
1 parent f75d9a3
commit e483012
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/Components/Apollo/Process.php b/src/Components/Apollo/Process.php
@@ -28,8 +28,8 @@ public static function getDefinition()
     public static function callback(Server $swoole, SwooleProcess $process)
     {
         $filename = base_path('.env');
-        if (isset($_ENV['LARAVEL_ENV'])) {
-            $filename .= '.' . $_ENV['LARAVEL_ENV'];
+        if (isset($_ENV['APP_ENV'])) {
+            $filename .= '.' . $_ENV['APP_ENV'];
         }
 
         self::$apollo = Client::createFromEnv();

diff --git a/src/Console/Portal.php b/src/Console/Portal.php
@@ -110,7 +110,7 @@ public function start()
         // Generate conf file storage/laravels.conf
         $options = $this->input->getOptions();
         if (isset($options['env']) && $options['env'] !== '') {
-            $_SERVER['LARAVEL_ENV'] = $_ENV['LARAVEL_ENV'] = $options['env'];
+            $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $options['env'];
         }
         if (isset($options['x-version']) && $options['x-version'] !== '') {
             $_SERVER['X_VERSION'] = $_ENV['X_VERSION'] = $options['x-version'];
@@ -293,9 +293,9 @@ public function loadApollo(array $options)
     public function makeArtisanCmd($subCmd)
     {
         $phpCmd = sprintf('%s -c "%s"', PHP_BINARY, php_ini_loaded_file());
-        $env = $this->input->getOption('env');
-        $envs = $env ? "APP_ENV={$env}" : '';
-        return trim(sprintf('%s %s %s/artisan %s', $envs, $phpCmd, $this->basePath, $subCmd));
+        $env = isset($_ENV['APP_ENV']) ? trim($_ENV['APP_ENV']) : '';
+        $appEnv = $env === '' ? '' : "APP_ENV={$env}";
+        return trim(sprintf('%s %s %s/artisan %s', $appEnv, $phpCmd, $this->basePath, $subCmd));
     }
 
     public function runArtisanCommand($cmd)

diff --git a/src/Illuminate/LaravelSCommand.php b/src/Illuminate/LaravelSCommand.php
@@ -85,7 +85,8 @@ protected function showComponents()
     {
         $this->comment('>>> Components');
         $laravelSVersion = '-';
-        $cfg = file_exists(base_path('composer.lock')) ? json_decode(file_get_contents(base_path('composer.lock')), true) : [];
+        $lockFile = base_path('composer.lock');
+        $cfg = file_exists($lockFile) ? json_decode(file_get_contents($lockFile), true) : [];
         if (isset($cfg['packages'])) {
             $packages = array_merge($cfg['packages'], Arr::get($cfg, 'packages-dev', []));
             foreach ($packages as $package) {
@@ -98,7 +99,7 @@ protected function showComponents()
         $this->table(['Component', 'Version'], [
             [
                 'PHP',
-                phpversion(),
+                PHP_VERSION,
             ],
             [
                 'Swoole',
@@ -120,6 +121,7 @@ protected function showProtocols()
         $this->comment('>>> Protocols');
 
         $config = unserialize((string)file_get_contents($this->getConfPath()));
+        $ssl = isset($config['server']['swoole']['ssl_key_file'], $config['server']['swoole']['ssl_cert_file']);
         $socketType = isset($config['server']['socket_type']) ? $config['server']['socket_type'] : SWOOLE_SOCK_TCP;
         if (in_array($socketType, [SWOOLE_SOCK_UNIX_DGRAM, SWOOLE_SOCK_UNIX_STREAM])) {
             $listenAt = $config['server']['listen_ip'];
@@ -132,15 +134,15 @@ protected function showProtocols()
                 'Main HTTP',
                 '<info>On</info>',
                 $this->getApplication()->getName(),
-                $listenAt,
+                sprintf('%s://%s', $ssl ? 'https' : 'http', $listenAt),
             ],
         ];
         if (!empty($config['server']['websocket']['enable'])) {
             $tableRows [] = [
                 'Main WebSocket',
                 '<info>On</info>',
                 $config['server']['websocket']['handler'],
-                $listenAt,
+                sprintf('%s://%s', $ssl ? 'wss' : 'ws', $listenAt),
             ];
         }