starter更改各类配置类的包路径

kosaka-bun · Dec 9, 2024 · 599e2db · 599e2db
1 parent 1127d96
commit 599e2db
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 80 deletions.
diff --git a/...bot-spring-boot-starter/src/main/java/de/honoka/qqrobot/framework/config/MiraiConfig.java b/...bot-spring-boot-starter/src/main/java/de/honoka/qqrobot/framework/config/MiraiConfig.java
@@ -1,6 +1,6 @@
 package de.honoka.qqrobot.framework.config;
 
-import de.honoka.qqrobot.framework.impl.mirai.config.MiraiProperties;
+import de.honoka.qqrobot.framework.config.property.MiraiProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;

diff --git a/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/framework/config/OnebotConfig.kt b/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/framework/config/OnebotConfig.kt
@@ -1,6 +1,6 @@
 package de.honoka.qqrobot.framework.config
 
-import de.honoka.qqrobot.framework.impl.onebot.config.OnebotProperties
+import de.honoka.qqrobot.framework.config.property.OnebotProperties
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.ComponentScan

diff --git a/...ot-spring-boot-starter/src/main/java/de/honoka/qqrobot/framework/config/TesterConfig.java b/...ot-spring-boot-starter/src/main/java/de/honoka/qqrobot/framework/config/TesterConfig.java
@@ -1,6 +1,6 @@
 package de.honoka.qqrobot.framework.config;
 
-import de.honoka.qqrobot.framework.impl.tester.config.TesterProperties;
+import de.honoka.qqrobot.framework.config.property.TesterProperties;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

diff --git a/...rk/impl/mirai/config/MiraiProperties.java → ...work/config/property/MiraiProperties.java b/...rk/impl/mirai/config/MiraiProperties.java → ...work/config/property/MiraiProperties.java
@@ -1,13 +1,11 @@
-package de.honoka.qqrobot.framework.impl.mirai.config;
+package de.honoka.qqrobot.framework.config.property;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import net.mamoe.mirai.utils.BotConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@Getter
-@Setter
 @ConfigurationProperties("honoka.qqrobot.mirai")
+@Data
 public class MiraiProperties {
 
     /**

diff --git a/.../impl/onebot/config/OnebotProperties.java → ...ork/config/property/OnebotProperties.java b/.../impl/onebot/config/OnebotProperties.java → ...ork/config/property/OnebotProperties.java
@@ -1,15 +1,13 @@
-package de.honoka.qqrobot.framework.impl.onebot.config;
+package de.honoka.qqrobot.framework.config.property;
 
 import de.honoka.sdk.util.file.FileUtils;
 import lombok.Data;
-import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.nio.file.Paths;
 
 @ConfigurationProperties("honoka.qqrobot.onebot")
 @Data
-@Accessors(chain = true)
 public class OnebotProperties {
 
     private String host;
@@ -26,4 +24,24 @@ public class OnebotProperties {
      * 发送图片或文件前，需要先将InputStream中的数据写出到文件中，才能被OneBot服务使用。
      */
     private String cachePath = Paths.get(FileUtils.getMainClasspath(), "cache").normalize().toString();
+
+    public String getUrlPrefix() {
+        return String.format("http://%s:%s", host, httpPort);
+    }
+
+    public String getWebsocketUrlPrefix() {
+        return String.format("ws://%s:%s", host, websocketPort);
+    }
+
+    public String getFileReceiverUrlPrefix() {
+        return String.format("http://%s:%s", host, fileReceiverPort);
+    }
+
+    public String getImagePath() {
+        return Paths.get(cachePath, "image").toString();
+    }
+
+    public String getFileToUploadPath() {
+        return Paths.get(cachePath, "fileToUpload").toString();
+    }
 }
diff --git a/.../impl/tester/config/TesterProperties.java → ...ork/config/property/TesterProperties.java b/.../impl/tester/config/TesterProperties.java → ...ork/config/property/TesterProperties.java
@@ -1,15 +1,13 @@
-package de.honoka.qqrobot.framework.impl.tester.config;
+package de.honoka.qqrobot.framework.config.property;
 
 import de.honoka.sdk.util.file.FileUtils;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.nio.file.Paths;
 
-@Getter
-@Setter
 @ConfigurationProperties("honoka.qqrobot.tester")
