parent
8ca5ff3290
commit
00693ef802
|
@ -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
|
||||
|
|
|
@ -52,4 +52,7 @@ public class ResponseCollect {
|
|||
@ApiModelProperty(value = "是否下载")
|
||||
private Integer isDownload;
|
||||
|
||||
@ApiModelProperty(value = "触发词")
|
||||
private String triggerWords = "-";
|
||||
|
||||
}
|
||||
|
|
|
@ -66,10 +66,7 @@ public class CollectServiceImpl implements CollectService {
|
|||
|
||||
//查询工作流
|
||||
List<ResponseCollect> responseCollectList = collectMapper.selectCollectWorkFlow(userIdMax);
|
||||
//校验是否下载
|
||||
for (ResponseCollect collect : responseCollectList) {
|
||||
collect.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,collect.getId(),1));
|
||||
}
|
||||
|
||||
|
||||
|
||||
return R.ok(responseCollectList);
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
</select>
|
||||
|
||||
<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
|
||||
LEFT JOIN model_version as v on c.product_id = v.id
|
||||
LEFT JOIN model as m on v.model_id = m.id
|
||||
|
|
Loading…
Reference in New Issue