Merge branch 'dev' into uat

This commit is contained in:
lxu75
2025-03-07 15:41:20 +08:00
2 changed files with 3 additions and 8 deletions

View File

@@ -41,13 +41,7 @@ public class TestController {
@Autowired @Autowired
private MqMessageRecordService mqMessageRecordService; private MqMessageRecordService mqMessageRecordService;
@Value("${dify.user}") /*
private String user;
@Value("${dify.flowId}")
private String flowId;
@PostMapping("/runWorkflows2") @PostMapping("/runWorkflows2")
@ApiOperation(value = "测试Dify") @ApiOperation(value = "测试Dify")
public ResultMsg<Object> runWorkflows2(@RequestBody String contentStr) { public ResultMsg<Object> runWorkflows2(@RequestBody String contentStr) {
@@ -86,7 +80,7 @@ public class TestController {
log.info("contentStr {}", contentStr); log.info("contentStr {}", contentStr);
boolean result = mqMessageRecordService.processMessageByMQ(contentStr); boolean result = mqMessageRecordService.processMessageByMQ(contentStr);
return ResultMsg.ok(result); return ResultMsg.ok(result);
} }*/
@PostMapping("/runWorkflows5") @PostMapping("/runWorkflows5")
@ApiOperation(value = "补偿处理消息") @ApiOperation(value = "补偿处理消息")

View File

@@ -41,6 +41,7 @@ public class DiFyServiceImpl implements DiFyService{
map.put("user",diFyReq.getUser()); map.put("user",diFyReq.getUser());
JSONObject difyResult = diFyFeign.runWorkflows("Bearer "+diFyReq.getFlowId(),map); JSONObject difyResult = diFyFeign.runWorkflows("Bearer "+diFyReq.getFlowId(),map);
log.info("请求DiFy响应结果:{}",difyResult.toJSONString());
JSONObject data = difyResult.getJSONObject("data"); JSONObject data = difyResult.getJSONObject("data");
if (data != null && "succeeded".equals(data.get("status"))){ if (data != null && "succeeded".equals(data.get("status"))){
JSONObject outputs = data.getJSONObject("outputs"); JSONObject outputs = data.getJSONObject("outputs");