diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/FileController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/FileController.java index 6aa471e9..7bb7692c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/FileController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/FileController.java @@ -1,6 +1,5 @@ package com.mdd.admin.controller; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IFileService; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IFileService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IFileService.java index 02ca8a48..e151e967 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IFileService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IFileService.java @@ -1,6 +1,5 @@ package com.mdd.admin.service; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.mdd.admin.validate.file.FileCateValidate; import com.mdd.admin.validate.file.FileSearchValidate; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FileServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FileServiceImpl.java index 953ae237..6bf47ce6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FileServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FileServiceImpl.java @@ -75,7 +75,7 @@ public class FileServiceImpl implements IFileService { IPage iPage = fileMapper.selectPage(new Page<>(page, limit), queryWrapper); String engine = ConfigUtils.get("storage", "default", "local"); - engine = engine.equals("") ? "local" : engine; + engine = engine.isEmpty() ? "local" : engine; List list = new ArrayList<>(); for (File file : iPage.getRecords()) { diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/file/FileCateValidate.java b/server/like-common/src/main/java/com/mdd/admin/validate/file/FileCateValidate.java similarity index 100% rename from server/like-admin/src/main/java/com/mdd/admin/validate/file/FileCateValidate.java rename to server/like-common/src/main/java/com/mdd/admin/validate/file/FileCateValidate.java diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/file/FileMoveValidate.java b/server/like-common/src/main/java/com/mdd/admin/validate/file/FileMoveValidate.java similarity index 100% rename from server/like-admin/src/main/java/com/mdd/admin/validate/file/FileMoveValidate.java rename to server/like-common/src/main/java/com/mdd/admin/validate/file/FileMoveValidate.java diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/file/FileRenameValidate.java b/server/like-common/src/main/java/com/mdd/admin/validate/file/FileRenameValidate.java similarity index 100% rename from server/like-admin/src/main/java/com/mdd/admin/validate/file/FileRenameValidate.java rename to server/like-common/src/main/java/com/mdd/admin/validate/file/FileRenameValidate.java diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/file/FileSearchValidate.java b/server/like-common/src/main/java/com/mdd/admin/validate/file/FileSearchValidate.java similarity index 100% rename from server/like-admin/src/main/java/com/mdd/admin/validate/file/FileSearchValidate.java rename to server/like-common/src/main/java/com/mdd/admin/validate/file/FileSearchValidate.java diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/FileServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/FileServiceImpl.java index 81abaff1..00ac0fd6 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/FileServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/FileServiceImpl.java @@ -1,26 +1,11 @@ package com.mdd.front.service.impl; -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.mdd.common.config.GlobalConfig; -import com.mdd.common.core.PageResult; import com.mdd.common.entity.file.File; -import com.mdd.common.entity.file.FileCate; -import com.mdd.common.mapper.album.FileCateMapper; import com.mdd.common.mapper.album.FileMapper; -import com.mdd.common.util.*; import com.mdd.front.service.IFileService; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; import java.util.Map; /** @@ -32,14 +17,11 @@ public class FileServiceImpl implements IFileService { @Resource FileMapper fileMapper; - @Resource - FileCateMapper fileCateMapper; - /** * 文件新增 * - * @author fzr * @param params 文件信息参数 + * @author fzr */ @Override public Integer fileAdd(Map params) {