Merge branch 'cherry-pick-accfa3ec' into 'master_dev'

fix:解决由于文件上传只返回非半路径而导致的3d-compent读取不到文件问题

See merge request yunteng/thingskit!463

@@ -86,16 +86,14 @@ public class LocalFileStorageService implements FileStorageService {
   @Override
   @Override
   public FileUploadResponse upload(MultipartFile file) {
   public FileUploadResponse upload(MultipartFile file) {
     String fileName = this.storeFile(file);
     String fileName = this.storeFile(file);
-    String fileDownloadPath =
-        ServletUriComponentsBuilder.fromCurrentRequestUri()
-            .path(fileStorageProperties.getDownloadPath())
-            .path(fileName)
-            .toUriString();
+//    String fileDownloadPath = ServletUriComponentsBuilder.fromCurrentRequestUri() .path(fileStorageProperties.getDownloadPath()) .path(fileName) .toUriString();
+    String fileDownloadPath = fileStorageProperties.getDownloadPath()+"/"+fileName;
     String realDownloadPath = fileDownloadPath.replace(fileStorageProperties.getUploadPath(), "");
     String realDownloadPath = fileDownloadPath.replace(fileStorageProperties.getUploadPath(), "");
-//    String ossStaticPath = ServletUriComponentsBuilder.fromCurrentContextPath().toUriString() + ossFileUrl;
-    ossFileUrl = ossFileUrl.replace("**", fileName);
+
+    String ossStaticPath = ServletUriComponentsBuilder.fromCurrentContextPath().toUriString() + ossFileUrl;
+    ossStaticPath = ossStaticPath.replace("**", fileName);
     return new FileUploadResponse(
     return new FileUploadResponse(
-        fileName, realDownloadPath, file.getContentType(), file.getSize(), ossFileUrl);
+        fileName, ossStaticPath, file.getContentType(), file.getSize(),  realDownloadPath);
   }
   }
 
 
   @Override
   @Override
@@ -130,12 +128,12 @@ public class LocalFileStorageService implements FileStorageService {
   }
   }
 
 
   @Override
   @Override
-  public String uploadFile(String fileName, String contentType, InputStream inputStream )
+  public String uploadFile(String name, String contentType, InputStream inputStream )
       throws IOException {
       throws IOException {
-    String name = storeFileByInputStream(fileName, inputStream);
-    String ossStaticPath = ossFileUrl;
-    ossStaticPath = ossStaticPath.replace("**", name);
-    return ossStaticPath;
+    String fileName = storeFileByInputStream(name, inputStream);
+    String fileDownloadPath = fileStorageProperties.getDownloadPath()+"/"+fileName;
+    String realDownloadPath = fileDownloadPath.replace(fileStorageProperties.getUploadPath(), "");
+    return realDownloadPath;
   }
   }
 
 
   @Override
   @Override

@@ -86,7 +86,6 @@ public class Tk3dComponentServiceImpl extends AbstractBaseService<Tk3dComponentM
 
 
     private boolean save(Tk3dComponentEntity entity) {
     private boolean save(Tk3dComponentEntity entity) {
         if (baseMapper.exists(new LambdaQueryWrapper<Tk3dComponentEntity>()
         if (baseMapper.exists(new LambdaQueryWrapper<Tk3dComponentEntity>()
-                .eq(Tk3dComponentEntity::getTenantId, entity.getTenantId())
                 .eq(Tk3dComponentEntity::getId, entity.getId()))) {
                 .eq(Tk3dComponentEntity::getId, entity.getId()))) {
             return baseMapper.updateById(entity)>0;
             return baseMapper.updateById(entity)>0;
         } else {
         } else {