From 8ce3bb68bdc2250cc4a8a3d29085443fac64615a Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/main' into v1.2.0
---
src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java b/src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java
index 030bf5f..be8438d 100644
--- a/src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java
+++ b/src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java
@@ -33,7 +33,7 @@
}
- @PostConstruct
+// @PostConstruct
private void loadJsonFile() {
try (InputStream inputStream = new ClassPathResource("hms.json").getInputStream()){
nodes = mapper.readTree(inputStream);
@@ -44,6 +44,9 @@
}
public static HmsMessage get(String key) {
+ if (nodes.get(key) == null) {
+ return new HmsMessage();
+ }
return mapper.convertValue(nodes.get(key), HmsMessage.class);
}
}
--
Gitblit v1.9.3