lpz/intelligent-application-orchestration-service
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'xiaohucoding'

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/resources/application.properties
This commit is contained in:
Lpz
2025-06-05 11:02:41 +08:00
parent 1cf3944744 158fdca6e0
commit 94bfc4cc70
11 changed files with 67 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pom.xml
View File

@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>2022.0.0.0</version> <!-- 适配 Spring Boot 3.1.x 的正确版本 -->
<version>2022.0.0.0-RC2</version> <!-- 适配 Spring Boot 3.1.x 的正确版本 -->
<type>pom</type>
<scope>import</scope>
</dependency>
@ -59,19 +59,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.hibernate</groupId>-->
<!-- <artifactId>hibernate-core</artifactId>-->
<!-- <version>6.4.5.Final</version> &lt;!&ndash; 推荐稳定版本:ml-citation{ref="5,8" data="citationList"} &ndash;&gt;-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.jboss.logging</groupId> &lt;!&ndash; 常见冲突源:ml-citation{ref="7" data="citationList"} &ndash;&gt;-->
<!-- <artifactId>jboss-logging</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- 数据库驱动 -->
<!-- 数据库驱动 -->
<dependency>
@ -138,16 +125,7 @@
<version>3.0.4</version>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-data-jpa</artifactId>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.hibernate.javax.persistence</groupId>-->
<!-- <artifactId>hibernate-jpa-2.1-api</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>