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
2fddcc3c
Commit
2fddcc3c
authored
Apr 14, 2022
by
罗长华
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/feature-cluster' into feature-cluster
parents
e77dd4d2
ed3e5aa0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
core/src/main/java/com/wecloud/multimeet/service/impl/MultiMeetServiceImpl.java
+0
-1
framework/src/main/java/io/geekidea/springbootplus/framework/signature/ControllerValidatorAspect.java
+3
-3
No files found.
core/src/main/java/com/wecloud/multimeet/service/impl/MultiMeetServiceImpl.java
View file @
2fddcc3c
...
@@ -72,7 +72,6 @@ public class MultiMeetServiceImpl implements MultiMeetService {
...
@@ -72,7 +72,6 @@ public class MultiMeetServiceImpl implements MultiMeetService {
boolean
onlineStatus
=
userStateCacheManager
.
isOnline
(
currentClient
.
getId
());
boolean
onlineStatus
=
userStateCacheManager
.
isOnline
(
currentClient
.
getId
());
if
(!
onlineStatus
)
{
if
(!
onlineStatus
)
{
log
.
info
(
"发起方必须在线"
+
currentClient
.
getFkAppid
()
+
currentClient
.
getClientId
());
log
.
info
(
"发起方必须在线"
+
currentClient
.
getFkAppid
()
+
currentClient
.
getClientId
());
throw
new
BusinessException
(
"发起方必须在线"
);
}
}
List
<
RoomMemberDto
>
members
=
Lists
.
newArrayList
();
List
<
RoomMemberDto
>
members
=
Lists
.
newArrayList
();
ImMultiRtcRoom
rtcRoom
=
imMultiRtcRoomService
.
getCachedMultiRtcRoom
(
currentClient
.
getFkAppid
(),
param
.
getRoomId
());
ImMultiRtcRoom
rtcRoom
=
imMultiRtcRoomService
.
getCachedMultiRtcRoom
(
currentClient
.
getFkAppid
(),
param
.
getRoomId
());
...
...
framework/src/main/java/io/geekidea/springbootplus/framework/signature/ControllerValidatorAspect.java
View file @
2fddcc3c
...
@@ -50,9 +50,9 @@ import com.google.common.collect.Lists;
...
@@ -50,9 +50,9 @@ import com.google.common.collect.Lists;
* @Date 2021年01月20日 04:21:30
* @Date 2021年01月20日 04:21:30
* @Version 1.0
* @Version 1.0
*/
*/
@Order
(
2
)
//
@Order(2)
@Aspect
//
@Aspect
@Component
//
@Component
@Slf4j
@Slf4j
public
class
ControllerValidatorAspect
implements
InitializingBean
{
public
class
ControllerValidatorAspect
implements
InitializingBean
{
...
...
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