提交代码

Author: tangtanglove

app/Http/Controllers/Admin/ConfigController.php

@@ -209,7 +209,7 @@ public function saveWebsite(Request $request)
                     ];
                 }
 
-                $this->modifyEnv($data);
+                Helper::modifyEnv($data);
             }
 
             $getResult = Config::where('name',$key)->update(['value'=>$value]);
@@ -604,31 +604,4 @@ public function changeMultiStatus(Request $request)
             return $this->error('操作失败！');
         }
     }
-    
-    /**
-     * 改变env文件
-     *
-     * @param  Request  $request
-     * @return Response
-     */
-    function modifyEnv(array $data) 
-    {
-        $envPath = base_path() . DIRECTORY_SEPARATOR . '.env';
-
-        $contentArray = collect(file($envPath, FILE_IGNORE_NEW_LINES));
-        
-        $contentArray->transform(function ($item) use ($data){
-            foreach ($data as $key => $value){
-                if(Str::contains($item, $key)){
-                    return $key . '=' . $value;
-                }
-            }
-            
-            return $item;
-        });
-        
-        $content = implode($contentArray->toArray(), "\n");
-        
-        \File::put($envPath, $content);
-    }
 }

app/Http/Controllers/Admin/ConsoleController.php

@@ -152,7 +152,7 @@ public function update(Request $request)
         $result['app_version'] = config('app.version');
         $result['repository'] = $repository;
 
-        $result['can_update'] = true;
+        $result['can_update'] = false;
 
         if(isset($repository['name'])) {
             if($repository['name'] != $result['app_version']) {
@@ -226,7 +226,7 @@ public function updateFile(Request $request)
 
         $path = storage_path('app/').'public/uploads/files/fullstack-backend-'.$version;
 
-        Helper::copyFileToDir($path,base_path());
+        Helper::copyDirToDir($path,base_path());
 
         return $this->success('程序更新成功！');
     }
@@ -245,4 +245,27 @@ public function updateDatabase(Request $request)
             return $this->error('数据库更新失败！',$result);
         }
     }
+
+    /**
+     * 完成，更新程序版本
+     * @author  tangtanglove <[email protected]>
+     */
+    public function finish(Request $request)
+    {
+        $version   = $request->get('version');
+
+        $data = [
+            'APP_VERSION' => $version
+        ];
+
+        Helper::modifyEnv($data);
+
+        $result = Artisan::call('config:clear');
+
+        if($result !== false) {
+            return $this->success('更新成功！');
+        } else {
+            return $this->error('更新失败！');
+        }
+    }
 }

app/Services/Helper.php

@@ -1809,4 +1809,31 @@ static function token($request)
         $authorizations = explode(' ',$authorization);
         return $authorizations[1];
     }
+    
+    /**
+     * 改变env文件
+     *
+     * @param  Request  $request
+     * @return Response
+     */
+    static function modifyEnv(array $data) 
+    {
+        $envPath = base_path() . DIRECTORY_SEPARATOR . '.env';
+
+        $contentArray = collect(file($envPath, FILE_IGNORE_NEW_LINES));
+        
+        $contentArray->transform(function ($item) use ($data){
+            foreach ($data as $key => $value){
+                if(Str::contains($item, $key)){
+                    return $key . '=' . $value;
+                }
+            }
+            
+            return $item;
+        });
+        
+        $content = implode($contentArray->toArray(), "\n");
+        
+        \File::put($envPath, $content);
+    }
 }

routes/admin.php

@@ -30,6 +30,7 @@
     Route::get('admin/console/extract', 'Admin\\ConsoleController@extract')->name('api/admin/console/extract');
     Route::get('admin/console/updateFile', 'Admin\\ConsoleController@updateFile')->name('api/admin/console/updateFile');
     Route::get('admin/console/updateDatabase', 'Admin\\ConsoleController@updateDatabase')->name('api/admin/console/updateDatabase');
+    Route::get('admin/console/finish', 'Admin\\ConsoleController@finish')->name('api/admin/console/finish');
 
     Route::any('admin/account/info', 'Admin\\AccountController@info')->name('api/admin/account/info');
     Route::post('admin/account/profile', 'Admin\\AccountController@profile')->name('api/admin/account/profile');