Fix: blocking while get uptoken

application/index/controller/File.php

@@ -170,6 +170,6 @@ class File extends Controller{
 			}
 
 		}
-		return FileManage::createFolder($dirName,$dirPosition,$this->userObj->uid);
+		return json(FileManage::createFolder($dirName,$dirPosition,$this->userObj->uid));
 	} 
 }

application/index/model/FileManage.php

@@ -543,7 +543,9 @@ class FileManage extends Model{
 		$fileList = Db::name('files')->where('upload_user',$uid)->where('dir',$path)->select();
 		$dirList = Db::name('folders')->where('owner',$uid)->where('position',$path)->select();
 		$count= 0;
-		$fileListData=[];
+		$fileListData=[
+			"result"=>[],
+		];
 		foreach ($dirList as $key => $value) {
 			$fileListData['result'][$count]['name'] = $value['folder_name'];
 			$fileListData['result'][$count]['rights'] = "drwxr-xr-x";

application/index/model/LocalAdapter.php

@@ -301,15 +301,15 @@ class LocalAdapter extends Model{
      * @return array
      */
     static function getThumbSize($width,$height){
-		$rate = $width/$height;
+		// $rate = $width/$height;
-		$maxWidth = 90;
+		// $maxWidth = 280;
-		$maxHeight = 39;
+		// $maxHeight = 150;
-		$changeWidth = 39*$rate;
+		// $changeWidth = 150*$rate;
-		$changeHeight = 90/$rate;
+		// $changeHeight = 280/$rate;
-		if($changeWidth>=$maxWidth){
+		// if($changeWidth>=$maxWidth){
-			return [(int)$changeHeight,90];
+		// 	return [(int)$changeHeight,280];
-		}
+		// }
-		return [39,(int)$changeWidth];
+		return [230,200];
     }
     
     /**

application/index/view/home/home.html

@@ -31,6 +31,9 @@
 			allowShare:"{$groupData.allow_share}",
             allowRemoteDownload:"{:explode(",",$groupData.aria2)[0]}",
             allowTorrentDownload:"{:explode(",",$groupData.aria2)[1]}",
+    };
+    apiURL={
+      imgThumb:"/File/Thumb"
     };
       </script>
   </head>

static/js/uploader/qiniu.js

@@ -714,7 +714,7 @@ function QiniuJsSDK() {
 				logger.debug("get uptoken from: ", that.uptoken_url);
 				// TODO: use mOxie
 				var ajax = that.createAjax();
-				ajax.open('GET', that.uptoken_url, false);
+				ajax.open('GET', that.uptoken_url, true);
 				ajax.setRequestHeader("If-Modified-Since", "0");
 				// ajax.onreadystatechange = function() {
 				//     if (ajax.readyState === 4 && ajax.status === 200) {
@@ -723,6 +723,7 @@ function QiniuJsSDK() {
 				//     }
 				// };
 				ajax.send();
+				ajax.onload = function (e){
 					if (ajax.status === 200) {
 						var res = that.parseJSON(ajax.responseText);
 						that.token = res.uptoken;
@@ -775,6 +776,11 @@ function QiniuJsSDK() {
 					} else {
 						logger.error("get uptoken error: ", ajax.responseText);
 					}
+				}
+				ajax.onerror = function (e){
+					logger.error("get uptoken error: ", ajax.responseText);
+				}
+
 			} else if (op.uptoken_func) {
 				logger.debug("get uptoken from uptoken_func");
 				that.token = op.uptoken_func(file);