wangli/im-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:REQ-1419 fixbug 消息发送异常

Browse Source
This commit is contained in:
zuoqinbo 2023-10-24 18:22:55 +08:00
parent e045ecd208
commit f00b64f327
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
im-center-server/im-center-server.iml
View File

@ -22,43 +22,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
<orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:2.2.0" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-haproxy:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-memcache:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-mqtt:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-redis:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-smtp:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-stomp:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-xml:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-rxtx:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-sctp:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-udt:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-classes-epoll:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-classes-kqueue:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns-classes-macos:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.5.15" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.32" level="project" />
<orderEntry type="library" name="Maven: cn.axzo.framework:axzo-web-spring-boot-starter:1.0.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: cn.axzo.framework:axzo-spring-boot-starter:1.0.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: cn.axzo.framework.jackson:jackson-starter:1.0.0-SNAPSHOT" level="project" />
@ -194,12 +157,21 @@
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.7" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson-spring-boot-starter:3.15.6" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson:3.15.6" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.12" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.12" level="project" />
<orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.11.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.11.Final" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.32" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.7" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.7" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
@ -248,6 +220,31 @@
<orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-common:4.9.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-acl:4.9.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-remoting:4.9.1" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-haproxy:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-memcache:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-mqtt:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-redis:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-smtp:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-stomp:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-xml:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-rxtx:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-sctp:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-udt:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-classes-epoll:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-classes-kqueue:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns-classes-macos:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.70.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.70.Final" level="project" />
<orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-logging:4.9.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-srvutil:4.9.1" level="project" />
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
@ -295,6 +292,7 @@
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.32" level="project" />
<orderEntry type="library" name="Maven: cn.axzo.third:third-party-api:2.0.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: cn.axzo.basics:basics-common:2.0.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.8.4" level="project" />
<orderEntry type="library" name="Maven: cn.axzo.framework:axzo-auth-spring-boot-starter:2.0.0-SNAPSHOT" level="project" />

3
im-center-server/src/main/java/cn/axzo/im/service/AccountService.java
View File

@ -115,7 +115,8 @@ public class AccountService {
if (StringUtils.isBlank(accountRegister.getImAccount())) {
//2.重新注册账户,如果已注册，就查询该账户信息
UserAccountResp accountResp = createNimAccount(userId, userIdWrapper, headImageUrl, nickName);
if (accountResp != null && StringUtils.isNotBlank(accountResp.getImAccount())) {
if (accountResp != null && StringUtils.isNotBlank(accountResp.getImAccount())
&& StringUtils.isNotBlank(accountResp.getToken())) {
accountRegister.setImAccount(accountResp.getImAccount());
accountRegister.setToken(accountResp.getToken());
accountRegister.setAppKey(appKey);

2
im-center-server/src/main/java/cn/axzo/im/service/MessageService.java
View File

@ -122,7 +122,9 @@ public class MessageService {
toPersonList.forEach(personId -> {
AccountRegister accountRegister = accountRegisterDao.lambdaQuery().eq(AccountRegister::getIsDelete, 0)
.eq(AccountRegister::getAccountId, personId)
.isNotNull(AccountRegister::getToken)
.eq(AccountRegister::getAppType, appType.getCode()).one();
if (accountRegister == null || StringUtils.isEmpty(accountRegister.getImAccount())) {
log.warn("接收用户账户[" + personId + "],appType[" + appType.getCode() + "],未注册IM账户!");
return;