Browse Source

移除数据库配置,上传文件不保存到数据库

陈长荣 2 months ago
parent
commit
c9f80c4bb4

+ 1 - 21
pom.xml

@@ -51,16 +51,7 @@
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
             <version>3.1.5</version>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.2.4</version>
-        </dependency>
+
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
@@ -91,17 +82,6 @@
             <version>${hutool.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>

+ 0 - 2
src/main/java/com/github/jfcloud/excel/editor/docdeal/DocDealApplication.java

@@ -1,6 +1,5 @@
 package com.github.jfcloud.excel.editor.docdeal;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -8,7 +7,6 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 //启动类
 @SpringBootApplication
 @EnableAspectJAutoProxy
-@MapperScan("com.github.jfcloud.excel.editor.docdeal.mapper")
 public class DocDealApplication {
 
     public static void main(String[] args) {

+ 13 - 15
src/main/java/com/github/jfcloud/excel/editor/docdeal/bean/FileUpload.java

@@ -1,33 +1,31 @@
 package com.github.jfcloud.excel.editor.docdeal.bean;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import ch.qos.logback.core.util.FileSize;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
 
 @Data
-@ToString
 @Accessors(chain = true)
-@TableName("onlyoffice_file_info")
 public class FileUpload {
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-    @TableField("file_name")
     private String fileName;
-    @TableField(value = "file_size")
+
     private Long fileSize;
-    @TableField(value = "file_type")
+
+    private String fileSizeStr;
+
     private String fileType;
-    @TableField(value = "file_path")
+
     private String filePath;
-    @TableField(value = "upload_date")
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date uploadDate;
+    private Date uploadDate = new Date();
+
+    public void setFileSize(Long fileSize) {
+        this.fileSize = fileSize;
+        this.fileSizeStr = new FileSize(fileSize).toString();
+    }
 }

+ 0 - 20
src/main/java/com/github/jfcloud/excel/editor/docdeal/controller/FileController.java

@@ -11,7 +11,6 @@ import com.github.jfcloud.excel.editor.docdeal.bean.FileUpload;
 import com.github.jfcloud.excel.editor.docdeal.bean.PreviewVo;
 import com.github.jfcloud.excel.editor.docdeal.oss.OssProperties;
 import com.github.jfcloud.excel.editor.docdeal.oss.service.OssTemplate;
-import com.github.jfcloud.excel.editor.docdeal.service.FileUploadService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -20,8 +19,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Date;
-import java.util.List;
 
 @Slf4j
 @Controller
@@ -31,9 +28,6 @@ public class FileController {
     @Autowired
     OssProperties ossProperties;
 
-    @Autowired
-    private FileUploadService uploadService;
-
     @ResponseBody
     @PostMapping(value = "upload")
     public FileUpload upload(@RequestPart("file") MultipartFile file, @RequestParam(required = false) String bucket) throws Exception {
@@ -52,13 +46,10 @@ public class FileController {
         log.info("上传文档已保存,bucket={} name={}", bucket, fileName);
 
         FileUpload upload = new FileUpload();
-        upload.setUploadDate(new Date());
         upload.setFileType(FileNameUtil.getSuffix(fileName));
         upload.setFilePath(String.format("/admin/sys-file/%s/%s", bucket, fileName));
         upload.setFileName(file.getOriginalFilename());
         upload.setFileSize(file.getSize());
-        uploadService.save(upload);
-
         return upload;
     }
 
@@ -102,15 +93,4 @@ public class FileController {
         }
     }
 
-    /**
-     * 查询所有上传文档信息接口
-     *
-     * @return
-     */
-    @GetMapping("/filelist")
-    @ResponseBody
-    public List<FileUpload> listFile() {
-        return uploadService.lambdaQuery().orderByDesc(FileUpload::getUploadDate).list();
-    }
-
 }

+ 0 - 8
src/main/java/com/github/jfcloud/excel/editor/docdeal/mapper/FileUploadMapper.java

@@ -1,8 +0,0 @@
-package com.github.jfcloud.excel.editor.docdeal.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.jfcloud.excel.editor.docdeal.bean.FileUpload;
-
-public interface FileUploadMapper extends  BaseMapper<FileUpload>{
-
-}

+ 0 - 8
src/main/java/com/github/jfcloud/excel/editor/docdeal/service/FileUploadService.java

@@ -1,8 +0,0 @@
-package com.github.jfcloud.excel.editor.docdeal.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.jfcloud.excel.editor.docdeal.bean.FileUpload;
-
-public interface FileUploadService extends IService<FileUpload> {
-
-}

+ 0 - 13
src/main/java/com/github/jfcloud/excel/editor/docdeal/service/impl/FileUploadServiceImpl.java

@@ -1,13 +0,0 @@
-package com.github.jfcloud.excel.editor.docdeal.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.jfcloud.excel.editor.docdeal.bean.FileUpload;
-import com.github.jfcloud.excel.editor.docdeal.mapper.FileUploadMapper;
-import com.github.jfcloud.excel.editor.docdeal.service.FileUploadService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class FileUploadServiceImpl extends ServiceImpl<FileUploadMapper, FileUpload> implements FileUploadService {
-
-
-}

+ 0 - 6
src/main/resources/mapper/FileUploadMapper.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.github.jfcloud.excel.editor.docdeal.mapper.FileUploadMapper">
-
-
-</mapper>