From 015b4f31cebbecf6f6da760ed2f8af3da721e802 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 四月 2025 16:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/pom.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index ad8024a..26c82a7 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -189,9 +189,15 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.60</version>
+ </dependency>
</dependencies>
<build>
+ <finalName>lianhelihua</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -205,7 +211,51 @@
<mainClass>com.doumee.LianhelihuaApplication</mainClass>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <delimiters>
+ <delimiter>@</delimiter>
+ </delimiters>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ </configuration>
+ </plugin>
</plugins>
+
</build>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <spring.active>dev</spring.active>
+ </properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>test</id>
+ <properties>
+ <spring.active>test</spring.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>pro</id>
+ <properties>
+ <spring.active>pro</spring.active>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
--
Gitblit v1.9.3