Merge branch 'v_3.0' of https://github.com/AriaLyy/Aria into v_3.0

This commit is contained in:
AriaLyy
2017-06-06 20:04:51 +08:00
14 changed files with 281 additions and 3 deletions

View File

@ -19,8 +19,9 @@ android {
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.1.1'
compile project(':AriaCompiler')
}
apply from: 'jcenter.gradle'

View File

@ -30,7 +30,7 @@ public class UploadTaskEntity extends AbsTaskEntity {
public String contentType = "multipart/form-data"; //上传的文件类型
public String userAgent = "User-Agent";
public String charset = "utf-8";
/**
* 文件上传表单
*/