Merge pull request #107 from simon-liubin/update/charset_utf8

Update/charset utf8

Author: longbai

src/main/java/com/qiniu/api/config/Config.java

@@ -5,6 +5,7 @@
  * side only.
  */
 public class Config {
+	public static final String CHARSET = "utf-8";
 
 	public static String USER_AGENT="qiniu java-sdk v6.0.0";
 

src/main/java/com/qiniu/api/io/IoApi.java

@@ -49,7 +49,7 @@ private static PutRet put(String uptoken, String key, File file,
 
 			if (extra.params != null) {
 				for (Map.Entry<String, String> xvar : extra.params.entrySet()) {
-					requestEntity.addPart(xvar.getKey(), new StringBody(xvar.getValue()));
+					requestEntity.addPart(xvar.getKey(), new StringBody(xvar.getValue(), Charset.forName(Config.CHARSET)));
 				}
 			}
 		} catch (Exception e) {
@@ -72,7 +72,7 @@ private static FileBody buildFileBody(File file,PutExtra extra){
 
 	private static void setKey(MultipartEntity requestEntity, String key) throws UnsupportedEncodingException{
 		if(key != null){
-			requestEntity.addPart("key", new StringBody(key,Charset.forName("utf-8")));
+			requestEntity.addPart("key", new StringBody(key,Charset.forName(Config.CHARSET)));
 		}
 	}
 
@@ -81,7 +81,7 @@ private static void setParam(MultipartEntity requestEntity, Map<String, String>
 			return;
 		}
 		for(String name : params.keySet()){
-			requestEntity.addPart(name, new StringBody(params.get(name),Charset.forName("utf-8")));
+			requestEntity.addPart(name, new StringBody(params.get(name),Charset.forName(Config.CHARSET)));
 		}
 	}
 

src/main/java/com/qiniu/api/net/EncodeUtils.java

@@ -1,5 +1,6 @@
 package com.qiniu.api.net;
 
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -10,6 +11,8 @@
 import org.apache.http.client.utils.URLEncodedUtils;
 import org.apache.http.message.BasicNameValuePair;
 
+import com.qiniu.api.config.Config;
+
 /**
  * URLEncoding is the alternate base64 encoding defined in RFC 4648. It is
  * typically used in URLs and file names.
@@ -38,7 +41,7 @@ public static byte[] urlsafeEncodeBytes(byte[] src) {
 	}
 
 	public static byte[] urlsafeBase64Decode(String encoded){
-		byte[] rawbs = encoded.getBytes();
+		byte[] rawbs = toByte(encoded);
 		for(int i=0;i<rawbs.length;i++){
 			if(rawbs[i] == '_'){
 				rawbs[i] = '/';
@@ -50,11 +53,11 @@ public static byte[] urlsafeBase64Decode(String encoded){
 	}
 
 	public static String urlsafeEncodeString(byte[] src) {
-		return new String(urlsafeEncodeBytes(src));
+		return toString(urlsafeEncodeBytes(src));
 	}
 
 	public static String urlsafeEncode(String text) {
-		return new String(urlsafeEncodeBytes(text.getBytes()));
+		return toString(urlsafeEncodeBytes(toByte(text)));
 	}
 
 	// replace '/' with '_', '+" with '-'
@@ -84,8 +87,24 @@ public static String encodeParams(Object params) {
 				list.add(new BasicNameValuePair(entry.getKey(), entry
 						.getValue()));
 			}
-			return URLEncodedUtils.format(list, "UTF-8");
+			return URLEncodedUtils.format(list, Config.CHARSET);
 		}
 		return null;
 	}
+	
+	public static byte[] toByte(String s){
+		try {
+			return s.getBytes(Config.CHARSET);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	public static String toString(byte[] bs){
+		try {
+			return new String(bs, Config.CHARSET);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+	}
 }

src/main/java/com/qiniu/api/rs/PutPolicy.java

@@ -6,6 +6,7 @@
 import com.qiniu.api.auth.AuthException;
 import com.qiniu.api.auth.digest.DigestAuth;
 import com.qiniu.api.auth.digest.Mac;
+import com.qiniu.api.net.EncodeUtils;
 
 /**
  * The PutPolicy class used to generate a upload token. To upload a file, you
@@ -146,7 +147,7 @@ public String token(Mac mac) throws AuthException, JSONException {
 			this.expires = 3600; // 3600s, default.
 		}
 		this.deadline = System.currentTimeMillis() / 1000 + this.expires;
-		byte[] data = this.marshal().getBytes();
+		byte[] data = EncodeUtils.toByte(this.marshal());
 		return DigestAuth.signWithData(mac, data);
 	}