From ac31382d554d8926cfb93b3bf2145dd7a6065ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <machaop@dcits.com>
Date: Thu, 9 Apr 2020 23:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mac/scp/controller/FileController.java    | 10 +++++-----
 .../src/main/java/com/mac/scp/domain/FileBean.java     | 10 ++++++++++
 file-web/src/main/resources/application.properties     |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/file-web/src/main/java/com/mac/scp/controller/FileController.java b/file-web/src/main/java/com/mac/scp/controller/FileController.java
index 91cbde7..402bccd 100644
--- a/file-web/src/main/java/com/mac/scp/controller/FileController.java
+++ b/file-web/src/main/java/com/mac/scp/controller/FileController.java
@@ -100,15 +100,15 @@ public class FileController {
      */
     @RequestMapping(value = "/batchdeletefile", method = RequestMethod.POST)
     @ResponseBody
-    public RestResult<String> deleteImageByIds(@RequestBody String files) {
+    public RestResult<String> deleteImageByIds(@RequestBody FileBean fileBean) {
         RestResult<String> result = new RestResult<String>();
         if (!operationCheck().isSuccess()) {
             return operationCheck();
         }
 
-        List<FileBean> fileList = JSON.parseArray(files, FileBean.class);
+        List<FileBean> fileList = JSON.parseArray(fileBean.getFiles(), FileBean.class);
 
-        for (FileBean fileBean : fileList) {
+        for (FileBean file : fileList) {
             fileService.deleteFile(fileBean);
         }
 
@@ -270,14 +270,14 @@ public class FileController {
      */
     @RequestMapping(value = "/selectfilebyfiletype", method = RequestMethod.GET)
     @ResponseBody
-    public RestResult<List<FileBean>> selectFileByFileType(@RequestParam int fileType) {
+    public RestResult<List<FileBean>> selectFileByFileType(FileBean fileBean) {
         RestResult<List<FileBean>> result = new RestResult<List<FileBean>>();
         UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal();
         long userid = sessionUserBean.getUserId();
         if (isShareFile){
             userid = 2;
         }
-        List<FileBean> file = fileService.selectFileByExtendName(getFileExtendsByType(fileType), userid);
+        List<FileBean> file = fileService.selectFileByExtendName(getFileExtendsByType(fileBean.getFiletype()), userid);
         result.setData(file);
         result.setSuccess(true);
         return result;
diff --git a/file-web/src/main/java/com/mac/scp/domain/FileBean.java b/file-web/src/main/java/com/mac/scp/domain/FileBean.java
index 2b39bf5..38df60e 100644
--- a/file-web/src/main/java/com/mac/scp/domain/FileBean.java
+++ b/file-web/src/main/java/com/mac/scp/domain/FileBean.java
@@ -79,6 +79,16 @@ public class FileBean {
     private String newfilepath;
     @Transient
     private String files;
+    @Transient
+    private int filetype;
+
+    public int getFiletype() {
+        return filetype;
+    }
+
+    public void setFiletype(int filetype) {
+        this.filetype = filetype;
+    }
 
     public String getOldfilepath() {
         return oldfilepath;
diff --git a/file-web/src/main/resources/application.properties b/file-web/src/main/resources/application.properties
index ebd3971..17b83d2 100644
--- a/file-web/src/main/resources/application.properties
+++ b/file-web/src/main/resources/application.properties
@@ -22,7 +22,7 @@ mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.url = jdbc:mysql://localhost:3306/file?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
 spring.datasource.username=root
-spring.datasource.password=macpassword123
+spring.datasource.password=ma123456
 
 #数据库初始化
 spring.datasource.data=classpath:database/data.sql