From 394991611d038ff2cd0b023a9234d6c46f89f2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com> Date: Thu, 9 May 2024 22:52:11 +0800 Subject: [PATCH] . --- conf/application.xml | 16 ++--- conf/persistence.xml | 6 +- pom.xml | 92 ++++++++++++++++++++++++++ src/com/zchd/base/BaseService.java | 4 +- src/com/zchd/zim/ImAccountService.java | 25 +++---- src/com/zchd/zim/ImChatService.java | 2 +- src/com/zchd/zim/ImChatWebSocket.java | 2 +- src/com/zchd/zim/ImMessageMonitor.java | 2 +- 8 files changed, 121 insertions(+), 28 deletions(-) create mode 100644 pom.xml diff --git a/conf/application.xml b/conf/application.xml index 6f6c74e..12fd411 100644 --- a/conf/application.xml +++ b/conf/application.xml @@ -2,22 +2,22 @@ - + - + - - + + - - + + - - + + diff --git a/conf/persistence.xml b/conf/persistence.xml index 34f0677..d100f00 100644 --- a/conf/persistence.xml +++ b/conf/persistence.xml @@ -6,9 +6,9 @@ ALL - - - + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..fe1028e --- /dev/null +++ b/pom.xml @@ -0,0 +1,92 @@ + + 4.0.0 + dev.zhub + zim + 1.0-SNAPSHOT + Archetype - dev.zhub.zim + http://maven.apache.org + + + 17 + 17 + UTF-8 + + + + + maven-release + maven-nexus + https://nexus.1216.top/repository/maven-public/ + + + + + + org.redkale + redkale + 2.2.0 + + + + mysql + mysql-connector-java + 8.0.33 + + + + net.tccn + zhub-client-redkale + x.22.0 + + + + org.mongodb + mongo-java-driver + 3.12.14 + + + + org.projectlombok + lombok + 1.18.26 + compile + + + + com.jfinal + enjoy + 4.8.dev + + + + com.github.jsqlparser + jsqlparser + 4.9 + + + + + lib/zim + + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.0 + + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + + diff --git a/src/com/zchd/base/BaseService.java b/src/com/zchd/base/BaseService.java index 5dc2f93..5f5d20a 100644 --- a/src/com/zchd/base/BaseService.java +++ b/src/com/zchd/base/BaseService.java @@ -1,12 +1,12 @@ package com.zchd.base; -import com.zdemo.cachex.MyRedisCacheSource; -import com.zdemo.zhub.ZHubClient; +import net.tccn.zhub.ZHubClient; import org.redkale.convert.json.JsonConvert; import org.redkale.service.AbstractService; import org.redkale.service.RetResult; import org.redkale.source.DataSource; import org.redkale.util.Sheet; +import org.redkalex.cache.redis.MyRedisCacheSource; import javax.annotation.Resource; import java.io.File; diff --git a/src/com/zchd/zim/ImAccountService.java b/src/com/zchd/zim/ImAccountService.java index bdc7a8a..51977c5 100644 --- a/src/com/zchd/zim/ImAccountService.java +++ b/src/com/zchd/zim/ImAccountService.java @@ -7,8 +7,8 @@ import com.zchd.zim.bean.SubscribeBean; import com.zchd.zim.entity.AppInfo; import com.zchd.zim.entity.ChannelUser; import com.zchd.zim.entity.ImUser; -import com.zdemo.cachex.MyRedisCacheSource; -import com.zdemo.zhub.RpcResult; +import net.tccn.zhub.Lock; +import net.tccn.zhub.RpcResult; import org.redkale.convert.json.JsonConvert; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestService; @@ -18,6 +18,7 @@ import org.redkale.util.AnyValue; import org.redkale.util.Comment; import org.redkale.util.TypeToken; import org.redkale.util.Utility; +import org.redkalex.cache.redis.MyRedisCacheSource; import javax.annotation.Resource; import java.io.Serializable; @@ -54,9 +55,9 @@ public class ImAccountService extends BaseService { ImBean bean = r.getValue(); RetResult result = register(bean); if (!result.isSuccess()) { - return r.buildError(result.getRetinfo()); + return r.retError(result.getRetinfo()); } - return r.buildResp(result.getResult()); + return r.render(result.getResult()); }); // 获取游戏用户 IM-TOKEN @@ -65,9 +66,9 @@ public class ImAccountService extends BaseService { ImBean bean = r.getValue(); RetResult result = getToken(bean); if (!result.isSuccess()) { - return r.buildError(result.getRetinfo()); + return r.retError(result.getRetinfo()); } - return r.buildResp(result.getResult()); + return r.render(result.getResult()); }); // 为用户新增订阅频道 @@ -75,7 +76,7 @@ public class ImAccountService extends BaseService { }, r -> { SubscribeBean bean = r.getValue(); RetResult result = subscribe(bean); - return r.buildResp(result.getResult()); + return r.render(result.getResult()); }); // 为用户取消订阅频道 @@ -83,7 +84,7 @@ public class ImAccountService extends BaseService { }, r -> { SubscribeBean bean = r.getValue(); RetResult result = unsubscribe(bean); - return r.buildResp(result.getResult()); + return r.render(result.getResult()); }); // 禁言 todo： ①禁言时长 ②禁言指定频道 @@ -96,7 +97,7 @@ public class ImAccountService extends BaseService { int userid = user.getUserid(); zimSource.updateColumn(ImUser.class, userid, ColumnValue.create("status", ImUser.STATUS_FREEZE_ACTIVE)); intCache.setBit("im:banned-talk", userid, true); - return r.buildResp(); + return r.render(); }); // 取消禁言 @@ -109,7 +110,7 @@ public class ImAccountService extends BaseService { int userid = user.getUserid(); zimSource.updateColumn(ImUser.class, userid, ColumnValue.create("status", 10)); intCache.setBit("im:banned-talk", userid, false); - return r.buildResp(); + return r.render(); }); } @@ -191,9 +192,9 @@ public class ImAccountService extends BaseService { public RetResult subscribe(SubscribeBean bean) { ImUser user = accountService.currentImUser(bean.getImtoken()); int userid = user.getUserid(); + Lock lock = zhub.lock("im:channel-create:" + userid, 500); try { // 添加数据库订阅关系 - intCache.tryLock("im:channel-create:" + userid, 500); FilterNode node1 = FilterNode.create("appid", user.getAppid()) .and("channeltype", bean.getChanneltype()) .and("channelvalue", bean.getChannelvalue()) @@ -206,7 +207,7 @@ public class ImAccountService extends BaseService { messageMonitor.subscribeChannel(userid, record.buildChannelid(), true); } } finally { - intCache.unlock("im:channel-create:" + userid); + lock.unLock(); } return RET_SUCCESS; } diff --git a/src/com/zchd/zim/ImChatService.java b/src/com/zchd/zim/ImChatService.java index 37809a5..aa851ad 100644 --- a/src/com/zchd/zim/ImChatService.java +++ b/src/com/zchd/zim/ImChatService.java @@ -7,8 +7,8 @@ import com.zchd.zim.entity.ChannelMessage; import com.zchd.zim.entity.ChannelUser; import com.zchd.zim.entity.FriendMessage; import com.zchd.zim.entity.ImUser; -import com.zdemo.zhub.ZHubClient; import net.tccn.timer.Timers; +import net.tccn.zhub.ZHubClient; import org.redkale.net.http.RestService; import org.redkale.net.http.WebSocketNode; import org.redkale.source.ColumnValue; diff --git a/src/com/zchd/zim/ImChatWebSocket.java b/src/com/zchd/zim/ImChatWebSocket.java index 0ae2c2d..ead4633 100644 --- a/src/com/zchd/zim/ImChatWebSocket.java +++ b/src/com/zchd/zim/ImChatWebSocket.java @@ -6,7 +6,6 @@ import com.zchd.base.util.Utils; import com.zchd.zim.entity.ChannelMessage; import com.zchd.zim.entity.FriendMessage; import com.zchd.zim.entity.ImUser; -import com.zdemo.cachex.MyRedisCacheSource; import org.redkale.net.http.HttpRequest; import org.redkale.net.http.RestOnMessage; import org.redkale.net.http.RestWebSocket; @@ -14,6 +13,7 @@ import org.redkale.net.http.WebSocket; import org.redkale.service.RetResult; import org.redkale.source.DataSource; import org.redkale.util.Comment; +import org.redkalex.cache.redis.MyRedisCacheSource; import javax.annotation.Resource; import java.util.Map; diff --git a/src/com/zchd/zim/ImMessageMonitor.java b/src/com/zchd/zim/ImMessageMonitor.java index 4d63855..73699a5 100644 --- a/src/com/zchd/zim/ImMessageMonitor.java +++ b/src/com/zchd/zim/ImMessageMonitor.java @@ -7,13 +7,13 @@ import com.zchd.base.util.Utils; import com.zchd.zim.entity.ChannelMessage; import com.zchd.zim.entity.ChannelUser; import com.zchd.zim.entity.FriendMessage; -import com.zdemo.cachex.MyRedisCacheSource; import org.redkale.net.http.RestService; import org.redkale.net.http.WebSocketNode; import org.redkale.util.AnyValue; import org.redkale.util.Comment; import org.redkale.util.TypeToken; import org.redkale.util.Utility; +import org.redkalex.cache.redis.MyRedisCacheSource; import javax.annotation.Resource; import java.util.BitSet;