Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

This commit is contained in:
赵辉
2025-12-10 09:28:06 +08:00
158 changed files with 4032 additions and 324 deletions
+124 -2
View File
@@ -43,6 +43,30 @@
<transmittable-thread-local.version>2.13.2</transmittable-thread-local.version>
<redisson.version>3.16.2</redisson.version>
<jetcache.version>2.7.3</jetcache.version>
<!-- 插件 -->
<plugin.maven.compiler.version>3.12.0</plugin.maven.compiler.version>
<plugin.maven.resources.version>3.1.0</plugin.maven.resources.version>
<plugin.maven.source.version>3.1.0</plugin.maven.source.version>
<plugin.maven.dockerfile.version>1.4.13</plugin.maven.dockerfile.version>
<!-- 基础框架 -->
<spring.boot.version>3.2.12</spring.boot.version>
<spring.cloud.version>2023.0.3</spring.cloud.version>
<spring.cloud.alibaba.version>2023.0.1.2</spring.cloud.alibaba.version>
<!-- 数据库 -->
<mybatis.plus.version>3.5.6</mybatis.plus.version>
<pagehelper.version>2.1.0</pagehelper.version>
<!-- 其它依赖 -->
<httpc.version>4.5.14</httpc.version>
<jasypt.version>3.0.5</jasypt.version>
<bcprov.version>1.78</bcprov.version>
<jwt.version>4.4.0</jwt.version>
<commons.io.version>2.16.0</commons.io.version>
<minio.version>8.5.2</minio.version>
<smartjavaai.version>1.0.23</smartjavaai.version>
</properties>
<!-- 依赖声明 -->
@@ -286,7 +310,7 @@
</dependency>
</dependencies>
<build>
<!-- <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -299,7 +323,7 @@
</configuration>
</plugin>
</plugins>
</build>
</build>-->
<!-- <repositories>-->
<!-- <repository>-->
@@ -334,6 +358,104 @@
</pluginRepository>
</pluginRepositories>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${plugin.maven.compiler.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>utf-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${plugin.maven.resources.version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${plugin.maven.source.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.4.10</version>
<executions>
<execution>
<id>default</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
<configuration>
<repository>${project.build.finalName}</repository>
<tag>${project.version}</tag>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
</plugins>
</build>
<!-- <pluginRepositories>-->
<!-- <pluginRepository>-->
<!-- <id>public</id>-->