mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2026-01-01 01:25:28 +08:00
【v3.8.3开源版本发布】
Merge remote-tracking branch 'origin/master' into springboot3 # Conflicts: # README.md # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml # jeecg-boot/pom.xml
This commit is contained in:
JEECG
@ -2,7 +2,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.jeecgframework.boot</groupId>
|
||||
<artifactId>jeecg-boot-parent</artifactId>
|
||||
<version>3.8.2</version>
|
||||
<version>3.8.3</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>JEECG BOOT ${project.version}</name>
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<jeecgboot.version>3.8.2</jeecgboot.version>
|
||||
<jeecgboot.version>3.8.3</jeecgboot.version>
|
||||
<!-- JDK版本支持17和1.8 -->
|
||||
<java.version>17</java.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
@ -47,12 +47,16 @@
|
||||
<!-- 数据库驱动 -->
|
||||
<postgresql.version>42.2.25</postgresql.version>
|
||||
<ojdbc6.version>11.2.0.3</ojdbc6.version>
|
||||
<sqljdbc4.version>4.0</sqljdbc4.version>
|
||||
<sqljdbc4.version>12.6.1.jre8</sqljdbc4.version>
|
||||
<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
|
||||
<hutool.version>5.8.25</hutool.version>
|
||||
<!-- 国产数据库驱动 -->
|
||||
<kingbase8.version>9.0.0</kingbase8.version>
|
||||
<dm8.version>8.1.1.49</dm8.version>
|
||||
<dm8.version>8.1.3.140</dm8.version>
|
||||
|
||||
<!-- Ai流程编排-->
|
||||
<kotlin.version>2.2.0</kotlin.version>
|
||||
<liteflow.version>2.15.0</liteflow.version>
|
||||
|
||||
<!-- 积木报表-->
|
||||
<jimureport-spring-boot-starter.version>2.1.3</jimureport-spring-boot-starter.version>
|
||||
@ -66,6 +70,7 @@
|
||||
<druid.version>1.2.24</druid.version>
|
||||
|
||||
<commons-io.version>2.11.0</commons-io.version>
|
||||
<commons-fileupload.version>1.5</commons-fileupload.version>
|
||||
<commons.version>2.6</commons.version>
|
||||
<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
|
||||
<aliyun.oss.version>3.17.3</aliyun.oss.version>
|
||||
@ -126,6 +131,12 @@
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>asm</artifactId>
|
||||
<groupId>org.ow2.asm</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- Lombok -->
|
||||
<dependency>
|
||||
@ -213,7 +224,7 @@
|
||||
<dependency>
|
||||
<groupId>org.jeecgframework.boot</groupId>
|
||||
<artifactId>jeecg-boot-starter3-job</artifactId>
|
||||
<version>3.8.2-RC</version>
|
||||
<version>${jeecgboot.version}</version>
|
||||
</dependency>
|
||||
<!--redis分布式锁-->
|
||||
<dependency>
|
||||
@ -279,13 +290,13 @@
|
||||
<!--达梦8数据库最新驱动 版本号1-3-26-2023.07.26-197096-20046-ENT -->
|
||||
<dependency>
|
||||
<groupId>com.dameng</groupId>
|
||||
<artifactId>Dm8JdbcDriver18</artifactId>
|
||||
<version>8.1.1.49</version>
|
||||
<artifactId>DmJdbcDriver18</artifactId>
|
||||
<version>${dm8.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.dameng</groupId>
|
||||
<artifactId>DmDialect-for-hibernate5.0</artifactId>
|
||||
<version>8.1.1.49</version>
|
||||
<version>${dm8.version}</version>
|
||||
</dependency>
|
||||
<!-- 七牛云SDK -->
|
||||
<dependency>
|
||||
@ -321,7 +332,7 @@
|
||||
<dependency>
|
||||
<groupId>commons-fileupload</groupId>
|
||||
<artifactId>commons-fileupload</artifactId>
|
||||
<version>1.5</version>
|
||||
<version>${commons-fileupload.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>commons-io</artifactId>
|
||||
@ -448,6 +459,26 @@
|
||||
<artifactId>autopoi</artifactId>
|
||||
<groupId>org.jeecgframework</groupId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<artifactId>jsqlparser</artifactId>
|
||||
<groupId>com.github.jsqlparser</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- AutoPoi Excel工具类-->
|
||||
<dependency>
|
||||
<groupId>org.jeecgframework.boot3</groupId>
|
||||
<artifactId>autopoi-web</artifactId>
|
||||
<version>${autopoi-web.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<artifactId>xercesImpl</artifactId>
|
||||
<groupId>xerces</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- mongo、redis和文件数据集支持包，按需引入 -->
|
||||
|
||||
Reference in New Issue
Block a user