Skip to content

Commit 7210c0a

Browse files
authored
fix: format code and fix style issue (#213)
fix: format code and fix style issue
1 parent 3560053 commit 7210c0a

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

base/src/main/java/com/tinyengine/it/config/AiChatConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
* @since 2024-10-20
2424
*/
2525
public class AiChatConfig {
26-
private static final String OPENAI_API_URL = "https://api.openai.com";
27-
private static final String LOCAL_GPT_API_URL = "https://dashscope.aliyuncs.com/compatible-mode";
26+
private static final String OPENAI_API_URL = "https://api.openai.com";
27+
private static final String LOCAL_GPT_API_URL = "https://dashscope.aliyuncs.com/compatible-mode";
2828

2929

3030
/**
3131
* Gets AI chat config.
3232
*
3333
* @return the AI chat config
3434
*/
35-
public static Map<String, AiChatConfigData> getAiChatConfig(String model,String token) {
35+
public static Map<String, AiChatConfigData> getAiChatConfig(String model, String token) {
3636
Map<String, AiChatConfigData> config = new HashMap<>();
3737

3838
Map<String, String> openaiHeaders = new HashMap<>();

base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public class AiChatClient {
4343
/**
4444
* Instantiates a new Ai chat client.
4545
*/
46-
public AiChatClient(String model,String token) {
47-
this.config = AiChatConfig.getAiChatConfig(model,token);
46+
public AiChatClient(String model, String token) {
47+
this.config = AiChatConfig.getAiChatConfig(model, token);
4848
// Optional: Default base URL
4949
this.webClient = WebClient.builder().baseUrl("https://default.api.url").build();
5050
}

base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public class BlockServiceImpl implements BlockService {
9393
private BlockGroupMapper blockGroupMapper;
9494
@Autowired
9595
private BlockGroupBlockMapper blockGroupBlockMapper;
96-
9796
@Autowired
9897
private LoginUserContext loginUserContext;
9998

@@ -190,7 +189,7 @@ public Result<BlockDto> updateBlockById(BlockParam blockParam, Integer appId) {
190189
// 根据区块id获取区块所在分组
191190
List<BlockGroup> blockGroups = blockGroupMapper.findBlockGroupByBlockId(blocks.getId(), loginUserContext.getLoginUserId());
192191
// 删除区块与分组关系
193-
if(blockGroups != null && !blockGroups.isEmpty()){
192+
if (blockGroups != null && !blockGroups.isEmpty()) {
194193
List<Integer> blockGroupIds = blockGroups.stream().map(BlockGroup::getId).collect(Collectors.toList());
195194
for (Integer id : blockGroupIds) {
196195
blockGroupBlockMapper.deleteByGroupIdAndBlockId(id, blocks.getId());
@@ -287,21 +286,18 @@ public Map<String, List<String>> getBlockAssets(Map<String, Object> pageContent,
287286
mergedAssets.put("styles", new ArrayList<>());
288287

289288
// Merge the assets using streams
290-
return blocksList.stream().map(Block::getAssets).map(assetsMap ->
291-
{
289+
return blocksList.stream().map(Block::getAssets).map(assetsMap -> {
292290
Map<String, List<String>> tempMap = new HashMap<>();
293291
tempMap.put("material", (List<String>) assetsMap.getOrDefault("material", new ArrayList<>()));
294292
tempMap.put("scripts", (List<String>) assetsMap.getOrDefault("scripts", new ArrayList<>()));
295293
tempMap.put("styles", (List<String>) assetsMap.getOrDefault("styles", new ArrayList<>()));
296294
return tempMap;
297-
}).reduce(mergedAssets, (acc, curr) ->
298-
{
295+
}).reduce(mergedAssets, (acc, curr) -> {
299296
acc.get("material").addAll(curr.get("material"));
300297
acc.get("scripts").addAll(curr.get("scripts"));
301298
acc.get("styles").addAll(curr.get("styles"));
302299
return acc;
303-
}, (map1, map2) ->
304-
{
300+
}, (map1, map2) -> {
305301
map1.get("material").addAll(map2.get("material"));
306302
map1.get("scripts").addAll(map2.get("scripts"));
307303
map1.get("styles").addAll(map2.get("styles"));

base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,15 @@ void testExecuteChatRequest() {
8787
when(bodyUriSpec.uri(anyString())).thenReturn(bodyUriSpec);
8888
HashMap<String, String> foundationModel = new HashMap<>();
8989
foundationModel.put("model", "ERNIE-4.0-8K");
90-
foundationModel.put("token","asdf");
90+
foundationModel.put("token", "asdf");
9191
ArrayList<AiMessages> messages = new ArrayList<>();
9292
AiMessages aiMessages = new AiMessages();
9393
aiMessages.setContent("dddd编码时遵从以下几条要求aaa");
9494
aiMessages.setName("John");
9595
aiMessages.setRole("user");
9696
messages.add(aiMessages);
97-
AiParam param = new AiParam(foundationModel,Arrays.asList(aiMessages));
97+
AiParam param = new AiParam(foundationModel, Arrays.asList(aiMessages));
9898
Map<String, Object> returnData = aiChatClient.executeChatRequest(param);
9999
Assertions.assertNull(returnData.get("data"));
100100
}
101101
}
102-

base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void testGetAnswerFromAi() {
6868
aiParam.setMessages(messages);
6969
HashMap<String, String> foundationModel = new HashMap<>();
7070
foundationModel.put("model", "ERNIE-4.0-8K");
71-
foundationModel.put("token","asdf");
71+
foundationModel.put("token", "asdf");
7272
aiParam.setFoundationModel(foundationModel);
7373

7474
Map<String, Object> dataMap = new HashMap<>();

0 commit comments

Comments
 (0)