Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4f5d632
feat: add resource API
lu-yg Sep 5, 2025
df6ba91
fix: modify source API
lu-yg Sep 5, 2025
0fef229
fix: modify source API
lu-yg Sep 5, 2025
ab24c40
fix: modify source API
lu-yg Sep 5, 2025
787d1d1
fix: modify source API
lu-yg Sep 5, 2025
5fed78f
fix: modify source API
lu-yg Sep 5, 2025
d483f04
fix: modify source API
lu-yg Sep 5, 2025
72e9c67
fix: modify source API
lu-yg Sep 5, 2025
1fe61d5
fix: modify source API
lu-yg Sep 5, 2025
fd74ac8
fix: modify source API
lu-yg Sep 5, 2025
398e5c0
feat: add scheduled tasks
lu-yg Sep 9, 2025
0b8105c
fix: modify resource download
lu-yg Sep 9, 2025
6c9c7e4
fix: modify resource group update
lu-yg Sep 9, 2025
6178ed2
fix: modify resource group update
lu-yg Sep 9, 2025
3d723ae
fix: modify resource group update
lu-yg Sep 9, 2025
797045c
Merge branch 'opentiny:develop' into feat/resourceManagement
lu-yg Sep 10, 2025
3e2e616
fix: modify resource download
lu-yg Sep 10, 2025
603f65d
fix: modify block group
lu-yg Sep 15, 2025
f8d37c0
fix: modify AI chat
lu-yg Sep 16, 2025
e7c73d8
Merge branch 'opentiny:develop' into feat/resourceManagement
lu-yg Sep 16, 2025
6c4f3ea
fix: modify AI chat
lu-yg Sep 16, 2025
35a0b45
fix: modify AI chat
lu-yg Sep 16, 2025
4d7848b
fix: modify AI chat
lu-yg Sep 16, 2025
ad807d9
fix: modify AI chat
lu-yg Sep 16, 2025
53313bf
fix: modify AI chat
lu-yg Sep 16, 2025
ca4ff1b
fix: modify AI chat
lu-yg Sep 16, 2025
bff65fe
fix: modify AI chat
lu-yg Sep 16, 2025
f1fe5d0
Merge branch 'opentiny:develop' into feat/resourceManagement
lu-yg Sep 17, 2025
4eaee7a
fix: modify resource upload
lu-yg Sep 17, 2025
d211902
fix: modify resource upload
lu-yg Sep 17, 2025
28bef56
fix: modify resource upload
lu-yg Sep 17, 2025
a93100a
fix: modify resource upload
lu-yg Sep 17, 2025
1014efc
fix: modify resource upload
lu-yg Sep 17, 2025
68193ce
fix: modify resource upload
lu-yg Sep 17, 2025
64a7397
fix: modify resource upload
lu-yg Sep 17, 2025
363f728
fix: modify resource upload
lu-yg Sep 17, 2025
e0883be
fix: modify resource upload and download
lu-yg Sep 17, 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
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ public Result<Resource> resourceUpload(@RequestParam MultipartFile file) throws
resource.setName(fileName);
resource.setResourceData(base64);
resource.setAppId(loginUserContext.getAppId());
resource.setCategory("image");
Resource result = resourceService.resourceUpload(resource);
return Result.success(result);
}
Expand Down Expand Up @@ -308,7 +307,7 @@ public Result<Resource> detail(@PathVariable Integer id) {
@SystemControllerLog(description = "获取资源")
@GetMapping("/resource/download")
public void getResource(@RequestParam String name, @RequestParam boolean isResource,
HttpServletResponse response) throws Exception {
@RequestParam(required = false) boolean isChat, HttpServletResponse response) throws Exception {
Resource resource = resourceService.queryResourceByName(name);
if(resource == null) {
throw new ServiceException(ExceptionEnum.CM009.getResultCode(),ExceptionEnum.CM009.getResultMsg());
Expand All @@ -326,11 +325,12 @@ public void getResource(@RequestParam String name, @RequestParam boolean isResou
response.setContentType(detectedType);

// 只使用 filename* 格式,避免中文字符直接出现在header中
response.setHeader("Content-Disposition",
"inline; filename*=UTF-8''" + encodedFileName);
response.setHeader("Content-Disposition", "inline; filename*=UTF-8''" + encodedFileName);
if(isChat){
response.setHeader("Content-Disposition", "attachment ; filename*=UTF-8''" + encodedFileName);
}
try (OutputStream out = response.getOutputStream()) {
out.write(imageBytes);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,19 @@ public Resource createResource(Resource resource) throws Exception {
@Override
@SystemServiceLog(description = "图片上传")
public Resource resourceUpload(Resource resource) {
String imageName = Instant.now().toEpochMilli()+resource.getName();
String imageName = Instant.now().toEpochMilli() + resource.getName();
resource.setName(imageName);
String resourceData = resource.getResourceData();
String tinyEngineUrl = System.getenv("TINY_ENGINE_URL");

String encodedName = URLEncoder.encode(imageName, StandardCharsets.UTF_8);
String resourceUrl = tinyEngineUrl + "?name=" + encodedName + "&isResource=" + true;
String thumbnailUrl = tinyEngineUrl + "?name=" + encodedName + "&isResource=" + false;
if (resource.getCategory() == null) {
resourceUrl = tinyEngineUrl + "?name=" + encodedName + "&isResource=" + true + "&isChat=" + true;
thumbnailUrl = tinyEngineUrl + "?name=" + encodedName + "&isResource=" + false + "&isChat=" + true;
resource.setCategory("image");
}
if (!StringUtils.isEmpty(resourceData)) {
String encodedName = URLEncoder.encode(imageName, StandardCharsets.UTF_8);
String resourceUrl = tinyEngineUrl + "?name=" + encodedName + "&isResource=" + true;
String thumbnailUrl = tinyEngineUrl + "?name=" + encodedName + "&isResource=" + false;
resource.setResourceUrl(resourceUrl);
resource.setThumbnailUrl(thumbnailUrl);
resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200));
Expand Down
Loading