Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
cf12529bb3
|
|
@ -1,5 +1,6 @@
|
||||||
package com.ljsd.jieling.kefu;
|
package com.ljsd.jieling.kefu;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
import com.ljsd.jieling.config.SErrorCodeEerverConfig;
|
import com.ljsd.jieling.config.SErrorCodeEerverConfig;
|
||||||
import com.ljsd.jieling.config.SGameSetting;
|
import com.ljsd.jieling.config.SGameSetting;
|
||||||
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
|
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.BIReason;
|
||||||
import com.ljsd.jieling.globals.Global;
|
import com.ljsd.jieling.globals.Global;
|
||||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
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.PlayerManager;
|
||||||
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
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);
|
String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false);
|
||||||
RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), teamForce);
|
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;
|
String name;
|
||||||
if (args.length == 1) {
|
if (args.length == 1) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue