Skip to content

W
wecloud_im_server
Commit 13318b4d by Future
Options

顺序消息调整

parent 627fd907
Showing with 11 additions and 9 deletions
config/src/main/resources/config/application-dev.yml
...@@ -15,9 +15,9 @@ spring-boot-plus: ...@@ -15,9 +15,9 @@ spring-boot-plus:
spring: spring:
datasource: datasource:
url: jdbc:mysql://192.168.1.51:3306/wecloud-im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:mysql://127.0.0.1:3306/wecloud-im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username: mysql username: root
password: mysql password: 123456
#//测试外网 #//测试外网
# url: jdbc:mysql://18.136.207.16:3306/wecloud_im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true # url: jdbc:mysql://18.136.207.16:3306/wecloud_im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
...@@ -27,14 +27,14 @@ spring: ...@@ -27,14 +27,14 @@ spring:
# Redis配置 # Redis配置
redis: redis:
database: 0 database: 0
host: 192.168.1.51 host: 127.0.0.1
password: password:
port: 6379 port: 6379
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 192.168.1.51:8848 server-addr: 127.0.0.1:8848
dubbo: dubbo:
...@@ -42,9 +42,11 @@ dubbo: ...@@ -42,9 +42,11 @@ dubbo:
port: 20881 port: 20881
name: dubbo name: dubbo
registry: registry:
address: nacos://192.168.1.51:8848?username=nacos&password=nacos address: nacos://127.0.0.1:8848?username=nacos&password=nacos
provider: provider:
cluster: channelRouterCluster cluster: channelRouterCluster
consumer:
check: false
# 打印SQL语句和结果集，本地开发环境可开启，线上注释掉 # 打印SQL语句和结果集，本地开发环境可开启，线上注释掉
mybatis-plus: mybatis-plus:
......
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
...@@ -152,7 +152,7 @@ public class NormalChatAction { ...@@ -152,7 +152,7 @@ public class NormalChatAction {
// 异步推送系统通知消息 // 异步推送系统通知消息
PushDTO pushDTO = mqSender.buildPushDto(data.getPush(), imClientReceiver, imApplication); PushDTO pushDTO = mqSender.buildPushDto(data.getPush(), imClientReceiver, imApplication);
mqSender.orderSend(MqConstant.Topic.IM_MSG_TOPIC, MqConstant.Tag.IM_MSG_TAG, pushDTO); mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
} }
// 响应发送方消息id等信息 // 响应发送方消息id等信息
......
core/src/main/java/com/wecloud/im/friend/service/FriendEventSender.java
...@@ -66,7 +66,7 @@ public class FriendEventSender { ...@@ -66,7 +66,7 @@ public class FriendEventSender {
pushVO.setTitle(FRIEND_APPLY_TITLE); pushVO.setTitle(FRIEND_APPLY_TITLE);
pushVO.setSubTitle(FRIEND_APPLY_TITLE_SUB); pushVO.setSubTitle(FRIEND_APPLY_TITLE_SUB);
PushDTO pushDTO = mqSender.buildPushDto(pushVO, receiveClient, app); PushDTO pushDTO = mqSender.buildPushDto(pushVO, receiveClient, app);
mqSender.orderSend(MqConstant.Topic.IM_MSG_TOPIC, MqConstant.Tag.IM_MSG_TAG, pushDTO); mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
} }
public void sendFriendApproveEventMsg(ImClient claimerClient, ImClient receiveClient, boolean isAgree, String rejectRemark) { public void sendFriendApproveEventMsg(ImClient claimerClient, ImClient receiveClient, boolean isAgree, String rejectRemark) {
...@@ -94,6 +94,6 @@ public class FriendEventSender { ...@@ -94,6 +94,6 @@ public class FriendEventSender {
pushVO.setTitle(FRIEND_APPROVE_TITLE); pushVO.setTitle(FRIEND_APPROVE_TITLE);
pushVO.setSubTitle(isAgree ? FRIEND_APPROVE_TITLE_AGREE : FRIEND_APPROVE_TITLE_REJECT); pushVO.setSubTitle(isAgree ? FRIEND_APPROVE_TITLE_AGREE : FRIEND_APPROVE_TITLE_REJECT);
PushDTO pushDTO = mqSender.buildPushDto(pushVO, receiveClient, app); PushDTO pushDTO = mqSender.buildPushDto(pushVO, receiveClient, app);
mqSender.orderSend(MqConstant.Topic.IM_MSG_TOPIC, MqConstant.Tag.IM_MSG_TAG, pushDTO); mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment