From 4c6c77be7a8395a82da4ddb85169e62e130e8713 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 23 九月 2022 23:15:44 +0800
Subject: [PATCH] 异常情况打印信息优化

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java              |    8 -
 src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java                                                                                 |   43 ----------
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java                                                        |    2 
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadResponseMessageHandler.java |    8 -
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java      |    2 
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java              |    8 -
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java  |    8 -
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java                                 |   16 +---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java     |   12 +--
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java   |    8 -
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java        |    8 -
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/timeout/impl/TimeoutProcessorImpl.java                                      |    7 +
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java          |    8 -
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java                                    |   16 +---
 /dev/null                                                                                                                              |   31 -------
 src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java                                                     |    8 --
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java                                             |    5 -
 src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java                                                                      |    7 +
 src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java                                                                              |   14 ---
 src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java                                                      |    1 
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java                |    8 -
 src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java                                                       |    2 
 src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java                                                        |    1 
 23 files changed, 44 insertions(+), 187 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java b/src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java
index 13ec692..74a90c2 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java
@@ -1,7 +1,10 @@
 package com.genersoft.iot.vmp.conf;
 
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd.AlarmQueryMessageHandler;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.utils.SystemInfoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -13,6 +16,8 @@
  */
 @Component
 public class SystemInfoTimerTask {
+
+    private Logger logger = LoggerFactory.getLogger(SystemInfoTimerTask.class);
 
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
@@ -27,7 +32,7 @@
             Map<String, String> networkInterfaces = SystemInfoUtils.getNetworkInterfaces();
             redisCatchStorage.addNetInfo(networkInterfaces);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            logger.error("[鑾峰彇绯荤粺淇℃伅澶辫触] {}", e.getMessage());
         }
 
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java b/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java
index 4ff5eba..5551b4f 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java
@@ -2,35 +2,23 @@
 
 import com.genersoft.iot.vmp.common.VersionPo;
 import com.genersoft.iot.vmp.utils.GitUtil;
-import com.genersoft.iot.vmp.utils.JarFileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
-import java.util.Map;
 
 @Component
 public class VersionInfo {
 
     @Autowired
-    VersionConfig config;
-    @Autowired
     GitUtil gitUtil;
-    @Autowired
-    JarFileUtils jarFileUtils;
 
     public VersionPo getVersion() {
         VersionPo versionPo = new VersionPo();
-        Map<String,String> map=jarFileUtils.readJarFile();
         versionPo.setGIT_Revision(gitUtil.getGitCommitId());
-        versionPo.setCreate_By(map.get("Created-By"));
         versionPo.setGIT_BRANCH(gitUtil.getBranch());
         versionPo.setGIT_URL(gitUtil.getGitUrl());
         versionPo.setBUILD_DATE(gitUtil.getBuildDate());
-        versionPo.setArtifactId(config.getArtifactId());
         versionPo.setGIT_Revision_SHORT(gitUtil.getCommitIdShort());
-        versionPo.setVersion(config.getVersion());
-        versionPo.setProject(config.getDescription());
-        versionPo.setBuild_Jdk(map.get("Build-Jdk"));
+        versionPo.setVersion(gitUtil.getBuildVersion());
 
         return versionPo;
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java
deleted file mode 100644
index 8731228..0000000
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.auth;
-
-import com.genersoft.iot.vmp.storager.impl.VideoManagerStorageImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-
-/**    
- * @description:娉ㄥ唽閫昏緫澶勭悊锛屽綋璁惧娉ㄥ唽鍚庤Е鍙戦�昏緫銆�
- * @author: swwheihei
- * @date:   2020骞�5鏈�8鏃� 涓嬪崍9:41:46     
- */
-@Component
-public class RegisterLogicHandler {
-
-	private Logger logger = LoggerFactory.getLogger(RegisterLogicHandler.class);
-
-	@Autowired
-	private SIPCommander cmder;
-
-	@Autowired
-	private VideoManagerStorageImpl storager;
-	
-	public void onRegister(Device device) {
-		// 鍙湁绗竴娆℃敞鍐屾椂璋冪敤鏌ヨ璁惧淇℃伅锛屽闇�鏇存柊璋冪敤鏇存柊API鎺ュ彛
-//		// TODO 姝ゅ閿欒鏃犳硶鑾峰彇鍒伴�氶亾
-//		Device device1 = storager.queryVideoDevice(device.getDeviceId());
-//		if (device.isFirsRegister()) {
-//			logger.info("[{}] 棣栨娉ㄥ唽锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
-//			try {
-//				Thread.sleep(100);
-//				cmder.deviceInfoQuery(device);
-//				Thread.sleep(100);
-//				cmder.catalogQuery(device, null);
-//			} catch (InterruptedException e) {
-//				e.printStackTrace();
-//			}
-//		}
-	}
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java
index 2b56326..9ee6477 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java
@@ -51,7 +51,6 @@
                 }
                 // 绉婚櫎宸插叧闂殑杩炴帴
                 it.remove();
-                // e.printStackTrace();
             }
         }
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
index 6e7b3dc..9bd3d57 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
@@ -3,23 +3,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.sip.ClientTransaction;
-import javax.sip.Dialog;
-
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.gb28181.bean.SipMsgInfo;
 import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
 import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
