Merge branch 'master' into production

src/main/java/com/censoft/flink/StreamingJob.java

@@ -91,7 +91,7 @@ public class StreamingJob {
                     .getAlgorithmName());
             warnPushBase.setAlarmTime(new Date(algorithmPushDto.getTimeStamp() * 1000));
             //获取图片地址
-            warnPushBase.setPicture("http://172.16.21.3"+algorithmPushDto.getPictureAddress());
+            warnPushBase.setPicture("http://"+algorithmPushDto.getServerIp()+algorithmPushDto.getPictureAddress());
             warnPushBase.setStatus("wait");
             warnPushBase.setSendUserIds("|1|");
             warnPushBase.setDelFlag(0);

src/main/java/com/censoft/flink/domain/AlgorithmPushDto.java

@@ -37,6 +37,9 @@ public class AlgorithmPushDto {
     //备注 放算法计算后所需信息
     private String remark;
 
+    //图片服务器ipp
+    private String serverIp;
+
 
 
 }