From d90652797035966245a557aa3fd3566561c58821 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 30 Sep 2019 16:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=88=86=E5=8C=85=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/AutoPackController.class.php   | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php
index 9da29ddaf..69c4a53c4 100644
--- a/Application/Admin/Controller/AutoPackController.class.php
+++ b/Application/Admin/Controller/AutoPackController.class.php
@@ -37,7 +37,6 @@ class AutoPackController extends Think
 
     public function package()
     {
-
         $find_web_stie = M('config')
                 -> field('value')
                 -> where(['name' => 'WEB_SITE'])
@@ -49,18 +48,10 @@ class AutoPackController extends Think
         }
 
         $this->checkPackageStatus();
-
         $this->app_package();//app渠道自动打包
-
         $this->channel();
-
         $this->launch_package(false);
-
         $this->leak_detection();
-
-
-
-
     }
 
     /**
@@ -209,7 +200,7 @@ class AutoPackController extends Think
                 $to = "./Uploads/" . $file_name . "/" . $new_name;
                 copy($url, ROOTTT . ltrim($to, './'));
                 $zip_res = $zip -> open(ROOTTT . ltrim($to, './'), \ZipArchive::CREATE);
-                
+
                 if($zip_res == true) {
                     #打包数据
                     $pack_data = array(
@@ -311,7 +302,6 @@ class AutoPackController extends Think
      * @throws \think\exception\DbException
      */
     private function channel() {
-
         $zip = new \ZipArchive();
 
         $map['status'] = 1;
@@ -346,13 +336,11 @@ class AutoPackController extends Think
                 $launchCount = $launchModel->where(['apply_id'=>$value['id']])->count();
 
                 if($launchCount>0) {
-
                     $applyModel->where(['id' => $value['id']]) -> setField('enable_status', 3);
 
                     $launchModel->where(['apply_id'=>$value['id'], 'launch_packge'=>['in',[0,2,3]]])->save(['launch_packge'=>2,'launch_down_url'=>'','launch_plist_url'=>'']);
 
                 } else {
-
                     $applyModel -> where(['id' => $value['id']]) -> setField('enable_status', 3);
 
                     if ($value['sdk_version'] == 1) {
@@ -377,6 +365,7 @@ class AutoPackController extends Think
                     }
                     $new_name = "game_package" . $value['game_id'] . "-" . $value['promote_id'] . $str_ver;
                     $to = "./Uploads/" . $file_name . "/" . $new_name;
+                    $localPath = ROOTTT . ltrim($to, './');
                     copy(get_game_source_file_url($value['game_id']), ROOTTT . ltrim($to, './'));
                     $zip_res = $zip -> open(ROOTTT . ltrim($to, './'), \ZipArchive::CREATE);
                     if ($zip_res == true) {
@@ -408,9 +397,14 @@ class AutoPackController extends Think
                             $new_to = ROOTTT . "Uploads/" . $file_name . "/" . $newname;
                             $updata['savename'] = $newname;
                             $updata['path'] = $new_to;
-                            $this -> upload_game_pak_oss($updata);
+                            $result = $this -> upload_game_pak_oss($updata);
                             @unlink($new_to);
 
+                            if ($result) {
+                                if (file_exists($localPath)) {
+                                    unlink($localPath);
+                                }
+                            }
                         } elseif (get_tool_status("qiniu_storage") == 1) {
 
                             $this -> dleteQiNiuFile($newname);