Merge branch '6170' into prod

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java

@@ -11,7 +11,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -40,7 +39,7 @@ public class AppFileController extends BaseController {
      * 上传文件
      */
     @PostMapping("/upload")
-    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) throws IOException {
+    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) {
         return toAjax(appFileService.add(bo));
     }
 

fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java

@@ -8,7 +8,6 @@ import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.oss.core.OssClient;
 import com.fuyuanshen.common.oss.factory.OssFactory;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
-import com.fuyuanshen.equipment.utils.FileHashUtil;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
@@ -16,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -33,38 +31,24 @@ public class AppFileService {
 
     private final IAppBusinessFileService appBusinessFileService;
 
-    private final FileHashUtil fileHashUtil;
-    private final ISysOssService ossService;
-
-
     public List<AppFileVo> list(AppBusinessFileBo bo) {
 //        bo.setCreateBy(AppLoginHelper.getUserId());
         return appBusinessFileService.queryAppFileList(bo);
     }
 
-
-    /**
-     * APP文件上传
-     */
-    public Boolean add(AppFileDto bo) throws IOException {
+    public Boolean add(AppFileDto bo) {
 
         MultipartFile[] files = bo.getFiles();
-        if (files == null || files.length == 0) {
+        if(files == null || files.length == 0){
             throw new ServiceException("请选择要上传的文件");
         }
-        if (files.length > 5) {
+        if(files.length > 5){
             throw new ServiceException("最多只能上传5个文件");
         }
         for (int i = 0; i < files.length; i++) {
             MultipartFile file = files[i];
             // 上传文件
-            // SysOssVo upload = sysOssService.upload(file);
-            String fileHash = fileHashUtil.hash(file);
-            SysOssVo upload = ossService.updateHash(file, fileHash);
-            // 强制将HTTP替换为HTTPS
-            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
-                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
-            }
+            SysOssVo upload = sysOssService.upload(file);
 
             if (upload == null) {
                 return false;
@@ -82,7 +66,6 @@ public class AppFileService {
         return true;
     }
 
-
     public Boolean delete(Long[] ids) {
         AppBusinessFileBo bo = new AppBusinessFileBo();
 //        bo.setCreateBy(AppLoginHelper.getUserId());
@@ -96,5 +79,4 @@ public class AppFileService {
         }
         return appBusinessFileService.deleteWithValidByIds(List.of(ids), true);
     }
-
 }

fys-admin/src/main/resources/application-jingquan.yml

@@ -8,8 +8,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${monitor.username}
+  password: ${monitor.password}
 
 --- # snail-job 配置
 snail-job:

fys-admin/src/main/resources/application-prod.yml

@@ -11,8 +11,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${monitor.username}
+  password: ${monitor.password}
 
 --- # snail-job 配置
 snail-job:

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssVo.java

@@ -72,10 +72,10 @@ public class SysOssVo implements Serializable {
      * 服务商
      */
     private String service;
-
     /**
      * 内容哈希
      */
     private String fileHash;
 
+
 }

pom.xml

@@ -85,10 +85,10 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-            <activation>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <!-- <activation> -->
+            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
+            <!--     <activeByDefault>true</activeByDefault> -->
+            <!-- </activation> -->
         </profile>
         <profile>
             <id>prod</id>
@@ -98,10 +98,10 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-            <!-- <activation> -->
-            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
-            <!--     <activeByDefault>true</activeByDefault> -->
-            <!-- </activation> -->
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <profile>
             <id>jingquan</id>