From e1020b4e48efc86bf145f22f3f3a3c2a20e1ffb7 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 21 Nov 2024 15:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=93=9D=E7=89=99=E5=8D=87=E7=BA=A7=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/CommonController.java | 25 +++++++++++++++++++ .../pile/PileFirmwareInfoController.java | 16 ++++++------ .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prd.yml | 2 +- .../src/main/resources/application-pre.yml | 2 +- .../src/main/resources/application-sit.yml | 2 +- .../common/config/AliyunOssConfig.java | 14 +++++++++++ .../util/file/AliyunOssUploadUtils.java | 7 +++--- .../pile/service/PileFirmwareInfoService.java | 1 + .../impl/PileFirmwareInfoServiceImpl.java | 2 ++ 10 files changed, 58 insertions(+), 15 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java index 1aaa9cfe3..ab2eb210d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java @@ -219,4 +219,29 @@ public class CommonController { return AjaxResult.error(e.getMessage()); } } + + /** + * 上传蓝牙升级程序到阿里云oss + * http://localhost:8080/common/uploadBlueToothFile2OSS + * @param file + * @return + * @throws Exception + */ + @CrossOrigin + @PostMapping("/uploadBlueToothFile2OSS") + public AjaxResult uploadBlueToothFile2OSS(MultipartFile file) throws Exception { + try { + String url = AliyunOssUploadUtils.uploadBlueToothFile(file); + AjaxResult ajax = AjaxResult.success(); + ajax.put("url", url); + ajax.put("fileName", FileUtils.getName(url)); + ajax.put("newFileName", FileUtils.getName(url)); + ajax.put("originalFilename", file.getOriginalFilename()); + log.info("固件上传成功 url:{}", url); + return ajax; + }catch (Exception e){ + log.error("上传到阿里云oss error, ", e); + return AjaxResult.error(e.getMessage()); + } + } } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java index 7f4ded039..9184d883f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java @@ -98,12 +98,12 @@ public class PileFirmwareInfoController extends BaseController { * @param file * @return */ - @PostMapping("/uploadBlueToothFile") - public AjaxResult uploadBlueToothFile(@RequestParam("avatarfile") MultipartFile file) { - if (!file.isEmpty()) { - String result = AliyunOssUploadUtils.uploadBlueToothFile(file); - return AjaxResult.success(); - } - return AjaxResult.error("上传文件错误！！"); - } + // @PostMapping("/uploadBlueToothFile") + // public AjaxResult uploadBlueToothFile(@RequestParam("blueToothFile") MultipartFile file) { + // if (!file.isEmpty()) { + // String result = AliyunOssUploadUtils.uploadBlueToothFile(file); + // return AjaxResult.success(); + // } + // return AjaxResult.error("上传文件错误！！"); + // } } diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 5b0f17d88..434cc5f17 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -144,7 +144,7 @@ aliyunoss: # 蓝牙小程序文件保存路径 bluetoothFileHost: bluetooth # 访问域名 - # url: https://ydc-oss-dev.oss-cn-shanghai.aliyuncs.com + interviewUrl: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com url: http://img.sit.jsowellcloud.com diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index 0c70b27d4..e0c575db8 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -143,7 +143,7 @@ aliyunoss: # 蓝牙小程序文件保存路径 bluetoothFileHost: bluetooth # 访问域名 - # url: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com + interviewUrl: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com url: https://img.jsowellcloud.com ########################微信支付参数####################################### diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 421da02a5..90d10c2ae 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -143,7 +143,7 @@ aliyunoss: # 蓝牙小程序文件保存路径 bluetoothFileHost: bluetooth # 访问域名 - # url: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com + interviewUrl: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com url: https://img.jsowellcloud.com ########################微信支付参数####################################### diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index cc747b44d..af7bc8053 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -143,7 +143,7 @@ aliyunoss: # 蓝牙小程序文件保存路径 bluetoothFileHost: bluetooth # 访问域名 - # url: https://ydc-oss-dev.oss-cn-shanghai.aliyuncs.com + interviewUrl: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com url: http://img.sit.jsowellcloud.com diff --git a/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java b/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java index 48c7c762d..dd883f356 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java +++ b/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java @@ -37,6 +37,11 @@ public class AliyunOssConfig { */ private String bluetoothFileHost; + /** + * 访问域名(上传蓝牙固件时用) + */ + private String interviewUrl; + /** * 访问域名 */ @@ -90,6 +95,14 @@ public class AliyunOssConfig { this.bluetoothFileHost = bluetoothFileHost; } + public String getInterviewUrl() { + return interviewUrl; + } + + public void setInterviewUrl(String interviewUrl) { + this.interviewUrl = interviewUrl; + } + public String getUrl() { return url; } @@ -107,6 +120,7 @@ public class AliyunOssConfig { .append("bucketName", bucketName) .append("filehost", filehost) .append("bluetoothFileHost", bluetoothFileHost) + .append("interviewUrl", interviewUrl) .append("url", url) .toString(); } diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/file/AliyunOssUploadUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/file/AliyunOssUploadUtils.java index f9a69c692..2d43397b6 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/file/AliyunOssUploadUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/file/AliyunOssUploadUtils.java @@ -1,5 +1,6 @@ package com.jsowell.common.util.file; +import com.alibaba.fastjson2.JSONObject; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.ObjectMetadata; @@ -59,7 +60,7 @@ public class AliyunOssUploadUtils { filePathName = aliyunOssConfig.getFilehost() + "/" + dir_name + randomNumber + filePathName; try { PutObjectResult putObjectResult = ossClient.putObject(aliyunOssConfig.getBucketName(), filePathName, file.getInputStream()); - log.info("上传OSS成功, url:{}", putObjectResult.getResponse().getUri()); + // log.info("上传OSS成功, url:{}", putObjectResult.getResponse().getUri()); } catch (IOException e) { e.printStackTrace(); } finally { @@ -86,7 +87,7 @@ public class AliyunOssUploadUtils { filePathName = aliyunOssConfig.getBluetoothFileHost() + "/files/" + filePathName; try { PutObjectResult putObjectResult = ossClient.putObject(aliyunOssConfig.getBucketName(), filePathName, file.getInputStream()); - log.info("上传OSS成功, url:{}", putObjectResult.getResponse().getUri()); + // log.info("上传蓝牙升级文件到OSS成功, putObjectResult:{}", JSONObject.toJSONString(putObjectResult)); } catch (IOException e) { e.printStackTrace(); } finally { @@ -94,7 +95,7 @@ public class AliyunOssUploadUtils { ossClient.shutdown(); } } - return aliyunOssConfig.getUrl() + "/" + filePathName; + return aliyunOssConfig.getInterviewUrl() + "/" + filePathName; } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java index 021aebe9c..daafa1bea 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java @@ -1,6 +1,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.PileFirmwareInfo; +import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java index 4db17b410..f0007cb5b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java @@ -1,11 +1,13 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.pile.domain.PileFirmwareInfo; import com.jsowell.pile.mapper.PileFirmwareInfoMapper; import com.jsowell.pile.service.PileFirmwareInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import java.util.List;