From 6f0cc3aaf8969405ebac4b6ad83911a979758cbd Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 6 Jun 2025 10:59:13 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=20=E6=9B=B4=E6=8D=A2=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9access=20key=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F=E4=B8=AD?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=94=B9=E4=B8=BA=E4=BB=8E=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/common/utils/SendRequestUtil.java | 10 +++++----- .../com/ai/da/service/impl/GenerateServiceImpl.java | 12 +++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ai/da/common/utils/SendRequestUtil.java b/src/main/java/com/ai/da/common/utils/SendRequestUtil.java index 173c2b30..8ed6321c 100644 --- a/src/main/java/com/ai/da/common/utils/SendRequestUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendRequestUtil.java @@ -14,14 +14,14 @@ import org.springframework.stereotype.Component; public class SendRequestUtil { @Value("${ALIYUN_API_KEY}") - private String AliYunAPIKey; + private String ALIYUN_API_KEY; @Value("${FREEPIK_API_KEY}") - private String freepikAPIKey; + private String FREEPIK_API_KEY; public String sendAliYunPostAsync(String apiUrl, String requestBody){ // 发送POST请求 todo 异常处理 HttpResponse execute = HttpRequest.post(apiUrl) - .header(Header.AUTHORIZATION, "Bearer " + AliYunAPIKey) + .header(Header.AUTHORIZATION, "Bearer " + ALIYUN_API_KEY) .header("X-DashScope-Async", "enable") .header(Header.CONTENT_TYPE, "application/json") .body(requestBody) @@ -42,7 +42,7 @@ public class SendRequestUtil { // 发送POST请求 todo 异常处理 HttpResponse execute = HttpRequest.post(FREE_PIK) .header(Header.CONTENT_TYPE, "application/json") - .header("x-freepik-api-key", freepikAPIKey) + .header("x-freepik-api-key", FREEPIK_API_KEY) .body(requestBody) .timeout(20000) // 设置超时时间20秒 .execute(); @@ -57,7 +57,7 @@ public class SendRequestUtil { public String sendAliYunGet(String fullUrl){ // 发送GET请求 todo 异常处理 HttpResponse httpResponse = HttpRequest.get(fullUrl) - .header(Header.AUTHORIZATION, "Bearer " + AliYunAPIKey) + .header(Header.AUTHORIZATION, "Bearer " + ALIYUN_API_KEY) .timeout(20000) // 设置超时时间20秒 .execute(); int status = httpResponse.getStatus(); diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 4ab2bdcd..773b3ff2 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -119,6 +119,13 @@ public class GenerateServiceImpl extends ServiceImpl i @Value("${ollama.url}") private String ollamaUrl; + @Value("${ALIYUN_API_KEY}") + private String ALIYUN_API_KEY; + + @Value("${FREEPIK_API_KEY}") + private String FREEPIK_API_KEY; + + @Resource private AccountService accountService; @@ -1349,7 +1356,7 @@ public class GenerateServiceImpl extends ServiceImpl i promptExtend.put("prompt_extend", false); ImageSynthesisParam param = ImageSynthesisParam.builder() - .apiKey(System.getenv("DASHSCOPE_API_KEY")) + .apiKey(ALIYUN_API_KEY) .model("wanx2.1-t2i-plus") .prompt(prompt) .n(1) @@ -1449,7 +1456,6 @@ public class GenerateServiceImpl extends ServiceImpl i private static final String TEMPLATE_ID_GEN = "https://dashscope.aliyuncs.com/api/v1/services/aigc/image2video/aa-template-generation/"; private static final String GET_ASYNC_RESULT = "https://dashscope.aliyuncs.com/api/v1/tasks/"; private static final String ANIMATE = "https://dashscope.aliyuncs.com/api/v1/services/aigc/image2video/video-synthesis/"; - private static final String API_KEY = System.getenv("DASHSCOPE_API_KEY"); // 替换为你的实际API密钥 public String animateAnyone(PoseTransformDTO poseTransformDTO, Long accountId){ accountId = 87L; @@ -1582,7 +1588,7 @@ public class GenerateServiceImpl extends ServiceImpl i try { // 发送GET请求查询任务状态 HttpResponse httpResponse = HttpRequest.get(GET_ASYNC_RESULT + taskId) - .header(Header.AUTHORIZATION, "Bearer " + API_KEY) + .header(Header.AUTHORIZATION, "Bearer " + ALIYUN_API_KEY) .timeout(10000) .execute();