图片

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/GetPicture.java

@@ -30,8 +30,7 @@ import java.io.OutputStream;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
-import static com.huimv.video.dhicc.icc.CommonConstant.IPAndPort;
-import static com.huimv.video.dhicc.icc.CommonConstant.Sg_IPAndPort;
+import static com.huimv.video.dhicc.icc.CommonConstant.*;
 
 
 @RestController
@@ -66,13 +65,13 @@ public class GetPicture {
             //如果 fileURL不为空  就认为是拿摄像头抓拍图片
             //目前只有曙光照片
             if (StringUtilsWork.isNotEmpty(fileUrl)) {
-                url = Sg_IPAndPort + "/evo-apigw/" + fileUrl;
+                url = hn_IPandPord + "/evo-apigw/" + fileUrl;
             } else if (StringUtilsWork.isNotEmpty(path)) {
                 //档案的图片
-                url = Sg_IPAndPort + "/evo-pic/" + path + "?token=" + access_token + "&oss_addr=" + CommonConstant.Sg_Document_Oss_Addr;
+                url = hn_IPandPord + "/evo-pic/" + path + "?token=" + access_token + "&oss_addr=" + CommonConstant.hn_Document_oss_addr;
             } else {
                 //事件的图片
-                url = Sg_IPAndPort + "/evo-pic/" + alarmPicture + "?token=" + access_token + "&oss_addr=" + CommonConstant.Sg_Shijian_Oss_Addr;
+                url = hn_IPandPord + "/evo-pic/" + alarmPicture + "?token=" + access_token + "&oss_addr=" + CommonConstant.hn_shijian_oss_addr;
             }
         }else if (farmId == 21){
             GetTokenResponse tokenTest03 = oauthIntegrationManager.getTokenTest03();
@@ -80,13 +79,13 @@ public class GetPicture {
             //如果 fileURL不为空  就认为是拿摄像头抓拍图片
             //目前只有曙光照片
             if (StringUtilsWork.isNotEmpty(fileUrl)) {
-                url = Sg_IPAndPort + "/evo-apigw/" + fileUrl;
+                url = cn_IPandPord + "/evo-apigw/" + fileUrl;
             } else if (StringUtilsWork.isNotEmpty(path)) {
                 //档案的图片
-                url = Sg_IPAndPort + "/evo-pic/" + path + "?token=" + access_token + "&oss_addr=" + CommonConstant.Sg_Document_Oss_Addr;
+                url = cn_IPandPord + "/evo-pic/" + path + "?token=" + access_token + "&oss_addr=" + CommonConstant.cn_Document_oss_addr;
             } else {
                 //事件的图片
-                url = Sg_IPAndPort + "/evo-pic/" + alarmPicture + "?token=" + access_token + "&oss_addr=" + CommonConstant.Sg_Shijian_Oss_Addr;
+                url = cn_IPandPord + "/evo-pic/" + alarmPicture + "?token=" + access_token + "&oss_addr=" + CommonConstant.cn_shijian_oss_addr;
             }
         }
         HttpResponse httpResponse = null;

huimv-farm-video/src/main/java/com/huimv/video/dhicc/icc/CommonConstant.java

@@ -69,6 +69,7 @@ public class CommonConstant {
     public static final String shijian_oss_addr = "172.16.3.223:8925";
 
     //海宁
+    public static final String hn_IPandPord = "https://122.225.64.254:447";
     //档案图片
     public static final String hn_Document_oss_addr = "192.168.3.202:9876";
     //    // 事件图片
@@ -76,6 +77,7 @@ public class CommonConstant {
 
 
     //苍南
+    public static final String cn_IPandPord = "https://61.153.47.93:447";
     //档案图片
     public static final String cn_Document_oss_addr = "192.168.2.202:9876";
     //    // 事件图片