From cdce552a2388f088e852325a3d570bb47642ac12 Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Tue, 18 Feb 2020 22:46:04 +0800
Subject: [PATCH] Add files via upload

---
 function/common.php | 6 +++---
 function/heroku.php | 1 +
 function/normal.php | 1 +
 function/scf.php    | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/function/common.php b/function/common.php
index d5bdbcc..80c5f29 100644
--- a/function/common.php
+++ b/function/common.php
@@ -410,8 +410,8 @@ function main($path)
 {
     global $exts;
     global $constStr;
-//echo 'main.enterpath:'.$path.'
-//';
+echo 'main.enterpath:'.$path.'
+';
     $constStr['language'] = $_COOKIE['language'];
     if ($constStr['language']=='') $constStr['language'] = getConfig('language');
     if ($constStr['language']=='') $constStr['language'] = 'en-us';
@@ -420,7 +420,7 @@ function main($path)
     $disktags = explode("|",getConfig('disktag'));
 //    echo 'count$disk:'.count($disktags);
     if (count($disktags)>1) {
-        if ($path=='/') return output('', 302, [ 'Location' => path_format($_SERVER['PHP_SELF'].'/'.$disktags[0]) ]);
+        if ($path=='/'||$path=='') return output('', 302, [ 'Location' => path_format($_SERVER['PHP_SELF'].'/'.$disktags[0]) ]);
         $_SERVER['disktag'] = $path;
         $pos = strpos($path, '/');
         if ($pos>1) $_SERVER['disktag'] = substr($path, 0, $pos);
diff --git a/function/heroku.php b/function/heroku.php
index 3dcb01d..4d00168 100644
--- a/function/heroku.php
+++ b/function/heroku.php
@@ -89,6 +89,7 @@ function setConfig($arr, $disktag = '')
         $tmp[$disktag] = json_encode($diskconfig);
     }
     if ($oparetdisk) {
+        $disktags = array_unique($disktags);
         foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
         if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
         else $tmp['disktag'] = '';
diff --git a/function/normal.php b/function/normal.php
index cab51f7..f0a3701 100644
--- a/function/normal.php
+++ b/function/normal.php
@@ -95,6 +95,7 @@ function setConfig($arr, $disktag = '')
         $tmp[$disktag] = json_encode($diskconfig);
     }*/
     if ($operatedisk) {
+        $disktags = array_unique($disktags);
         foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
         if ($disktag_s!='') $envs['disktag'] = substr($disktag_s, 0, -1);
         else $envs['disktag'] = '';
diff --git a/function/scf.php b/function/scf.php
index f29d391..94457cc 100644
--- a/function/scf.php
+++ b/function/scf.php
@@ -104,11 +104,12 @@ function setConfig($arr, $disktag = '')
         $tmp[$disktag] = json_encode($diskconfig);
     }
     if ($oparetdisk) {
+        $disktags = array_unique($disktags);
         foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
         if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
         else $tmp['disktag'] = '';
     }
-    //echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
+//    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
 //';
     return updateEnvironment($tmp, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'));
 }
@@ -161,7 +162,7 @@ function get_refresh_token()
             <meta http-equiv="refresh" content="2;URL=' . $url . '">';
             return message($str, getconstStr('WaitJumpIndex'));
         }
-        return message('<pre>' . $tmp['body'] . '</pre>', $tmp['stat']);
+        return message('<pre>' . json_encode(json_decode($tmp['body']), JSON_PRETTY_PRINT) . '</pre>', $tmp['stat']);
         //return message('<pre>' . json_encode($ret, JSON_PRETTY_PRINT) . '</pre>', 500);
     }
     if ($_GET['install1']) {