CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查看收藏列表接口 

修改配置为新测试环境
master
Diyu0904 2025-03-15 14:12:11 +08:00
parent 8ca5ff3290
commit 00693ef802
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mcwl-admin/src/main/resources/application-dev.yml
View File

@ -2,7 +2,7 @@
spring: spring:
#mq #mq
rabbitmq: rabbitmq:
host: 1.13.246.108 host: 113.45.190.154
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
@ -23,7 +23,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: 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 username: root
password: ybl123456@ password: ybl123456@
# 从库数据源 # 从库数据源
@ -156,11 +156,11 @@ mall:
# alipayCertPath: D:\workspace\mochuang\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\alipayPublicCert.crt # 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 # 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 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: huawei:
obs: obs:
@ -171,7 +171,7 @@ huawei:
endPoint: obs.cn-south-1.myhuaweicloud.com endPoint: obs.cn-south-1.myhuaweicloud.com
mqtt: mqtt:
broker-url: tcp://192.168.136.128:1883 broker-url: tcp://113.45.190.154:1883
client-id-prefix: emqx-client client-id-prefix: emqx-client
connection-timeout: 30 connection-timeout: 30
keep-alive-interval: 60 keep-alive-interval: 60

3
mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java
View File

@ -52,4 +52,7 @@ public class ResponseCollect {
@ApiModelProperty(value = "是否下载") @ApiModelProperty(value = "是否下载")
private Integer isDownload; private Integer isDownload;
@ApiModelProperty(value = "触发词")
private String triggerWords = "-";
} }

5
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java
View File

@ -66,10 +66,7 @@ public class CollectServiceImpl implements CollectService {
//查询工作流 //查询工作流
List<ResponseCollect> responseCollectList = collectMapper.selectCollectWorkFlow(userIdMax); List<ResponseCollect> responseCollectList = collectMapper.selectCollectWorkFlow(userIdMax);
//校验是否下载
for (ResponseCollect collect : responseCollectList) {
collect.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,collect.getId(),1));
}
return R.ok(responseCollectList); return R.ok(responseCollectList);

2
mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml
View File

@ -26,7 +26,7 @@
</select> </select>
<select id="selectCollectModel" resultType="com.mcwl.resource.domain.response.ResponseCollect"> <select id="selectCollectModel" resultType="com.mcwl.resource.domain.response.ResponseCollect">
SELECT c.product_id as id,m.surface_url as file_path,v.file_name,m.model_name as product_name,u.nick_name,v.file_size,c.create_time,v.model_version_type as type SELECT c.product_id as id,m.surface_url as file_path,v.file_name,m.model_name as product_name,u.nick_name,v.file_size,c.create_time,v.model_version_type as type,v.trigger_words
FROM collect as c FROM collect as c
LEFT JOIN model_version as v on c.product_id = v.id LEFT JOIN model_version as v on c.product_id = v.id
LEFT JOIN model as m on v.model_id = m.id LEFT JOIN model as m on v.model_id = m.id