Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wecloud_im_server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hewei
wecloud_im_server
Commits
13318b4d
Commit
13318b4d
authored
Feb 28, 2022
by
Future
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
顺序消息调整
parent
627fd907
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
config/src/main/resources/config/application-dev.yml
+8
-6
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
+1
-1
core/src/main/java/com/wecloud/im/friend/service/FriendEventSender.java
+2
-2
No files found.
config/src/main/resources/config/application-dev.yml
View file @
13318b4d
...
...
@@ -15,9 +15,9 @@ spring-boot-plus:
spring
:
datasource
:
url
:
jdbc:mysql://1
92.168.1.5
1:3306/wecloud-im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username
:
mysql
password
:
mysql
url
:
jdbc:mysql://1
27.0.0.
1:3306/wecloud-im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username
:
root
password
:
123456
#//测试外网
# 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:
# Redis配置
redis
:
database
:
0
host
:
1
92.168.1.5
1
host
:
1
27.0.0.
1
password
:
port
:
6379
cloud
:
nacos
:
discovery
:
server-addr
:
1
92.168.1.5
1:8848
server-addr
:
1
27.0.0.
1:8848
dubbo
:
...
...
@@ -42,9 +42,11 @@ dubbo:
port
:
20881
name
:
dubbo
registry
:
address
:
nacos://1
92.168.1.5
1:8848?username=nacos&password=nacos
address
:
nacos://1
27.0.0.
1:8848?username=nacos&password=nacos
provider
:
cluster
:
channelRouterCluster
consumer
:
check
:
false
# 打印SQL语句和结果集,本地开发环境可开启,线上注释掉
mybatis-plus
:
...
...
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
View file @
13318b4d
...
...
@@ -152,7 +152,7 @@ public class NormalChatAction {
// 异步推送系统通知消息
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等信息
...
...
core/src/main/java/com/wecloud/im/friend/service/FriendEventSender.java
View file @
13318b4d
...
...
@@ -66,7 +66,7 @@ public class FriendEventSender {
pushVO
.
setTitle
(
FRIEND_APPLY_TITLE
);
pushVO
.
setSubTitle
(
FRIEND_APPLY_TITLE_SUB
);
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
)
{
...
...
@@ -94,6 +94,6 @@ public class FriendEventSender {
pushVO
.
setTitle
(
FRIEND_APPROVE_TITLE
);
pushVO
.
setSubTitle
(
isAgree
?
FRIEND_APPROVE_TITLE_AGREE
:
FRIEND_APPROVE_TITLE_REJECT
);
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
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment