更新为本地存储

gis_application/src/main/resources/application-dev.properties

@@ -56,6 +56,7 @@ logging.level.com.gis=debug
 
 # file info
 server.file.path=E:\\data\\${project.en}_data\\
+server.domain=http://127.0.0.1:8001
 
 spring.mvc.static-path-pattern=/**
 ### \u5339\u914D\u8DEF\u5F84\uFF0C \u6CE8\u610Ffile\u540E\u9762\u7684/ \uFF0Cwindows:\\  , linxu:\u5168\u8DEF\u5F84, \u4E0D\u9700\u8981\u7279\u522B\u52A0\u659C\u6760

gis_application/src/main/resources/application-pro.properties

@@ -60,7 +60,8 @@ logging.level.com.gis=info
 
 
 # file info
-server.file.path=/root/data/${project.en}_data/
+server.file.path=/home/data/${project.en}_data/
+server.domain=http://8.135.106.227:8001
 
 ## url prefix
 #server.url.prefix=/data/

gis_application/src/main/resources/application-sit.properties

@@ -55,7 +55,8 @@ logging.level.com.gis=info
 
 
 # file info
-server.file.path=/root/data/${project.en}_data/
+server.file.path=/home/data/${project.en}_data/
+server.domain=http://8.135.106.227:8001
 
 spring.mvc.static-path-pattern=/**
 ### \u5339\u914D\u8DEF\u5F84\uFF0C \u6CE8\u610Ffile\u540E\u9762\u7684/ \uFF0Cwindows:\\  , linxu:\u5168\u8DEF\u5F84, \u4E0D\u9700\u8981\u7279\u522B\u52A0\u659C\u6760

gis_application/src/main/resources/application.properties

@@ -8,6 +8,10 @@ project.sc=\u5927\u7406\u535A\u7269\u9986
 # redis token \u524D\u7F00
 redis.prefix=${project.en}_token_
 
+# \u5141\u8BB8\u4E0A\u4F20\u6587\u4EF6\u540E\u7F00
+server.file.allow=.jpg,.gif,.png,.ico,.bmp,.jpeg,.zip,.zp,.rar,.mp3,.mp4,.avi,.mov,.flv,.3gp,.rmvb,.4dage,.wav,.wma,.m4a,.obj,.pdf,.audio,.ppt,.pptx,.xls,.xlsx,.doc,.docx,.txt,.xmind
+
+
 
 
 # \u8BBF\u95EE\u9759\u6001\u8D44\u6E90\u8BBE\u7F6E

gis_common/src/main/java/com/gis/common/constant/ConfigConstant.java

@@ -15,6 +15,9 @@ public class ConfigConstant {
     @Value("${server.file.path}")
     public  String serverBasePath;
 
+    @Value("${server.file.allow}")
+    public String serverFileFallow;
+
     /**redis token前缀*/
     @Value("${redis.prefix}")
     public  String redisPrefix;
@@ -23,11 +26,11 @@ public class ConfigConstant {
 //    @Value("${file.allow}")
 //    public String fileAllow;
 
-//    @Value("${project.en}")
-//    public String projectEn;
+    @Value("${project.en}")
+    public String projectEn;
 
-//    @Value("${project.name}")
-//    public String serverDomain;
+    @Value("${project.name}")
+    public String serverDomain;
 
     @Value("${oss.point}")
     public  String ossPoint;
@@ -65,4 +68,7 @@ public class ConfigConstant {
 
 
 
+
+
+
 }

gis_common/src/main/java/com/gis/common/util/DateUtils.java

@@ -0,0 +1,69 @@
+package com.gis.common.util;
+
+import cn.hutool.core.date.DateUtil;
+import org.junit.Test;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Created by owen on 2022/4/8 0008 14:32
+ */
+public class DateUtils extends DateUtil {
+
+    private static String YYYY_MM = "yyyy-MM";
+
+    private static String YYYYMM = "yyyyMM";
+
+    private static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    private static String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";
+
+
+    private static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    private static String YYYYMMDD_HHMMSSSSS = "yyyyMMdd_HHmmssSSS";
+
+    private static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+
+    /**
+     * 获取当前月
+     * @return
+     */
+    public static String getMonth(){
+        return format(LocalDateTime.now(), YYYYMM);
+    }
+
+    /**
+     * 获取当前月份的前几个月
+     * @param month
+     * @return
+     */
+    public static String minusMonths(int month){
+        return format(LocalDateTime.now().minusMonths(month), YYYYMM);
+    }
+
+    /**
+     * 获取当前时间戳
+     * @return
+     */
+    public static String getDateTime(){
+        return format(LocalDateTime.now(), YYYYMMDD_HHMMSSSSS);
+    }
+
+
+    /**
+     * 字符串转LocalDateTime
+     * @param time 字符串
+     * @return LocalDateTime
+     */
+    public static LocalDateTime srtToLocalDateTime(String time){
+        return LocalDateTime.parse(time, DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM));
+    }
+
+    @Test
+    public void test(){
+        System.out.println(srtToLocalDateTime("2022-02-16 12:26"));
+    }
+}

gis_common/src/main/java/com/gis/common/util/FileUtils2.java

@@ -0,0 +1,242 @@
+package com.gis.common.util;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
+import com.gis.common.constant.ConfigConstant;
+import com.gis.common.exception.BaseRuntimeException;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+/**
+ * Created by owen on 2020/5/12 0012 17:21
+ */
+@Slf4j
+@Component
+public class FileUtils2 {
+
+    @Autowired
+    ConfigConstant configConstant;
+
+    // 确保同一时间上传文件的唯一性
+    private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger();
+
+    public boolean checkFile(MultipartFile file) {
+        //设置允许上传文件类型
+        String suffixList = configConstant.serverFileFallow;
+        // 获取文件后缀
+        if(file == null){
+            log.error("文件流为空不可上传");
+            return false;
+        }
+        String fileName = file.getOriginalFilename();
+        String suffix = fileName.substring(fileName.lastIndexOf(".")
+                + 1, fileName.length());
+        if (suffixList.contains(suffix.trim().toLowerCase())) {
+            log.info("无非法参数可以放行！！！");
+            return true;
+        }
+        log.error("存在非法参数不能放行！请核对上传文件格式，重新刷新页面再次上传！输入文件后缀： {}", suffix);
+        return false;
+    }
+
+
+    /**
+     *
+     * @param file
+     * @param isPinYinRename false:时间戳重命名， true：用拼音重名文件
+     * @param savePath 保存地址(前面有斜杠， 后面没有)，没有文件名
+     * @return 文件名
+     */
+    public String upload(MultipartFile file, String savePath, boolean isPinYinRename) {
+
+        // 检查非法文件上传
+        boolean checkFile = this.checkFile(file);
+        if (!checkFile) {
+            throw new BaseRuntimeException("上传文件格式有误, 请重新上传");
+        }
+
+        // 文件目录
+        String fileName = file.getOriginalFilename();
+        String newName;
+        if (isPinYinRename){
+             newName = RegexUtil.getPinyinName(fileName);
+        } else {
+            String suffix = StrUtil.subAfter(fileName, ".", true);
+            newName =  DateUtils.getDateTime() + ATOMIC_INTEGER.incrementAndGet() + "." + suffix;
+        }
+
+        savePath = configConstant.serverBasePath + savePath + "/" + newName;
+        log.info("保存文件地址：{}", savePath);
+
+        try {
+            FileUtil.writeFromStream(file.getInputStream(), savePath);
+            return newName;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     *
+     * @param file
+     * @param isPinYinRename false:时间戳重命名， true：用拼音重名文件
+     * @param savePath 保存地址(前面有斜杠， 后面没有)，没有文件名
+     * @return map
+     */
+    public Map<String, Object> uploadMap(MultipartFile file, String savePath, boolean isPinYinRename) {
+        String newName = this.upload(file, savePath, isPinYinRename);
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("fileName", doFileName(file.getOriginalFilename()));
+        result.put("filePath", savePath + "/" + newName);
+        // 单位KB
+        result.put("fileSize", (file.getSize() / 1024));
+        return result;
+
+    }
+
+
+    /**
+     * 2023-09-26
+     * 临时使用， 为了改bug
+     * @param file
+     * @param savePath
+     * @param isPinYinRename
+     */
+    public HashMap<String, Object> uploadOss(MultipartFile file, String savePath, boolean isPinYinRename) {
+        String newName = this.upload(file, savePath, isPinYinRename);
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("fileName", doFileName(file.getOriginalFilename()));
+        result.put("filePath", savePath + "/" + newName);
+        Object filePath = result.get("filePath");
+
+        result.put("ossUrl", configConstant.serverDomain  + filePath);
+        result.put("ossPath", filePath);
+        // 单位KB
+        result.put("fileSize", (file.getSize() / 1024));
+        return result;
+    }
+
+
+    /**
+     * 处理文件名过长问题
+     * @param fileName
+     * @return
+     */
+    public String doFileName(String fileName){
+        int length = fileName.length();
+        // 名字长度少于32位不处理
+        if (length < 32){
+            return fileName;
+        }
+
+        // 后缀
+        String suffix = StrUtil.subAfter(fileName, ".", true);
+        // 前缀
+        String sub = StrUtil.sub(fileName, 0, 30);
+        return sub + "." + suffix;
+
+    }
+
+    /**
+     * 真删除文件
+     * @param path 参数是相对地址
+     */
+    public void del(String path){
+        if (StrUtil.isBlank(path)){
+            return;
+        }
+        log.info("path: {}", path);
+        // 过滤 路径为/////, 后面必须跟非斜杠字符
+        String regex = "^[/|\\\\]{1,2}[^/|\\\\]\\S";
+        if (!ReUtil.contains(regex, path)){
+            log.warn("非法路径删除：{}", path);
+            return;
+        }
+
+        String delPath = configConstant.serverBasePath + path;
+        FileUtil.del(delPath);
+        log.info("真删除文件： {}", delPath);
+    }
+
+    /**
+     * 路径必须包含中文或字母或符号
+     * @throws Exception
+     */
+    @Test
+    public void re() throws Exception {
+
+        System.out.println("/");
+        System.out.println("//");
+        System.out.println("///");
+        System.out.println("\\");
+        System.out.println("\\\\");
+        System.out.println("\\\\\\");
+//        String regex = "^[/|\\\\]{0,2}\\S";
+//        String regex = "^[/|\\\\](\\S+/?)+$";
+        String regex = "^[/|\\\\]{1,2}[^/|\\\\]\\S";
+
+
+//        String path = "\\qq\\aaa";
+//        String path = "/年后\\aaa";
+        String path = "//aaa";
+        System.out.println(path);
+        System.out.println(ReUtil.contains(regex, path));
+
+    }
+
+
+    @Test
+    public void test1() throws Exception {
+        File file = new File("E:\\桌面\\fsdownload\\1.jpg");
+        //字节输入流
+        InputStream fis = new FileInputStream(file);
+        //字节输出流
+        OutputStream fos = new FileOutputStream(file);
+
+        //字符输入流
+        Reader reader = new FileReader(file);
+        //字符输出流
+        Writer writer = new FileWriter(file);
+
+        //字节缓冲流
+        BufferedInputStream bis = new BufferedInputStream(fis);
+        BufferedOutputStream bos = new BufferedOutputStream(fos);
+
+        //字符缓冲流
+        BufferedReader bufferedReader = new BufferedReader(reader);
+        BufferedWriter bufferedWriter = new BufferedWriter(writer);
+
+        //转换流 字节流转字符流
+        InputStreamReader isr = new InputStreamReader(fis);
+        OutputStreamWriter osw = new OutputStreamWriter(fos);
+
+        //打印流
+        PrintWriter printWriter = new PrintWriter(file);
+        PrintStream printStream = new PrintStream(file);
+
+        //了解 什么时候使用过
+        InputStream in = System.in;
+        System.out.println(in);
+        PrintStream out = System.out;
+        System.out.println(out);
+
+    }
+
+
+
+
+    // jar包运行，只能用文件流的形式获取文件
+
+
+}

gis_service/src/main/java/com/gis/service/impl/ActivityServiceImpl.java

@@ -3,6 +3,7 @@ package com.gis.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.util.AliYunOssUtil;
+import com.gis.common.util.FileUtils2;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ActivityDto;
 import com.gis.domain.dto.TypePageDto;
@@ -22,6 +23,7 @@ import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -45,6 +47,9 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
     @Autowired
     AliYunOssUtil aliyunOssUtil;
 
+    @Autowired
+    FileUtils2 fileUtils2;
+
     @Override
     public IBaseMapper<ActivityEntity, Long> getBaseMapper() {
         return this.entityMapper;
@@ -127,14 +132,16 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
         if (StringUtils.isBlank(code)) {
             code = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         }
-        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "activity/" + code + "/");
+//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "activity/" + code + "/");
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/activity/", false);
         result.put("code", code);
         return Result.success(result);
     }
 
     @Override
     public Result uploadVideo(MultipartFile file) {
-        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "activity/video/", 500);
+//        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "activity/video/", 500);
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/activity/video/", true);
         return Result.success(result);
     }
 

gis_service/src/main/java/com/gis/service/impl/BookServiceImpl.java

@@ -1,6 +1,7 @@
 package com.gis.service.impl;
 
 import com.gis.common.util.AliYunOssUtil;
+import com.gis.common.util.FileUtils2;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.BookDto;
 import com.gis.domain.dto.PageDto;
@@ -17,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Condition;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +35,9 @@ public class BookServiceImpl extends IBaseServiceImpl<BookEntity, Long> implemen
     @Autowired
     AliYunOssUtil aliyunOssUtil;
 
+    @Autowired
+    FileUtils2 fileUtils2;
+
     @Override
     public IBaseMapper<BookEntity, Long> getBaseMapper() {
         return this.entityMapper;
@@ -87,7 +92,8 @@ public class BookServiceImpl extends IBaseServiceImpl<BookEntity, Long> implemen
 
     @Override
     public Result upload(MultipartFile file) {
-        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "book/");
+//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "book/");
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/book/", false);
         return Result.success(result);
     }
 

gis_service/src/main/java/com/gis/service/impl/ExhibitionServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
 import com.gis.common.util.AliYunOssUtil;
+import com.gis.common.util.FileUtils2;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ExhibitionDto;
 import com.gis.domain.dto.TypePageDto;
@@ -54,6 +55,9 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
     @Autowired
     FileService fileService;
 
