From 22bb29d3d9057bb97551ce45dece4ac2cf14553e Mon Sep 17 00:00:00 2001
From: gk <gk@zheling.com.cn>
Date: Tue, 26 Apr 2022 09:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B05.0.209?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/kdayun-app/pom.xml                    |  15 ++-
 .../src/main/resources/application-proxy.yml  |  10 ++
 pom.xml                                       | 101 ++++++++++++++----
 3 files changed, 99 insertions(+), 27 deletions(-)
 create mode 100644 modules/kdayun-app/src/main/resources/application-proxy.yml

diff --git a/modules/kdayun-app/pom.xml b/modules/kdayun-app/pom.xml
index cb987da..5996f6b 100644
--- a/modules/kdayun-app/pom.xml
+++ b/modules/kdayun-app/pom.xml
@@ -18,6 +18,16 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<deployRoot>${project.build.directory}/deploy/${base.version}/</deployRoot>
 	</properties>
+	<distributionManagement>
+		<repository>
+			<id>kdayun-releases</id>
+			<url>http://develop.kdayun.com:8081/repository/maven-local/</url>
+		</repository>
+		<snapshotRepository>
+			<id>kdayun-snapshots</id>
+			<url>http://develop.kdayun.com:8081/repository/maven-snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
 	<dependencies>
 		<dependency>
 			<groupId>com.kdayun</groupId>
@@ -59,11 +69,6 @@
 			<artifactId>kdayun-demo</artifactId>
 			<version>1.0.1</version>
 		</dependency>
