From 065d17919c9a010e8ec6f2b482b026e86dd662df Mon Sep 17 00:00:00 2001 From: longbao <1923439579@qq.com> Date: Tue, 26 Nov 2024 15:13:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E3=80=91=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/supervision/config/MinioConfig.java | 2 +- .../config/SadTalkerProperties.java | 22 +++++++++++++++++++ .../service/impl/HumanManageServiceImpl.java | 21 ++++++++---------- .../src/main/resources/bootstrap-dev.yml | 5 ----- .../src/main/resources/bootstrap-prod.yml | 8 +------ .../src/main/resources/bootstrap-test.yml | 8 +------ 6 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 virtual-patient-common/src/main/java/com/supervision/config/SadTalkerProperties.java diff --git a/virtual-patient-common/src/main/java/com/supervision/config/MinioConfig.java b/virtual-patient-common/src/main/java/com/supervision/config/MinioConfig.java index 44b6687a..14c87c84 100644 --- a/virtual-patient-common/src/main/java/com/supervision/config/MinioConfig.java +++ b/virtual-patient-common/src/main/java/com/supervision/config/MinioConfig.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration; import java.util.concurrent.TimeUnit; @Configuration -@EnableConfigurationProperties(MinioProperties.class) +@EnableConfigurationProperties({MinioProperties.class, SadTalkerProperties.class}) public class MinioConfig { /** diff --git a/virtual-patient-common/src/main/java/com/supervision/config/SadTalkerProperties.java b/virtual-patient-common/src/main/java/com/supervision/config/SadTalkerProperties.java new file mode 100644 index 00000000..ab15bc06 --- /dev/null +++ b/virtual-patient-common/src/main/java/com/supervision/config/SadTalkerProperties.java @@ -0,0 +1,22 @@ +package com.supervision.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * @Author：longbao + * @Date：2024/11/26 14:54 + * @Description: humanGenerate + */ +@ConfigurationProperties(prefix = "human") +@Data +public class SadTalkerProperties { + + public String baseUrl; + + private String silent; + + private String dynamic; + + private String status; +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/HumanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/HumanManageServiceImpl.java index 934a5789..9f87a2d4 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/HumanManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/HumanManageServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.supervision.config.SadTalkerProperties; import com.supervision.enums.EnumMedicalRec; import com.supervision.exception.BusinessException; import com.supervision.manage.dto.HumanGenerateDTO; @@ -27,6 +28,7 @@ import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -64,14 +66,9 @@ public class HumanManageServiceImpl implements HumanManageService { 60L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(20), ThreadUtil.newNamedThreadFactory("human", true), new ThreadPoolExecutor.CallerRunsPolicy()); - @Value("${humanGenerate.baseUrl}") - private String humanBaseUrl; - @Value("${humanGenerate.silent}") - private String silent; - @Value("${humanGenerate.dynamic}") - private String dynamic; - @Value("${humanGenerate.status}") - private String status; + + @Autowired + private SadTalkerProperties sadTalkerProperties; @Override @Transactional(rollbackFor = Exception.class) @@ -198,7 +195,7 @@ public class HumanManageServiceImpl implements HumanManageService { if (StrUtil.isAllBlank(human.getSilentVideoFileId(), human.getSilentTaskUid())) { HumanGenerateDTO silentDTO; try { - String post = HttpUtil.post(humanBaseUrl + silent, Map.of("image", imageFile)); + String post = HttpUtil.post(sadTalkerProperties.getBaseUrl() + sadTalkerProperties.getSilent(), Map.of("image", imageFile)); silentDTO = JSONUtil.toBean(post, HumanGenerateDTO.class); } catch (Exception e) { throw new BusinessException("生成数字人静态视频异常"); @@ -208,7 +205,7 @@ public class HumanManageServiceImpl implements HumanManageService { HumanGenerateDTO silentDTOGet; String silentDTOGetStatus = ""; do { - String post = HttpUtil.get(humanBaseUrl + status + "/" + silentDTO.getUid()); + String post = HttpUtil.get(sadTalkerProperties.getBaseUrl() + sadTalkerProperties.getStatus() + "/" + silentDTO.getUid()); silentDTOGet = JSONUtil.toBean(post, HumanGenerateDTO.class); silentDTOGetStatus = silentDTOGet.getStatus(); } while (!silentDTOGetStatus.equals("completed")); @@ -271,7 +268,7 @@ public class HumanManageServiceImpl implements HumanManageService { if (StrUtil.isAllBlank(human.getDynamicVideoFileId(), human.getDynamicTaskUid())) { HumanGenerateDTO dynamicDTO; try { - String post = HttpUtil.post(humanBaseUrl + dynamic, Map.of("image", imageFile)); + String post = HttpUtil.post(sadTalkerProperties.getBaseUrl() + sadTalkerProperties.getDynamic(), Map.of("image", imageFile)); dynamicDTO = JSONUtil.toBean(post, HumanGenerateDTO.class); } catch (Exception e) { throw new BusinessException("生成数字人动态视频异常"); @@ -283,7 +280,7 @@ public class HumanManageServiceImpl implements HumanManageService { HumanGenerateDTO dynamicDTOGet; String dynamicDTOGetStatus = ""; do { - String post = HttpUtil.get(humanBaseUrl + status + "/" + dynamicDTO.getUid()); + String post = HttpUtil.get(sadTalkerProperties.baseUrl + sadTalkerProperties.getStatus() + "/" + dynamicDTO.getUid()); dynamicDTOGet = JSONUtil.toBean(post, HumanGenerateDTO.class); dynamicDTOGetStatus = dynamicDTOGet.getStatus(); } while (!dynamicDTOGetStatus.equals("completed")); diff --git a/virtual-patient-manage/src/main/resources/bootstrap-dev.yml b/virtual-patient-manage/src/main/resources/bootstrap-dev.yml index 138b0886..37c5b155 100644 --- a/virtual-patient-manage/src/main/resources/bootstrap-dev.yml +++ b/virtual-patient-manage/src/main/resources/bootstrap-dev.yml @@ -8,8 +8,3 @@ spring: discovery: server-addr: 192.168.1.101:18498 namespace: ef0e6889-ac5f-4327-b7ac-ff3105318f58 -humanGenerate: - baseUrl: http://192.168.1.101:6711 - silent: /silent-video - dynamic: /dynamic-video - status: /status \ No newline at end of file diff --git a/virtual-patient-manage/src/main/resources/bootstrap-prod.yml b/virtual-patient-manage/src/main/resources/bootstrap-prod.yml index 97892282..e76e0f54 100644 --- a/virtual-patient-manage/src/main/resources/bootstrap-prod.yml +++ b/virtual-patient-manage/src/main/resources/bootstrap-prod.yml @@ -7,10 +7,4 @@ spring: namespace: prod discovery: server-addr: 192.168.1.101:18498 - namespace: prod - -humanGenerate: - baseUrl: http://192.168.1.101:6711 - silent: /silent-video - dynamic: /dynamic-video - status: /status \ No newline at end of file + namespace: prod \ No newline at end of file diff --git a/virtual-patient-manage/src/main/resources/bootstrap-test.yml b/virtual-patient-manage/src/main/resources/bootstrap-test.yml index c3c530cf..e0010333 100644 --- a/virtual-patient-manage/src/main/resources/bootstrap-test.yml +++ b/virtual-patient-manage/src/main/resources/bootstrap-test.yml @@ -7,10 +7,4 @@ spring: namespace: ef0e6889-ac5f-4327-b7ac-ff3105318f58 discovery: server-addr: 192.168.1.101:18498 - namespace: ef0e6889-ac5f-4327-b7ac-ff3105318f58 - -humanGenerate: - baseUrl: http://192.168.1.101:6711 - silent: /silent-video - dynamic: /dynamic-video - status: /status \ No newline at end of file + namespace: ef0e6889-ac5f-4327-b7ac-ff3105318f58 \ No newline at end of file