From 787520c98bec947a45497674ffff3e51101dff96 Mon Sep 17 00:00:00 2001
From: Grand-cocoa
 <1075576561@qq.com49111108+grand-cocoa@users.noreply.github.com>
Date: Thu, 26 Dec 2024 14:16:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                            | 11 ++++++++---
 pom.xml                                               |  7 -------
 .../info/alinadace/miraibot/bean/BotConfiguration.kt  |  7 -------
 .../service/drink_water/mapper/DrinkWaterMapper.kt    |  3 +--
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7d6e70c..23bb193 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,13 @@
+FROM maven as builder
+WORKDIR /app
+COPY . .
+RUN mvn clean package
+
 FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
 LABEL authors="Kane"
 
-#ENTRYPOINT ["top", "-b"]
-
 WORKDIR /opt
-ADD target/Mirai-bot-0.0.1-SNAPSHOT.jar /opt/Mirai-bot.jar
+COPY --from=builder /app/target/Mirai-bot-0.0.1-SNAPSHOT.jar /opt/Mirai-bot.jar
+#ADD target/Mirai-bot-0.0.1-SNAPSHOT.jar /opt/Mirai-bot.jar
 ENTRYPOINT java -jar /opt/Mirai-bot.jar
+
diff --git a/pom.xml b/pom.xml
index f150996..23c611f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,13 +154,6 @@
 			<artifactId>async-http-client</artifactId>
 			<version>3.0.0</version>
 		</dependency>
-		<dependency>
-			<groupId>xyz.cssxsh.mirai</groupId>
-			<artifactId>fix-protocol</artifactId>
-			<version>3.3.1</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/fix-protocol-version-1.13.0.mirai2.jar</systemPath>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/kotlin/info/alinadace/miraibot/bean/BotConfiguration.kt b/src/main/kotlin/info/alinadace/miraibot/bean/BotConfiguration.kt
index 9b13f95..839062d 100644
--- a/src/main/kotlin/info/alinadace/miraibot/bean/BotConfiguration.kt
+++ b/src/main/kotlin/info/alinadace/miraibot/bean/BotConfiguration.kt
@@ -7,7 +7,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.event.Event
-import net.mamoe.mirai.utils.BotConfiguration
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import top.mrxiaom.overflow.BotBuilder
@@ -55,10 +54,4 @@ class BotConfiguration {
         }
         return eventMap
     }
-
-    private fun BotConfiguration.extracted() {
-        fileBasedDeviceInfo()
-        protocol = BotConfiguration.MiraiProtocol.ANDROID_PAD
-        enableContactCache()
-    }
 }
diff --git a/src/main/kotlin/info/alinadace/miraibot/service/drink_water/mapper/DrinkWaterMapper.kt b/src/main/kotlin/info/alinadace/miraibot/service/drink_water/mapper/DrinkWaterMapper.kt
index c8b2021..3963888 100644
--- a/src/main/kotlin/info/alinadace/miraibot/service/drink_water/mapper/DrinkWaterMapper.kt
+++ b/src/main/kotlin/info/alinadace/miraibot/service/drink_water/mapper/DrinkWaterMapper.kt
@@ -8,5 +8,4 @@ import info.alinadace.miraibot.service.drink_water.domain.DrinkWaterUser
  * @author Kane
  * @since 2024/9/18 13:39
  */
-interface DrinkWaterMapper : BaseMapper<DrinkWaterUser> {
-}
+interface DrinkWaterMapper : BaseMapper<DrinkWaterUser>