From 01c07ee7ec11ab9f1db188e4c592e01518264069 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 16:41:55 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java | 2 +-
src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java | 6 +++---
src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java | 4 ++--
src/main/resources/application.yml | 12 ++++++------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
index 1971a4d..cf0f695 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
@@ -100,7 +100,7 @@
member = new MemberEntity();
member.setId(memberId);
-// member.setName(mbAddDto.getNickname());
+ member.setName(mbAddDto.getNickname());
memberDao.updateById(member);
return Result.ok("修改成功");
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java b/src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java
index da31baa..1963888 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java
@@ -14,8 +14,8 @@
@ApiModelProperty(value = "id - 编辑时传")
private Long id;
-// @NotBlank(message = "昵称不能为空")
-// @ApiModelProperty(value = "昵称", example = "123")
-// private String nickname;
+ @NotBlank(message = "昵称不能为空")
+ @ApiModelProperty(value = "昵称", example = "123")
+ private String nickname;
}
diff --git a/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
index bdc0a5d..9a2c634 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
@@ -54,7 +54,7 @@
OtcMsgUserListEntity from = new OtcMsgUserListEntity();
from.setMemberId(fromId);
from.setTargetId(toId);
- from.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
+ from.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
from.setLastMsgTime(new Date());
otcMsgUserListDao.insert(from);
}
@@ -65,7 +65,7 @@
OtcMsgUserListEntity from = new OtcMsgUserListEntity();
from.setMemberId(toId);
from.setTargetId(fromId);
- from.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
+ from.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
from.setLastMsgTime(new Date());
otcMsgUserListDao.insert(from);
} else {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2469a85..39bdbd0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,12 +7,12 @@
profiles:
active: dev
datasource:
-# url: jdbc:mysql://154.91.195.170:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
-# username: yd_otc
-# password: yd_otc123!@#
- url: jdbc:mysql://120.27.238.55:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ct_test
- password: 123456
+ url: jdbc:mysql://154.91.195.170:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: yd_otc
+ password: yd_otc123!@#
+# url: jdbc:mysql://120.27.238.55:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+# username: ct_test
+# password: 123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
--
Gitblit v1.9.1