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

2025-12-10 09:28:06 +08:00
parent 7b10ff2b25 1b8a0eb8a4
commit df299a21ae
158 changed files with 4032 additions and 324 deletions
@@ -80,9 +80,14 @@
        <artifactId>seata-spring-boot-starter</artifactId>
      </dependency>
        <!-- Mysql Connector -->
-        <dependency>
+        <!--<dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.1.193</version>
        </dependency>
        <!--添加druid连接池 依赖 -->
        <dependency>
@@ -272,5 +277,17 @@
        </resources>
    </build>

-
+    <profiles>
+        <profile>
+            <id>mhd_thrid_party</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.spotify</groupId>
+                        <artifactId>dockerfile-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>