diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index e41bb81..f0b0504 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -84,19 +84,7 @@ com.itextpdf itextpdf - 5.5.13 - - - - com.itextpdf - itext-asian - 5.2.0 - - - - org.apache.pdfbox - pdfbox - 2.0.24 + 5.0.6 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index e41bb81..f0b0504 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -84,19 +84,7 @@ com.itextpdf itextpdf - 5.5.13 - - - - com.itextpdf - itext-asian - 5.2.0 - - - - org.apache.pdfbox - pdfbox - 2.0.24 + 5.0.6 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index 8a5e8fe..9239122 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -22,8 +22,6 @@ import lombok.extern.slf4j.Slf4j; import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; @@ -247,7 +245,6 @@ (ObjectUtils.isNotEmpty(imageConfig.getColIndex()) && imageConfig.getColIndex() != -1)) { //指定电子章位置 Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection(); - docPicture.setFillColor(Color.white); //水平位置 docPicture.setHorizontalAlignment(ShapeHorizontalAlignment.Center); //垂直位置 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index e41bb81..f0b0504 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -84,19 +84,7 @@ com.itextpdf itextpdf - 5.5.13 - - - - com.itextpdf - itext-asian - 5.2.0 - - - - org.apache.pdfbox - pdfbox - 2.0.24 + 5.0.6 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index 8a5e8fe..9239122 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -22,8 +22,6 @@ import lombok.extern.slf4j.Slf4j; import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; @@ -247,7 +245,6 @@ (ObjectUtils.isNotEmpty(imageConfig.getColIndex()) && imageConfig.getColIndex() != -1)) { //指定电子章位置 Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection(); - docPicture.setFillColor(Color.white); //水平位置 docPicture.setHorizontalAlignment(ShapeHorizontalAlignment.Center); //垂直位置 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index 96fae46..7bd876f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.listeners.register; -import cn.afterturn.easypoi.entity.ImageEntity; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; -import com.casic.missiles.utils.QRCodeUtil; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.config.ConfigureBuilder; @@ -23,18 +21,9 @@ import com.spire.doc.documents.ShapeLineStyle; import com.spire.doc.documents.ShapeType; import com.spire.doc.fields.ShapeObject; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.pdmodel.PDPage; -import org.apache.pdfbox.pdmodel.PDPageContentStream; -import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xwpf.usermodel.XWPFPicture; -import org.springframework.util.ResourceUtils; - -import javax.imageio.ImageIO; import java.awt.*; import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; import java.io.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index e41bb81..f0b0504 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -84,19 +84,7 @@ com.itextpdf itextpdf - 5.5.13 - - - - com.itextpdf - itext-asian - 5.2.0 - - - - org.apache.pdfbox - pdfbox - 2.0.24 + 5.0.6 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index 8a5e8fe..9239122 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -22,8 +22,6 @@ import lombok.extern.slf4j.Slf4j; import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; @@ -247,7 +245,6 @@ (ObjectUtils.isNotEmpty(imageConfig.getColIndex()) && imageConfig.getColIndex() != -1)) { //指定电子章位置 Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection(); - docPicture.setFillColor(Color.white); //水平位置 docPicture.setHorizontalAlignment(ShapeHorizontalAlignment.Center); //垂直位置 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index 96fae46..7bd876f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.listeners.register; -import cn.afterturn.easypoi.entity.ImageEntity; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; -import com.casic.missiles.utils.QRCodeUtil; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.config.ConfigureBuilder; @@ -23,18 +21,9 @@ import com.spire.doc.documents.ShapeLineStyle; import com.spire.doc.documents.ShapeType; import com.spire.doc.fields.ShapeObject; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.pdmodel.PDPage; -import org.apache.pdfbox.pdmodel.PDPageContentStream; -import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xwpf.usermodel.XWPFPicture; -import org.springframework.util.ResourceUtils; - -import javax.imageio.ImageIO; import java.awt.*; import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; import java.io.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java index 6dde846..b5fefcf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java @@ -51,7 +51,7 @@ //封装返回值 byte[] data = out.toByteArray(); response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(file.getName(), "UTF-8")); + response.setHeader("Content-Disposition", file.getName()); response.addHeader("Content-Length", "" + data.length); response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index e41bb81..f0b0504 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -84,19 +84,7 @@ com.itextpdf itextpdf - 5.5.13 - - - - com.itextpdf - itext-asian - 5.2.0 - - - - org.apache.pdfbox - pdfbox - 2.0.24 + 5.0.6 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index 8a5e8fe..9239122 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -22,8 +22,6 @@ import lombok.extern.slf4j.Slf4j; import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; @@ -247,7 +245,6 @@ (ObjectUtils.isNotEmpty(imageConfig.getColIndex()) && imageConfig.getColIndex() != -1)) { //指定电子章位置 Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection(); - docPicture.setFillColor(Color.white); //水平位置 docPicture.setHorizontalAlignment(ShapeHorizontalAlignment.Center); //垂直位置 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index 96fae46..7bd876f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.listeners.register; -import cn.afterturn.easypoi.entity.ImageEntity; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; -import com.casic.missiles.utils.QRCodeUtil; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.config.ConfigureBuilder; @@ -23,18 +21,9 @@ import com.spire.doc.documents.ShapeLineStyle; import com.spire.doc.documents.ShapeType; import com.spire.doc.fields.ShapeObject; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.pdmodel.PDPage; -import org.apache.pdfbox.pdmodel.PDPageContentStream; -import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xwpf.usermodel.XWPFPicture; -import org.springframework.util.ResourceUtils; - -import javax.imageio.ImageIO; import java.awt.*; import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; import java.io.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java index 6dde846..b5fefcf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java @@ -51,7 +51,7 @@ //封装返回值 byte[] data = out.toByteArray(); response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(file.getName(), "UTF-8")); + response.setHeader("Content-Disposition", file.getName()); response.addHeader("Content-Length", "" + data.length); response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java index 873513d..9178192 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java @@ -161,7 +161,6 @@ electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(noKeyWordsSignId), electronicImages.get(count++), filePrintRegister)); } - electronicImageSeals.addAll(electronicImageSeals); } filePrintRegister.setElectronicImageList(electronicImageSeals); }