Browse Source

apk上传接口

wangtuohang@126.com 2 months ago
parent
commit
c4fdbd3eff

+ 1 - 27
src/main/java/org/springblade/modules/resource/builder/OssBuilder.java

@@ -1,28 +1,3 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
 package org.springblade.modules.resource.builder;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -36,7 +11,6 @@ import org.springblade.core.oss.OssTemplate;
 import org.springblade.core.oss.enums.OssEnum;
 import org.springblade.core.oss.enums.OssStatusEnum;
 import org.springblade.core.oss.props.OssProperties;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.core.tool.utils.WebUtil;
@@ -90,7 +64,7 @@ public class OssBuilder {
 	 * @return OssTemplate
 	 */
 	public OssTemplate template(String code) {
-		String tenantId = AuthUtil.getTenantId();
+		String tenantId = "000000";
 		return template(tenantId, code);
 	}
 

+ 4 - 5
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java

@@ -172,11 +172,12 @@ public class OssEndpoint {
 	 * @param file 文件
 	 * @return ObjectStat
 	 */
-	@SneakyThrows
 	@PostMapping("/put-apk")
-	public R putApk(@RequestParam MultipartFile file) {
-		InputStream inputStream = file.getInputStream();
+	public R putApk(@RequestParam MultipartFile file) throws Exception {
+		// 上传文件到minio
+		BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
 		// 获取md5值
+		InputStream inputStream = file.getInputStream();
 		MessageDigest digest = MessageDigest.getInstance("MD5");
 		byte[] buffer = new byte[1024];
 		int bytesRead;
@@ -185,8 +186,6 @@ public class OssEndpoint {
 		}
 		byte[] md5Bytes = digest.digest();
 		String md5Value = CommonUtil.bytesToHex(md5Bytes);
-		// 上传文件到minio
-		BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), inputStream);
 		// 返回结果
 		ApkVO apkVO = new ApkVO();
 		BeanUtils.copyProperties(bladeFile, apkVO);