+    @Autowired
+    FileUtils2 fileUtils2;
+
 
 
 
@@ -119,7 +123,8 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
             code = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         }
 
-        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "exhibition/" + code + "/");
+//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "exhibition/" + code + "/");
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/exhibition/", false);
         FileEntity entity = new FileEntity();
         entity.setModule(TypeCode.MODULE_EXHIBITION);
         entity.setName(result.get("fileName").toString());
@@ -133,7 +138,8 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
 
     @Override
     public Result uploadVideo(MultipartFile file) {
-        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "exhibition/video/", 500);
+//        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "exhibition/video/", 500);
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/exhibition/", true);
         return Result.success(result);
     }
 

gis_service/src/main/java/com/gis/service/impl/GoodsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.gis.service.impl;
 
 import com.gis.common.util.AliYunOssUtil;
+import com.gis.common.util.FileUtils2;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.GoodsDto;
 import com.gis.domain.dto.GoodsPageDto;
@@ -40,6 +41,9 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
     @Autowired
     AliYunOssUtil aliyunOssUtil;
 
+    @Autowired
+    FileUtils2 fileUtils2;
+
 
 
 
@@ -73,7 +77,8 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
 
     @Override
     public Result upload(MultipartFile file) {
-        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "goods/thumb/");
+//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "goods/thumb/");
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/goods/thumb/", false);
         return Result.success(result);
     }
 

