From 1e0fee57168f6190f5dc5a3e01f8cde2b5561811 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 19:50:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/api/HK/HKApi.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java b/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
index 4afd313..a9711cd 100644
--- a/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
@@ -3,6 +3,7 @@
import com.ycl.platform.domain.result.OSDResult;
import com.ycl.utils.StringUtils;
import constant.ApiConstants;
+import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
@@ -49,6 +50,7 @@
Date date = new Date();
//瑙ｆ瀽xml
parseXMl(timeString, "Time", "localTime", osdResult, date, ip);
+ osdResult.setDeviceBrand(DeviceType.HK.getType());
} catch (Exception e) {
return null;
}
--
Gitblit v1.8.0