Skip to content

Commit 4d7848b

Browse files
committed
fix: modify AI chat
1 parent 35a0b45 commit 4d7848b

File tree

5 files changed

+54
-12
lines changed

5 files changed

+54
-12
lines changed

base/src/main/java/com/tinyengine/it/controller/AiChatController.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.validation.annotation.Validated;
3333
import org.springframework.web.bind.annotation.PostMapping;
3434
import org.springframework.web.bind.annotation.RequestBody;
35+
import org.springframework.web.bind.annotation.RequestHeader;
3536
import org.springframework.web.bind.annotation.RequestMapping;
3637
import org.springframework.web.bind.annotation.RestController;
3738
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
@@ -103,7 +104,12 @@ public ResponseEntity<?> aiChat(@RequestBody ChatRequest request) {
103104
})
104105
@SystemControllerLog(description = "AI api v1")
105106
@PostMapping("/chat/completions")
106-
public ResponseEntity<?> chat(@RequestBody ChatRequest request) {
107+
public ResponseEntity<?> chat(@RequestBody ChatRequest request,
108+
@RequestHeader("Authorization") String authorization) {
109+
if (authorization != null && authorization.startsWith("Bearer ")) {
110+
String token = authorization.replace("Bearer ", "");
111+
request.setApiKey(token);
112+
}
107113
try {
108114
Object response = aiChatV1Service.chatCompletion(request);
109115

base/src/main/java/com/tinyengine/it/controller/ResourceController.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,27 @@ public Result<Resource> createResource(@Valid @RequestBody Resource resource) th
164164
return Result.success(result);
165165
}
166166

167+
/**
168+
* 上传图片
169+
*
170+
* @param resource the resource
171+
* @return Resource信息 result
172+
*/
173+
@Operation(summary = "创建resource", description = "创建resource",
174+
parameters = {
175+
@Parameter(name = "resource", description = "Resource入参对象")
176+
}, responses = {
177+
@ApiResponse(responseCode = "200", description = "返回信息",
178+
content = @Content(mediaType = "application/json", schema = @Schema(implementation = Resource.class))),
179+
@ApiResponse(responseCode = "400", description = "请求失败")
180+
})
181+
@SystemControllerLog(description = "创建resource")
182+
@PostMapping("/resource/uoload")
183+
public Result<Resource> resourceUoload(@Valid @RequestBody Resource resource) throws Exception {
184+
Resource result = resourceService.resourceUpload(resource);
185+
return Result.success(result);
186+
}
187+
167188
/**
168189
* 批量创建Resource
169190
*

base/src/main/java/com/tinyengine/it/service/app/impl/v1/AiChatV1ServiceImpl.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,6 @@ private StreamingResponseBody processStreamResponse(HttpRequest.Builder requestB
319319
}
320320
}
321321
} catch (Exception e) {
322-
// 简单的错误处理:如果是客户端断开连接,忽略错误
323-
String errorMsg = e.getMessage();
324-
if (errorMsg != null &&
325-
(errorMsg.contains("Broken pipe") || errorMsg.contains("Connection reset"))) {
326-
return;
327-
}
328322

329323
try {
330324
String errorEvent = "data: {\"error\": \"" + e.getMessage() + "\"}\n\n";

base/src/main/java/com/tinyengine/it/service/material/ResourceService.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ public interface ResourceService extends IService<Resource> {
8484
*/
8585
Resource createResource(Resource resource) throws Exception;
8686

87+
/**
88+
* 图片上传
89+
*
90+
* @param resource the resource
91+
* @return the integer
92+
*/
93+
Resource resourceUpload(Resource resource) throws Exception;
94+
8795
/**
8896
* 批量新增表t_resource数据
8997
*

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

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,23 @@ public Result<Resource> updateResourceById(Resource resource) {
155155
@SystemServiceLog(description = "新增表t_resource数据")
156156
public Resource createResource(Resource resource) throws Exception {
157157

158+
Resource res = this.resourceUpload(resource);
159+
ResourceGroupResource resourceGroupResource = new ResourceGroupResource();
160+
resourceGroupResource.setResourceId(res.getId());
161+
resourceGroupResource.setResourceGroupId(resource.getResourceGroupId());
162+
resourceGroupResourceMapper.createResourceGroupResource(resourceGroupResource);
163+
164+
return res;
165+
}
166+
167+
/**
168+
* 图片上传
169+
*
170+
* @param resource the resource
171+
* @return the integer
172+
*/
173+
@Override
174+
public Resource resourceUpload(Resource resource) throws Exception {
158175
ResourceRequestDto resourceParam = new ResourceRequestDto();
159176
resourceParam.setName(resource.getName());
160177
resourceParam.setCategory(resource.getCategory());
@@ -179,7 +196,7 @@ public Resource createResource(Resource resource) throws Exception {
179196
QueryWrapper<Resource> queryWrapper = new QueryWrapper<>();
180197
queryWrapper.eq("name", resource.getName());
181198
queryWrapper.eq("category", resource.getCategory());
182-
// 接入组合系统需添加租户id查询
199+
// 接入租户系统需添加租户id查询
183200
Resource resourceResult = this.baseMapper.selectOne(queryWrapper);
184201
if (resourceResult != null) {
185202
throw new ServiceException(ExceptionEnum.CM003.getResultCode(), ExceptionEnum.CM003.getResultMsg());
@@ -188,10 +205,6 @@ public Resource createResource(Resource resource) throws Exception {
188205
if (createResult != 1) {
189206
throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultMsg());
190207
}
191-
ResourceGroupResource resourceGroupResource = new ResourceGroupResource();
192-
resourceGroupResource.setResourceId(resource.getId());
193-
resourceGroupResource.setResourceGroupId(resource.getResourceGroupId());
194-
resourceGroupResourceMapper.createResourceGroupResource(resourceGroupResource);
195208

196209
return this.baseMapper.queryResourceById(resource.getId());
197210
}

0 commit comments

Comments
 (0)