gis_service/src/main/java/com/gis/service/impl/GuideServiceImpl.java

@@ -54,21 +54,4 @@ public class GuideServiceImpl extends IBaseServiceImpl<GuideEntity, Long> implem
 
     }
 
-
-
-
-
-
-//    @Override
-//    public Result findByid(String type) {
-//        GuideEntity entity = entityMapper.findByType(type);
-//        return Result.success(entity);
-//    }
-
-
-//    @Override
-//    public Result upload(MultipartFile file) {
-//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "slideshow/");
-//        return Result.success(result);
-//    }
 }

gis_service/src/main/java/com/gis/service/impl/IBaseServiceImpl.java

@@ -72,12 +72,6 @@ public abstract class IBaseServiceImpl<T extends BaseEntity, ID extends Serializ
         return getBaseMapper().selectByCondition(condition);
     }
 
-//    public List<T> findAllDesc(){
-//        Condition condition = new Condition(entityClass);
-//        condition.and().andEqualTo("isDelete", 0);
-//        condition.orderBy("createTime").desc();
-//        return getBaseMapper().selectByCondition(condition);
-//    }
 
 
     /**

gis_service/src/main/java/com/gis/service/impl/MuseumInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.gis.service.impl;
 
 import com.gis.common.util.AliYunOssUtil;
+import com.gis.common.util.FileUtils2;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.MuseumInfoDto;
 import com.gis.domain.po.MuseumInfoEntity;
@@ -15,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.Map;
 
 
@@ -41,6 +43,9 @@ public class MuseumInfoServiceImpl extends IBaseServiceImpl<MuseumInfoEntity, Lo
     @Autowired
     FileService fileService;
 
+    @Autowired
+    FileUtils2 fileUtils2;
+
 
 
 
@@ -84,7 +89,8 @@ public class MuseumInfoServiceImpl extends IBaseServiceImpl<MuseumInfoEntity, Lo
 
     @Override
     public Result upload(MultipartFile file) {
-        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "qrCode/");
+//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "qrCode/");
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/qrCode/", false);
         return Result.success(result);
     }
 

gis_service/src/main/java/com/gis/service/impl/NewsServiceImpl.java

@@ -2,6 +2,7 @@ package com.gis.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.gis.common.util.AliYunOssUtil;
+import com.gis.common.util.FileUtils2;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.NewsDto;
 import com.gis.domain.dto.TypePageDto;
@@ -21,6 +22,7 @@ import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -48,6 +50,8 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
     @Autowired
     FileService fileService;
 
+    @Autowired
+    FileUtils2 fileUtils2;
 
 
 
@@ -117,14 +121,17 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
         if (StringUtils.isBlank(code)) {
              code = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         }
-        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "news/" + code + "/");
+//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "news/" + code + "/");
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/news/", false);
+
         result.put("code", code);
         return Result.success(result);
     }
 
     @Override
     public Result uploadVideo(MultipartFile file) {
-        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "news/video/", 500);
+//        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "news/video/", 500);
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/news/video/", true);
         return Result.success(result);
     }
 

gis_service/src/main/java/com/gis/service/impl/ProfileServiceImpl.java

@@ -85,9 +85,5 @@ public class ProfileServiceImpl extends IBaseServiceImpl<ProfileEntity, Long> im
     }
 
 
-//    @Override
-//    public Result upload(MultipartFile file) {
-//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "slideshow/");
-//        return Result.success(result);
-//    }
+
 }

gis_service/src/main/java/com/gis/service/impl/QuestionGroupServiceImpl.java

@@ -43,8 +43,7 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
     @Autowired
     FileService fileService;
 
-//    @Autowired
-//    AuditLogService auditLogService;
+
 
     @Autowired
     QuestionService questionService;

gis_service/src/main/java/com/gis/service/impl/QuestionServiceImpl.java

@@ -99,24 +99,7 @@ public class QuestionServiceImpl extends IBaseServiceImpl<QuestionEntity, Long>
         return Result.success(entity.getId());
     }
 
-//    private Long saveVo(QuestionDto param){
-//        Long id = param.getId();
-//        QuestionEntity entity = null;
-//        if (id == null) {
-//            entity = new QuestionEntity();
-//            BeanUtils.copyProperties(param, entity);
-//            this.save(entity);
-//        } else {
-//            entity = this.findById(id);
-//            if (entity == null) {
-//                throw new BaseRuntimeException("对象不存在： " + id);
-//            }
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setUpdateTime(LocalDateTime.now());
-//            this.update(entity);
-//        }
-//        return entity.getId();
-//    }
+
 
     @Override
     public Result remove(Long id) {
@@ -131,14 +114,7 @@ public class QuestionServiceImpl extends IBaseServiceImpl<QuestionEntity, Long>
         return  Result.success();
     }
 
-//    @Override
-//    public Result<QuestionEntity> detail(Long id) {
-//        QuestionEntity entity = this.findById(id);
-//        if (entity == null) {
-//            return Result.failure("对象不存在");
-//        }
-//        return  Result.success(entity);
-//    }
+
 
 
 

gis_service/src/main/java/com/gis/service/impl/SlideshowServiceImpl.java

@@ -1,6 +1,7 @@
 package com.gis.service.impl;
 
 import com.gis.common.util.AliYunOssUtil;
+import com.gis.common.util.FileUtils2;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.SlideshowDto;
 import com.gis.domain.po.SlideshowEntity;
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +31,9 @@ public class SlideshowServiceImpl extends IBaseServiceImpl<SlideshowEntity, Long
     @Autowired
     AliYunOssUtil aliyunOssUtil;
 
+    @Autowired
+    FileUtils2 fileUtils2;
+
     @Override
     public IBaseMapper<SlideshowEntity, Long> getBaseMapper() {
         return this.entityMapper;
@@ -84,7 +89,8 @@ public class SlideshowServiceImpl extends IBaseServiceImpl<SlideshowEntity, Long
 
     @Override
     public Result upload(MultipartFile file) {
-        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "slideshow/");
+//        Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "slideshow/");
+        HashMap<String, Object> result = fileUtils2.uploadOss(file, "/museum_dali/slideshow/", false);
         return Result.success(result);
     }
 

gis_web/src/main/java/com/gis/web/controller/CommentController.java

@@ -60,19 +60,7 @@ public class CommentController extends BaseController {
         return Result.success();
     }
 
-//    @ApiOperation("是否显示")
-//    @GetMapping("display/{id}/{display}")
-//    public Result display(@PathVariable Long id, @PathVariable Integer display) {
-//        CommentEntity entity = commentService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setDisplay(display);
-//        commentService.update(entity);
-//        return Result.success();
-//    }
+
 
     @ApiOperation(value = "v0.1-是否显示(支持批量)", notes = "ids多个以逗号隔开")
     @GetMapping("displays/{ids}/{display}")

gis_web/src/main/java/com/gis/web/controller/QuestionGroupController.java

@@ -71,26 +71,7 @@ public class QuestionGroupController {
     }
 
 
-//    @WebControllerLog(description = "题组管理-提审", addDb = true)
-//    @ApiOperation("题组管理-提审")
-//    @GetMapping("apply/{id}")
-//    public Result apply(@PathVariable Long id) {
-//        return entityService.apply(id);
-//    }
-
-//    @WebControllerLog(description = "题组管理-审核", addDb = true)
-//    @ApiOperation(value = "题组管理-审核", notes = "审核状态，1：通过， 0：不通过")
-//    @PostMapping("audit")
-//    public Result apply(@RequestBody AuditDto param) {
-//        return entityService.audit(param);
-//    }
-
-//    @WebControllerLog(description = "题组管理-审核详情")
-//    @ApiOperation("题组管理-审核详情")
-//    @GetMapping("auditDetail/{id}")
-//    public Result auditDetail(@PathVariable Long id) {
-//        return entityService.auditDetail(id);
-//    }
+
 
 
     @WebControllerLog(description = "题组管理-问题新增/修改", addDb = true)