From ec7cc88fca8de4b3c56f8ebee074fb7ce71ebf1e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 02 七月 2025 10:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/pom.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index 071901b..c053a5b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -4,10 +4,10 @@
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>
<groupId>com.doumee</groupId>
- <artifactId>official_website</artifactId>
+ <artifactId>dmttwebsite</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>official_website</name>
+ <packaging>war</packaging>
+ <name>dmttwebsite</name>
<description></description>
<parent>
@@ -48,6 +48,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
+ <!-- <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ <scope>provided</scope>
+ </dependency>-->
<!-- Redis -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -111,8 +116,16 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
+ <version>8.0.19</version>
+ <!--<scope>system</scope>-->
</dependency>
+ <!-- <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>8.0.19</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/doc/mysql-connector-java-8.0.19.jar</systemPath>
+ </dependency>-->
<!-- swagger -->
<!--<dependency>
<groupId>io.springfox</groupId>
@@ -216,7 +229,7 @@
</dependencies>
<build>
- <finalName>official_website</finalName>
+ <finalName>dmttwebsite</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -242,6 +255,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
<configuration>
<delimiters>
<delimiter>@</delimiter>
--
Gitblit v1.9.3