diff --git a/pom.xml b/pom.xml
index be047878..708e3d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
4.2.1-1.5.2
5.5.13.3
3.1
- 23.7
+ 23.9
1.70
1.0.3
diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java
index 94f5823c..9663cddd 100644
--- a/server/src/main/java/cn/keking/service/FileHandlerService.java
+++ b/server/src/main/java/cn/keking/service/FileHandlerService.java
@@ -11,11 +11,9 @@ import cn.keking.utils.UrlEncoderUtils;
import cn.keking.utils.WebUtils;
import cn.keking.web.filter.BaseUrlFilter;
import com.aspose.cad.*;
+import com.aspose.cad.fileformats.cad.CadDrawTypeMode;
import com.aspose.cad.fileformats.tiff.enums.TiffExpectedFormat;
-import com.aspose.cad.imageoptions.CadRasterizationOptions;
-import com.aspose.cad.imageoptions.PdfOptions;
-import com.aspose.cad.imageoptions.SvgOptions;
-import com.aspose.cad.imageoptions.TiffOptions;
+import com.aspose.cad.imageoptions.*;
import com.aspose.cad.internal.Exceptions.TimeoutException;
import com.itextpdf.text.pdf.PdfReader;
import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -40,10 +38,7 @@ import java.io.*;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.*;
import java.util.stream.IntStream;
@@ -337,13 +332,24 @@ public class FileHandlerService implements InitializingBean {
LoadOptions opts = new LoadOptions();
opts.setSpecifiedEncoding(CodePages.SimpChinese);
Image cadImage = Image.load(inputFilePath, opts);
+ RasterizationQuality rasterizationQuality = new RasterizationQuality();
+ rasterizationQuality.setArc(RasterizationQualityValue.High);
+ rasterizationQuality.setHatch(RasterizationQualityValue.High);
+ rasterizationQuality.setText(RasterizationQualityValue.High);
+ rasterizationQuality.setOle(RasterizationQualityValue.High);
+ rasterizationQuality.setObjectsPrecision(RasterizationQualityValue.High);
+ rasterizationQuality.setTextThicknessNormalization(true);
CadRasterizationOptions cadRasterizationOptions = new CadRasterizationOptions();
cadRasterizationOptions.setBackgroundColor(Color.getWhite());
- cadRasterizationOptions.setPageWidth(1400);
- cadRasterizationOptions.setPageHeight(650);
- cadRasterizationOptions.setAutomaticLayoutsScaling(true);
+ cadRasterizationOptions.setPageWidth(cadImage.getWidth());
+ cadRasterizationOptions.setPageHeight(cadImage.getHeight());
+ cadRasterizationOptions.setUnitType(cadImage.getUnitType());
+ cadRasterizationOptions.setAutomaticLayoutsScaling(false);
cadRasterizationOptions.setNoScaling(false);
- cadRasterizationOptions.setDrawType(1);
+ cadRasterizationOptions.setQuality(rasterizationQuality);
+ cadRasterizationOptions.setDrawType(CadDrawTypeMode.UseObjectColor);
+ cadRasterizationOptions.setExportAllLayoutContent(true);
+ cadRasterizationOptions.setVisibilityMode(VisibilityMode.AsScreen);
SvgOptions SvgOptions = null;
PdfOptions pdfOptions = null;
TiffOptions TiffOptions = null;