diff --git a/src/main/java/com/wonderland/stardewvalley/Application.java b/src/main/java/com/wonderland/stardewvalley/Application.java index c2c9a6f..3cb1f77 100644 --- a/src/main/java/com/wonderland/stardewvalley/Application.java +++ b/src/main/java/com/wonderland/stardewvalley/Application.java @@ -1,6 +1,6 @@ package com.wonderland.stardewvalley; -import com.wonderland.stardewvalley.lark.EventListener; +import com.wonderland.stardewvalley.util.lark.EventListener; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/wonderland/stardewvalley/constant/BackGroundConstant.java b/src/main/java/com/wonderland/stardewvalley/common/constant/BackGroundConstant.java similarity index 96% rename from src/main/java/com/wonderland/stardewvalley/constant/BackGroundConstant.java rename to src/main/java/com/wonderland/stardewvalley/common/constant/BackGroundConstant.java index 2e5f523..6794c9e 100644 --- a/src/main/java/com/wonderland/stardewvalley/constant/BackGroundConstant.java +++ b/src/main/java/com/wonderland/stardewvalley/common/constant/BackGroundConstant.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.constant; +package com.wonderland.stardewvalley.common.constant; import lombok.Getter; diff --git a/src/main/java/com/wonderland/stardewvalley/constant/CityCode.java b/src/main/java/com/wonderland/stardewvalley/common/constant/CityCode.java similarity index 76% rename from src/main/java/com/wonderland/stardewvalley/constant/CityCode.java rename to src/main/java/com/wonderland/stardewvalley/common/constant/CityCode.java index 6b89f0d..e6bce11 100644 --- a/src/main/java/com/wonderland/stardewvalley/constant/CityCode.java +++ b/src/main/java/com/wonderland/stardewvalley/common/constant/CityCode.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.constant; +package com.wonderland.stardewvalley.common.constant; import lombok.Getter; diff --git a/src/main/java/com/wonderland/stardewvalley/constant/GuideConstant.java b/src/main/java/com/wonderland/stardewvalley/common/constant/GuideConstant.java similarity index 96% rename from src/main/java/com/wonderland/stardewvalley/constant/GuideConstant.java rename to src/main/java/com/wonderland/stardewvalley/common/constant/GuideConstant.java index 3c7b81b..863a265 100644 --- a/src/main/java/com/wonderland/stardewvalley/constant/GuideConstant.java +++ b/src/main/java/com/wonderland/stardewvalley/common/constant/GuideConstant.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.constant; +package com.wonderland.stardewvalley.common.constant; public class GuideConstant { diff --git a/src/main/java/com/wonderland/stardewvalley/constant/LarkConstant.java b/src/main/java/com/wonderland/stardewvalley/common/constant/LarkConstant.java similarity index 82% rename from src/main/java/com/wonderland/stardewvalley/constant/LarkConstant.java rename to src/main/java/com/wonderland/stardewvalley/common/constant/LarkConstant.java index 17692e4..d83c400 100644 --- a/src/main/java/com/wonderland/stardewvalley/constant/LarkConstant.java +++ b/src/main/java/com/wonderland/stardewvalley/common/constant/LarkConstant.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.constant; +package com.wonderland.stardewvalley.common.constant; public class LarkConstant { diff --git a/src/main/java/com/wonderland/stardewvalley/exception/BusinessException.java b/src/main/java/com/wonderland/stardewvalley/common/exception/BusinessException.java similarity index 90% rename from src/main/java/com/wonderland/stardewvalley/exception/BusinessException.java rename to src/main/java/com/wonderland/stardewvalley/common/exception/BusinessException.java index e87a68e..0958b48 100644 --- a/src/main/java/com/wonderland/stardewvalley/exception/BusinessException.java +++ b/src/main/java/com/wonderland/stardewvalley/common/exception/BusinessException.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.exception; +package com.wonderland.stardewvalley.common.exception; /** * 运行时异常封装为业务异常 diff --git a/src/main/java/com/wonderland/stardewvalley/exception/ErrorCode.java b/src/main/java/com/wonderland/stardewvalley/common/exception/ErrorCode.java similarity index 90% rename from src/main/java/com/wonderland/stardewvalley/exception/ErrorCode.java rename to src/main/java/com/wonderland/stardewvalley/common/exception/ErrorCode.java index c2771d5..2729fd9 100644 --- a/src/main/java/com/wonderland/stardewvalley/exception/ErrorCode.java +++ b/src/main/java/com/wonderland/stardewvalley/common/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.exception; +package com.wonderland.stardewvalley.common.exception; import lombok.Getter; diff --git a/src/main/java/com/wonderland/stardewvalley/exception/ThrowUtils.java b/src/main/java/com/wonderland/stardewvalley/common/exception/ThrowUtils.java similarity index 90% rename from src/main/java/com/wonderland/stardewvalley/exception/ThrowUtils.java rename to src/main/java/com/wonderland/stardewvalley/common/exception/ThrowUtils.java index 15dabd5..d118617 100644 --- a/src/main/java/com/wonderland/stardewvalley/exception/ThrowUtils.java +++ b/src/main/java/com/wonderland/stardewvalley/common/exception/ThrowUtils.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.exception; +package com.wonderland.stardewvalley.common.exception; /** * 根据条件抛出异常 diff --git a/src/main/java/com/wonderland/stardewvalley/controller/ChatController.java b/src/main/java/com/wonderland/stardewvalley/controller/ChatController.java index cb2ea63..081a99e 100644 --- a/src/main/java/com/wonderland/stardewvalley/controller/ChatController.java +++ b/src/main/java/com/wonderland/stardewvalley/controller/ChatController.java @@ -1,9 +1,9 @@ package com.wonderland.stardewvalley.controller; -import com.wonderland.stardewvalley.ai.ChatUtil; +import com.wonderland.stardewvalley.service.ai.ChatUtil; import com.wonderland.stardewvalley.entity.AIChatRequest; import com.wonderland.stardewvalley.entity.BaseResponse; -import com.wonderland.stardewvalley.util.ResultUtil; +import com.wonderland.stardewvalley.util.response.ResultUtil; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/wonderland/stardewvalley/controller/HealthController.java b/src/main/java/com/wonderland/stardewvalley/controller/HealthController.java index d162a5c..edf96ba 100644 --- a/src/main/java/com/wonderland/stardewvalley/controller/HealthController.java +++ b/src/main/java/com/wonderland/stardewvalley/controller/HealthController.java @@ -1,7 +1,7 @@ package com.wonderland.stardewvalley.controller; import com.wonderland.stardewvalley.entity.BaseResponse; -import com.wonderland.stardewvalley.util.ResultUtil; +import com.wonderland.stardewvalley.util.response.ResultUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/wonderland/stardewvalley/controller/LarkController.java b/src/main/java/com/wonderland/stardewvalley/controller/LarkController.java index cacf2c7..523e9d6 100644 --- a/src/main/java/com/wonderland/stardewvalley/controller/LarkController.java +++ b/src/main/java/com/wonderland/stardewvalley/controller/LarkController.java @@ -1,9 +1,9 @@ package com.wonderland.stardewvalley.controller; -import com.wonderland.stardewvalley.constant.GuideConstant; +import com.wonderland.stardewvalley.common.constant.GuideConstant; import com.wonderland.stardewvalley.entity.BaseResponse; -import com.wonderland.stardewvalley.lark.LarkUtil; -import com.wonderland.stardewvalley.util.ResultUtil; +import com.wonderland.stardewvalley.util.lark.LarkUtil; +import com.wonderland.stardewvalley.util.response.ResultUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/wonderland/stardewvalley/entity/BaseResponse.java b/src/main/java/com/wonderland/stardewvalley/entity/BaseResponse.java index 60ababe..076ff75 100644 --- a/src/main/java/com/wonderland/stardewvalley/entity/BaseResponse.java +++ b/src/main/java/com/wonderland/stardewvalley/entity/BaseResponse.java @@ -1,7 +1,7 @@ package com.wonderland.stardewvalley.entity; -import com.wonderland.stardewvalley.exception.ErrorCode; +import com.wonderland.stardewvalley.common.exception.ErrorCode; import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/com/wonderland/stardewvalley/ai/ChatUtil.java b/src/main/java/com/wonderland/stardewvalley/service/ai/ChatUtil.java similarity index 93% rename from src/main/java/com/wonderland/stardewvalley/ai/ChatUtil.java rename to src/main/java/com/wonderland/stardewvalley/service/ai/ChatUtil.java index 2d382d9..b28a46f 100644 --- a/src/main/java/com/wonderland/stardewvalley/ai/ChatUtil.java +++ b/src/main/java/com/wonderland/stardewvalley/service/ai/ChatUtil.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.ai; +package com.wonderland.stardewvalley.service.ai; import org.springframework.ai.chat.client.ChatClient; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wonderland/stardewvalley/lark/EventListener.java b/src/main/java/com/wonderland/stardewvalley/util/lark/EventListener.java similarity index 94% rename from src/main/java/com/wonderland/stardewvalley/lark/EventListener.java rename to src/main/java/com/wonderland/stardewvalley/util/lark/EventListener.java index f348da0..c37811f 100644 --- a/src/main/java/com/wonderland/stardewvalley/lark/EventListener.java +++ b/src/main/java/com/wonderland/stardewvalley/util/lark/EventListener.java @@ -1,4 +1,4 @@ -package com.wonderland.stardewvalley.lark; +package com.wonderland.stardewvalley.util.lark; import com.lark.oapi.core.utils.Jsons; import com.lark.oapi.event.EventDispatcher; @@ -7,7 +7,7 @@ import com.lark.oapi.service.application.v6.model.P2BotMenuV6; import com.lark.oapi.service.im.ImService; import com.lark.oapi.service.im.v1.model.P2MessageReceiveV1; import com.lark.oapi.ws.Client; -import com.wonderland.stardewvalley.constant.LarkConstant; +import com.wonderland.stardewvalley.common.constant.LarkConstant; public class EventListener { diff --git a/src/main/java/com/wonderland/stardewvalley/lark/LarkUtil.java b/src/main/java/com/wonderland/stardewvalley/util/lark/LarkUtil.java similarity index 95% rename from src/main/java/com/wonderland/stardewvalley/lark/LarkUtil.java rename to src/main/java/com/wonderland/stardewvalley/util/lark/LarkUtil.java index 2450d21..b0bb39d 100644 --- a/src/main/java/com/wonderland/stardewvalley/lark/LarkUtil.java +++ b/src/main/java/com/wonderland/stardewvalley/util/lark/LarkUtil.java @@ -1,8 +1,7 @@ -package com.wonderland.stardewvalley.lark; +package com.wonderland.stardewvalley.util.lark; import cn.hutool.core.util.IdUtil; -import cn.hutool.json.JSONUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.gson.JsonParser; @@ -11,8 +10,8 @@ import com.lark.oapi.core.utils.Jsons; import com.lark.oapi.service.im.v1.model.CreateMessageReq; import com.lark.oapi.service.im.v1.model.CreateMessageReqBody; import com.lark.oapi.service.im.v1.model.CreateMessageResp; -import com.wonderland.stardewvalley.ai.ChatUtil; -import com.wonderland.stardewvalley.constant.LarkConstant; +import com.wonderland.stardewvalley.service.ai.ChatUtil; +import com.wonderland.stardewvalley.common.constant.LarkConstant; import com.wonderland.stardewvalley.entity.game.Weather; import com.wonderland.stardewvalley.lark.card.CardTemplate; import jakarta.annotation.Resource; @@ -30,9 +29,6 @@ public class LarkUtil { // 复制该 Demo 后, 需要将 "YOUR_APP_ID", "YOUR_APP_SECRET" 替换为自己应用的 APP_ID, APP_SECRET. // 以下示例代码默认根据文档示例值填充,如果存在代码问题,请在 API 调试台填上相关必要参数后再复制代码使用 - @Resource - private ChatUtil chatUtil; - /** * 发送简单的文本消息 * @param content 发送的内容 diff --git a/src/main/java/com/wonderland/stardewvalley/util/ResultUtil.java b/src/main/java/com/wonderland/stardewvalley/util/response/ResultUtil.java similarity index 85% rename from src/main/java/com/wonderland/stardewvalley/util/ResultUtil.java rename to src/main/java/com/wonderland/stardewvalley/util/response/ResultUtil.java index 4ceadf9..1c619c6 100644 --- a/src/main/java/com/wonderland/stardewvalley/util/ResultUtil.java +++ b/src/main/java/com/wonderland/stardewvalley/util/response/ResultUtil.java @@ -1,8 +1,8 @@ -package com.wonderland.stardewvalley.util; +package com.wonderland.stardewvalley.util.response; import com.wonderland.stardewvalley.entity.BaseResponse; -import com.wonderland.stardewvalley.exception.ErrorCode; +import com.wonderland.stardewvalley.common.exception.ErrorCode; /** * 返回统一的格式 diff --git a/src/main/java/com/wonderland/stardewvalley/util/WeatherUtil.java b/src/main/java/com/wonderland/stardewvalley/util/weather/WeatherUtil.java similarity index 89% rename from src/main/java/com/wonderland/stardewvalley/util/WeatherUtil.java rename to src/main/java/com/wonderland/stardewvalley/util/weather/WeatherUtil.java index 45b6ff6..3ce0c45 100644 --- a/src/main/java/com/wonderland/stardewvalley/util/WeatherUtil.java +++ b/src/main/java/com/wonderland/stardewvalley/util/weather/WeatherUtil.java @@ -1,19 +1,13 @@ -package com.wonderland.stardewvalley.util; +package com.wonderland.stardewvalley.util.weather; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.wonderland.stardewvalley.ai.ChatUtil; -import com.wonderland.stardewvalley.constant.BackGroundConstant; -import com.wonderland.stardewvalley.constant.CityCode; +import com.wonderland.stardewvalley.common.constant.CityCode; import com.wonderland.stardewvalley.entity.game.Weather; -import jakarta.annotation.Resource; -import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; - @Service @Slf4j public class WeatherUtil { diff --git a/src/test/java/com/wonderland/stardewvalley/ai/ChatUtilTest.java b/src/test/java/com/wonderland/stardewvalley/ai/ChatUtilTest.java index 8cbaa70..33a1789 100644 --- a/src/test/java/com/wonderland/stardewvalley/ai/ChatUtilTest.java +++ b/src/test/java/com/wonderland/stardewvalley/ai/ChatUtilTest.java @@ -1,12 +1,11 @@ package com.wonderland.stardewvalley.ai; -import com.wonderland.stardewvalley.constant.BackGroundConstant; +import com.wonderland.stardewvalley.common.constant.BackGroundConstant; +import com.wonderland.stardewvalley.service.ai.ChatUtil; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.jupiter.api.Assertions.*; - @SpringBootTest class ChatUtilTest { diff --git a/src/test/java/com/wonderland/stardewvalley/lark/LarkUtilTest.java b/src/test/java/com/wonderland/stardewvalley/lark/LarkUtilTest.java index ba512a2..0183fe4 100644 --- a/src/test/java/com/wonderland/stardewvalley/lark/LarkUtilTest.java +++ b/src/test/java/com/wonderland/stardewvalley/lark/LarkUtilTest.java @@ -1,8 +1,8 @@ package com.wonderland.stardewvalley.lark; import com.wonderland.stardewvalley.entity.game.Weather; -import com.wonderland.stardewvalley.util.WeatherUtil; -import jakarta.annotation.Resource; +import com.wonderland.stardewvalley.util.weather.WeatherUtil; +import com.wonderland.stardewvalley.util.lark.LarkUtil; import org.junit.jupiter.api.Test; class LarkUtilTest { diff --git a/src/test/java/com/wonderland/stardewvalley/util/WeatherUtilTest.java b/src/test/java/com/wonderland/stardewvalley/util/WeatherUtilTest.java index 366070f..ca0cb7b 100644 --- a/src/test/java/com/wonderland/stardewvalley/util/WeatherUtilTest.java +++ b/src/test/java/com/wonderland/stardewvalley/util/WeatherUtilTest.java @@ -1,12 +1,11 @@ package com.wonderland.stardewvalley.util; import com.wonderland.stardewvalley.entity.game.Weather; +import com.wonderland.stardewvalley.util.weather.WeatherUtil; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.jupiter.api.Assertions.*; - @SpringBootTest class WeatherUtilTest {