From 33d4107d0c1776d730d84998c42b29933673525f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 06 九月 2023 10:21:42 +0800
Subject: [PATCH] 修复启动时如果上机平台不可连接的导致的持续报错

---
 src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java |    2 +-
 src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java           |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java b/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
index b58b91c..7760bdd 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
@@ -14,9 +14,6 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import javax.sip.InvalidArgumentException;
-import javax.sip.SipException;
-import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -61,8 +58,10 @@
                     sipCommanderForPlatform.unregister(parentPlatform, parentPlatformCatchOld.getSipTransactionInfo(), null, (eventResult)->{
                         platformService.login(parentPlatform);
                     });
-                } catch (InvalidArgumentException | ParseException | SipException e) {
+                } catch (Exception e) {
                     logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+                    platformService.offline(parentPlatform, true);
+                    continue;
                 }
             }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
index 86ee0f4..d295ed4 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
@@ -276,7 +276,7 @@
                         eventResult.statusCode, eventResult.msg);
                 offline(parentPlatform, false);
             }, null);
-        } catch (InvalidArgumentException | ParseException | SipException e) {
+        } catch (Exception e) {
             logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈瀹氭椂娉ㄥ唽: {}", e.getMessage());
         }
     }

--
Gitblit v1.8.0