升级到itext5.x

huigou-common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>huigou-common</artifactId>
 	<name>huigou-common</name>

huigou-core-api/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>huigou-core-api</artifactId>
 	<name>huigou-core-api</name>

huigou-core-impl/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>
+		<version>1.1.0</version>
 
 	</parent>
 	<artifactId>huigou-core-impl</artifactId>
@@ -71,6 +71,11 @@
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

huigou-core-impl/src/main/java/com/huigou/uasp/bmp/opm/impl/AuthenticationApplicationImpl.java

 package com.huigou.uasp.bmp.opm.impl;
 
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 import java.util.Map;
 
@@ -19,7 +20,6 @@ import com.huigou.uasp.bmp.opm.application.OrgApplication;
 import com.huigou.uasp.bmp.opm.domain.model.org.Org;
 import com.huigou.uasp.bmp.opm.domain.model.org.Person;
 import com.huigou.util.Md5Builder;
-import com.lowagie.text.pdf.codec.Base64;
 
 public class AuthenticationApplicationImpl extends BaseApplication implements AuthenticationApplication {
 
@@ -154,7 +154,7 @@ public class AuthenticationApplicationImpl extends BaseApplication implements Au
 
     @Override
     public Map<String, Object> login(String loginName, String password) {
-        String decodedPassword = new String(Base64.decode(password));
+        String decodedPassword = new String(Base64.getDecoder().decode(password));
 
         try {
             /*

huigou-core-proxy/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>
+		<version>1.1.0</version>
 
 	</parent>
 	<artifactId>huigou-core-proxy</artifactId>

huigou-data/pom.xml

@@ -6,8 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>
-
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>huigou-data</artifactId>
 	<name>huigou-data</name>
@@ -69,7 +68,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.xhtmlrenderer</groupId>
-			<artifactId>core-renderer</artifactId>
+			<artifactId>flying-saucer-pdf-itext5</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.xhtmlrenderer</groupId>
+			<artifactId>flying-saucer-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

huigou-data/src/main/java/com/huigou/data/pdf/B64ImgReplacedElementFactory.java

 package com.huigou.data.pdf;
 
-import java.io.IOException;
-
+import com.itextpdf.text.BadElementException;
+import com.itextpdf.text.Image;
 import org.apache.commons.codec.binary.Base64;
 import org.w3c.dom.Element;
 import org.xhtmlrenderer.extend.FSImage;
@@ -14,8 +14,8 @@ import org.xhtmlrenderer.pdf.ITextImageElement;
 import org.xhtmlrenderer.render.BlockBox;
 import org.xhtmlrenderer.simple.extend.FormSubmissionListener;
 
-import com.lowagie.text.BadElementException;
-import com.lowagie.text.Image;
+
+import java.io.IOException;
 
 /**
  * 解决iText+freemark导出pdf不支持base64

huigou-data/src/main/java/com/huigou/data/pdf/PDFCreater.java

 package com.huigou.data.pdf;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
-import java.util.Map;
-
+import com.huigou.data.exception.ExportExcelException;
+import com.huigou.exception.ApplicationException;
+import com.huigou.freemarker.FreemarkerUtil;
+import com.huigou.util.FileHelper;
+import com.huigou.util.LogHome;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.pdf.BaseFont;
 import org.apache.poi.poifs.filesystem.DirectoryEntry;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.springframework.core.io.ClassPathResource;
 import org.xhtmlrenderer.pdf.ITextFontResolver;
 import org.xhtmlrenderer.pdf.ITextRenderer;
 
-import com.huigou.data.exception.ExportExcelException;
-import com.huigou.exception.ApplicationException;
-import com.huigou.freemarker.FreemarkerUtil;
-import com.huigou.util.FileHelper;
-import com.huigou.util.LogHome;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.BaseFont;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.util.Map;
 
 /**
  * 根据HTML生成PDF文件

huigou-loader/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>
+		<version>1.1.0</version>
 
 	</parent>
 	<artifactId>huigou-loader</artifactId>

huigou-system-common/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>		
+		<version>1.1.0</version>
 	</parent>
 
 	<artifactId>huigou-system-common</artifactId>

huigou-uasp/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>
+		<version>1.1.0</version>
 
 	</parent>
 	<artifactId>huigou-uasp</artifactId>
@@ -104,7 +104,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.xhtmlrenderer</groupId>
-			<artifactId>core-renderer</artifactId>
+			<artifactId>flying-saucer-pdf-itext5</artifactId>
 		</dependency>
 		<!-- freemarker -->
 		<dependency>

huigou-xt/pom.xml

@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>huigou-xt</artifactId>
-	<name>统一应用支出平台</name>
-	<description>>统一应用支出平台</description>
+	<name>统一应用支撑平台</name>
+	<description>>统一应用支撑平台</description>
 	<packaging>war</packaging>
 	<build>
 		<finalName>huigou-xt</finalName>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.huigou</groupId>
     <artifactId>root</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
 
     <packaging>pom</packaging>
 
@@ -36,8 +36,8 @@
         <commons-net.version>1.4.1</commons-net.version>
         <commons-io.version>2.4</commons-io.version>
         <commons-beanutils.version>1.8.0</commons-beanutils.version>
-        <itext.version>2.1.0</itext.version>
-        <core-renderer.version>R8</core-renderer.version>
+        <itext.version>4.2.2</itext.version>
+        <core-renderer.version>9.1.18</core-renderer.version>
         <javax.ws.rs.version>2.0.1</javax.ws.rs.version>
         <cxf.version>3.1.7</cxf.version>
         <ehcache.version>2.10.1</ehcache.version>
@@ -159,7 +159,7 @@
         <!-- test -->
         <junit.version>4.9</junit.version>
         <spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version>
-        <huigou.uasp.version>1.0.0</huigou.uasp.version>
+        <huigou.uasp.version>1.1.0</huigou.uasp.version>
     </properties>
 
     <dependencyManagement>
@@ -172,7 +172,7 @@
             <dependency>
                 <groupId>com.huigou</groupId>
                 <artifactId>huigou-ueditor</artifactId>
-                <version>${huigou.uasp.version}</version>
+                <version>1.0.0</version>
             </dependency>
             <dependency>
                 <groupId>com.huigou</groupId>
@@ -202,7 +202,7 @@
             <dependency>
                 <groupId>com.huigou</groupId>
                 <artifactId>gongtou-oa</artifactId>
-                <version>${huigou.uasp.version}</version>
+                <version>1.0.0</version>
             </dependency>
             <dependency>
                 <groupId>guava</groupId>
@@ -1160,14 +1160,13 @@
             </dependency>
             <dependency>
                 <groupId>org.xhtmlrenderer</groupId>
-                <artifactId>core-renderer</artifactId>
+                <artifactId>flying-saucer-core</artifactId>
+                <version>${core-renderer.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.xhtmlrenderer</groupId>
+                <artifactId>flying-saucer-pdf-itext5</artifactId>
                 <version>${core-renderer.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
             <!-- cxf -->
@@ -1980,7 +1979,7 @@
         <repository>
             <id>topsunit</id>
             <name>topsunit</name>
-            <url>http://nexus.cdcloud.topsunit.com:18080/repository/huigou-repostitory/</url>
+            <url>http://nexus.local.topsunit.com/repository/huigou-repostitory/</url>
         </repository>
     </distributionManagement>
     <build>