Skip to content

fix: Modify code format #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hexqi merged 12 commits into from
Jun 27, 2025
Merged

fix: Modify code format #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2927e24
feat: Service extends IService
lu-yg Jun 13, 2025
67daf4e
feat: Service extends IService
lu-yg Jun 13, 2025
bbd19f2
feat: Service extends IService
lu-yg Jun 16, 2025
e6e5331
fix: Modify unit testing
lu-yg Jun 17, 2025
159897a
fix: Modify web config
lu-yg Jun 17, 2025
2248004
Merge branch 'opentiny:develop' into feat/develop
lu-yg Jun 17, 2025
61cf638
feat: Add JsonUtils and modify related methods
lu-yg Jun 20, 2025
2049478
Merge branch 'feat/develop' of github.com:lu-yg/tiny-engine-backend-j…
lu-yg Jun 20, 2025
3fb5982
feat: Add JsonUtils and modify related methods
lu-yg Jun 20, 2025
a2778ed
Merge branch 'opentiny:develop' into feat/develop
lu-yg Jun 27, 2025
4aacc25
fix: Modify code format
lu-yg Jun 27, 2025
6fa623a
fix: Modify code format
lu-yg Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public static <T> T decode(ByteBuf src, Class<T> valueType) {
} catch (Throwable var5) {
var6.addSuppressed(var5);
}
throw var6;
throw new ServiceException(ExceptionEnum.CM001.getResultCode(),var6.getMessage());
}
inputStream.close();
return var3;
Expand Down
4 changes: 1 addition & 3 deletions base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
package com.tinyengine.it.gateway.ai;

import com.fasterxml.jackson.core.type.TypeReference;
import com.tinyengine.it.common.exception.ExceptionEnum;
import com.tinyengine.it.common.exception.ServiceException;
import com.tinyengine.it.common.utils.JsonUtils;
import com.tinyengine.it.config.AiChatConfig;
import com.tinyengine.it.model.dto.AiParam;
Expand All @@ -39,7 +37,7 @@
@Slf4j
public class AiChatClient {
private final Map<String, AiChatConfig.AiChatConfigData> config;
// 新增 Setter 方法，便于测试时注入 Mock 对象

@Setter
private RestTemplate restTemplate;

Expand Down
5 changes: 2 additions & 3 deletions base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ public Result<FileResult> readFileAndBulkCreate(MultipartFile file) {
componentLibrary.setIsOfficial(true);
ComponentLibrary library = new ComponentLibrary();
library.setName(componentLibrary.getName());
// 默认覆盖更新 其他业务需求多版本组件可放开
// library.setVersion(componentLibrary.getVersion());
// 默认覆盖更新 其他业务需求多版本组件可放开 library.setVersion(componentLibrary.getVersion());
// 查询是否存在组件库
List<ComponentLibrary> componentLibraryList = componentLibraryMapper.queryComponentLibraryByCondition(
library);
Expand Down Expand Up @@ -376,7 +375,7 @@ private List<Component> buildComponentList(BundleDto bundleDto, List<Map<String,
}
Map<String, Object> snippetMap = BeanUtil.beanToMap(snippet);
component.setSnippets(Arrays.asList(snippetMap));
if(Objects.isNull(component.getCategory())) {
if (Objects.isNull(component.getCategory())) {
component.setCategory(child.getGroup());
}
}
Expand Down
8 changes: 0 additions & 8 deletions base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,17 @@

package com.tinyengine.it.gateway.ai;

import static javax.management.Query.eq;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import com.tinyengine.it.common.utils.TestUtil;
import com.tinyengine.it.config.AiChatConfig;
import com.tinyengine.it.model.dto.AiMessages;
import com.tinyengine.it.model.dto.AiParam;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Answers;
import org.mockito.InjectMocks;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.springframework.http.HttpEntity;
Expand Down
Loading