Merge branch 'project0.95'
# Conflicts: # tablemanager/src/main/java/config/SRewardItem.javaback_recharge
commit
85bf6d74dc
|
@ -113,9 +113,10 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
||||||
List<CommonProto.GoodsTypeDuration> goodsTypeDurations = new ArrayList<>(3);
|
List<CommonProto.GoodsTypeDuration> goodsTypeDurations = new ArrayList<>(3);
|
||||||
for(Map.Entry<Integer,Integer> entry : goodsTypeDurationMap.entrySet()){
|
for(Map.Entry<Integer,Integer> entry : goodsTypeDurationMap.entrySet()){
|
||||||
Integer goodsId = entry.getKey();
|
Integer goodsId = entry.getKey();
|
||||||
SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId);
|
|
||||||
Integer goodsEndTime = entry.getValue();
|
Integer goodsEndTime = entry.getValue();
|
||||||
goodsTypeDurations.add(CommonProto.GoodsTypeDuration.newBuilder().setGoodsType(sRechargeCommodityConfig.getType()).setEndTime(goodsEndTime).build());
|
// SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId);
|
||||||
|
|
||||||
|
goodsTypeDurations.add(CommonProto.GoodsTypeDuration.newBuilder().setGoodsType(goodsId).setEndTime(goodsEndTime).build());
|
||||||
}
|
}
|
||||||
//问卷状态
|
//问卷状态
|
||||||
int questState =-1;
|
int questState =-1;
|
||||||
|
|
|
@ -68,10 +68,10 @@ public class ExchangeCdkHandler extends BaseHandler<PlayerInfoProto.ExchangeCdkR
|
||||||
}
|
}
|
||||||
|
|
||||||
//pid
|
//pid
|
||||||
if(user.getPlayerInfoManager().getPid()!=scdkInfo.getPid())
|
if(scdkInfo.getPid()!=-2&&user.getPlayerInfoManager().getPid()!=scdkInfo.getPid()){
|
||||||
{
|
|
||||||
throw new ErrorCodeException(ErrorCode.CDK_FAIL);
|
throw new ErrorCodeException(ErrorCode.CDK_FAIL);
|
||||||
}
|
}
|
||||||
|
|
||||||
int usetype = scdkInfo.getUsetype();
|
int usetype = scdkInfo.getUsetype();
|
||||||
if (usetype == 0) {//只能兑换一次
|
if (usetype == 0) {//只能兑换一次
|
||||||
if (cdkInfo.getStatus() == 1) {
|
if (cdkInfo.getStatus() == 1) {
|
||||||
|
|
|
@ -2,7 +2,7 @@ package com.ljsd.jieling.kefu;
|
||||||
|
|
||||||
import com.ljsd.jieling.db.redis.RedisKey;
|
import com.ljsd.jieling.db.redis.RedisKey;
|
||||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||||
|
import com.ljsd.jieling.hotfix.HotfixUtil;
|
||||||
public class Cmd_join_gm extends GmAbstract {
|
public class Cmd_join_gm extends GmAbstract {
|
||||||
@Override
|
@Override
|
||||||
public boolean exec(String[] args) throws Exception {
|
public boolean exec(String[] args) throws Exception {
|
||||||
|
@ -11,7 +11,7 @@ public class Cmd_join_gm extends GmAbstract {
|
||||||
// String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false);
|
// String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false);
|
||||||
// RedisUtil.getInstence().zsetAddOne(key, String.valueOf(10000+i), 10000+i);
|
// RedisUtil.getInstence().zsetAddOne(key, String.valueOf(10000+i), 10000+i);
|
||||||
// }
|
// }
|
||||||
|
HotfixUtil.getInstance();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,6 +53,7 @@ public class MinuteTask extends Thread {
|
||||||
LOGGER.info("MinuteTask start...");
|
LOGGER.info("MinuteTask start...");
|
||||||
LOGGER.info("online use num::"+ OnlineUserManager.sessionMap.entrySet().size());
|
LOGGER.info("online use num::"+ OnlineUserManager.sessionMap.entrySet().size());
|
||||||
//TODO 每分钟逻辑通过监听事件处理 已经迁移活动和热更新
|
//TODO 每分钟逻辑通过监听事件处理 已经迁移活动和热更新
|
||||||
|
HotfixUtil.getInstance();
|
||||||
Poster.getPoster().dispatchEvent(new MinuteTaskEvent());
|
Poster.getPoster().dispatchEvent(new MinuteTaskEvent());
|
||||||
|
|
||||||
MessageUtil.checkAndSendMsg();
|
MessageUtil.checkAndSendMsg();
|
||||||
|
|
|
@ -34,13 +34,16 @@ public class RetrySendIndicationThread extends Thread{
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doWork() throws InterruptedException {
|
private void doWork() throws InterruptedException {
|
||||||
Map<Integer, ISession> sessionMap = OnlineUserManager.sessionMap;
|
Map<Integer, ISession> sessionMap = new ConcurrentHashMap<>(OnlineUserManager.sessionMap);
|
||||||
if(sessionMap == null){
|
if(sessionMap == null){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
long now = TimeUtils.now();
|
long now = TimeUtils.now();
|
||||||
Set<Integer> removeIds = new HashSet<>();
|
Set<Integer> removeIds = new HashSet<>();
|
||||||
for(ISession session : sessionMap.values()){
|
for(ISession session : sessionMap.values()){
|
||||||
|
if(session == null){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if(!session.getChannel().isClosed()&&session.getChannel().isConnected()){
|
if(!session.getChannel().isClosed()&&session.getChannel().isConnected()){
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue