diff --git a/sql/mysql/tashow-order.sql b/sql/mysql/tashow-order.sql deleted file mode 100644 index e69de29..0000000 diff --git a/tashow-gateway/src/main/resources/application-local.yaml b/tashow-gateway/src/main/resources/application-local.yaml index 8ef2917..59b8b16 100644 --- a/tashow-gateway/src/main/resources/application-local.yaml +++ b/tashow-gateway/src/main/resources/application-local.yaml @@ -3,9 +3,9 @@ spring: cloud: nacos: - server-addr: localhost:8848 # Nacos 服务器地址 - username: # Nacos 账号 - password: # Nacos 密码 + server-addr: 43.139.42.137:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 discovery: # 【配置中心】配置项 namespace: dev # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP diff --git a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/app/dialog/vo/AiDialogMessageRespVo.java b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/app/dialog/vo/AiDialogMessageRespVo.java index 18bf676..5c5b606 100644 --- a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/app/dialog/vo/AiDialogMessageRespVo.java +++ b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/app/dialog/vo/AiDialogMessageRespVo.java @@ -3,8 +3,7 @@ package com.tashow.cloud.ai.controller.app.dialog.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; - -import java.util.Date; +import org.springframework.format.annotation.DateTimeFormat; import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -71,6 +70,7 @@ public class AiDialogMessageRespVo { * 创建时间 */ @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date createTime; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private String createTime; } \ No newline at end of file diff --git a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java index ef4fb19..7f6b8b7 100644 --- a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java +++ b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java @@ -100,10 +100,7 @@ public class AiDialogServiceImpl extends ServiceImpl messageDO.setContentText(fileUrl); messageDO.setContentType(2); - //宠物档案 todo - messageDO.setPetId(1l); - messageDO.setPetName("猫猫翻译"); - messageDO.setPetAvatar("https://img1.baidu.com/it/u=1224902049,3440357835&fm=253&app=138&f=JPEG?w=801&h=800"); + //获取当前最后的排序 AiDialogMessageDO aiDialogMessageDO = aiDialogMessageMapper.selectOne(new LambdaQueryWrapper() .eq(AiDialogMessageDO::getDialogId, fileReqVo.getDialogId()) @@ -157,6 +154,10 @@ public class AiDialogServiceImpl extends ServiceImpl .orElse(null); //返回结果 + //宠物档案 todo + messageDO.setPetId(1l); + messageDO.setPetName(speciesLabels); + messageDO.setPetAvatar("https://img1.baidu.com/it/u=1224902049,3440357835&fm=253&app=138&f=JPEG?w=801&h=800"); messageDO.setPetType(speciesLabels); messageDO.setTransStatus(1); messageDO.setTransResult(StrUtil.isBlank(resultKey) ? "" : resultKey.split(StrUtil.UNDERLINE)[1]); diff --git a/tashow-module/tashow-module-member/src/main/resources/application.yaml b/tashow-module/tashow-module-member/src/main/resources/application.yaml index ab354a8..f98b23c 100644 --- a/tashow-module/tashow-module-member/src/main/resources/application.yaml +++ b/tashow-module/tashow-module-member/src/main/resources/application.yaml @@ -1,3 +1,5 @@ +server: + port: 48084 spring: application: name: member-server diff --git a/tashow-module/tashow-module-system/src/main/resources/application-local.yaml b/tashow-module/tashow-module-system/src/main/resources/application-local.yaml index 0dd66fe..03bada2 100644 --- a/tashow-module/tashow-module-system/src/main/resources/application-local.yaml +++ b/tashow-module/tashow-module-system/src/main/resources/application-local.yaml @@ -1,9 +1,9 @@ spring: cloud: nacos: - server-addr: localhost:8848 # Nacos 服务器地址 -# username: nacos # Nacos 账号 -# password: nacos # Nacos 密码 + server-addr: 43.139.42.137:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 discovery: # 【配置中心】配置项 namespace: dev # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP diff --git a/tashow-module/tashow-module-trade/src/main/resources/application.yaml b/tashow-module/tashow-module-trade/src/main/resources/application.yaml index 08707ee..0491d71 100644 --- a/tashow-module/tashow-module-trade/src/main/resources/application.yaml +++ b/tashow-module/tashow-module-trade/src/main/resources/application.yaml @@ -1,5 +1,5 @@ server: - port: 48102 + port: 48085 spring: application: name: trade-server