Merge remote-tracking branch 'origin/master'

jiangping

2025-07-02 ec7cc88fca8de4b3c56f8ebee074fb7ce71ebf1e

 server/pom.xml

@@ -47,18 +47,12 @@
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-web</artifactId>
    <!--  <exclusions>
        <exclusion>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-tomcat</artifactId>
        </exclusion>
      </exclusions> -->
    </dependency>
    <dependency>
   <!-- <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-tomcat</artifactId>
      <scope>provided</scope>
    </dependency>
    </dependency>-->
    <!-- Redis -->
    <dependency>
      <groupId>org.springframework.boot</groupId>
@@ -261,6 +255,7 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-resources-plugin</artifactId>
        <version>3.1.0</version>
        <configuration>
          <delimiters>
            <delimiter>@</delimiter>