From bf182ebc89d3fefc31c41f6a2185de0eb021a4f9 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Tue, 25 Nov 2025 14:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E5=B0=86HTTP=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BAHTTPS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fuyuanshen/app/controller/AppVideoController.java     | 3 +--
 .../equipment/domain/dto/DeviceWithTypeExcelExportDTO.java    | 2 +-
 .../fuyuanshen/equipment/service/impl/DeviceServiceImpl.java  | 4 ++++
 .../src/main/java/com/fuyuanshen/system/domain/SysOss.java    | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
index 8e40e40..9dbb01d 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
@@ -1,6 +1,5 @@
 package com.fuyuanshen.app.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import com.fuyuanshen.app.service.AudioProcessService;
 import com.fuyuanshen.app.service.VideoProcessService;
 import com.fuyuanshen.common.core.domain.R;
@@ -14,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.Base64;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -74,4 +72,5 @@ public class AppVideoController extends BaseController {
     public R<String> extract(@RequestParam("file") MultipartFile file) throws Exception {
         return R.ok("Success", audioProcessService.extract(file));
     }
+
 }
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceWithTypeExcelExportDTO.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceWithTypeExcelExportDTO.java
index 0ffced9..00f638e 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceWithTypeExcelExportDTO.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceWithTypeExcelExportDTO.java
@@ -13,7 +13,7 @@ import java.net.URL;
  * 设备及完整类型信息导出DTO
  *
  * @author: 默苍璃
- * @date: 2025-11-0416:25
+ * @date: 2025-11-04 16:25
  */
 @Data
 @HeadRowHeight(20)  // 表头行高
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
index 533b06d..da9372d 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
@@ -286,6 +286,10 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         if (deviceForm.getFile() != null) {
             String fileHash = fileHashUtil.hash(deviceForm.getFile());
             SysOssVo upload = ossService.updateHash(deviceForm.getFile(), fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
             // 设置图片路径
             deviceForm.setDevicePic(upload.getUrl());
         }
diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java
index 6d187f5..99e941f 100644
--- a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java
+++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java
@@ -51,6 +51,7 @@ public class SysOss extends TenantEntity {
      * 服务商
      */
     private String service;
+
     /**
      * 内容哈希
      */