From 35c8aca3b8107ee2a4fbb5790ce1eeb70f4bb461 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 22 Mar 2024 18:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/manage/service/impl/ConfigProductServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/ConfigProductServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/ConfigProductServiceImpl.java
index b117586..2b2f59f 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/ConfigProductServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/ConfigProductServiceImpl.java
@@ -1,7 +1,8 @@
package com.dji.sample.manage.service.impl;
+import com.dji.sample.manage.model.common.AppLicenseProperties;
import com.dji.sample.manage.model.common.NtpServerProperties;
-import com.dji.sample.manage.model.dto.NtpServerDTO;
+import com.dji.sample.manage.model.dto.ProductConfigDTO;
import com.dji.sample.manage.service.IRequestsConfigService;
import org.springframework.stereotype.Service;
@@ -15,6 +16,6 @@
@Override
public Object getConfig() {
- return new NtpServerDTO(NtpServerProperties.host);
+ return new ProductConfigDTO(NtpServerProperties.host, AppLicenseProperties.id, AppLicenseProperties.key, AppLicenseProperties.license);
}
}
--
Gitblit v1.9.3