From 00693ef80272997c135687fc875c17bd4e60528b Mon Sep 17 00:00:00 2001 From: Diyu0904 <1819728964@qq.com> Date: Sat, 15 Mar 2025 14:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=85=8D=E7=BD=AE=E4=B8=BA=E6=96=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mcwl-admin/src/main/resources/application-dev.yml | 10 +++++----- .../mcwl/resource/domain/response/ResponseCollect.java | 3 +++ .../mcwl/resource/service/impl/CollectServiceImpl.java | 5 +---- .../main/resources/mapper/resource/CollectMapper.xml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mcwl-admin/src/main/resources/application-dev.yml b/mcwl-admin/src/main/resources/application-dev.yml index eae9890..81676cc 100644 --- a/mcwl-admin/src/main/resources/application-dev.yml +++ b/mcwl-admin/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ spring: #mq rabbitmq: - host: 1.13.246.108 + host: 113.45.190.154 port: 5672 username: guest password: guest @@ -23,7 +23,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://1.13.246.108:3306/mcwl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://113.45.190.154:3306/mcwl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: ybl123456@ # 从库数据源 @@ -156,11 +156,11 @@ mall: # alipayCertPath: D:\workspace\mochuang\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\alipayPublicCert.crt # # 沙箱支付宝根证书路径 # alipayRootCertPath: D:\workspace\mochuang\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\alipayRootCert.crt - notifyUrl: http://1.13.246.108:8080/ali/pay/notify + notifyUrl: http://113.45.190.154:8080/ali/pay/notify # 沙箱支付宝网关 gatewayUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do # 绑定回调 - bindUrl: http://1.13.246.108:8080/ali/pay/callback + bindUrl: http://113.45.190.154:8080/ali/pay/callback huawei: obs: @@ -171,7 +171,7 @@ huawei: endPoint: obs.cn-south-1.myhuaweicloud.com mqtt: - broker-url: tcp://192.168.136.128:1883 + broker-url: tcp://113.45.190.154:1883 client-id-prefix: emqx-client connection-timeout: 30 keep-alive-interval: 60 diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java index 17a4c1e..12126fb 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java @@ -52,4 +52,7 @@ public class ResponseCollect { @ApiModelProperty(value = "是否下载") private Integer isDownload; + @ApiModelProperty(value = "触发词") + private String triggerWords = "-"; + } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java index 24faa7f..3ac3dd6 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java @@ -66,10 +66,7 @@ public class CollectServiceImpl implements CollectService { //查询工作流 List responseCollectList = collectMapper.selectCollectWorkFlow(userIdMax); - //校验是否下载 - for (ResponseCollect collect : responseCollectList) { - collect.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,collect.getId(),1)); - } + return R.ok(responseCollectList); diff --git a/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml b/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml index cffeb1d..095996d 100644 --- a/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml +++ b/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml @@ -26,7 +26,7 @@