Index: ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back =================================================================== diff -u -r24865 -r24869 --- ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back (.../applicationContext-acegi-security-standard.xml.back) (revision 24865) +++ ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back (.../applicationContext-acegi-security-standard.xml.back) (revision 24869) @@ -66,6 +66,7 @@ + Index: ssts-web/src/main/webapp/WEB-INF/web-standard.xml =================================================================== diff -u -r24865 -r24869 --- ssts-web/src/main/webapp/WEB-INF/web-standard.xml (.../web-standard.xml) (revision 24865) +++ ssts-web/src/main/webapp/WEB-INF/web-standard.xml (.../web-standard.xml) (revision 24869) @@ -64,7 +64,7 @@ com.forgon.register.filter.VersionManagerFilter noFilterUrl - /ext-4.2.3/;/buttjoint/;/qualitymonitoringWithNoLogon/;/debug/;/disinfectsystem/config/;/disinfectsystem/common/;/disinfectSystem/fileUploadServlet;/CodeImageServlet;/fckeditor/;/UserUpLoadFiles/;/openSystemMainPage.jsp;/logon.jsp;/favicon.ico;/js/;/common/taglibs.jsp;/jquery/;/ext/;/dwr/;/images/;/styles/;/scripts/;/wap/index.jsp;/themes/;/services/;/ikey/;/mobileClient/;/disinfectSystem/sterilization/sterilizationRecordAction!uploadSterilizationRecordPic.do/;/disinfectSystem/printBarcodeAction!printBarcodeImage.do + /ext-4.2.3/;/buttjoint/;/qualitymonitoringWithNoLogon/;/debug/;/disinfectsystem/config/;/disinfectsystem/common/;/disinfectSystem/fileUploadServlet;/CodeImageServlet;/fckeditor/;/UserUpLoadFiles/;/openSystemMainPage.jsp;/logon.jsp;/favicon.ico;/js/;/common/taglibs.jsp;/jquery/;/ext/;/dwr/;/images/;/styles/;/scripts/;/wap/index.jsp;/themes/;/services/;/ikey/;/mobileClient/;/disinfectSystem/sterilization/sterilizationRecordAction!uploadSterilizationRecordPic.do/;/disinfectSystem/printBarcodeAction!printBarcodeImage.do/;/servlets/image Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/dwr/table/JasperreportsTableManager.java =================================================================== diff -u -r21579 -r24869 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/dwr/table/JasperreportsTableManager.java (.../JasperreportsTableManager.java) (revision 21579) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/dwr/table/JasperreportsTableManager.java (.../JasperreportsTableManager.java) (revision 24869) @@ -77,8 +77,8 @@ if (session.getAttribute("pageIndex") != null) { pageIndex = Integer.parseInt(session.getAttribute("pageIndex").toString()); } - - + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort(); + String attributeName = ImageServlet.DEFAULT_JASPER_PRINT_SESSION_ATTRIBUTE; JasperPrint jasperPrint = (JasperPrint)session.getAttribute(attributeName); JRHtmlExporter exporter = new JRHtmlExporter(); @@ -92,14 +92,16 @@ StringBuffer sbuffer = new StringBuffer(); exporter.setParameter(JRExporterParameter.JASPER_PRINT, jasperPrint); exporter.setParameter(JRExporterParameter.OUTPUT_STRING_BUFFER, sbuffer); - exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, "../servlets/image?image="); +// exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, "../servlets/image?image="); + exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, basePath+"/servlets/image?image="); exporter.setParameter(JRHtmlExporterParameter.BETWEEN_PAGES_HTML, ""); exporter.setParameter(JRExporterParameter.PAGE_INDEX, new Integer(i)); try { exporter.exportReport(); String printContent = sbuffer.toString(); if(i == (pageSize-1)){//处理最后一页table无底线(因为表格数据不够,用图片代替时,图片将table的底线遮住了,现将图片去掉) - String regex = "\"\""; +// String regex = "\"\""; + String regex = "\"\""; printContent = StringTools.replaceLast(printContent, regex, ""); } pageCodeArray.add(printContent); @@ -111,15 +113,17 @@ StringBuffer sbuffer = new StringBuffer(); exporter.setParameter(JRExporterParameter.JASPER_PRINT, jasperPrint); exporter.setParameter(JRExporterParameter.OUTPUT_STRING_BUFFER, sbuffer); - exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, "../servlets/image?image="); +// exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, "../servlets/image?image="); + exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, basePath+"/servlets/image?image="); exporter.setParameter(JRHtmlExporterParameter.BETWEEN_PAGES_HTML, ""); exporter.setParameter(JRExporterParameter.PAGE_INDEX, new Integer(pageIndex)); try { exporter.exportReport(); String printContent = sbuffer.toString(); if(pageIndex == (pageSize-1)){ //处理最后一页table无底线(因为表格数据不够,用图片代替时,图片将table的底线遮住了,现将图片去掉) - String regex = "\"\""; +// String regex = "\"\""; + String regex = "\"\""; printContent = StringTools.replaceLast(printContent, regex, ""); }