Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
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: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ ENV ACCESS_KEY_ID=" "
ENV ACCESS_KEY_SECRET = " "
ENV INDEX_ID = " "
ENV WORK_SPACE_ID = ""
# 替换为自己的域名接口路径
ENV TINY_ENGINE_URL="https://agent.opentiny.design/material-center/api/resource/download"
ENTRYPOINT ["java", "-jar", "tiny-engine-app.jar", "--spring.profiles.active=alpha"]
EXPOSE 9090

Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
Expand Down Expand Up @@ -103,7 +104,12 @@ public ResponseEntity<?> aiChat(@RequestBody ChatRequest request) {
})
@SystemControllerLog(description = "AI api v1")
@PostMapping("/chat/completions")
public ResponseEntity<?> chat(@RequestBody ChatRequest request) {
public ResponseEntity<?> chat(@RequestBody ChatRequest request,
@RequestHeader("Authorization") String authorization) {
if (authorization != null && authorization.startsWith("Bearer ")) {
String token = authorization.replace("Bearer ", "");
request.setApiKey(token);
}
try {
Object response = aiChatV1Service.chatCompletion(request);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,27 @@ public Result<Resource> createResource(@Valid @RequestBody Resource resource) th
return Result.success(result);
}

/**
* 上传图片
*
* @param resource the resource
* @return Resource信息 result
*/
@Operation(summary = "上传图片", description = "上传图片",
parameters = {
@Parameter(name = "resource", description = "Resource入参对象")
}, responses = {
@ApiResponse(responseCode = "200", description = "返回信息",
content = @Content(mediaType = "application/json", schema = @Schema(implementation = Resource.class))),
@ApiResponse(responseCode = "400", description = "请求失败")
})
@SystemControllerLog(description = "上传图片")
@PostMapping("/resource/uoload")
public Result<Resource> resourceUoload(@Valid @RequestBody Resource resource) throws Exception {
Resource result = resourceService.resourceUpload(resource);
return Result.success(result);
}

/**
* 批量创建Resource
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,13 +319,6 @@ private StreamingResponseBody processStreamResponse(HttpRequest.Builder requestB
}
}
} catch (Exception e) {
// 简单的错误处理:如果是客户端断开连接,忽略错误
String errorMsg = e.getMessage();
if (errorMsg != null &&
(errorMsg.contains("Broken pipe") || errorMsg.contains("Connection reset"))) {
return;
}

try {
String errorEvent = "data: {\"error\": \"" + e.getMessage() + "\"}\n\n";
outputStream.write(errorEvent.getBytes(StandardCharsets.UTF_8));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@ public interface ResourceService extends IService<Resource> {
*/
Resource createResource(Resource resource) throws Exception;

/**
* 图片上传
*
* @param resource the resource
* @return the integer
*/
Resource resourceUpload(Resource resource) throws Exception;

/**
* 批量新增表t_resource数据
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,24 @@ public Result<Resource> updateResourceById(Resource resource) {
@SystemServiceLog(description = "新增表t_resource数据")
public Resource createResource(Resource resource) throws Exception {

Resource res = this.resourceUpload(resource);
ResourceGroupResource resourceGroupResource = new ResourceGroupResource();
resourceGroupResource.setResourceId(res.getId());
resourceGroupResource.setResourceGroupId(resource.getResourceGroupId());
resourceGroupResourceMapper.createResourceGroupResource(resourceGroupResource);

return res;
}

/**
* 图片上传
*
* @param resource the resource
* @return the integer
*/
@Override
@SystemServiceLog(description = "图片上传")
public Resource resourceUpload(Resource resource) throws Exception {
ResourceRequestDto resourceParam = new ResourceRequestDto();
resourceParam.setName(resource.getName());
resourceParam.setCategory(resource.getCategory());
Expand All @@ -179,7 +197,7 @@ public Resource createResource(Resource resource) throws Exception {
QueryWrapper<Resource> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name", resource.getName());
queryWrapper.eq("category", resource.getCategory());
// 接入组合系统需添加租户id查询
// 接入租户系统需添加租户id查询
Resource resourceResult = this.baseMapper.selectOne(queryWrapper);
if (resourceResult != null) {
throw new ServiceException(ExceptionEnum.CM003.getResultCode(), ExceptionEnum.CM003.getResultMsg());
Expand All @@ -188,10 +206,6 @@ public Resource createResource(Resource resource) throws Exception {
if (createResult != 1) {
throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultMsg());
}
ResourceGroupResource resourceGroupResource = new ResourceGroupResource();
resourceGroupResource.setResourceId(resource.getId());
resourceGroupResource.setResourceGroupId(resource.getResourceGroupId());
resourceGroupResourceMapper.createResourceGroupResource(resourceGroupResource);

return this.baseMapper.queryResourceById(resource.getId());
}
Expand Down
Loading