2.2.0

src/main/java/com/fdkankan/scene/config/HaixinProperties.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.config;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
@@ -26,4 +27,12 @@ public class HaixinProperties {
 
     }
 
+    public String getRealHost(String customHost){
+        String host = StrUtil.isNotEmpty(customHost) ? customHost : this.host;
+        if(host.endsWith("/")){
+            host = host.substring(0, host.length() -1);
+        }
+        return host;
+    }
+
 }

src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

@@ -130,6 +130,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         Long userId = scenePlus.getUserId();
         JyUser jyUser = jyUserService.getByUserId(userId.intValue());
 
+
         //组装参数
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("cid", jyUser.getIdCard());
@@ -138,16 +139,15 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         List<Map<String, JSONObject>> sceneMaterialEvidenceList = new ArrayList<>();
         jsonObject.put("sceneMaterialEvidenceList", sceneMaterialEvidenceList);
         for (EvidenceParamVO evidenceParamVO : addVOList) {
-            Map<String, JSONObject> map = this.genSceneMaterialEvidence(num, evidenceParamVO);
+            Map<String, JSONObject> map = this.genSceneMaterialEvidence(scenePlus, evidenceParamVO);
             sceneMaterialEvidenceList.add(map);
         }
-        String host = StrUtil.isNotEmpty(scenePlus.getPushAddress()) ? scenePlus.getPushAddress() : haixinProperties.getHost();
-        haixinClient.saveSceneInfo(host.concat(haixinProperties.getApi().getSaveSceneInfo()), haixinProperties.getAppKey(),  jsonObject);
+        haixinClient.saveSceneInfo(haixinProperties.getRealHost(scenePlus.getPushAddress()).concat(haixinProperties.getApi().getSaveSceneInfo()), haixinProperties.getAppKey(),  jsonObject);
 
 
     }
 
-    private Map<String, JSONObject> genSceneMaterialEvidence(String num, EvidenceParamVO evidenceParamVO){
+    private Map<String, JSONObject> genSceneMaterialEvidence(ScenePlus scenePlus, EvidenceParamVO evidenceParamVO){
 
         Map<String, JSONObject> result = new HashMap<>();
 
@@ -234,8 +234,8 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             return false;
         }).map(v -> JSON.parseObject(JSON.toJSONString(v))).get();
         String fileName = firstImageObj.getString("src");
-        String imagePath = ossProperties.getAbsolutePath(String.format(UploadFilePath.USER_EDIT_PATH, num)) + fileName;
-        JSONObject jsonObject = haixinClient.uploadToFdfs(haixinProperties.getHost().concat(haixinProperties.getApi().getFdfsUpload()), imagePath);
+        String imagePath = ossProperties.getAbsolutePath(String.format(UploadFilePath.USER_EDIT_PATH, scenePlus.getNum())) + fileName;
+        JSONObject jsonObject = haixinClient.uploadToFdfs(haixinProperties.getRealHost(scenePlus.getPushAddress()).concat(haixinProperties.getApi().getFdfsUpload()), imagePath);
         JSONObject uploadToFdfsResp = jsonObject.getJSONObject("data");
         //海信文件服务器存储路径
         String fileServerPath = uploadToFdfsResp.getString("fileNameRemote");