Merge remote-tracking branch 'origin/master'

# Conflicts:
#	java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketEmailsServiceImpl.java

java/storlead-knowledge/storlead-knowledge-api/src/main/java/com/storlead/knowledge/api/WorkflowsController.java

@@ -38,7 +38,9 @@ public class WorkflowsController {
         return workflowsService.AiWorkflows(chatDTO);
     }
 
-    @PostMapping("streaming")
+
+
+    @PostMapping(value = "streaming")
     @ApiOperation("执行流程 流式返回")
     public SseEmitter workflowsStreaming(@RequestBody ChatDTO chatDTO) throws IOException {
 
@@ -47,6 +49,7 @@ public class WorkflowsController {
         String url = difyProperties.getBaseUrl() + "workflows/run";
 
         String body = JacksonHolder.OBJECT_MAPPER.writeValueAsString(chatDTO);
+        body = body.replace("responseMode","response_mode");
         httpService.postStream(
                 url,
                 "Bearer " +chatDTO.getAppId(),

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketEmailsServiceImpl.java

@@ -151,8 +151,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         List<Long> sopDetailIdList = marketingCampaignSopDetailEntityList.stream()
                 .map(MarketingCampaignSopDetailEntity::getSopDetailId)
                 .collect(Collectors.toList());
-        List<SopDetailEntity> sopDetailEntityList = sopDetailService.listByIds(sopDetailIdList).stream()
-                .collect(Collectors.toList());
+        List<SopDetailEntity> sopDetailEntityList = sopDetailService.listByIds(sopDetailIdList).stream().collect(Collectors.toList());
         // 1. 查询营销关联的客户基础信息
         LambdaQueryWrapper<CustomerBaseEntity> customerBaseWrapper = new LambdaQueryWrapper<>();
         customerBaseWrapper.eq(CustomerBaseEntity::getMarketingCampaignId, marketingCampaignEntity.getId());

ui/smarttrade-platform/src/api/emails/index.js

@@ -1,6 +1,6 @@
 import { get, post, put, remove, upload } from '@/utils/request'
 
 export const getMailsPort = (mailAccount) => post('/router/rest/mail/mail_port_config', { mailAccount })
-export const emailsTest = (data) => post('/router/rest/smtp/pop/setting/test_connect', data)
-export const addEmailsSetting = (data) => post('/router/rest/smtp/pop/setting/save', data)
-export const getUserEmails = () => post('/router/rest/smtp/pop/setting/personal_mail_account')
+export const emailsTest = (data) => post('/router/rest/mkt/email/account/test_connect', data)
+export const addEmailsSetting = (data) => post('/router/rest/mkt/email/account/save', data)
+export const getUserEmails = () => post('/router/rest/mkt/email/account/personal_mail_account')