优化 mediaTypes

troyzhxu · troyzhxu · commit 5b178a4142e1 · 2022-04-08T16:34:50.000+08:00
diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/HttpTask.java b/okhttps/src/main/java/com/ejlchina/okhttps/HttpTask.java
@@ -506,7 +506,7 @@ public C addFilePara(String name, String filePath) {
     /**
      * &#28155;&#21152;&#25991;&#20214;&#21442;&#25968;&#65288;&#20197; multipart/form-data &#24418;&#24335;&#19978;&#20256;&#65289;
      * @param name &#21442;&#25968;&#21517;
-     * @param type &#25991;&#20214;&#31867;&#22411;/&#25193;&#23637;&#21517;: &#22914; txt&#12289;png&#12289;jpg&#12289;doc &#31561;&#65292;&#21442;&#32771; @{ HTTP$Builder#mediaTypes }
+     * @param type &#25991;&#20214;&#31867;&#22411;/&#25193;&#23637;&#21517;: &#22914; txt&#12289;png&#12289;jpg&#12289;doc &#31561;&#65292;&#21442;&#32771; {@link HTTP.Builder#getMediaTypes() }
      * @param filePath &#25991;&#20214;&#36335;&#24452;
      * @return HttpTask &#23454;&#20363;
      */
diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/internal/AbstractHttpClient.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/AbstractHttpClient.java
@@ -161,12 +161,15 @@ public MediaType mediaType(String type) {
             return MediaType.parse(mediaType);
         }
         if (type != null) {
+            if (type.indexOf('/') < 0) {
+                type = "application/" + type;
+            }
             MediaType mType = MediaType.parse(type);
             if (mType != null) {
                 return mType;
             }
         }
-        return MediaType.parse("application/octet-stream");
+        return MediaType.parse("application/unknown");
     }
 
     @Override
diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/okhttp/OkHttpBuilderImpl.java b/okhttps/src/main/java/com/ejlchina/okhttps/okhttp/OkHttpBuilderImpl.java
@@ -50,20 +50,22 @@ public class OkHttpBuilderImpl implements HTTP.Builder {
 
     public OkHttpBuilderImpl() {
         mediaTypes = new HashMap<>();
-        mediaTypes.put("*", "application/octet-stream");
         mediaTypes.put("png", "image/png");
         mediaTypes.put("jpg", "image/jpeg");
         mediaTypes.put("jpeg", "image/jpeg");
         mediaTypes.put("wav", "audio/wav");
         mediaTypes.put("mp3", "audio/mp3");
-        mediaTypes.put("mp4", "video/mpeg4");
+        mediaTypes.put("mp4", "video/mp4");
         mediaTypes.put("txt", "text/plain");
         mediaTypes.put("xls", "application/x-xls");
+        mediaTypes.put("xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         mediaTypes.put("xml", "text/xml");
         mediaTypes.put("apk", "application/vnd.android.package-archive");
         mediaTypes.put("doc", "application/msword");
-        mediaTypes.put("pdf", "application/pdf");
+        mediaTypes.put("docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
         mediaTypes.put("html", "text/html");
+        mediaTypes.put("rar", "application/x-rar");
+        mediaTypes.put("jar", "application/x-java-archive");
         contentTypes = new ArrayList<>();
         contentTypes.add("application/x-www-form-urlencoded; charset={charset}");
         contentTypes.add("application/json; charset={charset}");

-Original file line number
+Diff line change
     /**
      * 添加文件参数（以 multipart/form-data 形式上传）
      * @param name 参数名
 -     * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等，参考 @{ HTTP$Builder#mediaTypes }
 +     * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等，参考 {@link HTTP.Builder#getMediaTypes() }
      * @param filePath 文件路径
      * @return HttpTask 实例
      */
Original file line number	Diff line number	Diff line change
`@@ -161,12 +161,15 @@ public MediaType mediaType(String type) {`
`161`	`161`	`return MediaType.parse(mediaType);`
`162`	`162`	`}`
`163`	`163`	`if (type != null) {`
	`164`	`+ if (type.indexOf('/') < 0) {`
	`165`	`+ type = "application/" + type;`
	`166`	`+ }`
`164`	`167`	`MediaType mType = MediaType.parse(type);`
`165`	`168`	`if (mType != null) {`
`166`	`169`	`return mType;`
`167`	`170`	`}`
`168`	`171`	`}`
`169`		`- return MediaType.parse("application/octet-stream");`
	`172`	`+ return MediaType.parse("application/unknown");`
`170`	`173`	`}`
`171`	`174`
`172`	`175`	`@Override`