From 6c636a92f56faa3c2cd443cd4f043e2021a4fecf Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 11 Nov 2019 10:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Service/GameSourceService.class.php | 6 +++++-
 Application/Base/Tool/Base62.class.php               | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php
index 8f844413d..f8b748d83 100644
--- a/Application/Base/Service/GameSourceService.class.php
+++ b/Application/Base/Service/GameSourceService.class.php
@@ -74,7 +74,7 @@ class GameSourceService {
             'game_id' => $game['id'],
             'game_name' => $game['game_name'],
             'game_appid' => $game['game_appid'],
-            'promote_id' => $apply ? $apply['promote_id'] : '',
+            'promote_id' => $apply ? $apply['promote_id'] : '0',
             'promote_account' => $apply ? $apply['promote_account'] : '自然渠道',
             'source_version' => $gameSource['source_version'],
         ];
@@ -117,6 +117,10 @@ class GameSourceService {
     {
         $zip = new \ZipArchive();
         if ($zip->open($zipFile, \ZipArchive::CREATE)) {
+            $rows = explode('/' . $distFolder);
+            unset($rows[count($rows) -1]);
+            $txChannelFolder = implode('/', $rows);
+            $zip->deleteName($txChannelFolder);
             $zip->addEmptyDir($distFolder);
             $zip->close();
             return true;
diff --git a/Application/Base/Tool/Base62.class.php b/Application/Base/Tool/Base62.class.php
index b0cc27bf5..b7eba121e 100644
--- a/Application/Base/Tool/Base62.class.php
+++ b/Application/Base/Tool/Base62.class.php
@@ -59,7 +59,7 @@ class Base62
         return implode('', $result);
     }
 
-    public static function decode($string, $decodes)
+    public static function decode($string)
     {
         $decodes = self::getIndexChars(self::ENCODES);
         $chars = self::getCharArray($string);