kdpublic
/
kdayun-template
3
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新到5.0.209

master
gk 2022-04-26 09:16:56 +08:00
parent 06501b9a85
commit 22bb29d3d9
3 changed files with 99 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/kdayun-app/pom.xml
View File

@ -18,6 +18,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<deployRoot>${project.build.directory}/deploy/${base.version}/</deployRoot> <deployRoot>${project.build.directory}/deploy/${base.version}/</deployRoot>
</properties> </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> <dependencies>
<dependency> <dependency>
<groupId>com.kdayun</groupId> <groupId>com.kdayun</groupId>
@ -59,11 +69,6 @@
<artifactId>kdayun-demo</artifactId> <artifactId>kdayun-demo</artifactId>
<version>1.0.1</version> <version>1.0.1</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.bingoohuang</groupId>
<artifactId>patchca</artifactId>
<version>0.0.1</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>compile</defaultGoal> <defaultGoal>compile</defaultGoal>

10
modules/kdayun-app/src/main/resources/application-proxy.yml Normal file
View File

@ -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

101
pom.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <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">
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> <modelVersion>4.0.0</modelVersion>
<groupId>com.kdayun</groupId> <groupId>com.kdayun</groupId>
<artifactId>kdayun-root</artifactId> <artifactId>kdayun-root</artifactId>
@ -24,7 +23,7 @@
<!-- jdk版本 --> <!-- jdk版本 -->
<jdk.version>1.8</jdk.version> <jdk.version>1.8</jdk.version>
<!-- 平台版本 --> <!-- 平台版本 -->
<base.version>5.0.208</base.version> <base.version>5.0.209</base.version>
<!-- Spring 版本号 --> <!-- Spring 版本号 -->
<spring.version>5.1.2.RELEASE</spring.version> <spring.version>5.1.2.RELEASE</spring.version>
@ -82,13 +81,17 @@
<!-- POI 版本号 --> <!-- POI 版本号 -->
<poi.version>3.15</poi.version> <poi.version>3.15</poi.version>
<!-- Jxls 版本号（已进行改造，现可以被 JDK 1.6 支持） --> <!-- kdayun-jxls 版本号（已进行改造，现可以被 JDK 1.6 支持） -->
<jxls.version>2.3.2</jxls.version> <kdayun-jxls.version>2.3.3</kdayun-jxls.version>
<!-- Jxls-poi 版本号（已进行改造，现可以被 JDK 1.6 支持） --> <!-- kdayun-jxls-poi 版本号（已进行改造，现可以被 JDK 1.6 支持） -->
<jxls-poi.version>1.1.0</jxls-poi.version> <kdayun-jxls-poi.version>1.1.1</kdayun-jxls-poi.version>
<!-- jsql版本号 (已经进行源码改造,源码在svn git上) --> <!-- kdayun-jsql版本号 -->
<kdayun-jsql.version>1.0</kdayun-jsql.version> <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 版本号 -->
<kaptcha.version>2.3</kaptcha.version> <kaptcha.version>2.3</kaptcha.version>
@ -134,7 +137,7 @@
<jersey-client.version>1.19.4</jersey-client.version> <jersey-client.version>1.19.4</jersey-client.version>
<com.google.zxing.version>2.3.0</com.google.zxing.version> <com.google.zxing.version>2.3.0</com.google.zxing.version>
<cxf.version>2.7.5</cxf.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> <dom4j.version>1.6.1</dom4j.version>
<commons-logging.version>1.1.1</commons-logging.version> <commons-logging.version>1.1.1</commons-logging.version>
<axis.version>1.4</axis.version> <axis.version>1.4</axis.version>
@ -147,14 +150,16 @@
<groovy.version>2.4.12</groovy.version> <groovy.version>2.4.12</groovy.version>
<univocity-parsers.version>2.5.8</univocity-parsers.version> <univocity-parsers.version>2.5.8</univocity-parsers.version>
<commons-compress.version>1.4.1</commons-compress.version> <commons-compress.version>1.4.1</commons-compress.version>
<guava.version>18.0</guava.version> <guava.version>30.0-jre</guava.version>
<log4j.version>2.15.0</log4j.version> <log4j.version>2.17.2</log4j.version>
<jedis.version>2.9.0</jedis.version> <jedis.version>2.9.0</jedis.version>
<shiro-redis.version>2.4.2-RELEASE</shiro-redis.version> <shiro-redis.version>2.4.2-RELEASE</shiro-redis.version>
<org.springframework.data.version>1.6.0.RELEASE</org.springframework.data.version> <org.springframework.data.version>1.6.0.RELEASE</org.springframework.data.version>
<reflections.version>0.9.10</reflections.version> <reflections.version>0.9.10</reflections.version>
<snack3.version>3.1.6</snack3.version> <snack3.version>3.1.6</snack3.version>
<thumbnailator.version>0.4.8</thumbnailator.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> </properties>
<build> <build>
<plugins> <plugins>
@ -173,14 +178,24 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <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> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId> <artifactId>spring-boot-starter-logging</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
@ -213,7 +228,11 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId> <artifactId>spring-boot-starter-aop</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- 引入log4j2依赖 <!-- 引入log4j2依赖
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -230,25 +249,24 @@
</exclusions> </exclusions>
</dependency> </dependency>
--> -->
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<version>${log4j.version}</version> <!--$NO-MVN-MAN-VER$--> <version>${log4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>${log4j.version}</version> <!--$NO-MVN-MAN-VER$--> <version>${log4j.version}</version>
</dependency> </dependency>
<!--不加下面这个依赖mybatis sql日志打印有问题-->
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version> <!--$NO-MVN-MAN-VER$--> <version>${log4j.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
@ -404,23 +422,26 @@
<dependency> <dependency>
<groupId>com.kdayun</groupId> <groupId>com.kdayun</groupId>
<artifactId>kdayun-jxls</artifactId> <artifactId>kdayun-jxls</artifactId>
<version>${jxls.version}</version> <version>${kdayun-jxls.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>commons.commons-beanutils</groupId> <groupId>commons.commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId> <artifactId>logback-core</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.kdayun</groupId> <groupId>com.kdayun</groupId>
<artifactId>kdayun-jxls-poi</artifactId> <artifactId>kdayun-jxls-poi</artifactId>
<version>${jxls-poi.version}</version> <version>${kdayun-jxls-poi.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -971,6 +992,42 @@
<artifactId>thumbnailator</artifactId> <artifactId>thumbnailator</artifactId>
<version>${thumbnailator.version}</version> <version>${thumbnailator.version}</version>
</dependency> </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> <!-- <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>