冲突提交

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/dfs/FastDFSController.java

@@ -351,7 +351,7 @@ public class FastDFSController extends EnvelopRestEndpoint {
        response.setDateHeader("Expire", 0);
        try {
            // 由于是读取本机的文件，file是一定要加上的， path是在application配置文件中的路径
            Resource resource = resourceLoader.getResource("file:" + img_path + fileName);
            Resource resource = resourceLoader.getResource("file:" + img_path1 + fileName);
            File file = resource.getFile();
            FileInputStream fis;
            fis = new FileInputStream(file);