Merge branch 'bt/hefu' into dev_dh_bt
commit
0d19cccb45
|
@ -1,6 +1,8 @@
|
|||
package com.ljsd.jieling.core;
|
||||
|
||||
import com.ljsd.GameApplication;
|
||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
import com.ljsd.jieling.db.mongo.core.CHefuInfo;
|
||||
import com.ljsd.jieling.db.mongo.core.ServerAreaInfoManager;
|
||||
import com.ljsd.jieling.logic.dao.SCdkInfo;
|
||||
import com.ljsd.jieling.logic.dao.root.UserInfo;
|
||||
|
@ -30,13 +32,25 @@ public class CoreLogic {
|
|||
public final static CoreLogic instance = new CoreLogic();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public ServerAreaInfoManager findServerArenaInfoManager() throws Exception{
|
||||
MongoTemplate coreMongoTemplate =MongoUtil.getCoreMongoTemplate();
|
||||
MongoTemplate coreMongoTemplate = MongoUtil.getCoreMongoTemplate();
|
||||
return coreMongoTemplate.findById(1,ServerAreaInfoManager.class);
|
||||
}
|
||||
|
||||
public CHefuInfo findHefuInfo() {
|
||||
MongoTemplate coreMongoTemplate = MongoUtil.getCoreMongoTemplate();
|
||||
Query query = new Query(Criteria.where("serverId").is(GameApplication.serverId));
|
||||
return coreMongoTemplate.findOne(query, CHefuInfo.class);
|
||||
}
|
||||
|
||||
public boolean isHefu(int serverId) {
|
||||
CHefuInfo hefuInfo = findHefuInfo();
|
||||
if (hefuInfo == null){
|
||||
return false;
|
||||
}
|
||||
return hefuInfo.getSlaveServerIds().contains(serverId);
|
||||
}
|
||||
|
||||
public int findServerIdFromMongo(int uid) {
|
||||
MongoTemplate coreMongoTemplate = MongoUtil.getCoreMongoTemplate();
|
||||
Query query = new Query(Criteria.where("_id").is(uid));
|
||||
|
|
|
@ -416,19 +416,25 @@ public class AreaManager {
|
|||
}
|
||||
|
||||
public int getServerIdByUid(int uid, int defaultServerId) {
|
||||
// Integer serverIdByUid = RedisUtil.getInstence().getMapEntry(RedisKey.CUser_ServerId_Key,"",Integer.toString(uid),Integer.class);
|
||||
if (serverIds.contains(uid)) {
|
||||
return uid;
|
||||
if (defaultServerId == GameApplication.serverId){
|
||||
return defaultServerId;
|
||||
}
|
||||
|
||||
Integer serverIdByUid = RedisUtil.getInstence().getObject(RedisKey.CUser_ServerId_Key, Integer.toString(uid), Integer.class, GlobalsDef.REDIS_OVER_TIME_DAY * 10);
|
||||
if (serverIdByUid != null) {
|
||||
if (serverIdByUid != null && !CoreLogic.getInstance().isHefu(serverIdByUid)) {
|
||||
return serverIdByUid;
|
||||
}
|
||||
|
||||
int serverIdFromMongo = CoreLogic.getInstance().findServerIdFromMongo(uid);
|
||||
if (serverIdFromMongo > 0) {
|
||||
String key = RedisKey.CUser_ServerId_Key + RedisKey.Delimiter_colon + uid;
|
||||
RedisUtil.getInstence().setObject(key, Integer.toString(serverIdFromMongo), GlobalsDef.REDIS_OVER_TIME_DAY * 10);
|
||||
}
|
||||
if (serverIdFromMongo != 0 && !CoreLogic.getInstance().isHefu(serverIdFromMongo)){
|
||||
return serverIdFromMongo;
|
||||
}
|
||||
|
||||
return GameApplication.serverId;
|
||||
}
|
||||
|
||||
public void putCUserServer(int uid, int serverId){
|
||||
String key = RedisKey.CUser_ServerId_Key + RedisKey.Delimiter_colon + uid;
|
||||
RedisUtil.getInstence().setObject(key, serverId, GlobalsDef.REDIS_OVER_TIME_DAY * 10);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
package com.ljsd.jieling.db.mongo.core;
|
||||
|
||||
import org.springframework.data.annotation.Id;
|
||||
import org.springframework.data.mongodb.core.mapping.Document;
|
||||
import org.springframework.data.mongodb.core.mapping.Field;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author hj
|
||||
* @Date 2023/5/17 17:22:10
|
||||
* @Description:
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Document(collection = "c_hefu_info")
|
||||
public class CHefuInfo {
|
||||
|
||||
@Id
|
||||
private int id;
|
||||
|
||||
@Field(value = "masterServerId")
|
||||
private int masterServerId;
|
||||
|
||||
@Field(value = "slaveServerIds")
|
||||
private List<Integer> slaveServerIds;
|
||||
|
||||
public int getMasterServerId() {
|
||||
return masterServerId;
|
||||
}
|
||||
|
||||
public void setMasterServerId(int masterServerId) {
|
||||
this.masterServerId = masterServerId;
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public List<Integer> getSlaveServerIds() {
|
||||
return slaveServerIds;
|
||||
}
|
||||
|
||||
public void setSlaveServerIds(List<Integer> slaveServerIds) {
|
||||
this.slaveServerIds = slaveServerIds;
|
||||
}
|
||||
}
|
|
@ -1589,7 +1589,7 @@ public class RedisUtil {
|
|||
|
||||
if (!RedisKey.newAreaCacChe.contains(type) && !RedisKey.rankCacChe.contains(type) && key.length() == 8) {
|
||||
Integer serverId = RedisUtil.getInstence().getObject(RedisKey.CUser_ServerId_Key, key, Integer.class, GlobalsDef.REDIS_OVER_TIME_DAY * 10);
|
||||
if (serverId != null){
|
||||
if (serverId != null) {
|
||||
return serverId + RedisKey.Delimiter_colon + type + RedisKey.Delimiter_colon + key;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
|
|||
import com.ljsd.GameApplication;
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.HeroStaticConfig;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.db.mongo.AreaManager;
|
||||
import com.ljsd.jieling.db.mongo.LjsdMongoTemplate;
|
||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
import com.ljsd.jieling.db.mongo.gmActivity.ARBActivity;
|
||||
|
@ -83,6 +84,7 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
|||
int token = netData.getToken();
|
||||
int msgId = netData.getMsgId();
|
||||
int msgIndex = netData.getIndex();
|
||||
AreaManager.getInstance().putCUserServer(userId,GameApplication.serverId);
|
||||
PlayerInfoProto.GetPlayerInfoRequest getPlayerInfoRequest = PlayerInfoProto.GetPlayerInfoRequest.parseFrom(netData.parseClientProtoNetData());
|
||||
LOGGER.info("processMessage->uid={},token={},msgId={},msgIndex={},messageNum={},messageStr={}",
|
||||
userId, token,msgId,msgIndex,getPlayerInfoRequest.getNum(),getPlayerInfoRequest.getStr());
|
||||
|
|
|
@ -182,7 +182,7 @@ public class CSPlayer {
|
|||
}
|
||||
|
||||
public int getServerId() {
|
||||
return AreaManager.getInstance().getServerIdByUid(userId, GameApplication.serverId);
|
||||
return AreaManager.getInstance().getServerIdByUid(userId, 0);
|
||||
}
|
||||
|
||||
public void setServerId(int serverId) {
|
||||
|
|
|
@ -4,6 +4,7 @@ import com.google.gson.Gson;
|
|||
import com.ljsd.GameApplication;
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
|
||||
import com.ljsd.jieling.core.CoreLogic;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.core.VipPrivilegeType;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
|
||||
|
@ -1777,6 +1778,7 @@ public class PlayerLogic {
|
|||
if (rpcString == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String[] split = rpcString.split(":");
|
||||
if (split.length < 4) {
|
||||
LOGGER.error("获取玩家rpc地址,长度错误,rpc:{},玩家id:{},服务器id:{}", rpcString, uid, serverId);
|
||||
|
|
Loading…
Reference in New Issue