diff --git a/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java b/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java index d0494f7b..6e33da2a 100644 --- a/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java +++ b/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java @@ -45,5 +45,7 @@ public int getPlatformId() { } @Override - public String getSiteId() { return "1"; } + public String getSiteId() { + return "1"; + } } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java index 3e6a628d..dfbf3664 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java @@ -91,12 +91,12 @@ public Result> getAnswerFromAi(AiParam aiParam) { if (aiParam.getFoundationModel().get("model").isEmpty()) { model = Enums.FoundationModel.GPT_35_TURBO.getValue(); } - foundationModel.put("model",model); + foundationModel.put("model", model); aiParam.setFoundationModel(foundationModel); Result> resultData = requestAnswerFromAi(aiParam.getMessages(), aiParam.getFoundationModel()); // 调用接口失败时且data为null - if(!resultData.isSuccess() && resultData.getData() == null){ - return Result.failed(resultData.getCode(),resultData.getMessage()); + if (!resultData.isSuccess() && resultData.getData() == null) { + return Result.failed(resultData.getCode(), resultData.getMessage()); } Map data = resultData.getData(); if (data.isEmpty()) { @@ -134,7 +134,7 @@ public Result> getAnswerFromAi(AiParam aiParam) { try { data = requestAnswerFromAi(aiParam.getMessages(), aiParam.getFoundationModel()).getData(); } catch (Exception e) { - throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg()); + throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg()); } choices = (List>) data.get("choices"); message = (Map) choices.get(0).get("message"); @@ -167,14 +167,14 @@ public Result> getAnswerFromAi(AiParam aiParam) { private Result> requestAnswerFromAi(List messages, Map foundationModel) { List aiMessages = formatMessage(messages); - AiParam aiParam = new AiParam(foundationModel,aiMessages); + AiParam aiParam = new AiParam(foundationModel, aiMessages); AiChatClient aiChatClient = new AiChatClient(foundationModel.get("model"), foundationModel.get("token")); Map response = aiChatClient.executeChatRequest(aiParam); // 适配文心一言的响应数据结构,文心的部分异常情况status也是200,需要转为400,以免前端无所适从 if (response.get("error_code") != null) { - String code = response.get("error_code").toString(); + String code = response.get("error_code").toString(); String message = response.get("error_msg").toString(); - return Result.failed(code,message); + return Result.failed(code, message); } if (response.get("error") != null) { String code = (response.get("code") != null) ? response.get("code").toString() : ""; diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java index bdbd53b4..8ff5e693 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java @@ -139,12 +139,12 @@ public class PageServiceImpl implements PageService { @SystemServiceLog(description = "通过appId查询page所有数据实现方法") public List queryAllPage(Integer aid) { List pageList = pageMapper.queryPageByApp(aid); - if(pageList == null){ + if (pageList == null) { return null; } // 遍历数据给页面的ishome字段赋值 - for (Page page:pageList) { - if(page.getIsPage()){ + for (Page page : pageList) { + if (page.getIsPage()) { addIsHome(page); } } diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java index aa06da42..61a4480c 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java @@ -33,7 +33,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -202,7 +201,7 @@ public List getBlockGroupByIdsOrAppId(List ids, Integer app blockGroupsListResult = blockGroupMapper.queryBlockGroupByAppId(appId, blockCreatedBy, groupCreatedBy); } if (ids == null && appId == null) { - blockGroupsListResult = blockGroupMapper.queryAllBlockGroupAndBlock( blockCreatedBy, groupCreatedBy); + blockGroupsListResult = blockGroupMapper.queryAllBlockGroupAndBlock(blockCreatedBy, groupCreatedBy); } if (blockGroupsListResult.isEmpty() || blockGroupsListResult.get(0).getId() == null) { diff --git a/base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java b/base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java index de554cd5..edd1e913 100644 --- a/base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java +++ b/base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java @@ -43,5 +43,7 @@ public int getPlatformId() { } @Override - public String getSiteId() { return "1"; } + public String getSiteId() { + return "1"; + } }