Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
ebcb4db464
|
@ -1,5 +1,6 @@
|
|||
package com.ljsd.jieling.kefu;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.ljsd.jieling.config.SErrorCodeEerverConfig;
|
||||
import com.ljsd.jieling.config.SGameSetting;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
|
||||
|
@ -10,7 +11,9 @@ import com.ljsd.jieling.db.redis.RedisUtil;
|
|||
import com.ljsd.jieling.globals.BIReason;
|
||||
import com.ljsd.jieling.globals.Global;
|
||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
||||
import com.ljsd.jieling.logic.dao.ActivityManager;
|
||||
import com.ljsd.jieling.logic.dao.PlayerManager;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||
|
@ -40,6 +43,30 @@ public class Cmd_changename extends GmRoleAbstract {
|
|||
String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false);
|
||||
RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), teamForce);
|
||||
}
|
||||
|
||||
if("userinfo".equals(args[2])){
|
||||
Gson gson = new Gson();
|
||||
PlayerManager playerManager = user.getPlayerInfoManager();
|
||||
|
||||
LOGGER.info("cmd_________userinfo:"+gson.toJson(playerManager));
|
||||
|
||||
|
||||
ActivityManager activityManager = user.getActivityManager();
|
||||
LOGGER.info("cmd_________userinfo_ac:"+gson.toJson(activityManager));
|
||||
}
|
||||
|
||||
if("reload".equals(args[2])){
|
||||
if (null != user) {
|
||||
UserManager.removeUser(user.getId());
|
||||
}
|
||||
user = MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), user.getId(), User.class);
|
||||
if (user != null) {
|
||||
UserManager.addUser(user);
|
||||
LOGGER.info("cmd_________reload:");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
String name;
|
||||
if (args.length == 1) {
|
||||
|
|
|
@ -22,7 +22,7 @@ class RechargeTotalActivity extends AbstractActivity {
|
|||
long now = TimeUtils.now();
|
||||
User user = UserManager.getUser(session.getUid());
|
||||
RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo();
|
||||
int days = TimeUtils.differentDays(rechargeInfo.getCreateTime(), now) + 1;
|
||||
int days = TimeUtils.differentDaysByHour(rechargeInfo.getCreateTime(), now,5) + 1;
|
||||
if (missionProgress < values[0][0] || days < values[0][1]) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -361,7 +361,7 @@ public class BuyGoodsLogic {
|
|||
ISession session = OnlineUserManager.getSessionByUid(uid);
|
||||
if(session!=null && change){
|
||||
PlayerInfoProto.AllGiftGoodsIndication build = PlayerInfoProto.AllGiftGoodsIndication.newBuilder().addAllGiftGoodsInfo(goodsBagInfo).build();
|
||||
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ALL_GIFTGOODS_INDICATION_VALUE,build,true);
|
||||
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.ALL_GIFTGOODS_INDICATION_VALUE,build,true);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -228,7 +228,7 @@ public class ProtocolsManager implements ProtocolsAbstract {
|
|||
String key = RedisUtil.getInstence().getKey(RedisKey.INDICATION_OFFLINE, Integer.toString(session.getUid()));
|
||||
Type type = new TypeToken<Map<Integer, ISession.IndicationMsg>>(){}.getType();
|
||||
Object indicationInRedis = RedisUtil.getInstence().get(key);
|
||||
int maxMsgId = 0;
|
||||
int maxMsgId = 1;
|
||||
if(indicationInRedis!=null){
|
||||
Map<Integer, ISession.IndicationMsg> map= gson.fromJson(indicationInRedis.toString(),type);
|
||||
for(Map.Entry<Integer,ISession.IndicationMsg> info : map.entrySet()){
|
||||
|
|
Loading…
Reference in New Issue