lyhzzz преди 3 години
родител
ревизия
1e4fd6c0bb

+ 3 - 3
src/main/java/com/fdkankan/fusion/common/util/UploadToOssUtil.java

@@ -198,16 +198,16 @@ public class UploadToOssUtil {
 		return contentJson.toString();
 	}
 
-	public  void uploadFileOss(File file,String filePath) {
+	public  void uploadFileOss(File file) {
 		if(file.isFile()){
-			String ossPath = file.getPath().replace(filePath,"");
+			String ossPath = file.getPath();
 			ossPath = ossPath.replace("/mnt/","");
 			ossPath =  ossPath.replace("\\","/");
 			this.uploadOss(file.getPath(),ossPath);
 		}else {
 			File[] files = file.listFiles();
 			for (File file1 : files) {
-				uploadFileOss(file1,filePath);
+				uploadFileOss(file1);
 			}
 		}
 	}

+ 1 - 1
src/main/java/com/fdkankan/fusion/config/WebAppConfig.java

@@ -24,7 +24,7 @@ public class WebAppConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**")
-				.excludePathPatterns("/**/fdLogin/**","/test/**","/**/list/**","/**allLis/**");
+				.excludePathPatterns("/**/fdLogin/**","/test/**","/**/list/**","/**allLis/**","/**/sceneList/**");
 		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -138,7 +138,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             if("las".equals(model.getModelType()) || "ply".equals(model.getModelType()) ){
                 mntFile =  OBJToGLBUtil.lasOrPlyToBin(file1);
                 glbOssPath = mntFile.getPath().replace("/mnt/","")+"/webcloud";
-                uploadToOssUtil.uploadFileOss(mntFile ,glbOssPath);
+                uploadToOssUtil.uploadFileOss(mntFile );
             }
 
             model.setModelObjUrl(objPath);