hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-31 18:28:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【优化】调试 mj proxy 通知回调

Browse Source
This commit is contained in:
cherishsince
2024-06-04 14:50:27 +08:00
parent 3ab218efc6
commit dbe23cfe8e
5 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/client/MidjourneyProxyClient.java
View File

@@ -1,10 +1,12 @@
package cn.iocoder.yudao.module.ai.client; package cn.iocoder.yudao.module.ai.client;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.module.ai.client.vo.MidjourneyImagineReqVO; import cn.iocoder.yudao.module.ai.client.vo.MidjourneyImagineReqVO;
import cn.iocoder.yudao.module.ai.client.vo.MidjourneySubmitRespVO; import cn.iocoder.yudao.module.ai.client.vo.MidjourneySubmitRespVO;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@@ -35,7 +37,15 @@ public class MidjourneyProxyClient {
* @return * @return
*/ */
public MidjourneySubmitRespVO imagine(@Validated @NotNull MidjourneyImagineReqVO imagineReqVO) { public MidjourneySubmitRespVO imagine(@Validated @NotNull MidjourneyImagineReqVO imagineReqVO) {
return restTemplate.postForObject(url.concat(URI_IMAGINE), imagineReqVO, MidjourneySubmitRespVO.class); // 创建 HttpHeaders 对象
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
headers.set("Authorization", "Bearer sk-c3qxUCVKsPfdQiYU8440E3Fc8dE5424d9cB124A4Ee2489E3");
// 创建 HttpEntity 对象，将 HttpHeaders 和请求体传递给它
HttpEntity<String> requestEntity = new HttpEntity<>(JsonUtils.toJsonString(imagineReqVO), headers);
// 发送 post 请求
ResponseEntity<String> response = restTemplate.exchange(url.concat(URI_IMAGINE), HttpMethod.POST, requestEntity, String.class);
return JsonUtils.parseObject(response.getBody(), MidjourneySubmitRespVO.class);
} }
} }

2
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/client/vo/MidjourneyNotifyReqVO.java
View File

@@ -19,7 +19,7 @@ public class MidjourneyNotifyReqVO {
@Schema(description = "任务类型") @Schema(description = "任务类型")
private MidjourneyTaskActionEnum action; private MidjourneyTaskActionEnum action;
@Schema(description = "任务状态") @Schema(description = "任务状态")
private MidjourneyTaskStatusEnum status = MidjourneyTaskStatusEnum.NOT_START; private MidjourneyTaskStatusEnum status;
@Schema(description = "提示词") @Schema(description = "提示词")
private String prompt; private String prompt;

7
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
View File

@@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -70,10 +71,10 @@ public class AiImageController {
return success(imageService.midjourneyImagine(getLoginUserId(), req)); return success(imageService.midjourneyImagine(getLoginUserId(), req));
} }
// TODO @芋艿：不拦截
@Operation(summary = "midjourney proxy - 回调通知") @Operation(summary = "midjourney proxy - 回调通知")
@RequestMapping("/midjourney-notify") @PostMapping("/midjourney-notify")
public CommonResult<Boolean> midjourneyNotify(MidjourneyNotifyReqVO notifyReqVO) { @PermitAll
public CommonResult<Boolean> midjourneyNotify( @RequestBody MidjourneyNotifyReqVO notifyReqVO) {
return success(imageService.midjourneyNotify(getLoginUserId(), notifyReqVO)); return success(imageService.midjourneyNotify(getLoginUserId(), notifyReqVO));
} }

1
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageServiceImpl.java
View File

@@ -212,7 +212,6 @@ public class AiImageServiceImpl implements AiImageService {
.setId(image.getId()) .setId(image.getId())
.setStatus(imageStatus) .setStatus(imageStatus)
.setPicUrl(filePath) .setPicUrl(filePath)
// .setOriginalPicUrl(notifyReqVO.getImageUrl()) TODO @fan：就不存原始的图片地址啦
); );
return true; return true;
} }

7
yudao-server/src/main/resources/application-local.yaml
View File

@@ -76,6 +76,13 @@ server:
enabled: true enabled: true
charset: UTF-8 charset: UTF-8
force: true force: true
# ai
ai:
midjourney-proxy:
url: https://api.holdai.top/mj
notifyUrl: http://7b1aada4.r26.cpolar.top/admin-api/ai/image/midjourney-notify
--- #################### 定时任务相关配置 #################### --- #################### 定时任务相关配置 ####################
# Quartz 配置项，对应 QuartzProperties 配置类 # Quartz 配置项，对应 QuartzProperties 配置类