修复文件上传请求头问题

atove · Jan 18, 2017 · fe7a734 · fe7a734
1 parent c3877cc
commit fe7a734
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 4 deletions.
diff --git a/app/src/main/assets/url.xml b/app/src/main/assets/url.xml
@@ -10,4 +10,8 @@
         Url="/api/user/login"
     />
 
+    <!--上传图片-->
+    <Node DecorateType="from" Expires="0" Host="MainHost" Key="file" NetType="post"
+        Url="/api/resource/coverImage" />
+
 </url>
diff --git a/app/src/main/java/com/astra/simple/http/FromRequest.java b/app/src/main/java/com/astra/simple/http/FromRequest.java
@@ -0,0 +1,38 @@
+package com.astra.simple.http;
+
+import android.util.Log;
+
+import com.astra.http.RequestDecorate;
+import com.astra.http.RequestParameter;
+
+import java.util.HashMap;
+
+/**
+ * Created by Astra on 17/1/11.
+ */
+
+public class FromRequest extends RequestDecorate {
+    public FromRequest() {
+        //addRequestHeader("Content-Type", "application/json");
+    }
+
+    @Override
+    public String getMediaType() {
+        return "multipart/form-data";
+    }
+
+    @Override
+    public String getContent() {
+        return null;
+    }
+
+    @Override
+    public HashMap<String, String> getRequestHeader() {
+
+        String accesskey = "huluaff7f7b455e6d529|74ab4ab038263409b2e045435c796891|07ffebfd75192d2caaad03765514a53b|1484118151711";
+        addRequestHeader("accesskey", accesskey);
+        Log.d("accesskey", accesskey);
+        return super.getRequestHeader();
+    }
+
+}
diff --git a/app/src/main/java/com/astra/simple/http/MainActivity.java b/app/src/main/java/com/astra/simple/http/MainActivity.java
@@ -9,6 +9,7 @@
 import com.astra.http.RemoteService;
 import com.astra.http.RequestCallback;
 
+import java.io.File;
 import java.util.UUID;
 
 public class MainActivity extends AppCompatActivity {
@@ -19,7 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
         RemoteService.getInstance().init(this, "url.xml");
         RemoteService.getInstance().addHost("MainHost", "http://hulu.leanapp.cn");
-        RemoteService.getInstance().addrequestDecorate("json", new JsonRequest());
+        RemoteService.getInstance().addrequestDecorate("from", new FromRequest());
         RemoteService.getInstance().isPrintLog(true);
 
 
@@ -52,7 +53,7 @@ public String getTime(){
     public void onClick(View view) {
         switch (view.getId()){
             case R.id.btn_login:
-                RemoteService.getInstance().invoke("login")
+                /*RemoteService.getInstance().invoke("login")
                         //.addUrlSuffix("183874777287834")
                         .addParam("loginname", "17090020673")
                         .addParam("password", "ls123456")
@@ -68,7 +69,24 @@ public void onFail(int code, String errorMessage) {
 
                             }
                         })
+                        .start();*/
+
+                RemoteService.getInstance()
+                        .invoke("file")
+                        .setFile(new File("file:///storage/emulated/0/Pictures/Screenshots/Screenshot_20160923-165949.png"))
+                        .setRequestCall(new RequestCallback() {
+                            @Override
+                            public void onSuccess(String content) {
+                                Log.d("1234", content);
+                            }
+
+                            @Override
+                            public void onFail(int code, String errorMessage) {
+
+                            }
+                        })
                         .start();
+
                 break;
         }
     }

diff --git a/astrahttp/src/main/java/com/astra/http/Request.java b/astrahttp/src/main/java/com/astra/http/Request.java
@@ -108,7 +108,7 @@ public Request setFileType(String fileType){
         this.fileType = fileType;
         return this;
     }
-    private String fileName = "image/png";//文件类型，默认图片
+    private String fileName = "image.jpg";//文件名称
     public Request setFileName(String fileName){
         this.fileName = fileName;
         return this;
@@ -300,7 +300,7 @@ private RequestBody getBody(okhttp3.Request.Builder builder){
         }
 
         if(RemoteService.isPrintLog) {
-            if (requestDecorate != null){
+            if (requestDecorate != null && requestDecorate.getContent() != null){
                 Log.d("请求参数", requestDecorate.getContent());
             }else {
                 Log.d("请求参数", paramSerialize(requestParameters));