七牛多分区支持

HFO4 · HFO4 · commit 42203a3729c1 · 2017-01-25T10:18:19.000+08:00
diff --git a/admin/add_policy.php b/admin/add_policy.php
@@ -479,6 +479,26 @@
                     </div>
               
             </div>
+             <div style="height:10px;"></div>
+            <div class="row">
+                <div class="col-lg-2" align="right">
+                 <label class="lab">储存区:</label>
+                    </div>
+                 <div class="col-lg-5" align="right">
+                 <select name="p_server" class="form-control">
+
+  <option value ="https://up.qbox.me">华东区(https://up.qbox.me)</option>
+ <option value ="https://up-z1.qbox.me">华北区(https://up-z1.qbox.me)</option>
+  <option value ="https://up-z2.qbox.me">华南区(https://up-z2.qbox.me)</option>
+  <option value ="https://up-na0.qbox.me">北美区(https://up-na0.qbox.me)</option>
+    </select> 
+
+                    </div>
+                    <div class="col-lg-3" align="right">
+                <div class="sm" align="left">可在七牛后台查看或创建空间时选择。请正确填写，否则无法上传。</div>
+                    </div>
+              
+            </div>
    <div style="height:10px;"></div>
             <div class="row">
                 <div class="col-lg-2" align="right">
diff --git a/content/themes/material/js/qiniu.js b/content/themes/material/js/qiniu.js
@@ -216,7 +216,7 @@ function QiniuJsSDK() {
             return key;
         };
         plupload.extend(option, op, {
-            url:"https://up.qbox.me",
+            url:upserver,
             multipart_params:{
                 token:""
             }
@@ -318,7 +318,7 @@ function QiniuJsSDK() {
                         }
                     }
                     up.setOption({
-                        url:"https://up.qbox.me/mkblk/" + blockSize,
+                        url:upserver+"/mkblk/" + blockSize,
                         multipart:false,
                         chunk_size:chunk_size,
                         required_features:"chunks",
@@ -340,7 +340,7 @@ function QiniuJsSDK() {
             chunk_size = chunk_size || up.settings && up.settings.chunk_size;
             if (leftSize < chunk_size) {
                 up.setOption({
-                    url:"https://up.qbox.me/mkblk/" + leftSize
+                    url:upserver+"/mkblk/" + leftSize
                 });
             }
             localStorage.setItem(file.name, JSON.stringify({
@@ -515,7 +515,7 @@ function QiniuJsSDK() {
                             }
                         }
                     }
-                    var url = "https://up.qbox.me/mkfile/" + file.size + key + x_vars_url;
+                    var url = upserver+"/mkfile/" + file.size + key + x_vars_url;
                     var ajax = that.createAjax();
                     ajax.open("POST", url, true);
                     ajax.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
diff --git a/includes/adminAction.php b/includes/adminAction.php
@@ -45,7 +45,11 @@
 		$policyname=$_POST['policyname'];
 		$policytype=$_POST['policytype'];
 		$kjm=$_POST['kjm'];
-		$p_server = $_POST['p_server_method'] == "http://" ? "http://".$_POST['p_server']."/" : "https://".$_POST['p_server']."/";
+		if($policytype == "qiniu"){
+			$p_server = $_POST["p_server"];
+		}else{
+			$p_server = $_POST['p_server_method'] == "http://" ? "http://".$_POST['p_server']."/" : "https://".$_POST['p_server']."/";
+		}
 		$p_dir=$_POST['p_dir'];
 		$namerule=$_POST['namerule'];
 		$zzurl=$_POST['zzurl'];
diff --git a/index.php b/index.php
@@ -50,7 +50,7 @@
 	}
 }else{
 	$fileType = 'var min="'.$fileType.'"';
-	$upServer = "https://up.qbox.me";
+	$upServer = $serverUrl;
 	$filePart = "4";
 }
 $smarty->template_dir = "content/themes/".$theme;

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ function QiniuJsSDK() {`
`216`	`216`	`return key;`
`217`	`217`	`};`
`218`	`218`	`plupload.extend(option, op, {`
`219`		`- url:"https://up.qbox.me",`
	`219`	`+ url:upserver,`
`220`	`220`	`multipart_params:{`
`221`	`221`	`token:""`
`222`	`222`	`}`
`@@ -318,7 +318,7 @@ function QiniuJsSDK() {`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`	`up.setOption({`
`321`		`- url:"https://up.qbox.me/mkblk/" + blockSize,`
	`321`	`+ url:upserver+"/mkblk/" + blockSize,`
`322`	`322`	`multipart:false,`
`323`	`323`	`chunk_size:chunk_size,`
`324`	`324`	`required_features:"chunks",`
`@@ -340,7 +340,7 @@ function QiniuJsSDK() {`
`340`	`340`	`chunk_size = chunk_size \|\| up.settings && up.settings.chunk_size;`
`341`	`341`	`if (leftSize < chunk_size) {`
`342`	`342`	`up.setOption({`
`343`		`- url:"https://up.qbox.me/mkblk/" + leftSize`
	`343`	`+ url:upserver+"/mkblk/" + leftSize`
`344`	`344`	`});`
`345`	`345`	`}`
`346`	`346`	`localStorage.setItem(file.name, JSON.stringify({`
`@@ -515,7 +515,7 @@ function QiniuJsSDK() {`
`515`	`515`	`}`
`516`	`516`	`}`
`517`	`517`	`}`
`518`		`- var url = "https://up.qbox.me/mkfile/" + file.size + key + x_vars_url;`
	`518`	`+ var url = upserver+"/mkfile/" + file.size + key + x_vars_url;`
`519`	`519`	`var ajax = that.createAjax();`
`520`	`520`	`ajax.open("POST", url, true);`
`521`	`521`	`ajax.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`}`
`51`	`51`	`}else{`
`52`	`52`	`$fileType = 'var min="'.$fileType.'"';`
`53`		`- $upServer = "https://up.qbox.me";`
	`53`	`+ $upServer = $serverUrl;`
`54`	`54`	`$filePart = "4";`
`55`	`55`	`}`
`56`	`56`	`$smarty->template_dir = "content/themes/".$theme;`