diff --git a/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java b/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java index 14ee6573..e69c16b5 100644 --- a/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java +++ b/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java @@ -23,8 +23,8 @@ * @since 2024-10-20 */ public class AiChatConfig { - private static final String OPENAI_API_URL = "https://api.openai.com"; - private static final String LOCAL_GPT_API_URL = "https://dashscope.aliyuncs.com/compatible-mode"; + private static final String OPENAI_API_URL = "https://api.openai.com"; + private static final String LOCAL_GPT_API_URL = "https://dashscope.aliyuncs.com/compatible-mode"; /** @@ -32,7 +32,7 @@ public class AiChatConfig { * * @return the AI chat config */ - public static Map getAiChatConfig(String model,String token) { + public static Map getAiChatConfig(String model, String token) { Map config = new HashMap<>(); Map openaiHeaders = new HashMap<>(); diff --git a/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java b/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java index 9d34320c..017583ce 100644 --- a/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java +++ b/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java @@ -43,8 +43,8 @@ public class AiChatClient { /** * Instantiates a new Ai chat client. */ - public AiChatClient(String model,String token) { - this.config = AiChatConfig.getAiChatConfig(model,token); + public AiChatClient(String model, String token) { + this.config = AiChatConfig.getAiChatConfig(model, token); // Optional: Default base URL this.webClient = WebClient.builder().baseUrl("https://default.api.url").build(); } diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java index d932106e..377a8810 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java @@ -93,7 +93,6 @@ public class BlockServiceImpl implements BlockService { private BlockGroupMapper blockGroupMapper; @Autowired private BlockGroupBlockMapper blockGroupBlockMapper; - @Autowired private LoginUserContext loginUserContext; @@ -190,7 +189,7 @@ public Result updateBlockById(BlockParam blockParam, Integer appId) { // 根据区块id获取区块所在分组 List blockGroups = blockGroupMapper.findBlockGroupByBlockId(blocks.getId(), loginUserContext.getLoginUserId()); // 删除区块与分组关系 - if(blockGroups != null && !blockGroups.isEmpty()){ + if (blockGroups != null && !blockGroups.isEmpty()) { List blockGroupIds = blockGroups.stream().map(BlockGroup::getId).collect(Collectors.toList()); for (Integer id : blockGroupIds) { blockGroupBlockMapper.deleteByGroupIdAndBlockId(id, blocks.getId()); @@ -287,21 +286,18 @@ public Map> getBlockAssets(Map pageContent, mergedAssets.put("styles", new ArrayList<>()); // Merge the assets using streams - return blocksList.stream().map(Block::getAssets).map(assetsMap -> - { + return blocksList.stream().map(Block::getAssets).map(assetsMap -> { Map> tempMap = new HashMap<>(); tempMap.put("material", (List) assetsMap.getOrDefault("material", new ArrayList<>())); tempMap.put("scripts", (List) assetsMap.getOrDefault("scripts", new ArrayList<>())); tempMap.put("styles", (List) assetsMap.getOrDefault("styles", new ArrayList<>())); return tempMap; - }).reduce(mergedAssets, (acc, curr) -> - { + }).reduce(mergedAssets, (acc, curr) -> { acc.get("material").addAll(curr.get("material")); acc.get("scripts").addAll(curr.get("scripts")); acc.get("styles").addAll(curr.get("styles")); return acc; - }, (map1, map2) -> - { + }, (map1, map2) -> { map1.get("material").addAll(map2.get("material")); map1.get("scripts").addAll(map2.get("scripts")); map1.get("styles").addAll(map2.get("styles")); diff --git a/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java b/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java index a59e7d12..1547ef62 100644 --- a/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java +++ b/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java @@ -87,16 +87,15 @@ void testExecuteChatRequest() { when(bodyUriSpec.uri(anyString())).thenReturn(bodyUriSpec); HashMap foundationModel = new HashMap<>(); foundationModel.put("model", "ERNIE-4.0-8K"); - foundationModel.put("token","asdf"); + foundationModel.put("token", "asdf"); ArrayList messages = new ArrayList<>(); AiMessages aiMessages = new AiMessages(); aiMessages.setContent("dddd编码时遵从以下几条要求aaa"); aiMessages.setName("John"); aiMessages.setRole("user"); messages.add(aiMessages); - AiParam param = new AiParam(foundationModel,Arrays.asList(aiMessages)); + AiParam param = new AiParam(foundationModel, Arrays.asList(aiMessages)); Map returnData = aiChatClient.executeChatRequest(param); Assertions.assertNull(returnData.get("data")); } } - diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java index 43ea47cd..0905c253 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java @@ -68,7 +68,7 @@ void testGetAnswerFromAi() { aiParam.setMessages(messages); HashMap foundationModel = new HashMap<>(); foundationModel.put("model", "ERNIE-4.0-8K"); - foundationModel.put("token","asdf"); + foundationModel.put("token", "asdf"); aiParam.setFoundationModel(foundationModel); Map dataMap = new HashMap<>();