Merge branch 'master' of chenweida/esb into master

Hos-Resource-Mini/src/main/java/com.yihu.ehr/service/DataAcquisitionManager.java

@@ -167,10 +167,11 @@ public class DataAcquisitionManager implements IDataAcquisitionManager {
            */
            File f = JSON.json2File(params);
            //文件上传
            if ("1".equals(urlType)) {
           // if ("1".equals(urlType)) {
                //post
                responseMsg = HttpHelper.postFile(path, null, f).getBody();
            }
            //    responseMsg = HttpHelper.postFile(path, null, f).getBody();
            //}
            responseMsg = HttpHelper.postFile(path, null, f).getBody();
            //删除文件
            f.delete();
        }

Hos-Resource-Mini/src/main/java/com.yihu.ehr/util/httpclient/HttpClientUtil.java

@@ -131,7 +131,6 @@ public class HttpClientUtil {
        } catch (Exception e) {
            re.setStatusCode(201);
            re.setBody(e.getMessage());
            System.out.print(e.getMessage());
        } finally {
            close(httpclient, response);
        }

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/datacquisition/dataAcquistionJs.jsp

@@ -14,7 +14,7 @@
            dataAcquistion.grid = $("#divGrid").ligerGrid({
                url: '${contextRoot}/dataAcquisition/getDataAcquisition',
                columns: [
                    {display:'接口名称',name:'transactioncode', width:'20%'},
                    {display:'接口名称',name:'name', width:'20%'},
                    {display:'接口代码',name:'transactioncode', width:'10%'},
                    {display:'接口请求方式',name:'request_type', width:'10%',render:function(row,index,value){
                        if(value=="1")