diff --git a/apps/admin/controller/system/UpgradeController.php b/apps/admin/controller/system/UpgradeController.php index 81b7884d47caf8edad16649be85924cf7ff8d75b..a694f5373fafab55b056ce746a00cbdf3df80ef1 100644 --- a/apps/admin/controller/system/UpgradeController.php +++ b/apps/admin/controller/system/UpgradeController.php @@ -97,42 +97,38 @@ class UpgradeController extends Controller // 鎵ц涓嬭浇 public function down() { - if ($_POST) { - if (! ! $list = post('list')) { - if (! is_array($list)) { // 鍗曚釜鏂囦欢杞崲涓烘暟缁� - $list = array( - $list - ); - } - $len = count($list) ?: 0; - foreach ($list as $value) { - // 鏈湴瀛樺偍璺緞 - $path = RUN_PATH . '/upgrade' . $value; - // 鑷姩鍒涘缓鐩綍 - if (! check_dir(dirname($path), true)) { - json(0, '鐩綍鍐欏叆鏉冮檺涓嶈冻锛屾棤娉曚笅杞藉崌绾ф枃浠讹紒' . dirname($path)); - } - - // 瀹氫箟鎵ц涓嬭浇鐨勭被鍨� - $types = '.zip|.rar|.doc|.docx|.ppt|.pptx|.xls|.xlsx|.chm|'; - $pathinfo = explode(".", basename($path)); - $ext = end($pathinfo); // 鑾峰彇鎵╁睍 - if (preg_match('/\.' . $ext . '\|/i', $types)) { - $result = $this->getServerDown('/release/' . $this->branch . $value, $path); - } else { - $result = $this->getServerFile($value, $path); - } + if (! ! $list = get('list')) { + if (! is_array($list)) { // 鍗曚釜鏂囦欢杞崲涓烘暟缁� + $list = array( + $list + ); + } + $len = count($list) ?: 0; + foreach ($list as $value) { + // 鏈湴瀛樺偍璺緞 + $path = RUN_PATH . '/upgrade' . $value; + // 鑷姩鍒涘缓鐩綍 + if (! check_dir(dirname($path), true)) { + json(0, '鐩綍鍐欏叆鏉冮檺涓嶈冻锛屾棤娉曚笅杞藉崌绾ф枃浠讹紒' . dirname($path)); } - if ($len == 1) { - json(1, "鏇存柊鏂囦欢 " . basename($value) . " 涓嬭浇鎴愬姛!"); + + // 瀹氫箟鎵ц涓嬭浇鐨勭被鍨� + $types = '.zip|.rar|.doc|.docx|.ppt|.pptx|.xls|.xlsx|.chm|.ttf|.otf|'; + $pathinfo = explode(".", basename($path)); + $ext = end($pathinfo); // 鑾峰彇鎵╁睍 + if (preg_match('/\.' . $ext . '\|/i', $types)) { + $result = $this->getServerDown('/release/' . $this->branch . $value, $path); } else { - json(1, "鏇存柊鏂囦欢" . basename($value) . "绛夋枃浠跺叏閮ㄤ笅杞芥垚鍔�!"); + $result = $this->getServerFile($value, $path); } + } + if ($len == 1) { + json(1, "鏇存柊鏂囦欢 " . basename($value) . " 涓嬭浇鎴愬姛!"); } else { - json(0, '璇烽€夋嫨瑕佷笅杞界殑鏂囦欢锛�'); + json(1, "鏇存柊鏂囦欢" . basename($value) . "绛夋枃浠跺叏閮ㄤ笅杞芥垚鍔�!"); } } else { - json(0, '璇蜂娇鐢≒OST鎻愪氦璇锋眰锛�'); + json(0, '璇烽€夋嫨瑕佷笅杞界殑鏂囦欢锛�'); } } diff --git a/apps/admin/view/default/system/upgrade.html b/apps/admin/view/default/system/upgrade.html index 5a19ea05e3c706d85df621006e236fe051e981d8..e8a2a4ac0330422c3f81c04e8da5833bc57adc43 100644 --- a/apps/admin/view/default/system/upgrade.html +++ b/apps/admin/view/default/system/upgrade.html @@ -177,7 +177,7 @@ function down(){ $(checked).each(function(index,element){ setTimeout(function () { //寤惰繜鎵ц銆侀伩鍏嶆枃浠跺お澶氬崱姝婚棶棰� $.ajax({ - type: 'POST', + type: 'GET', url: url, dataType: 'json', async:true, diff --git a/apps/common/version.php b/apps/common/version.php index b8bbc0219d20f249906a2fd253aec0cc3e74131c..98247604a8be4f8531e4b15abba0618271a086bf 100644 --- a/apps/common/version.php +++ b/apps/common/version.php @@ -4,9 +4,9 @@ return array( 'app_version' => '2.0.5', // 鍙戝竷鏃堕棿 - 'release_time' => '20200130', + 'release_time' => '20200131', // 淇鐗堟湰 - 'revise_version' => '1' + 'revise_version' => '0' ); diff --git a/doc/ChangeLog.txt b/doc/ChangeLog.txt index 889af293d47138cd088de0923c8f8dccc9e9e20d..8a9d6b0d521c3416802d4449ff36514abc8c4399 100644 --- a/doc/ChangeLog.txt +++ b/doc/ChangeLog.txt @@ -4,7 +4,7 @@ 鐗堟潈鎵€鏈夛細婀栧崡缈变簯缃戠粶绉戞妧鏈夐檺鍏徃 ########################################## -PbootCMS V2.0.5 build 2020-01-30 +PbootCMS V2.0.5 build 2020-01-31 1銆佷紭鍖栧墠鍙�404.html锛屽苟鏀寔鍐呭鍐厈info}鑷€傚簲鎻愮ず鏂囧瓧锛� 2銆佷紭鍖栧唴瀹瑰垪琛ㄦ帓搴忔柟寮�,骞朵慨澶峚pi浣跨敤闅忔満鎺掑簭鏃犳晥闂锛� 3銆佷慨澶嶅悗鍙板叆鍙f枃浠朵慨鏀瑰悕瀛楀悗鍦ㄧ嚎鍗囩骇鏃犳硶鑷€傚簲闂锛