-import com.genersoft.iot.vmp.utils.SerializeUtils;
 import com.genersoft.iot.vmp.utils.redis.RedisUtil;
-import gov.nist.javax.sip.message.SIPRequest;
 import gov.nist.javax.sip.message.SIPResponse;
-import gov.nist.javax.sip.stack.SIPDialog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 /**    
  * @description:瑙嗛娴乻ession绠$悊鍣紝绠$悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
index bfc1ea9..4b67c1b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -13,11 +13,7 @@
 import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.utils.GitUtil;
-import com.genersoft.iot.vmp.utils.SerializeUtils;
-import gov.nist.javax.sip.SIPConstants;
 import gov.nist.javax.sip.SipProviderImpl;
-import gov.nist.javax.sip.SipStackImpl;
 import gov.nist.javax.sip.message.MessageFactoryImpl;
 import gov.nist.javax.sip.message.SIPRequest;
 import org.slf4j.Logger;
@@ -27,7 +23,6 @@
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.lang.Nullable;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
index 09436ed..5723181 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -661,12 +661,8 @@
                     mediaListManager.removedChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream());
                     try {
                         responseAck(serverTransaction, Response.TEMPORARILY_UNAVAILABLE, response.getMsg());
-                    } catch (SipException e) {
-                        throw new RuntimeException(e);
-                    } catch (InvalidArgumentException e) {
-                        throw new RuntimeException(e);
-                    } catch (ParseException e) {
-                        throw new RuntimeException(e);
+                    } catch (SipException | InvalidArgumentException | ParseException e) {
+                        logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐐规挱鍥炲: {}", e.getMessage());
                     }
                 }
             });
@@ -733,12 +729,8 @@
                                         mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
                             }
                         }
-                    } catch (InvalidArgumentException e) {
-                        throw new RuntimeException(e);
-                    } catch (ParseException e) {
-                        throw new RuntimeException(e);
-                    } catch (SipException e) {
-                        throw new RuntimeException(e);
+                    } catch (InvalidArgumentException | ParseException | SipException e) {
+                        logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐐规挱鍥炲: {}", e.getMessage());
                     }
 
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
index b5f16ac..66f5442 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
@@ -115,23 +115,15 @@
                         // 澶辫触鐨勫洖澶�
                         try {
                             responseAck(serverTransaction, eventResult.statusCode, eventResult.msg);
-                        } catch (SipException e) {
-                            e.printStackTrace();
-                        } catch (InvalidArgumentException e) {
-                            e.printStackTrace();
-                        } catch (ParseException e) {
-                            e.printStackTrace();
+                        } catch (SipException | InvalidArgumentException | ParseException e) {
+                            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 褰曞儚鎺у埗: {}", e.getMessage());
                         }
                     }, eventResult -> {
                         // 鎴愬姛鐨勫洖澶�
                         try {
                             responseAck(serverTransaction, eventResult.statusCode);
-                        } catch (SipException e) {
-                            e.printStackTrace();
-                        } catch (InvalidArgumentException e) {
-                            e.printStackTrace();
-                        } catch (ParseException e) {
-                            e.printStackTrace();
+                        } catch (SipException | InvalidArgumentException | ParseException e) {
+                            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 褰曞儚鎺у埗: {}", e.getMessage());
                         }
                     });
                 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
index ec75015..1e09ae0 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
@@ -217,12 +217,8 @@
         // 鍥炲200 OK
         try {
             responseAck(getServerTransaction(evt), Response.OK);
-        } catch (SipException e) {
-            throw new RuntimeException(e);
-        } catch (InvalidArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鎶ヨ閫氱煡鍥炲: {}", e.getMessage());
         }
         Element deviceIdElement = rootElement.element("DeviceID");
         String channelId = deviceIdElement.getText().toString();
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
index 63dc7d8..289f162 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
@@ -78,12 +78,8 @@
                     deviceService.online(device);
                 }
             }
-        } catch (SipException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 蹇冭烦鍥炲: {}", e.getMessage());
         }
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
index 98d42d6..041f739 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
@@ -68,12 +68,8 @@
         // 鍥炲200 OK
         try {
             responseAck(getServerTransaction(evt), Response.OK);
-        } catch (SipException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 褰曞儚娴佹帹閫佸畬姣曪紝鍥炲200OK: {}", e.getMessage());
         }
         CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
         String NotifyType =getText(rootElement, "NotifyType");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java
index e35da0e..be24faa 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java
@@ -59,12 +59,8 @@
         logger.info("涓嶆敮鎸乤larm鏌ヨ");
         try {
             responseAck(getServerTransaction(evt), Response.NOT_FOUND, "not support alarm query");
-        } catch (SipException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 alarm鏌ヨ鍥炲200OK: {}", e.getMessage());
         }
 
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
index cd98094..82f4a25 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
@@ -100,12 +100,8 @@
                 // 鍥炲鏃犻�氶亾
                 cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), 0);
             }
-        } catch (SipException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐩綍鏌ヨ: {}", e.getMessage());
         }
 
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
index b1bd489..8192043 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
@@ -63,7 +63,7 @@
 
 
         } catch (ParseException | SipException | InvalidArgumentException e) {
-            e.printStackTrace();
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 璇煶鍠婅瘽: {}", e.getMessage());
         }
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadResponseMessageHandler.java
index 200677a..1c4aa8a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadResponseMessageHandler.java
@@ -63,12 +63,8 @@
             msg.setKey(key);
             msg.setData(json);
             deferredResultHolder.invokeAllResult(msg);
-        } catch (SipException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 璁惧閰嶇疆鏌ヨ: {}", e.getMessage());
         }
 
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java
index cd6d1b8..12c8468 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java
@@ -58,12 +58,8 @@
             msg.setKey(key);
             msg.setData(json);
             deferredResultHolder.invokeAllResult(msg);
-        } catch (SipException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 璁惧鎺у埗: {}", e.getMessage());
         }
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java
index b324b5d..e96ecec 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java
@@ -60,12 +60,8 @@
         // 鍥炲200 OK
         try {
             responseAck(getServerTransaction(evt), Response.OK);
-        } catch (SipException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 璁惧鐘舵�佸簲绛斿洖澶�200OK: {}", e.getMessage());
         }
         Element deviceIdElement = element.element("DeviceID");
         Element onlineElement = element.element("Online");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
index e9ee32d..fa741de 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
@@ -147,7 +147,7 @@
                                 }
                             }
                         } catch (DocumentException e) {
-                            throw new RuntimeException(e);
+                            logger.error("xml瑙f瀽寮傚父锛� ", e);
                         } finally {
                             taskQueueHandlerRun = false;
                         }
@@ -155,13 +155,9 @@
                 });
             }
 
-        } catch (SipException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }finally {
+        } catch (SipException | InvalidArgumentException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍥芥爣褰曞儚: {}", e.getMessage());
+        } finally {
             taskQueueHandlerRun = false;
         }
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/timeout/impl/TimeoutProcessorImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/timeout/impl/TimeoutProcessorImpl.java
index 86861af..531505d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/timeout/impl/TimeoutProcessorImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/timeout/impl/TimeoutProcessorImpl.java
@@ -1,8 +1,11 @@
 package com.genersoft.iot.vmp.gb28181.transmit.event.timeout.impl;
 
+import com.genersoft.iot.vmp.conf.SystemInfoTimerTask;
 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
 import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
 import com.genersoft.iot.vmp.gb28181.transmit.event.timeout.ITimeoutProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -12,6 +15,8 @@
 
 @Component
 public class TimeoutProcessorImpl implements InitializingBean, ITimeoutProcessor {
+
+    private Logger logger = LoggerFactory.getLogger(TimeoutProcessorImpl.class);
 
     @Autowired
     private SIPProcessorObserver processorObserver;
@@ -36,7 +41,7 @@
             sipSubscribe.removeErrorSubscribe(callId);
             sipSubscribe.removeOkSubscribe(callId);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("[瓒呮椂浜嬩欢澶辫触]: {}", e.getMessage());
         }
     }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
index 3e13f48..1b21995 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
@@ -93,7 +93,6 @@
             try {
                 gBMap.put(streamPushExcelDto.getApp() + streamPushExcelDto.getStream(), streamPushExcelDto.getGbId());
             }catch (IllegalArgumentException e) {
-                e.printStackTrace();
                 errorGBList.add(streamPushExcelDto.getGbId() + "(涓嶅悓鐨刟pp+stream浣跨敤浜嗙浉鍚岀殑鍥芥爣ID)");
                 return;
             }
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
index 2d4a82f..c2be439 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
@@ -156,7 +156,7 @@
                                             try {
                                                 playMsgCallback.handler(responseSendItemMsg);
                                             } catch (ParseException e) {
-                                                throw new RuntimeException(e);
+                                                logger.error("[REDIS娑堟伅澶勭悊寮傚父] ", e);
                                             }
                                         }
                                         break;
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java
index 47f9421..2d9bd39 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java
@@ -17,49 +17,6 @@
     public static BaiduPoint Wgs84ToBd09(String xx, String yy) {
 
 
-//        try {
-//            Socket s = new Socket("api.map.baidu.com", 80);
-//            BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8"));
-//            OutputStream out = s.getOutputStream();
-//            StringBuffer sb = new StringBuffer("GET /ag/coord/convert?from=0&to=4");
-//            sb.append("&x=" + xx + "&y=" + yy);
-//            sb.append("&callback=BMap.Convertor.cbk_3976 HTTP/1.1\r\n");
-//            sb.append("User-Agent: Java/1.6.0_20\r\n");
-//            sb.append("Host: api.map.baidu.com:80\r\n");
-//            sb.append("Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2\r\n");
-//            sb.append("Connection: Close\r\n");
-//            sb.append("\r\n");
-//            out.write(sb.toString().getBytes());
-//            String json = "";
-//            String tmp = "";
-//            while ((tmp = br.readLine()) != null) {
-//                // logger.info(tmp);
-//                json += tmp;
-//            }
-//
-//            s.close();
-//            int start = json.indexOf("cbk_3976");
-//            int end = json.lastIndexOf("}");
-//            if (start != -1 && end != -1 && json.contains("\"x\":\"")) {
-//                json = json.substring(start, end);
-//                String[] point = json.split(",");
-//                String x = point[1].split(":")[1].replace("\"", "");
-//                String y = point[2].split(":")[1].replace("\"", "");
-//                BaiduPoint bdPoint= new BaiduPoint();
-//                bdPoint.setBdLng(new String(decode(x)));
-//                bdPoint.setBdLat(new String(decode(y)));
-//                return bdPoint;
-//                //return (new String(decode(x)) + "," + new String(decode(y)));
-//            } else {
-//                logger.info("gps鍧愭爣鏃犳晥锛侊紒");
-//            }
-//            out.close();
-//            br.close();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-
-
         double lng = Double.parseDouble(xx);
         double lat = Double.parseDouble(yy);
         Double[] gcj02 = Coordtransform.WGS84ToGCJ02(lng, lat);
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/IpUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/IpUtil.java
deleted file mode 100644
index d754554..0000000
--- a/src/main/java/com/genersoft/iot/vmp/utils/IpUtil.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.genersoft.iot.vmp.utils;
-
-
-import javax.servlet.http.HttpServletRequest;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-public class IpUtil {
-    public static String getIpAddr(HttpServletRequest request) {
-        String ipAddress = null;
-        try {
-            ipAddress = request.getHeader("x-forwarded-for");
-            if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-                ipAddress = request.getHeader("Proxy-Client-IP");
-            }
-            if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-                ipAddress = request.getHeader("WL-Proxy-Client-IP");
-            }
-            if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-                ipAddress = request.getRemoteAddr();
-                if (ipAddress.equals("127.0.0.1")) {
-                    // 鏍规嵁缃戝崱鍙栨湰鏈洪厤缃殑IP
-                    InetAddress inet = null;
-                    try {
-                        inet = InetAddress.getLocalHost();
-                    } catch (UnknownHostException e) {
-                        e.printStackTrace();
-                    }
-                    ipAddress = inet.getHostAddress();
-                }
-            }
-            // 瀵逛簬閫氳繃澶氫釜浠g悊鐨勬儏鍐碉紝绗竴涓狪P涓哄鎴风鐪熷疄IP,澶氫釜IP鎸夌収','鍒嗗壊
-            if (ipAddress != null && ipAddress.length() > 15) { // "***.***.***.***".length()
-                // = 15
-                if (ipAddress.indexOf(",") > 0) {
-                    ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
-                }
-            }
-        } catch (Exception e) {
-            ipAddress="";
-        }
-        // ipAddress = this.getRequest().getRemoteAddr();
-
-        return ipAddress;
-    }
-}
-
-
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/JarFileUtils.java b/src/main/java/com/genersoft/iot/vmp/utils/JarFileUtils.java
deleted file mode 100644
index 686b562..0000000
--- a/src/main/java/com/genersoft/iot/vmp/utils/JarFileUtils.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.genersoft.iot.vmp.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ClassUtils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-/**
- * 涓�涓紭绉�鐨勯搴熺▼搴忕尶
- */
-@Component
-public class JarFileUtils {
-    private static Logger log = LoggerFactory.getLogger(JarFileUtils.class);
-    private static Map<String, String> map = new HashMap<>();
-
-    public  Map<String, String> readJarFile() {
-        JarFile jarFile = null;
-        BufferedReader br = null;
-        try {
-            // 鑾峰彇jar鐨勮繍琛岃矾寰勶紝鍥爈inux涓媕ar鐨勮矾寰勪负鈥漟ile:/app/.../test.jar!/BOOT-INF/class!/鈥滆繖绉嶆牸寮忥紝鎵�浠ラ渶瑕佸幓鎺夆�漟ile:鈥滃拰鈥�!/BOOT-INF/class!/鈥�
-            String jarFilePath = ClassUtils.getDefaultClassLoader().getResource("").getPath().replace("!/BOOT-INF/classes!/", "");
-            if (jarFilePath.startsWith("file")) {
-                jarFilePath = jarFilePath.substring(5);
-            }
-            log.debug("jarFilePath:" + jarFilePath);
-            // 閫氳繃JarFile鐨刧etJarEntry鏂规硶璇诲彇META-INF/MANIFEST.MF
-            jarFile = new JarFile(jarFilePath);
-            JarEntry entry = jarFile.getJarEntry("META-INF/MANIFEST.MF");
-            log.info("璇诲彇鐨勫唴瀹�:" + entry.toString());
-            // 濡傛灉璇诲彇鍒癕ANIFEST.MF鏂囦欢鍐呭锛屽垯杞崲涓簊tring
-            if (entry != null) {
-                InputStream in = jarFile.getInputStream(entry);
-
-                StringBuilder sb = new StringBuilder();
-                br = new BufferedReader(new InputStreamReader(in));
-                String line = "";
-                while ((line = br.readLine()) != null) {
-                    if (line != null && line.contains(":")) {
-                        int index = line.indexOf(":");
-                        map.put(line.substring(0, index).trim(), line.substring(index + 1, line.length()).trim());
-                    }
-                }
-                return map;
-            }
-        } catch (IOException e) {
-            log.debug("璇诲彇MANIFEST.MF鏂囦欢寮傚父:" + e.getMessage());
-        } finally {
-            try {
-                if (null != br) {
-                    br.close();
-                }
-                if (null != jarFile) {
-                    jarFile.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return map;
-
-    }
-
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/SerializeUtils.java b/src/main/java/com/genersoft/iot/vmp/utils/SerializeUtils.java
deleted file mode 100644
index ae91ad5..0000000
--- a/src/main/java/com/genersoft/iot/vmp/utils/SerializeUtils.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.genersoft.iot.vmp.utils;
-
-import java.io.*;
-
-public class SerializeUtils {
-    public static byte[] serialize(Object obj){
-        byte[] bytes = null;
-        try {
-            ByteArrayOutputStream baos=new ByteArrayOutputStream();;
-            ObjectOutputStream oos=new ObjectOutputStream(baos);
-            oos.writeObject(obj);
-            bytes=baos.toByteArray();
-            baos.close();
-            oos.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return bytes;
-    }
-    public static Object deSerialize(byte[] bytes){
-        Object obj=null;
-        try {
-            ByteArrayInputStream bais=new ByteArrayInputStream(bytes);
-            ObjectInputStream ois=new ObjectInputStream(bais);
-            obj=ois.readObject();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return obj;
-    }
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
index b876cf9..6f7132e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
@@ -96,7 +96,7 @@
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                logger.error("[绾跨▼浼戠湢澶辫触]锛� {}", e.getMessage());
             }
             if (useSourceIpAsStreamIp != null && useSourceIpAsStreamIp) {
                 String host = request.getHeader("Host");

--
Gitblit v1.8.0