提交内容：

文件上传功能改进。
可以选择是否需要时间串儿分隔，可以自定义上传的子目录，以及上传文件的名称（空时取原文件名称）

display-server/src/com/ai/server/bean/UploadDownloadBean.java

@@ -1,19 +1,26 @@
package com.ai.server.bean;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.util.Streams;
import org.apache.commons.lang.StringUtils;
import com.ai.server.core.bean.DisplayBean;
import com.ai.server.util.ApplicationPath;
@@ -29,6 +36,14 @@ import com.ailk.mobile.util.MobileUtility;
 *
 */
public class UploadDownloadBean extends DisplayBean {
    
    /**
    * @Fields hasTimeRandom : 上传图片的路径中，是否包含时间串儿，例如：201511022351123_1234
    * 如果为true，则可以保证每次上传的图片不重名，可以保留原文件的名称不变，下载时候可获取原文件的名称。
    * 
    */
    private final boolean hasTimeRandom = false;
    
	/************************************************************************************
	 * 文件上传；
	 * 如果在参数param中包含USER_NAME键值对，那么文件将保存到USER_NAME对应的目录下；否则保存在TEMP目录下
@@ -37,7 +52,7 @@ public class UploadDownloadBean extends DisplayBean {
	 * @return
	 * @throws Exception
	 */
	public IData upload(IData param) throws Exception{
	/*public IData upload(IData param) throws Exception{
	    IData result = new DataMap();
		HttpServletRequest request = ServletManager.getRequest();
		if (!ServletFileUpload.isMultipartContent(request)) {
@@ -119,7 +134,7 @@ public class UploadDownloadBean extends DisplayBean {
    	   MobileUtility.error("上传失败", e);
       }
       return result;
	}
	}*/
	/************************************************************************************
	 * 文件下载；
	 * 
@@ -161,4 +176,130 @@ public class UploadDownloadBean extends DisplayBean {
		
		return null;
	}
	
	public IData upload(IData param) throws Exception{
	    IData returnMap = new DataMap();  // 返回的对象
        HttpServletRequest request = ServletManager.getRequest();
        HttpServletResponse response = ServletManager.getResponse();
        response.setContentType("text/html;charset=UTF-8");
        response.setHeader("Cache-Control", "no-cache");
        if (!ServletFileUpload.isMultipartContent(request)) {
            MobileUtility.error("获取的上传文件并非以文件流格式传送，请核查！");
        }
        
        log.debug("【上传资源开始。。。】");
        Date date = new Date();// 获取当前时间
        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmssSSS");
        String dateStr = formatter.format(date);
        int random = (int)(Math.random()*10000);
        String dateStr_random = dateStr+"_"+random;  //时间字符串+随机数 最后一级别的文件夹
        String path = null; // 存放数据库用 相对路径 path = typePath + dateStr_random + fileName
        String rootDir = ApplicationPath.getFilePath(request).replace("//", File.separator).replace("\\", File.separator) + File.separator + "upload"; // eg:F:\eclipseWorkspace3\android-share\display-server\web
        String typePath = null;
        String filePath = null;  // 上传服务器用 绝对路径 filePath = rootDir + typePath + dateStr_random + fileName
        String fileName = null;
        BufferedInputStream in = null;
        BufferedOutputStream outStream = null;
        try {
            // 获得磁盘文件条目工厂
            FileItemFactory factory = new DiskFileItemFactory();
            // 高水平的API文件上传处理
            ServletFileUpload upload = new ServletFileUpload(factory);
            upload.setHeaderEncoding("UTF-8");
            // 获取多个上传文件
            List<?> fileList = upload.parseRequest(request);
            // 遍历上传文件写入磁盘
            Iterator<?> it = fileList.iterator();
            
            while (it.hasNext()) {
                FileItem item = (FileItem) it.next();
                if (item == null) {
                    continue;
                }
                //获取表单的属性名字
                String name = item.getFieldName();
                //如果获取的表单信息,是普通的文本信息
                if (item.isFormField()) {
                    //获取用户具体输入的字符串，因为表单提交过来的是字符串类型的
                    String value = item.getString();
                    if ("data".equals(name)) {
                        IData postData = new DataMap(value);
                        typePath = postData.getString("UPLOAD_PATH", "temp");
                        fileName = postData.getString("FILE_NAME");
                    }
                    request.setAttribute(name, value);
                    continue;
                }
                
                // 获取路径名
                String value = item.getName();
                if (value != null) {
                    // 索引到最后一个反斜杠
                    int start = value.lastIndexOf("\\");
                    // 截取 上传文件的 字符串名字，加1是 去掉反斜杠，
                    String originalFileName = value.substring(start + 1);   // 文件名称
                    if (StringUtils.isEmpty(fileName)) {
                        fileName = originalFileName;
                    } 
                    
                    String mulu = null;
                    if (hasTimeRandom) {
                        path = FileUtil.connectFilePath(typePath, dateStr_random, fileName);
                        mulu = FileUtil.connectFilePath(rootDir, typePath, dateStr_random);
                    }
                    else {
                        path = FileUtil.connectFilePath(typePath, fileName);
                        mulu = FileUtil.connectFilePath(rootDir, typePath);
                    }
                    filePath = FileUtil.connectFilePath(rootDir, path);
                    File file = new File(mulu);
                    if (!file.isDirectory()) {
                        log.debug("目录不存在，自动生成目录:" + mulu);
                        file.mkdirs();
                    }
                    in = new BufferedInputStream(item.getInputStream());// 获得文件输入流
                    outStream = new BufferedOutputStream(new FileOutputStream(new File(filePath)));// 获得文件输出流
                    long filelenth = Streams.copy(in, outStream, true);// 开始把文件写到你指定的上传文件夹
                    
                    returnMap.put("size", filelenth);
                    returnMap.put("lujing", path);
                    returnMap.put("fileName", fileName);
                    
                }
            }
            log.debug("【上传结束：】" + returnMap.toString());
        } catch (Exception e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
        }
        finally
        {
            if (in != null)
            {
                try
                {
                    in.close();
                }
                catch (Exception e)
                {
                    throw new RuntimeException(e);
                }
            }
            if (outStream != null)
            {
                try
                {
                    outStream.close();
                }
                catch (Exception e)
                {
                    throw new RuntimeException(e);
                }
            }
        }
       
        return returnMap;
    }
}

display-server/web/biz/js/plugin/uploaddownload.js

@@ -4,14 +4,14 @@ require(["domReady!","wadeMobile", "util"], function(doc,WadeMobile) {
		/*单文件上传*/
		WadeMobile.getPicture(function(filePath){
			var params = Wade.DataMap();
			params.put("UPLOAD_PATH","photo/");
			params.put("FILE_NAME","my.png");
			$("#fileUpload").html(filePath);
			params.put("UPLOAD_PATH","uploadPhoto"); // 图片上传的制定相对路径，如果没有设置，默认值temp
//			params.put("FILE_NAME","my.png");   // 图片默认的名字，如果没有设置，取原图片的名字
			//服务端SESSION_ID不能为空,服务端配置verify="false"并不校验
//			params.put("SESSION_ID",new Date().getTime());
			WadeMobile.uploadWithServlet(filePath, "UploadDownloadBean.upload", params.toString(), function(result){
				var data = new Wade.DataMap(result);
				alert("上传文件的大小：" + data.get("size") + "字节.");
				$("#fileUpload").html(data.get("lujing"));
			});
		});
		/*多文件上传*/

wade-mobile-func/src/com/wade/mobile/func/MobileNetWork.java

@@ -19,7 +19,6 @@ import com.ailk.common.data.impl.DataMap;
import com.litesuits.http.LiteHttpClient;
import com.litesuits.http.request.Request;
import com.litesuits.http.response.Response;
import com.mashape.unirest.http.Unirest;
import com.wade.mobile.app.MobileAppInfo;
import com.wade.mobile.common.MobileThread;
import com.wade.mobile.common.bluetooth.activity.ShareByBluetoothActivity;
@@ -338,15 +337,7 @@ public class MobileNetWork extends Plugin {
						filePostData.put("UPLOAD_FILE"+i, file);//装载文件
					}
					filePostData.put("UPLOAD_FILE_COUNT", filePaths.length());//装载文件数量
					//result = UnirestUtil.uploadByPost(MobileConfig.getInstance().getRequestUrl(), filePostData);
					String requestUrl = MobileConfig.getInstance()
                            .getRequestUrl();
                    String url = requestUrl + "?action=" + dataAction;
                    result = Unirest.post(url)
                            .header("accept", "application/json")
                            .fields(filePostData)
                            .field("file", new File(filePath)).asString()
                            .getBody();
					result = UnirestUtil.uploadByPost(MobileConfig.getInstance().getRequestUrl()+ "?action=" + dataAction, filePostData);
					if (ServerDataConfig.isEncrypt(dataAction)) {
						result = MobileSecurity.responseDecrypt(result);
					}