+@Data
 public class TesterProperties {
 
     public static final String WEB_PREFIX = "/tester-framework";

diff --git a/...ing-boot-starter/src/main/java/de/honoka/qqrobot/framework/impl/mirai/MiraiFramework.java b/...ing-boot-starter/src/main/java/de/honoka/qqrobot/framework/impl/mirai/MiraiFramework.java
@@ -10,8 +10,8 @@
 import de.honoka.qqrobot.framework.api.model.RobotMessage;
 import de.honoka.qqrobot.framework.api.model.RobotMessageType;
 import de.honoka.qqrobot.framework.api.model.RobotMultipartMessage;
+import de.honoka.qqrobot.framework.config.property.MiraiProperties;
 import de.honoka.qqrobot.framework.impl.mirai.component.MiraiEventListener;
-import de.honoka.qqrobot.framework.impl.mirai.config.MiraiProperties;
 import de.honoka.qqrobot.framework.impl.mirai.model.MiraiMessage;
 import de.honoka.qqrobot.starter.config.property.RobotBasicProperties;
 import de.honoka.sdk.util.file.FileUtils;

diff --git a/...ing-boot-starter/src/main/java/de/honoka/qqrobot/framework/impl/onebot/OnebotFramework.kt b/...ing-boot-starter/src/main/java/de/honoka/qqrobot/framework/impl/onebot/OnebotFramework.kt
@@ -10,14 +10,14 @@ import cn.hutool.json.JSONUtil
 import de.honoka.qqrobot.framework.BaseFramework
 import de.honoka.qqrobot.framework.api.model.RobotMessageType.*
 import de.honoka.qqrobot.framework.api.model.RobotMultipartMessage
+import de.honoka.qqrobot.framework.config.property.OnebotProperties
 import de.honoka.qqrobot.framework.impl.onebot.component.ContactManager
-import de.honoka.qqrobot.framework.impl.onebot.config.*
 import de.honoka.qqrobot.framework.impl.onebot.model.OnebotMessage
 import de.honoka.qqrobot.starter.RobotStarter
 import de.honoka.qqrobot.starter.config.property.RobotBasicProperties
 import de.honoka.sdk.util.kotlin.code.json.toJsonWrapper
+import de.honoka.sdk.util.kotlin.code.log
 import jakarta.annotation.PreDestroy
-import org.slf4j.LoggerFactory
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 import org.springframework.web.socket.*
@@ -41,8 +41,6 @@ class OnebotFramework(
 
     companion object {
 
-        private val log = LoggerFactory.getLogger(OnebotFramework::class.java)
-
         const val TIME_TO_WAIT_ONLINE = 5000L
 
         const val HTTP_REQUEST_TIMEOUT = 3000

diff --git a/...starter/src/main/java/de/honoka/qqrobot/framework/impl/onebot/component/ContactManager.kt b/...starter/src/main/java/de/honoka/qqrobot/framework/impl/onebot/component/ContactManager.kt
@@ -3,24 +3,18 @@ package de.honoka.qqrobot.framework.impl.onebot.component
 import cn.hutool.http.HttpUtil
 import cn.hutool.json.JSONObject
 import cn.hutool.json.JSONUtil
+import de.honoka.qqrobot.framework.config.property.OnebotProperties
 import de.honoka.qqrobot.framework.impl.onebot.OnebotFramework
-import de.honoka.qqrobot.framework.impl.onebot.config.OnebotProperties
-import de.honoka.qqrobot.framework.impl.onebot.config.urlPrefix
 import de.honoka.qqrobot.starter.RobotStarter
+import de.honoka.sdk.util.kotlin.code.log
 import jakarta.annotation.PostConstruct
-import org.slf4j.LoggerFactory
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 import java.util.concurrent.ConcurrentHashMap
 
 @Component
 class ContactManager(private val onebotProperties: OnebotProperties) {
 
-    companion object {
-
-        private val log = LoggerFactory.getLogger(ContactManager::class.java)
-    }
-
     data class Contact(val name: String)
 
     data class Group(val name: String, val memberList: ConcurrentHashMap<Long, Contact>)

diff --git a/...-starter/src/main/java/de/honoka/qqrobot/framework/impl/onebot/config/OnebotProperties.kt b/...-starter/src/main/java/de/honoka/qqrobot/framework/impl/onebot/config/OnebotProperties.kt
diff --git a/...g-boot-starter/src/main/java/de/honoka/qqrobot/framework/impl/tester/TesterFramework.java b/...g-boot-starter/src/main/java/de/honoka/qqrobot/framework/impl/tester/TesterFramework.java
@@ -8,7 +8,7 @@
 import de.honoka.qqrobot.framework.api.model.RobotMessageType;
 import de.honoka.qqrobot.framework.api.model.RobotMultipartMessage;
 import de.honoka.qqrobot.framework.config.TesterConfig;
-import de.honoka.qqrobot.framework.impl.tester.config.TesterProperties;
+import de.honoka.qqrobot.framework.config.property.TesterProperties;
 import de.honoka.qqrobot.framework.impl.tester.model.TesterMessage;
 import de.honoka.qqrobot.framework.impl.tester.model.TesterMessageType;
 import de.honoka.qqrobot.framework.impl.tester.model.TesterRobotMessage;

diff --git a/...mpl/tester/server/TesterServerConfig.java → ...mpl/tester/config/TesterServerConfig.java b/...mpl/tester/server/TesterServerConfig.java → ...mpl/tester/config/TesterServerConfig.java
@@ -1,6 +1,8 @@
-package de.honoka.qqrobot.framework.impl.tester.server;
+package de.honoka.qqrobot.framework.impl.tester.config;
 
-import de.honoka.qqrobot.framework.impl.tester.config.TesterProperties;
+import de.honoka.qqrobot.framework.config.property.TesterProperties;
+import de.honoka.qqrobot.framework.impl.tester.server.TesterServer;
+import de.honoka.qqrobot.framework.impl.tester.server.TesterServerConnection;
 import jakarta.annotation.Resource;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;

diff --git a/...ot-starter/src/main/java/de/honoka/qqrobot/framework/impl/tester/server/TesterServer.java b/...ot-starter/src/main/java/de/honoka/qqrobot/framework/impl/tester/server/TesterServer.java
@@ -1,7 +1,7 @@
 package de.honoka.qqrobot.framework.impl.tester.server;
 
 import de.honoka.qqrobot.framework.api.Framework;
-import de.honoka.qqrobot.framework.impl.tester.config.TesterProperties;
+import de.honoka.qqrobot.framework.config.property.TesterProperties;
 import jakarta.annotation.Resource;
 import lombok.Getter;
 import org.springframework.context.annotation.Lazy;

diff --git a/.../src/main/java/de/honoka/qqrobot/framework/impl/tester/server/TesterServerConnection.java b/.../src/main/java/de/honoka/qqrobot/framework/impl/tester/server/TesterServerConnection.java
@@ -6,7 +6,7 @@
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import de.honoka.qqrobot.framework.api.Framework;
-import de.honoka.qqrobot.framework.impl.tester.config.TesterProperties;
+import de.honoka.qqrobot.framework.config.property.TesterProperties;
 import de.honoka.qqrobot.framework.impl.tester.model.TesterMessage;
 import de.honoka.qqrobot.framework.impl.tester.model.TesterMessageType;
 import de.honoka.qqrobot.framework.impl.tester.model.TesterRobotMessage;

diff --git a/...rter/src/main/java/de/honoka/qqrobot/framework/impl/tester/server/TesterServerWebApi.java b/...rter/src/main/java/de/honoka/qqrobot/framework/impl/tester/server/TesterServerWebApi.java
@@ -1,7 +1,7 @@
 package de.honoka.qqrobot.framework.impl.tester.server;
 
 import cn.hutool.core.io.IoUtil;
-import de.honoka.qqrobot.framework.impl.tester.config.TesterProperties;
+import de.honoka.qqrobot.framework.config.property.TesterProperties;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.SneakyThrows;
@@ -22,8 +22,8 @@ public class TesterServerWebApi {
     @Resource
     private TesterProperties testerProperties;
 
-    @SneakyThrows
     @RequestMapping("/image")
+    @SneakyThrows
     public synchronized void getImage(@RequestParam String name, HttpServletResponse response) {
         response.setContentType("image/png");
         OutputStream os = response.getOutputStream();

diff --git a/...rter/src/main/java/de/honoka/qqrobot/starter/component/logger/dao/ExceptionRecordDao.java b/...rter/src/main/java/de/honoka/qqrobot/starter/component/logger/dao/ExceptionRecordDao.java
@@ -21,8 +21,7 @@ public class ExceptionRecordDao {
 
     @SneakyThrows
     public List<ExceptionRecord> readException(int maxSize) {
-        String sql = "select * from `exception_record` " +
-                "order by `datetime` desc limit ?";
+        String sql = "select * from `exception_record` order by `datetime` desc limit ?";
         try(Connection connection = loggerServer.getConnection();
             PreparedStatement statement = connection.prepareStatement(sql)) {
             statement.setInt(1, maxSize);
@@ -39,19 +38,17 @@ public List<ExceptionRecord> readException(int maxSize) {
     @SneakyThrows
     private ExceptionRecord parseRecord(ResultSet resultSet) {
         return new ExceptionRecord()
-                .setId(resultSet.getInt("id"))
-                .setDatetime(resultSet.getTimestamp("datetime"))
-                .setExceptionText(resultSet.getString("exceptionText"));
+            .setId(resultSet.getInt("id"))
+            .setDatetime(resultSet.getTimestamp("datetime"))
+            .setExceptionText(resultSet.getString("exceptionText"));
     }
 
     @SneakyThrows
     public void insert(ExceptionRecord record) {
-        String sql = "insert into `exception_record` (`datetime`, `exceptionText`) " +
-                "values (?, ?)";
+        String sql = "insert into `exception_record` (`datetime`, `exceptionText`) values (?, ?)";
         try(Connection connection = loggerServer.getConnection();
             PreparedStatement statement = connection.prepareStatement(sql)) {
-            statement.setTimestamp(1, new Timestamp(
-                    record.getDatetime().getTime()));
+            statement.setTimestamp(1, new Timestamp(record.getDatetime().getTime()));
             statement.setString(2, record.getExceptionText());
             statement.execute();
         }

diff --git a/...oot-starter/src/main/java/de/honoka/qqrobot/starter/component/logger/dao/UsageLogDao.java b/...oot-starter/src/main/java/de/honoka/qqrobot/starter/component/logger/dao/UsageLogDao.java
@@ -33,9 +33,7 @@ public int getCount() {
     @SneakyThrows
     public List<UsageLog> selectPage(int page, int pageSize) {
         int offset = (page - 1) * pageSize;
-        String sql = "select * from `usage_log` " +
-                "order by `datetime` desc " +
-                "limit ? offset ?";
+        String sql = "select * from `usage_log` order by `datetime` desc limit ? offset ?";
         try(Connection connection = loggerServer.getConnection();
             PreparedStatement statement = connection.prepareStatement(sql)) {
             statement.setInt(1, pageSize);
@@ -53,24 +51,22 @@ public List<UsageLog> selectPage(int page, int pageSize) {
     @SneakyThrows
     public UsageLog parseLog(ResultSet resultSet) {
         return new UsageLog()
-                .setId(resultSet.getInt("id"))
-                .setQq(resultSet.getLong("qq"))
-                .setDatetime(resultSet.getTimestamp("datetime"))
-                .setGroupName(resultSet.getString("groupName"))
-                .setUsername(resultSet.getString("username"))
-                .setMsg(resultSet.getString("msg"))
-                .setReply(resultSet.getString("reply"));
+            .setId(resultSet.getInt("id"))
+            .setQq(resultSet.getLong("qq"))
+            .setDatetime(resultSet.getTimestamp("datetime"))
+            .setGroupName(resultSet.getString("groupName"))
+            .setUsername(resultSet.getString("username"))
+            .setMsg(resultSet.getString("msg"))
+            .setReply(resultSet.getString("reply"));
     }
 
     @SneakyThrows
     public void insert(UsageLog log) {
-        String sql = "insert into `usage_log` (`datetime`, `qq`, " +
-                "`groupName`, `username`, `msg`, `reply`) values (" +
-                "?, ?, ?, ?, ?, ?)";
+        String sql = "insert into `usage_log` (`datetime`, `qq`, `groupName`, `username`, " +
+            "`msg`, `reply`) values (?, ?, ?, ?, ?, ?)";
         try(Connection connection = loggerServer.getConnection();
             PreparedStatement statement = connection.prepareStatement(sql)) {
-            statement.setTimestamp(1, new Timestamp(
-                    log.getDatetime().getTime()));
+            statement.setTimestamp(1, new Timestamp(log.getDatetime().getTime()));
             statement.setLong(2, log.getQq());
             statement.setString(3, log.getGroupName());
             statement.setString(4, log.getUsername());