diff --git a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java index 108616e..9bf7558 100644 --- a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -54,6 +54,7 @@ public class SecurityConfig { .requestMatchers("/user/login").anonymous() .requestMatchers("/user/code").permitAll() .requestMatchers("/sms/resetPassword").permitAll() + .requestMatchers("/tempFile/**").permitAll() .requestMatchers("/system/user/auditUser").permitAll() .requestMatchers("/eng/**").permitAll() .requestMatchers("/env/**").permitAll() diff --git a/backend/src/main/java/com/yfd/platform/config/WebConfig.java b/backend/src/main/java/com/yfd/platform/config/WebConfig.java index 45b051a..8356277 100644 --- a/backend/src/main/java/com/yfd/platform/config/WebConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/WebConfig.java @@ -4,6 +4,7 @@ import cn.hutool.cache.Cache; import cn.hutool.cache.CacheUtil; import lombok.SneakyThrows; import jakarta.annotation.Resource; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; @@ -17,6 +18,9 @@ public class WebConfig implements WebMvcConfigurer { @Resource private FileSpaceProperties fileSpaceProperties; + @Value("${app.zip-import.temp-dir}") + private String platformPath; + @Bean @@ -54,7 +58,8 @@ public class WebConfig implements WebMvcConfigurer { String systemUrl = "file:" + fileSpaceProperties.getSystem().replace("\\", "/")+"user\\"; registry.addResourceHandler("/avatar/**").addResourceLocations(systemUrl).setCachePeriod(0); - + String platformUrl = "file:" + platformPath.replace("\\", "/"); + registry.addResourceHandler("/tempFile/**").addResourceLocations(platformUrl).setCachePeriod(0); } diff --git a/backend/src/main/java/com/yfd/platform/data/utils/ZipFileUtil.java b/backend/src/main/java/com/yfd/platform/data/utils/ZipFileUtil.java index 4d921e9..3fdd10e 100644 --- a/backend/src/main/java/com/yfd/platform/data/utils/ZipFileUtil.java +++ b/backend/src/main/java/com/yfd/platform/data/utils/ZipFileUtil.java @@ -35,9 +35,9 @@ public class ZipFileUtil { } String os = System.getProperty("os.name").toLowerCase(); if (os.contains("win")) { - return "D:\\zip_import_temp"; + return "D:\\qgc-platform\\zip_import_temp"; } else { - return "/tmp/zip_import_temp"; + return "/qgc-platform/tmp/zip_import_temp"; } } diff --git a/backend/src/main/resources/application-dev.yml b/backend/src/main/resources/application-dev.yml index 8d16f53..1df2467 100644 --- a/backend/src/main/resources/application-dev.yml +++ b/backend/src/main/resources/application-dev.yml @@ -55,7 +55,7 @@ login: app: # ZIP导入临时目录配置 zip-import: - temp-dir: ${ZIP_IMPORT_TEMP_DIR:D:\zip_import_temp} + temp-dir: ${ZIP_IMPORT_TEMP_DIR:D:\qgc-platform\zip_import_temp} init: enabled: false schema: classpath:db-init/sql/min-schema.sql @@ -82,8 +82,8 @@ ip: file-space: #项目文档空间 - files: D:\demoproject\files\ #单独上传的文件附件 - system: D:\demoproject\system\ #单独上传的文件 + files: D:\qgc-platform\files\ #单独上传的文件附件 + system: D:\qgc-platform\system\ #单独上传的文件 task: pool: diff --git a/backend/src/main/resources/application-devtw.yml b/backend/src/main/resources/application-devtw.yml index 25aaddf..b88605e 100644 --- a/backend/src/main/resources/application-devtw.yml +++ b/backend/src/main/resources/application-devtw.yml @@ -77,7 +77,7 @@ login: app: # ZIP导入临时目录配置 zip-import: - temp-dir: ${ZIP_IMPORT_TEMP_DIR:D:\zip_import_temp} + temp-dir: ${ZIP_IMPORT_TEMP_DIR:D:\qgc-platform\zip_import_temp} init: enabled: false schema: classpath:db-init/sql/min-schema.sql diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml index dc2e84b..a9e6495 100644 --- a/backend/src/main/resources/application-prod.yml +++ b/backend/src/main/resources/application-prod.yml @@ -77,7 +77,7 @@ login: app: # ZIP导入临时目录配置 zip-import: - temp-dir: ${ZIP_IMPORT_TEMP_DIR:/tmp/zip_import_temp} + temp-dir: ${ZIP_IMPORT_TEMP_DIR:/qgc-platform/tmp/zip_import_temp} init: enabled: false schema: classpath:db-init/sql/min-schema.sql @@ -104,8 +104,8 @@ ip: file-space: #项目文档空间 - files: D:\demoproject\files\ #单独上传的文件附件 - system: D:\demoproject\system\ #单独上传的文件 + files: /qgc-platform/files/ #单独上传的文件附件 + system: /qgc-platform/system/ #单独上传的文件 task: pool: