From b7e6fe79582228834d2c21c1a8c103494893e799 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 14 Aug 2023 10:36:03 +0800
Subject: [PATCH] build: add mock server and improve embedded

---
 .../src/test/resources/bootstrap.properties   |  4 ++-
 pom.xml                                       | 26 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/backend/services/system-setting/src/test/resources/bootstrap.properties b/backend/services/system-setting/src/test/resources/bootstrap.properties
index df85de4cef..06c4f49489 100644
--- a/backend/services/system-setting/src/test/resources/bootstrap.properties
+++ b/backend/services/system-setting/src/test/resources/bootstrap.properties
@@ -10,4 +10,6 @@ embedded.redis.enabled=true
 # kafka
 embedded.kafka.enabled=true
 # minio
-embedded.minio.enabled=true
\ No newline at end of file
+embedded.minio.enabled=true
+# server
+embedded.server.enabled=true
diff --git a/pom.xml b/pom.xml
index dca74c1d08..ceb665618f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,8 +79,9 @@
         <jgit.version>6.6.0.202305301015-r</jgit.version>
         <curator.version>5.4.0</curator.version>
         <graalvmjs.version>22.3.1</graalvmjs.version>
-        <embedded.version>3.0.0-RC7</embedded.version>
+        <embedded.version>3.0.0-RC9</embedded.version>
         <otp-java.version>2.0.1</otp-java.version>
+        <mockserver-client-java.version>5.15.0</mockserver-client-java.version>
         <httpclient.version>4.5.14</httpclient.version>
         <!-- frontend -->
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
@@ -120,6 +121,23 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-netty</artifactId>
+            <version>${mockserver-client-java.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-client-java</artifactId>
+            <version>${mockserver-client-java.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!--   embedded 配置      -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -152,6 +170,12 @@
             <version>${embedded.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.playtika.testcontainers</groupId>
+            <artifactId>embedded-mockserver</artifactId>
+            <version>${embedded.version}</version>
+            <scope>test</scope>
+        </dependency>
         <!-- end  embedded 配置     -->
     </dependencies>