From c1385b50742eba45e1261e8ce25930919234ebda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Tue, 27 Oct 2020 23:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Doss=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/domain/TableQueryBean.java | 27 ------ .../common/operation/EncryptOperation.java | 14 --- .../common/operation/FileOperation.java | 9 -- .../common/oss/AliyunOSSDelete.java | 85 ------------------- file-common/src/main/resources/mybatis.xml | 34 -------- .../com/qiwenshare/file/api/IUserService.java | 9 +- .../qiwenshare/file/mapper/UserMapper.java | 4 - .../qiwenshare/file/service/FileService.java | 3 + .../qiwenshare/file/service/UserService.java | 5 -- .../resources/mybatis/mapper/UserMapper.xml | 32 ------- 10 files changed, 4 insertions(+), 218 deletions(-) delete mode 100644 file-common/src/main/java/com/qiwenshare/common/domain/TableQueryBean.java delete mode 100644 file-common/src/main/java/com/qiwenshare/common/operation/EncryptOperation.java delete mode 100644 file-common/src/main/resources/mybatis.xml diff --git a/file-common/src/main/java/com/qiwenshare/common/domain/TableQueryBean.java b/file-common/src/main/java/com/qiwenshare/common/domain/TableQueryBean.java deleted file mode 100644 index 8fbf6c4..0000000 --- a/file-common/src/main/java/com/qiwenshare/common/domain/TableQueryBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.qiwenshare.common.domain; - -import lombok.Data; - -@Data -public class TableQueryBean { - //key, pageIndex, pageSize, sortField, sortOrder - - private int page; - private int limit; - private int beginCount; - - /** - * 搜索关键词 - */ - private String key; - - /** - * 排序字段 - */ - private String field; - /** - * 排序规则 - */ - private String order; - -} diff --git a/file-common/src/main/java/com/qiwenshare/common/operation/EncryptOperation.java b/file-common/src/main/java/com/qiwenshare/common/operation/EncryptOperation.java deleted file mode 100644 index c3e4b76..0000000 --- a/file-common/src/main/java/com/qiwenshare/common/operation/EncryptOperation.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.qiwenshare.common.operation; - -import org.springframework.util.DigestUtils; - -import java.io.UnsupportedEncodingException; -import java.security.NoSuchAlgorithmException; - -public class EncryptOperation { - - public static String encodeByMd5(String string) throws UnsupportedEncodingException { - return DigestUtils.md5DigestAsHex(string.getBytes("utf-8")); - } - -} \ No newline at end of file diff --git a/file-common/src/main/java/com/qiwenshare/common/operation/FileOperation.java b/file-common/src/main/java/com/qiwenshare/common/operation/FileOperation.java index 732dc08..9d2e233 100644 --- a/file-common/src/main/java/com/qiwenshare/common/operation/FileOperation.java +++ b/file-common/src/main/java/com/qiwenshare/common/operation/FileOperation.java @@ -345,15 +345,6 @@ public class FileOperation { return res; } - public static void main(String[] args) { - try { -// unrar(new File("C:\\Users\\MACHAOP\\Desktop\\Oracle资料.rar"), "C:\\Users\\MACHAOP\\Desktop\\123"); - unzip(new File("C:\\Users\\MACHAOP\\Desktop\\123.zip"), "C:\\Users\\MACHAOP\\Desktop\\123"); - } catch (Exception e) { - e.printStackTrace(); - } - } - public static long deleteFileFromDisk(String fileurl) { String fileUrl = PathUtil.getStaticPath() + fileurl; String extendName = FileUtil.getFileType(fileUrl); diff --git a/file-common/src/main/java/com/qiwenshare/common/oss/AliyunOSSDelete.java b/file-common/src/main/java/com/qiwenshare/common/oss/AliyunOSSDelete.java index 70f01ef..a21ac15 100644 --- a/file-common/src/main/java/com/qiwenshare/common/oss/AliyunOSSDelete.java +++ b/file-common/src/main/java/com/qiwenshare/common/oss/AliyunOSSDelete.java @@ -52,89 +52,4 @@ public class AliyunOSSDelete { } -// -// public static void main(String[] args) { -// -// -// -// // 生成OSSClient，您可以指定一些参数，详见“SDK手册 > Java-SDK > 初始化”， -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/init.html?spm=5176.docoss/sdk/java-sdk/get-start -// OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); -// -// try { -// -// // 判断Bucket是否存在。详细请参看“SDK手册 > Java-SDK > 管理Bucket”。 -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/manage_bucket.html?spm=5176.docoss/sdk/java-sdk/init -// if (ossClient.doesBucketExist(bucketName)) { -// System.out.println("您已经创建Bucket：" + bucketName + "。"); -// } else { -// System.out.println("您的Bucket不存在，创建Bucket：" + bucketName + "。"); -// // 创建Bucket。详细请参看“SDK手册 > Java-SDK > 管理Bucket”。 -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/manage_bucket.html?spm=5176.docoss/sdk/java-sdk/init -// ossClient.createBucket(bucketName); -// } -// -// // 查看Bucket信息。详细请参看“SDK手册 > Java-SDK > 管理Bucket”。 -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/manage_bucket.html?spm=5176.docoss/sdk/java-sdk/init -// BucketInfo info = ossClient.getBucketInfo(bucketName); -// System.out.println("Bucket " + bucketName + "的信息如下："); -// System.out.println("\t数据中心：" + info.getBucket().getLocation()); -// System.out.println("\t创建时间：" + info.getBucket().getCreationDate()); -// System.out.println("\t用户标志：" + info.getBucket().getOwner()); -// -// // 把字符串存入OSS，Object的名称为firstKey。详细请参看“SDK手册 > Java-SDK > 上传文件”。 -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/upload_object.html?spm=5176.docoss/user_guide/upload_object -// InputStream is = new ByteArrayInputStream("Hello OSS".getBytes()); -// ossClient.putObject(bucketName, firstKey, is); -// System.out.println("Object：" + firstKey + "存入OSS成功。"); -// -// // 下载文件。详细请参看“SDK手册 > Java-SDK > 下载文件”。 -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/download_object.html?spm=5176.docoss/sdk/java-sdk/manage_object -// OSSObject ossObject = ossClient.getObject(bucketName, firstKey); -// InputStream inputStream = ossObject.getObjectContent(); -// StringBuilder objectContent = new StringBuilder(); -// BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); -// while (true) { -// String line = reader.readLine(); -// if (line == null) -// break; -// objectContent.append(line); -// } -// inputStream.close(); -// System.out.println("Object：" + firstKey + "的内容是：" + objectContent); -// -// // 文件存储入OSS，Object的名称为fileKey。详细请参看“SDK手册 > Java-SDK > 上传文件”。 -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/upload_object.html?spm=5176.docoss/user_guide/upload_object -// String fileKey = "README.md"; -// ossClient.putObject(bucketName, fileKey, new File("README.md")); -// System.out.println("Object：" + fileKey + "存入OSS成功。"); -// -// // 查看Bucket中的Object。详细请参看“SDK手册 > Java-SDK > 管理文件”。 -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/manage_object.html?spm=5176.docoss/sdk/java-sdk/manage_bucket -// ObjectListing objectListing = ossClient.listObjects(bucketName); -// List objectSummary = objectListing.getObjectSummaries(); -// System.out.println("您有以下Object："); -// for (OSSObjectSummary object : objectSummary) { -// System.out.println("\t" + object.getKey()); -// } -// -// // 删除Object。详细请参看“SDK手册 > Java-SDK > 管理文件”。 -// // 链接地址是：https://help.aliyun.com/document_detail/oss/sdk/java-sdk/manage_object.html?spm=5176.docoss/sdk/java-sdk/manage_bucket -// ossClient.deleteObject(bucketName, firstKey); -// System.out.println("删除Object：" + firstKey + "成功。"); -// ossClient.deleteObject(bucketName, fileKey); -// System.out.println("删除Object：" + fileKey + "成功。"); -// -// } catch (OSSException oe) { -// oe.printStackTrace(); -// } catch (ClientException ce) { -// ce.printStackTrace(); -// } catch (Exception e) { -// e.printStackTrace(); -// } finally { -// ossClient.shutdown(); -// } -// -// } - } diff --git a/file-common/src/main/resources/mybatis.xml b/file-common/src/main/resources/mybatis.xml deleted file mode 100644 index c98dc27..0000000 --- a/file-common/src/main/resources/mybatis.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IUserService.java b/file-web/src/main/java/com/qiwenshare/file/api/IUserService.java index 285a41a..03f2036 100644 --- a/file-web/src/main/java/com/qiwenshare/file/api/IUserService.java +++ b/file-web/src/main/java/com/qiwenshare/file/api/IUserService.java @@ -2,8 +2,6 @@ package com.qiwenshare.file.api; import com.baomidou.mybatisplus.extension.service.IService; import com.qiwenshare.common.cbb.RestResult; -import com.qiwenshare.common.domain.TableQueryBean; -import com.qiwenshare.file.domain.FileBean; import com.qiwenshare.file.domain.UserBean; import java.util.List; @@ -104,10 +102,5 @@ public interface IUserService extends IService { - /** - * 获取用户数量 - * @param tableQueryBean 查询条件 - * @return 用户数量 - */ - int selectUserCountByCondition(TableQueryBean tableQueryBean); + } diff --git a/file-web/src/main/java/com/qiwenshare/file/mapper/UserMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/UserMapper.java index 4308404..3d0d2ec 100644 --- a/file-web/src/main/java/com/qiwenshare/file/mapper/UserMapper.java +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/UserMapper.java @@ -1,7 +1,6 @@ package com.qiwenshare.file.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.qiwenshare.common.domain.TableQueryBean; import com.qiwenshare.file.domain.UserBean; @@ -57,9 +56,6 @@ public interface UserMapper extends BaseMapper { List selectAllUserList(); - List selectUserListByCondition(TableQueryBean tableQueryBean); - int selectUserCountByCondition(TableQueryBean tableQueryBean); - } diff --git a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java index 73ad52e..ef62be8 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java @@ -131,6 +131,9 @@ public class FileService extends ServiceImpl implements IF }else{ fileMapper.deleteFileById(fileBean); deleteSize = FileOperation.getFileSize(fileUrl); + if (deleteSize == 0) { + deleteSize = fileBean.getFileSize(); + } //删除服务器文件 if (fileBean.getFileUrl() != null && fileBean.getFileUrl().indexOf("upload") != -1){ if (fileBean.getIsOSS() == 1) { diff --git a/file-web/src/main/java/com/qiwenshare/file/service/UserService.java b/file-web/src/main/java/com/qiwenshare/file/service/UserService.java index c511215..e8d6820 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/UserService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/UserService.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qiwenshare.common.cbb.DateUtil; import com.qiwenshare.common.cbb.RestResult; -import com.qiwenshare.common.domain.TableQueryBean; import com.qiwenshare.common.util.JjwtUtil; import com.qiwenshare.common.util.PasswordUtil; import com.qiwenshare.file.api.IUserService; @@ -306,10 +305,6 @@ public class UserService extends ServiceImpl implements IU - @Override - public int selectUserCountByCondition(TableQueryBean tableQueryBean) { - return userMapper.selectUserCountByCondition(tableQueryBean); - } @Override public void deleteUserInfo(UserBean userBean) { diff --git a/file-web/src/main/resources/mybatis/mapper/UserMapper.xml b/file-web/src/main/resources/mybatis/mapper/UserMapper.xml index de71639..4adf141 100644 --- a/file-web/src/main/resources/mybatis/mapper/UserMapper.xml +++ b/file-web/src/main/resources/mybatis/mapper/UserMapper.xml @@ -79,26 +79,6 @@ - - - - delete from user where userId = #{userId} @@ -145,16 +125,4 @@ - - \ No newline at end of file