-		<dependency>
-			<groupId>com.github.bingoohuang</groupId>
-			<artifactId>patchca</artifactId>
-			<version>0.0.1</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<defaultGoal>compile</defaultGoal>
diff --git a/modules/kdayun-app/src/main/resources/application-proxy.yml b/modules/kdayun-app/src/main/resources/application-proxy.yml
new file mode 100644
index 0000000..eb377c7
--- /dev/null
+++ b/modules/kdayun-app/src/main/resources/application-proxy.yml
@@ -0,0 +1,10 @@
+
+proxy:
+    urls:
+# 将/cgi-bin/以下地址转发到企业微信微信服务器 反向代理避免前端浏览器的跨区异步请求
+      - servlet_url: /cgi-bin/* 
+        target_url: https://qyapi.weixin.qq.com/cgi-bin
+        logging_enabled: false
+      - servlet_url: /baidu-test/*
+        target_url: https://baidu.com
+        logging_enabled: false   
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dd1f413..f0b3633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.kdayun</groupId>
 	<artifactId>kdayun-root</artifactId>
@@ -24,7 +23,7 @@
 		<!-- jdk版本 -->
 		<jdk.version>1.8</jdk.version>
 		<!-- 平台版本 -->
-		<base.version>5.0.208</base.version>
+		<base.version>5.0.209</base.version>
 		<!-- Spring 版本号 -->
 		<spring.version>5.1.2.RELEASE</spring.version>
 
@@ -82,13 +81,17 @@
 		<!-- POI 版本号 -->
 		<poi.version>3.15</poi.version>
 
-		<!-- Jxls 版本号（已进行改造，现可以被 JDK 1.6 支持） -->
-		<jxls.version>2.3.2</jxls.version>
+		<!-- kdayun-jxls 版本号（已进行改造，现可以被 JDK 1.6 支持） -->
+		<kdayun-jxls.version>2.3.3</kdayun-jxls.version>
 
-		<!-- Jxls-poi 版本号（已进行改造，现可以被 JDK 1.6 支持） -->
-		<jxls-poi.version>1.1.0</jxls-poi.version>
-		<!-- jsql版本号 (已经进行源码改造,源码在svn git上) -->
+		<!-- kdayun-jxls-poi 版本号（已进行改造，现可以被 JDK 1.6 支持） -->
+		<kdayun-jxls-poi.version>1.1.1</kdayun-jxls-poi.version>
+		<!-- kdayun-jsql版本号 -->
 		<kdayun-jsql.version>1.0</kdayun-jsql.version>
+		<kdayun.pdf.version>1.0.0</kdayun.pdf.version>
+		<kdayun.words.version>1.0.0</kdayun.words.version>
+		<kdayun.cells.version>1.0.0</kdayun.cells.version>
+		<kdayun.slides.version>1.0.0</kdayun.slides.version>
 
 		<!-- Kaptcha 版本号 -->
 		<kaptcha.version>2.3</kaptcha.version>
@@ -134,7 +137,7 @@
 		<jersey-client.version>1.19.4</jersey-client.version>
 		<com.google.zxing.version>2.3.0</com.google.zxing.version>
 		<cxf.version>2.7.5</cxf.version>
-		<xstream.version>1.3.1</xstream.version>
+		<xstream.version>1.4.18</xstream.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<commons-logging.version>1.1.1</commons-logging.version>
 		<axis.version>1.4</axis.version>
@@ -147,14 +150,16 @@
 		<groovy.version>2.4.12</groovy.version>
 		<univocity-parsers.version>2.5.8</univocity-parsers.version>
 		<commons-compress.version>1.4.1</commons-compress.version>
-		<guava.version>18.0</guava.version>
-		<log4j.version>2.15.0</log4j.version>
+		<guava.version>30.0-jre</guava.version>
+		<log4j.version>2.17.2</log4j.version>
 		<jedis.version>2.9.0</jedis.version>
 		<shiro-redis.version>2.4.2-RELEASE</shiro-redis.version>
 		<org.springframework.data.version>1.6.0.RELEASE</org.springframework.data.version>
 		<reflections.version>0.9.10</reflections.version>
 		<snack3.version>3.1.6</snack3.version>
 		<thumbnailator.version>0.4.8</thumbnailator.version>
+		<bingoohuang.patchca.version>0.0.1</bingoohuang.patchca.version>
+		<commons-collections.version>3.2.1</commons-collections.version>
 	</properties>
 	<build>
 		<plugins>
@@ -173,14 +178,24 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-			<exclusions>				<!--去掉logback配置 -->
+			<exclusions>
+				<!--去掉logback配置 -->
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-logging</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -213,7 +228,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-aop</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- 引入log4j2依赖 
 		<dependency>
 		    <groupId>org.springframework.boot</groupId>
@@ -230,25 +249,24 @@
 		    </exclusions>
 		</dependency>
 		-->
+
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>${log4j.version}</version>			<!--$NO-MVN-MAN-VER$-->
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>${log4j.version}</version>			<!--$NO-MVN-MAN-VER$-->
+			<version>${log4j.version}</version>
 		</dependency>
-		<!--不加下面这个依赖mybatis sql日志打印有问题-->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>${log4j.version}</version>			<!--$NO-MVN-MAN-VER$-->
+			<version>${log4j.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
-
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
@@ -404,23 +422,26 @@
 		<dependency>
 			<groupId>com.kdayun</groupId>
 			<artifactId>kdayun-jxls</artifactId>
-			<version>${jxls.version}</version>
+			<version>${kdayun-jxls.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons.commons-beanutils</groupId>
 					<artifactId>commons-beanutils</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>ch.qos.logback</groupId>
 					<artifactId>logback-core</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-
 		<dependency>
 			<groupId>com.kdayun</groupId>
 			<artifactId>kdayun-jxls-poi</artifactId>
-			<version>${jxls-poi.version}</version>
+			<version>${kdayun-jxls-poi.version}</version>
 		</dependency>
 
 		<dependency>
@@ -971,6 +992,42 @@
 			<artifactId>thumbnailator</artifactId>
 			<version>${thumbnailator.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.8</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kdayun</groupId>
+			<artifactId>pdf</artifactId>
+			<version>${kdayun.pdf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kdayun</groupId>
+			<artifactId>slides</artifactId>
+			<version>${kdayun.slides.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kdayun</groupId>
+			<artifactId>words</artifactId>
+			<version>${kdayun.words.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kdayun</groupId>
+			<artifactId>cells</artifactId>
+			<version>${kdayun.cells.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.bingoohuang</groupId>
+			<artifactId>patchca</artifactId>
+			<version>${bingoohuang.patchca.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>${commons-collections.version}</version>
+		</dependency>
+
 		<!-- 热部署 -->
 		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>