From 13b8946115d3bcc6950a6ea45b32787f172cf0e7 Mon Sep 17 00:00:00 2001 From: mashiyu Date: Wed, 6 Mar 2019 15:07:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E8=B4=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/common/mogodb/BeanUtil.java | 45 +++++++------- .../ljsd/common/mogodb/LjsdMongoTemplate.java | 7 ++- .../com/ljsd/common/mogodb/MongoBase.java | 58 +++---------------- .../ljsd/common/mogodb/MongoUpdateCache.java | 47 ++++++++++----- .../mogodb/MongoUpdateCacheThreadLocal.java | 27 ++++----- .../ljsd/common/mogodb/test/TestMongo.java | 1 - .../mogodb/test/pojo/BaseInfoForTest.java | 18 +++--- .../common/mogodb/test/pojo/CardTestInfo.java | 9 ++- .../mogodb/test/pojo/PlayerForTest.java | 10 +--- .../main/java/com/ljsd/GameApplication.java | 12 ++-- .../com/ljsd/jieling/db/mongo/MongoKey.java | 27 +++++++++ .../com/ljsd/jieling/db/mongo/MongoUtil.java | 44 ++++++++++++++ .../handler/GameGM/GMRequestHandler.java | 3 +- .../jieling/handler/GetAllHerosHandler.java | 4 +- .../jieling/handler/GetAllItemHandler.java | 4 +- .../jieling/handler/GetPlayerInfoHandler.java | 5 +- .../jieling/handler/LoginRequestHandler.java | 2 +- .../handler/UseAndPriceItemHandler.java | 7 --- .../com/ljsd/jieling/handler/map/Cell.java | 5 +- .../ljsd/jieling/handler/map/MapLogic.java | 2 +- .../ljsd/jieling/handler/map/MapManager.java | 35 ++++++----- .../handler/map/behavior/BaseBehavior.java | 2 +- .../map/behavior/DestroyMissionBehavior.java | 2 +- .../map/behavior/DestroyPointBehavior.java | 2 +- .../handler/map/behavior/DunBehavior.java | 2 +- .../handler/map/behavior/EatBuffBehavior.java | 2 +- .../handler/map/behavior/FightBehavior.java | 5 +- .../map/behavior/FinishMissionBehavior.java | 2 +- .../handler/map/behavior/JumpBehavior.java | 2 +- .../handler/map/behavior/LeaveBehavior.java | 2 +- .../map/behavior/MonitorMissionBehavior.java | 2 +- .../map/behavior/OpenMissionBehavior.java | 2 +- .../handler/map/behavior/ScoutBehavior.java | 6 +- .../behavior/UseItemAndDestroyBehavior.java | 2 +- .../handler/map/behavior/UseItemBehavior.java | 2 +- .../map/behavior/UseItemMissionBehavior.java | 2 +- .../ljsd/jieling/handler/mission/Mission.java | 5 +- .../jieling/handler/mission/MissionLogic.java | 2 +- .../handler/mission/MissionManager.java | 18 ++++-- .../jieling/logic/dao/AdventureManager.java | 7 ++- .../jieling/logic/dao/AdventureStateInfo.java | 1 + .../ljsd/jieling/logic/dao/AutoIncrement.java | 3 +- .../logic/dao/AutoIncrementManager.java | 11 +++- .../com/ljsd/jieling/logic/dao/Equip.java | 9 +-- .../ljsd/jieling/logic/dao/EquipManager.java | 12 +++- .../java/com/ljsd/jieling/logic/dao/Hero.java | 29 +++++----- .../ljsd/jieling/logic/dao/HeroManager.java | 15 +++-- .../java/com/ljsd/jieling/logic/dao/Item.java | 6 +- .../ljsd/jieling/logic/dao/ItemManager.java | 13 +++-- .../java/com/ljsd/jieling/logic/dao/Mail.java | 2 +- .../ljsd/jieling/logic/dao/MailManager.java | 17 ++++-- .../ljsd/jieling/logic/dao/MailingSystem.java | 49 ---------------- .../logic/dao/MailingSystemManager.java | 15 +++-- .../ljsd/jieling/logic/dao/PlayerManager.java | 34 ++++++----- .../com/ljsd/jieling/logic/dao/Pokemon.java | 5 +- .../jieling/logic/dao/PokemonManager.java | 8 ++- .../com/ljsd/jieling/logic/dao/Skill.java | 9 +-- .../com/ljsd/jieling/logic/dao/SysMail.java | 3 +- .../jieling/logic/dao/SysMailManager.java | 10 +++- .../ljsd/jieling/logic/dao/SystemMail.java | 1 + .../jieling/logic/dao/SystemMailManager.java | 7 +++ .../jieling/logic/dao/TeamPosManager.java | 13 +++-- .../ljsd/jieling/logic/dao/UserManager.java | 52 ++++++++--------- .../jieling/logic/dao/WorkShopController.java | 17 ++++-- .../jieling/logic/dao/root/MailingSystem.java | 55 ++++++++++++++++++ .../jieling/logic/dao/{ => root}/User.java | 47 +++++++-------- .../ljsd/jieling/logic/fight/CombatLogic.java | 2 + .../ljsd/jieling/logic/hero/HeroLogic.java | 2 + .../ljsd/jieling/logic/item/ItemLogic.java | 5 +- .../jieling/logic/item/WorkShopLogic.java | 5 +- .../ljsd/jieling/logic/mail/MailLogic.java | 5 +- .../network/server/ProtocolsManager.java | 17 +++--- .../java/com/ljsd/jieling/util/ItemUtil.java | 1 + .../com/ljsd/jieling/util/MessageUtil.java | 4 +- 74 files changed, 521 insertions(+), 404 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoKey.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystem.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/MailingSystem.java rename serverlogic/src/main/java/com/ljsd/jieling/logic/dao/{ => root}/User.java (66%) diff --git a/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java b/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java index 4e5a9b748..d21c52f8d 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java +++ b/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java @@ -228,7 +228,7 @@ public class BeanUtil { return key; } //将DBObject转为map - private static Map dbObject2Map(DBObject dbObject, Field field, MongoRoot root) throws Exception { + private static Map dbObject2Map(DBObject dbObject, Field field) throws Exception { ParameterizedType pt = (ParameterizedType) field.getGenericType(); Type[] types = pt.getActualTypeArguments(); @@ -244,7 +244,7 @@ public class BeanUtil { Iterator iterator = values.iterator(); while (iterator.hasNext()){ Object next = iterator.next(); - Object obj = getObj(next,actualTypeArgument, root); + Object obj = getObj(next,actualTypeArgument); objects.add(obj); } Object key = getKey(entry.getKey(), (Class)types[0]); @@ -252,7 +252,7 @@ public class BeanUtil { return map; } - Object obj = getObj(entry.getValue(), (Class)type, root); + Object obj = getObj(entry.getValue(), (Class)type); // Object value = ((Class)types[1]).newInstance(); // Object obj = dbObject2Bean((DBObject) entry.getValue(), value, root); Object key = getKey(entry.getKey(), (Class)types[0]); @@ -268,7 +268,7 @@ public class BeanUtil { return false; } //将dbobj转为普通对象 - private static Object getObj(Object dbobj, Class clazz, MongoRoot root) throws Exception { + private static Object getObj(Object dbobj, Class clazz) throws Exception { Object obj = getBaseObj(dbobj, clazz); if(obj == null){ Constructor constructor = clazz.getDeclaredConstructor(); @@ -276,18 +276,18 @@ public class BeanUtil { constructor.setAccessible(true); obj = constructor.newInstance(); constructor.setAccessible(isAccessible); - dbObject2Bean((DBObject) dbobj, obj, root); + dbObject2Bean((DBObject) dbobj, obj); } return obj; } //将DBObject转为set - private static Set dbObject2Set(DBObject dbObject, Field field, MongoRoot root) throws Exception { + private static Set dbObject2Set(DBObject dbObject, Field field) throws Exception { ParameterizedType pt = (ParameterizedType) field.getGenericType(); Type[] types = pt.getActualTypeArguments(); Set set = ConcurrentHashMap. newKeySet(); BasicDBList dbList = (BasicDBList)dbObject; for (Object dbobj : dbList) { - Object obj = getObj(dbobj, (Class)types[0], root); + Object obj = getObj(dbobj, (Class)types[0]); set.add(obj); } return set; @@ -304,12 +304,12 @@ public class BeanUtil { return clazz.isArray(); } //将DBObject转换为数组 - private static Object[] dbObject2Array(DBObject dbObject, Class clazz, MongoRoot root) throws Exception { + private static Object[] dbObject2Array(DBObject dbObject, Class clazz) throws Exception { BasicDBList basicDBList = (BasicDBList)dbObject; Object[] objs = (Object[])Array.newInstance(clazz.getComponentType(), basicDBList.size()); for(int i=0; i List dbObject2List(DBObject dbObject, Field field, MongoRoot root) throws Exception { + private static List dbObject2List(DBObject dbObject, Field field) throws Exception { ParameterizedType pt = (ParameterizedType) field.getGenericType(); Type[] types = pt.getActualTypeArguments(); List list = new CopyOnWriteArrayList(); BasicDBList dbList = (BasicDBList)dbObject; for (Object dbobj : dbList) { - Object obj = getObj(dbobj, (Class)types[0], root); + Object obj = getObj(dbobj, (Class)types[0]); list.add(obj); } return list; } //DBObject转换为Bean对象 - public static Object dbObject2Bean(DBObject dbObject, Object bean, MongoRoot root) throws Exception { + public static Object dbObject2Bean(DBObject dbObject, Object bean) throws Exception { if (bean == null) { return null; } @@ -357,10 +357,11 @@ public class BeanUtil { // ((MongoBase)bean).setRoot((MongoRoot) root); // continue; // } - else if(varName.equals("bsave")){ - ((MongoRoot)bean).setBsave(true); - continue; - } else { +// else if(varName.equals("bsave")){ +// ((MongoRoot)bean).setBsave(true); +// continue; +// } + else { object = dbObject.get(varName); } if (object == null) { @@ -377,18 +378,18 @@ public class BeanUtil { if (obj != null) { field.set(bean, obj); } else if (isMap(fieldClazz)) { - obj = dbObject2Map((DBObject) object, field, root); + obj = dbObject2Map((DBObject) object, field); } else if (isSet(fieldClazz)) { - obj = dbObject2Set((DBObject) object, field, root); + obj = dbObject2Set((DBObject) object, field); } else if (isArray(fieldClazz)) { - obj = dbObject2Array((DBObject) object, fieldClazz, root); + obj = dbObject2Array((DBObject) object, fieldClazz); } else if (isList(fieldClazz)) { - obj = dbObject2List((DBObject) object, field, root); + obj = dbObject2List((DBObject) object, field); } else if (isByteArray(fieldClazz)) { obj = object; } else { obj = fieldClazz.newInstance(); - obj = dbObject2Bean((DBObject) object, obj, root); + obj = dbObject2Bean((DBObject) object, obj); } field.set(bean, obj); // 恢复访问控制权限 @@ -404,7 +405,7 @@ public class BeanUtil { return null; } T bean = clazz.newInstance(); - dbObject2Bean(dbObject, bean, (MongoRoot)bean); + dbObject2Bean(dbObject, bean); return bean; } } diff --git a/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java b/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java index c3aef2227..b2e6aace1 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java +++ b/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java @@ -23,9 +23,10 @@ public class LjsdMongoTemplate { } public void save(T obj) throws Exception { - MongoRoot root = (MongoRoot)obj; - mongoTemplate.save(obj,root.getCollection()); - root.setBsave(true); +// MongoRoot root = (MongoRoot)obj; +// mongoTemplate.save(obj,root.getCollection()); +// root.setBsave(true); + mongoTemplate.save(obj); } public void saveWithoutMongoRoot(T obj) throws Exception { diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java b/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java index 20fd52e32..6129f8ce8 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java @@ -7,54 +7,26 @@ import java.lang.ref.WeakReference; //使用下划线,是为了在json转换时,能转为正确的值 public abstract class MongoBase { - private String mongoKey; //该级对应的mongodb的key + private String rootId; @Transient - private boolean _save; - + private String mongoKey; //该级对应的mongodb的key @Transient private String rootCollection; - @Transient - private String rootId; - - @Transient - private LjsdMongoTemplate _myMongoTemplate; - - public void init(String id, LjsdMongoTemplate _myMongoTemplate ,String rootCollection ,String mongoKey, boolean _save) { + public void init(String id,String mongoKey) { this.rootId = id; - this.rootCollection = rootCollection; - this._myMongoTemplate = _myMongoTemplate; this.mongoKey = mongoKey; - this._save = _save; } - public void init(String id, LjsdMongoTemplate _myMongoTemplate ,String rootCollection ,String mongoKey) { - this.rootId = id; - this.rootCollection = rootCollection; - this._myMongoTemplate = _myMongoTemplate; - this.mongoKey = mongoKey; - this._save = true; + public void updateString(String fieldName, Object value) { + MongoUpdateCacheThreadLocal.addUpdateRequest(this, mongoKey + "." + fieldName, value); } - public void updateString(MongoBase dataBase, String fieldName, Object value) { - - MongoUpdateCacheThreadLocal.addUpdateRequest(this, dataBase.get_myMongoTemplate(), dataBase.getRootCollection(), dataBase.getRootId(), - mongoKey + "." + fieldName, value); + public void removeString(String key) { + MongoUpdateCacheThreadLocal.removeRequest(this, key); } - - public void updateString(String fieldName, MongoBase value) { - MongoUpdateCacheThreadLocal.addUpdateRequest(value, value.get_myMongoTemplate(), value.getRootCollection(), value.getRootId(), - mongoKey + "." + fieldName, value); - } - - - public void removeString(String key, MongoBase value) { - MongoUpdateCacheThreadLocal.removeRequest(this, value.get_myMongoTemplate(), value.getRootCollection(), value.getRootId(), key); - } - - public String getMongoKey() { return mongoKey; } @@ -63,14 +35,6 @@ public abstract class MongoBase { this.mongoKey = mongoKey; } - public boolean is_save() { - return _save; - } - - public void set_save(boolean _save) { - this._save = _save; - } - public String getRootCollection() { return rootCollection; } @@ -86,12 +50,4 @@ public abstract class MongoBase { public void setRootId(String rootId) { this.rootId = rootId; } - - public LjsdMongoTemplate get_myMongoTemplate() { - return _myMongoTemplate; - } - - public void set_myMongoTemplate(LjsdMongoTemplate _myMongoTemplate) { - this._myMongoTemplate = _myMongoTemplate; - } } diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java index 810be263b..cd209a03b 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java @@ -1,12 +1,8 @@ package com.ljsd.common.mogodb; -import ch.qos.logback.core.joran.util.beans.BeanUtil; import com.mongodb.BasicDBObject; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class MongoUpdateCache { static class UpdateRequest { @@ -24,23 +20,38 @@ public class MongoUpdateCache { } //key:String, collection + ":" + id - private final Map> requestMap = new HashMap<>(); + private final Map> requestMap = new HashMap<>(); - protected void addUpdateRequest(MongoBase mongoBase, String collection, String id, String fullKey, Object value, int opCode) { - String key = collection + ":" + id; - List listRequest = requestMap.get(key); + + protected void addUpdateRequest(MongoBase mongoBase, String fullKey, Object value, int opCode) { + String key = mongoBase.getRootCollection() + ":" + mongoBase.getRootId(); + Map listRequest = requestMap.get(key); if (listRequest == null) { - listRequest = new ArrayList(); + listRequest = new HashMap<>(); requestMap.put(key, listRequest); + } else { + Iterator> it = listRequest.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = it.next(); + String key1 = entry.getKey(); + if (fullKey.contains(key1)) { + return; + } + if (key1.contains(fullKey)) { + it.remove(); + } + } } UpdateRequest request = new UpdateRequest(fullKey, value, opCode, mongoBase); - listRequest.add(request); + listRequest.put(fullKey, request); } + + protected void update(LjsdMongoTemplate ljsdMongoTemplate) throws IllegalAccessException { BasicDBObject searchQuery = new BasicDBObject(); - for (Map.Entry> entry : requestMap.entrySet()) { + for (Map.Entry> entry : requestMap.entrySet()) { String[] strs = entry.getKey().split(":"); String collection = strs[0]; String id = strs[1]; @@ -49,23 +60,27 @@ public class MongoUpdateCache { BasicDBObject valueDBObj = new BasicDBObject(); BasicDBObject dbobj = new BasicDBObject(); BasicDBObject removedbobj = new BasicDBObject(); - for (UpdateRequest request : entry.getValue()) { + for (UpdateRequest request : entry.getValue().values()) { if (request.opCode == 2) { removedbobj.append(request.fullKey, request.value); continue; } valueDBObj.append(request.fullKey, ljsdMongoTemplate.convertToMongoType(request.value)); - request.mongoBase.set_save(false); } + + boolean flag = false; if (!valueDBObj.isEmpty()) { dbobj.append("$set", valueDBObj); + flag = true; } if (!removedbobj.isEmpty()) { dbobj.append("$unset", removedbobj); + flag = true; + } + if (flag){ + ljsdMongoTemplate.updateValue(collection, searchQuery, dbobj); } - - ljsdMongoTemplate.updateValue(collection, searchQuery, dbobj); } requestMap.clear(); diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCacheThreadLocal.java b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCacheThreadLocal.java index 73524b979..2f2aeb3d6 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCacheThreadLocal.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCacheThreadLocal.java @@ -4,34 +4,29 @@ import java.util.HashMap; import java.util.Map; public class MongoUpdateCacheThreadLocal { - private final static ThreadLocal> mongoUpdateCacheThreadLocal = new ThreadLocal<>(); + private final static ThreadLocal mongoUpdateCacheThreadLocal = new ThreadLocal<>(); - private static MongoUpdateCache getMongoUpdateCache(LjsdMongoTemplate ljsdMongoTemplate) { - Map mongoUpdateCacheMap = mongoUpdateCacheThreadLocal.get(); - if (mongoUpdateCacheMap == null) { - mongoUpdateCacheMap = new HashMap(); - mongoUpdateCacheThreadLocal.set(mongoUpdateCacheMap); - } - MongoUpdateCache mongoUpdateCache = mongoUpdateCacheMap.get(ljsdMongoTemplate); + private static MongoUpdateCache getMongoUpdateCache() { + MongoUpdateCache mongoUpdateCache = mongoUpdateCacheThreadLocal.get(); if (mongoUpdateCache == null) { mongoUpdateCache = new MongoUpdateCache(); - mongoUpdateCacheMap.put(ljsdMongoTemplate, mongoUpdateCache); + mongoUpdateCacheThreadLocal.set(mongoUpdateCache); } return mongoUpdateCache; } - protected static void addUpdateRequest(MongoBase mongoBase, LjsdMongoTemplate ljsdMongoTemplate, String collection, String id, String fullKey, Object value) { - MongoUpdateCache mongoUpdateCache = getMongoUpdateCache(ljsdMongoTemplate); - mongoUpdateCache.addUpdateRequest(mongoBase, collection, id, fullKey, value, 1); + protected static void addUpdateRequest(MongoBase mongoBase, String fullKey, Object value) { + MongoUpdateCache mongoUpdateCache = getMongoUpdateCache(); + mongoUpdateCache.addUpdateRequest(mongoBase, fullKey, value, 1); } - protected static void removeRequest(MongoBase mongoBase, LjsdMongoTemplate ljsdMongoTemplate, String collection, String id, String fullKey) { - MongoUpdateCache mongoUpdateCache = getMongoUpdateCache(ljsdMongoTemplate); - mongoUpdateCache.addUpdateRequest(mongoBase, collection, id, fullKey, "", 2); + protected static void removeRequest(MongoBase mongoBase, String fullKey) { + MongoUpdateCache mongoUpdateCache = getMongoUpdateCache(); + mongoUpdateCache.addUpdateRequest(mongoBase, fullKey, "", 2); } protected static void update(LjsdMongoTemplate ljsdMongoTemplate) throws IllegalAccessException { - MongoUpdateCache mongoUpdateCache = getMongoUpdateCache(ljsdMongoTemplate); + MongoUpdateCache mongoUpdateCache = getMongoUpdateCache(); mongoUpdateCache.update(ljsdMongoTemplate); } } diff --git a/common/src/main/java/com/ljsd/common/mogodb/test/TestMongo.java b/common/src/main/java/com/ljsd/common/mogodb/test/TestMongo.java index 0f6300d99..d3dac66ba 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/test/TestMongo.java +++ b/common/src/main/java/com/ljsd/common/mogodb/test/TestMongo.java @@ -20,7 +20,6 @@ public class TestMongo { public static void main(String[] args) { try { ljsdMongoTemplate = getLjsdMongoTemplate(); - PlayerForTest.init(ljsdMongoTemplate); // save(); PlayerForTest one = findOne(); update(one); diff --git a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/BaseInfoForTest.java b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/BaseInfoForTest.java index 9e887a142..80255e65b 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/BaseInfoForTest.java +++ b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/BaseInfoForTest.java @@ -14,11 +14,12 @@ public class BaseInfoForTest extends MongoBase { public BaseInfoForTest(){ cardTestInfoMap = new ConcurrentHashMap<>(); + this.setRootCollection(PlayerForTest._COLLECTION_NAME); + this.setMongoKey("baseInfoForTest"); } public void addCard(int cardId,CardTestInfo cardTestInfo) throws Exception { - cardTestInfo.init(cardTestInfo.getRootId(),cardTestInfo.get_myMongoTemplate(),cardTestInfo.getRootCollection(), - getMongoKey() + ".cardTestInfoMap." + cardId); + cardTestInfo.init(cardTestInfo.getRootId(),getMongoKey() + ".cardTestInfoMap." + cardId); updateString("cardMap." +cardId, cardTestInfo); cardTestInfoMap.put(cardId,cardTestInfo); } @@ -28,7 +29,7 @@ public class BaseInfoForTest extends MongoBase { } public void setName(String name) throws Exception { - updateString(this,"name", name); + updateString("name", name); this.name = name; } @@ -37,7 +38,7 @@ public class BaseInfoForTest extends MongoBase { } public void setAge(int age) throws Exception { - updateString(this,"age", name); + updateString("age", name); this.age = age; } @@ -46,7 +47,7 @@ public class BaseInfoForTest extends MongoBase { } public void setOtherInfoMsg(Map otherInfoMsg) throws Exception { - updateString(this,"otherInfoMsg", name); + updateString("otherInfoMsg", name); this.otherInfoMsg = otherInfoMsg; } @@ -54,10 +55,13 @@ public class BaseInfoForTest extends MongoBase { String value = otherInfoMsg.get(id); if (value!=null){ otherInfoMsg.remove(id); - removeString("otherInfoMsg." + id,this); + removeString("otherInfoMsg." + id); } } - + @Override + public String getMongoKey() { + return null; + } } diff --git a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/CardTestInfo.java b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/CardTestInfo.java index 32fe0df66..fc14c23c8 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/CardTestInfo.java +++ b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/CardTestInfo.java @@ -9,12 +9,12 @@ public class CardTestInfo extends MongoBase { private String level; public void setId(String id) { - updateString(this,"id",id); + updateString("id",id); this.id = id; } public void setLevel(String level) throws Exception { - updateString(this,"level",level); + updateString("level",level); this.level = level; } @@ -25,4 +25,9 @@ public class CardTestInfo extends MongoBase { public String getLevel() { return level; } + + @Override + public String getMongoKey() { + return null; + } } diff --git a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java index 94f2513ce..2b410f5f2 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java +++ b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java @@ -6,19 +6,13 @@ import com.ljsd.common.mogodb.MongoRoot; import java.util.Map; public class PlayerForTest extends MongoRoot { - private final static String _COLLECTION_NAME = "play_test"; + public final static String _COLLECTION_NAME = "play_test"; private BaseInfoForTest baseInfoForTest; - private static LjsdMongoTemplate _ljsdMongoTemplate; - - public static void init( LjsdMongoTemplate ljsdMongoTemplate){ - _ljsdMongoTemplate = ljsdMongoTemplate; - } - public PlayerForTest(int playerId,BaseInfoForTest baseInfoForTest){ setId(String.valueOf(playerId)); this.baseInfoForTest = baseInfoForTest; - baseInfoForTest.init(String.valueOf(playerId),_ljsdMongoTemplate,_COLLECTION_NAME,"baseInfoForTest",false); + baseInfoForTest.init(String.valueOf(playerId),"baseInfoForTest"); } // public PlayerForTest(){ diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index eb7881080..10c171abf 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -3,12 +3,12 @@ package com.ljsd; import com.ljsd.jieling.config.ServerConfig; import com.ljsd.jieling.config.json.ServerConfiguration; import com.ljsd.jieling.config.json.ServerProperties; +import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.logic.STableManager; import com.ljsd.jieling.logic.dao.MailingSystemManager; -import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.server.NettyGameServer; import com.ljsd.jieling.network.NettyProperties; import com.ljsd.jieling.network.NettyServerAutoConfiguration; @@ -43,7 +43,6 @@ public class GameApplication { public static ServerProperties serverProperties; private static NettyGameServer nettyServer = null; public static int serverId = 0; -// public static ServerProperties serverProperties; public static boolean start = false; public static ServerConfig serverConfig; @@ -71,10 +70,11 @@ public class GameApplication { RedisUtil.getInstence().init(configurableApplicationContext); + MongoUtil.getInstence().init(configurableApplicationContext); + STableManager.initialize("com.ljsd.jieling.config"); - UserManager.init(configurableApplicationContext); - MailingSystemManager.init(configurableApplicationContext); +// MailingSystemManager.init(configurableApplicationContext); ThreadManager threadManager = new ThreadManager(); threadManager.init(configurableApplicationContext); MapLogic.getInstance().init(configurableApplicationContext); @@ -82,7 +82,7 @@ public class GameApplication { final NettyServerAutoConfiguration netServerConfig = configurableApplicationContext.getBean(NettyServerAutoConfiguration.class); NettyProperties properties = netServerConfig.getNettyProperties(); //todo 设置开服时间 - ServerConfig serverConfigTmp = UserManager.ljsdMongoTemplate.findById(1, ServerConfig.class); + ServerConfig serverConfigTmp = MongoUtil.getInstence().getMyMongoTemplate().findById(1, ServerConfig.class); if( null == serverConfigTmp ){ serverConfigTmp = new ServerConfig(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -91,7 +91,7 @@ public class GameApplication { serverConfigTmp.setOpenTime(format); serverConfigTmp.setCacheOpenTime(serverOenTime); serverConfigTmp.setId(1); - UserManager.ljsdMongoTemplate.saveWithoutMongoRoot(serverConfigTmp); + MongoUtil.getInstence().getMyMongoTemplate().saveWithoutMongoRoot(serverConfigTmp); }else{ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String openTime = serverConfigTmp.getOpenTime(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoKey.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoKey.java new file mode 100644 index 000000000..f34af585e --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoKey.java @@ -0,0 +1,27 @@ +package com.ljsd.jieling.db.mongo; + +public class MongoKey { + + public final static String playerManager = "playerManager"; + + public final static String itemManager = "itemManager"; + + public final static String heroManager = "heroManager"; + + public final static String mapManager = "mapManager"; + + public final static String missionManager = "missionManager"; + + public final static String teamPosManager = "teamPosManager"; + + public final static String mailManager = "mailManager"; + + public final static String equipManager = "equipManager"; + + public final static String adventureManager = "adventureManager"; + + public final static String pokemonManager = "pokemonManager"; + + public final static String workShopController = "workShopController"; + +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java new file mode 100644 index 000000000..82a33d3b6 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java @@ -0,0 +1,44 @@ +package com.ljsd.jieling.db.mongo; + +import com.google.gson.Gson; +import com.ljsd.common.mogodb.LjsdMongoTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ConfigurableApplicationContext; + +public class MongoUtil { + + private static final Logger LOGGER = LoggerFactory.getLogger(MongoUtil.class); + + private Gson gson = new Gson(); + + private static int MAX_TRY_TIMES = 3; //最大尝试次数,保障获取/存储成功 + private static int FAILED_SLEEP = 2; //每次失败最大停顿时间 + + private MongoUtil() { + } + + public static MongoUtil getInstence() { + return MongoUtil.InnerClass.instance; + } + + private static class InnerClass { + private static final MongoUtil instance = new MongoUtil(); + } + + private LjsdMongoTemplate myMongoTemplate; + + + public void init(ConfigurableApplicationContext configurableApplicationContext){ + myMongoTemplate =configurableApplicationContext.getBean(LjsdMongoTemplate.class); + } + + public LjsdMongoTemplate getMyMongoTemplate() { + return myMongoTemplate; + } + + public void lastUpdate() throws Exception { + this.myMongoTemplate.lastUpdate(); + } + +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 59ee3daaf..78f630a97 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -4,7 +4,7 @@ import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.globals.GlobalGm; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.dao.Mail; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; @@ -13,7 +13,6 @@ import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.TimeUtils; -import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllHerosHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllHerosHandler.java index e1e2f5b1d..108511e35 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllHerosHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllHerosHandler.java @@ -1,11 +1,9 @@ package com.ljsd.jieling.handler; -import com.ljsd.jieling.config.SCHero; import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.logic.STableManager; import com.ljsd.jieling.logic.dao.Hero; import com.ljsd.jieling.logic.dao.HeroManager; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java index 81cf7d416..258089d24 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java @@ -1,7 +1,7 @@ package com.ljsd.jieling.handler; import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; @@ -37,7 +37,7 @@ public class GetAllItemHandler extends BaseHandler { LOGGER.info("processMessage->uid={},token={},msgId={},msgIndex={},itemStartIndex={}", userId, token,msgId,msgIndex,itemStartIndex); boolean isSendFinish = false; - User user = UserManager.getUserForLogin(userId); + User user = UserManager.getUser(userId); List allItemList = ItemUtil.getAllItem(user); int endItemIndes = itemStartIndex + Global.SEND_ITEM_COUNT; if (itemStartIndex < allItemList.size()) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index f92c8b0d9..57b1644d8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -1,7 +1,6 @@ package com.ljsd.jieling.handler; -import com.ljsd.jieling.db.redis.RedisUtil; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; @@ -37,7 +36,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ LOGGER.info("processMessage->uid={},token={},msgId={},msgIndex={},messageNum={},messageStr={}", userId, token,msgId,msgIndex,getPlayerInfoRequest.getNum(),getPlayerInfoRequest.getStr()); - User user = UserManager.getUserForLogin(userId); + User user = UserManager.getUser(userId); CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), user.getMapManager().getMaxMapId(), user.getMapManager().getCurMapId()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java index 2787394cb..60b9ff90e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java @@ -1,6 +1,6 @@ package com.ljsd.jieling.handler; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java index f98038cd7..c32c9579d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java @@ -1,22 +1,15 @@ package com.ljsd.jieling.handler; -import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.logic.dao.User; -import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.item.ItemLogic; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.protocols.PlayerInfoProto; -import com.ljsd.jieling.util.ItemUtil; -import com.ljsd.jieling.util.MessageUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import java.util.List; - @Component public class UseAndPriceItemHandler extends BaseHandler { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java index 3105eed72..8e30dd0c0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java @@ -33,12 +33,13 @@ public class Cell extends MongoBase { } public void setPointId(int pointId) throws Exception { - updateString(this,"pointId", pointId); + updateString("pointId", pointId); this.pointId = pointId; } public void setEventId(int eventId) throws Exception { - updateString(this,"eventId", eventId); + updateString("eventId", eventId); this.eventId = eventId; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 0a5bf1cb3..987841e26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -8,7 +8,7 @@ import com.ljsd.jieling.handler.map.behavior.BaseBehavior; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.logic.dao.Hero; import com.ljsd.jieling.logic.dao.TeamPosHeroInfo; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.network.session.ISession; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index bfc17de4b..441406a4e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -3,12 +3,10 @@ package com.ljsd.jieling.handler.map; import com.ljsd.common.mogodb.MongoBase; -import com.ljsd.jieling.handler.map.Cell; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -30,6 +28,12 @@ public class MapManager extends MongoBase { private Map crossMapInfos = new ConcurrentHashMap<>(); + public MapManager() { + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.mapManager); + } + + public Map getMapInfo() { return mapInfo; } @@ -39,7 +43,7 @@ public class MapManager extends MongoBase { } public void updateCrossMapInfos(int key, CrossMapCell crossMapCell) throws Exception { - updateString(this, "mapInfo." + key, crossMapCell); + updateString("mapInfo." + key, crossMapCell); crossMapInfos.put(key, crossMapCell); } @@ -48,7 +52,7 @@ public class MapManager extends MongoBase { } public void setCurMapId(int curMapId) throws Exception { - updateString(this,"curMapId", curMapId); + updateString("curMapId", curMapId); this.curMapId = curMapId; } @@ -57,17 +61,17 @@ public class MapManager extends MongoBase { } public void setCurXY(int curXY) throws Exception { - updateString(this,"curXY", curXY); + updateString("curXY", curXY); this.curXY = curXY; } public void addOrUpdateCell(int key, Cell cell) throws Exception { - updateString(this,"mapInfo." + key, cell); + updateString("mapInfo." + key, cell); this.mapInfo.put(key, cell); } public void setMapInfo(Map mapInfo) throws Exception { - updateString(this, "mapInfo", mapInfo); + updateString( "mapInfo", mapInfo); this.mapInfo = mapInfo; } @@ -81,7 +85,7 @@ public class MapManager extends MongoBase { } public void setTypeEight(Map typeEight) throws Exception { - updateString(this, "typeEight", typeEight); + updateString( "typeEight", typeEight); this.typeEight = typeEight; } @@ -90,7 +94,7 @@ public class MapManager extends MongoBase { } public void setHeroes(Set heroes) throws Exception { - updateString(this, "heroes", heroes); + updateString( "heroes", heroes); this.heroes = heroes; } @@ -99,12 +103,12 @@ public class MapManager extends MongoBase { } public void setWalkCells(Set walkCells) throws Exception { - updateString(this, "walkCells", walkCells); + updateString( "walkCells", walkCells); this.walkCells = walkCells; } public void addWalkCells(Set walkCells) throws Exception { - updateString(this, "walkCells", walkCells); + updateString( "walkCells", walkCells); if (this.walkCells == null) { this.walkCells = walkCells; } else { @@ -117,7 +121,8 @@ public class MapManager extends MongoBase { } public void setMaxMapId(int maxMapId) throws Exception { - updateString(this, "maxMapId", maxMapId); + updateString( "maxMapId", maxMapId); this.maxMapId = maxMapId; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BaseBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BaseBehavior.java index fb131f2ba..d6e8df4f8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BaseBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BaseBehavior.java @@ -1,6 +1,6 @@ package com.ljsd.jieling.handler.map.behavior; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; public abstract class BaseBehavior { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyMissionBehavior.java index 2efd6b13e..aedce82be 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyMissionBehavior.java @@ -5,7 +5,7 @@ import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionLogic; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java index ee810f178..fcd9f2d90 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java @@ -2,7 +2,7 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.Cell; import com.ljsd.jieling.handler.map.EventType; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java index e2ad2de8b..454abac8c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java @@ -5,7 +5,7 @@ import com.ljsd.jieling.config.SCMapConfig; import com.ljsd.jieling.handler.map.*; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionLogic; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.CellUtil; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java index 036c11546..c9970f971 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java @@ -1,7 +1,7 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.EventType; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java index ad01bdbff..2acfbc9d6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java @@ -3,17 +3,14 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; -import com.ljsd.jieling.handler.map.Cell; import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.logic.dao.Hero; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.protocols.CommonProto; -import com.ljsd.jieling.protocols.FightInfoProto; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.CBean2Proto; -import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.MonsterUtil; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java index 1637705ce..506ddedfb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java @@ -4,7 +4,7 @@ import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionLogic; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java index fcd2f8bc4..0908f84fb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java @@ -2,7 +2,7 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.handler.map.MapLogic; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/LeaveBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/LeaveBehavior.java index b211133ce..5466f0e96 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/LeaveBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/LeaveBehavior.java @@ -1,7 +1,7 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.EventType; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.MathUtils; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionBehavior.java index c9cdc72ba..a91a92bf0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionBehavior.java @@ -4,7 +4,7 @@ import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionLogic; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenMissionBehavior.java index 40579a733..23625300f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenMissionBehavior.java @@ -4,7 +4,7 @@ import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionLogic; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ScoutBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ScoutBehavior.java index 3358dfcd0..305d966a9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ScoutBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ScoutBehavior.java @@ -1,15 +1,11 @@ package com.ljsd.jieling.handler.map.behavior; -import com.ljsd.jieling.config.SItem; import com.ljsd.jieling.handler.map.EventType; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; import org.springframework.stereotype.Component; -import java.util.HashMap; -import java.util.Map; - @Component public class ScoutBehavior extends BaseBehavior { @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java index 53925d8f3..826d25b15 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java @@ -2,7 +2,7 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.Cell; import com.ljsd.jieling.handler.map.EventType; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemBehavior.java index 23ff22530..823af3a40 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemBehavior.java @@ -1,7 +1,7 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.EventType; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; import org.springframework.stereotype.Component; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemMissionBehavior.java index 6cb977495..fe62e231c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemMissionBehavior.java @@ -4,7 +4,7 @@ import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionLogic; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java index 87bdcb446..c6b12600c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java @@ -50,7 +50,7 @@ public class Mission extends MongoBase { } public void setMissionInfo(String missionInfo) throws Exception { - updateString(this,"missionInfo", missionInfo); + updateString("missionInfo", missionInfo); this.missionInfo = missionInfo; } @@ -59,7 +59,8 @@ public class Mission extends MongoBase { } public void updateMapPoints(int pointId, int eventId) throws Exception { - updateString(this,"mapPoints." + pointId, eventId); + updateString("mapPoints." + pointId, eventId); this.mapPoints.put(pointId, eventId); } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionLogic.java index 2a7cbec1a..168c40dac 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionLogic.java @@ -2,7 +2,7 @@ package com.ljsd.jieling.handler.mission; import com.ljsd.jieling.config.SMissionEventsConfig; import com.ljsd.jieling.handler.map.Cell; -import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java index cccf3e2f8..78c0a8c17 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java @@ -2,6 +2,8 @@ package com.ljsd.jieling.handler.mission; import com.google.common.collect.Sets; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; import java.util.Map; import java.util.Set; @@ -15,6 +17,13 @@ public class MissionManager extends MongoBase { private Set takeRewardMissions = Sets.newConcurrentHashSet(); + + public MissionManager(){ + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.missionManager); + } + + public Map getDoingMissions() { return doingMissions; } @@ -29,21 +38,22 @@ public class MissionManager extends MongoBase { public void updateDoingMissions(Map doingMissions) throws Exception { this.doingMissions = doingMissions; - updateString(this, "doingMissions", doingMissions); + updateString( "doingMissions", doingMissions); } public void updateOneDoingMissions(int missionId, Mission mission) throws Exception { this.doingMissions.put(missionId, mission); - updateString(this, "doingMissions." + missionId, mission); + updateString( "doingMissions." + missionId, mission); } public void updateFinishMissions(Set finishMissions) throws Exception { this.finishMissions = finishMissions; - updateString(this, "finishMissions", finishMissions); + updateString( "finishMissions", finishMissions); } public void addTakeRewardMissions(int missionId) throws Exception { takeRewardMissions.add(missionId); - updateString(this, "takeRewardMissions", takeRewardMissions); + updateString( "takeRewardMissions", takeRewardMissions); } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java index 760ec935c..61841265f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java @@ -1,6 +1,8 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; import java.util.HashMap; @@ -11,6 +13,8 @@ public class AdventureManager extends MongoBase { private Map adventureStateInfoMap; public AdventureManager(){ + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.adventureManager); adventureStateInfoMap = new HashMap<>(); } @@ -23,7 +27,7 @@ public class AdventureManager extends MongoBase { public void clearStation(int position){ AdventureStateInfo adventureStateInfo = adventureStateInfoMap.get(position); if (adventureStateInfo!=null){ - removeString("adventureStateInfoMap." + position, adventureStateInfo); + removeString("adventureStateInfoMap." + position); adventureStateInfoMap.remove(position); } @@ -36,4 +40,5 @@ public class AdventureManager extends MongoBase { public void setAdventureStateInfoMap(Map adventureStateInfoMap) { this.adventureStateInfoMap = adventureStateInfoMap; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java index add0e8d68..b01d26cc0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java @@ -34,4 +34,5 @@ public class AdventureStateInfo extends MongoBase { public int getPosition() { return position; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrement.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrement.java index a45ac3c5a..9cba5d1e4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrement.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrement.java @@ -15,7 +15,7 @@ public class AutoIncrement extends MongoBase { } public void setCnt(int cnt) throws Exception { - updateString(this,"cnt", cnt); + updateString("cnt", cnt); this.cnt = cnt; } public AutoIncrement(String name){ @@ -30,4 +30,5 @@ public class AutoIncrement extends MongoBase { public int getCnt() { return cnt; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrementManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrementManager.java index eeeee18b8..00da0d8b0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrementManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrementManager.java @@ -1,24 +1,31 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.logic.dao.root.MailingSystem; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class AutoIncrementManager extends MongoBase { + private Map autoIncrementMap = new ConcurrentHashMap<>(); + public AutoIncrementManager(){ + this.setRootCollection(MailingSystem._COLLECTION_NAME); + this.setMongoKey("autoIncrementManager"); + } + public Map getAutoIncrementMap() { return autoIncrementMap; } public void addAutoIncrement(AutoIncrement autoIncrement) throws Exception { - autoIncrement.init(autoIncrement.getRootId(), autoIncrement.get_myMongoTemplate(), autoIncrement.getRootCollection(), - getMongoKey() + ".autoIncrementMap." + autoIncrement.getName()); + autoIncrement.init(autoIncrement.getRootId(), getMongoKey() + ".autoIncrementMap." + autoIncrement.getName()); updateString("autoIncrementMap." + autoIncrement.getName(), autoIncrement); autoIncrementMap.put(autoIncrement.getName(),autoIncrement); } public AutoIncrement getAutoIncrement(String key){ return autoIncrementMap.get(key); } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java index 8e96533ce..a4d72d50c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java @@ -204,7 +204,7 @@ public class Equip extends MongoBase { } public void setEquipId(int equipId) throws Exception { - updateString(this,"equipId",equipId); + updateString("equipId",equipId); this.equipId = equipId; } @@ -213,7 +213,7 @@ public class Equip extends MongoBase { } public void setLevel(int level) throws Exception { - updateString(this,"level",level); + updateString("level",level); this.level = level; } @@ -222,7 +222,7 @@ public class Equip extends MongoBase { } public void setStar(int star) throws Exception { - updateString(this,"star",star); + updateString("star",star); this.star = star; } @@ -231,7 +231,7 @@ public class Equip extends MongoBase { } public void setHeroId(String heroId) throws Exception { - updateString(this,"heroId",heroId); + updateString("heroId",heroId); this.heroId = heroId; } @@ -242,4 +242,5 @@ public class Equip extends MongoBase { public Map getSecondValueByIdMap() { return secondValueByIdMap; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java index 67b6eece7..8ec2f58d8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java @@ -1,6 +1,8 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; import java.util.HashMap; import java.util.Map; @@ -10,6 +12,10 @@ public class EquipManager extends MongoBase { private Map equipMap; public EquipManager() { + + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.equipManager); + this.equipMap = new HashMap<>(); } @@ -19,9 +25,8 @@ public class EquipManager extends MongoBase { } public void remove(String equipId){ - Equip equip = equipMap.get(equipId); - if (equip!=null){ - removeString("equipMap." + equipId, equip); + if (equipMap.containsKey(equipId)){ + removeString("equipMap." + equipId); equipMap.remove(equipId); } } @@ -29,4 +34,5 @@ public class EquipManager extends MongoBase { public Map getEquipMap() { return equipMap; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 4bfc9af90..9f3c54e8a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -72,8 +72,8 @@ public class Hero extends MongoBase { } this.skillList.addAll(skillIds); } - updateString(this,"star",star); - updateString(this,"skillList",skillList); + updateString("star",star); + updateString("skillList",skillList); } @@ -82,7 +82,7 @@ public class Hero extends MongoBase { } public void setTemplateId(int templateId) throws Exception { - updateString(this,"templateId",templateId); + updateString("templateId",templateId); this.templateId = templateId; } @@ -91,17 +91,17 @@ public class Hero extends MongoBase { } public void setCurHp(float curHp) throws Exception { - updateString(this,"curHp",curHp); + updateString("curHp",curHp); this.curHp = curHp; } public void setLevel(int level) throws Exception { - updateString(this,"level",level); + updateString("level",level); this.level = level; } public void setStar(int star) throws Exception { - updateString(this,"star",star); + updateString("star",star); this.star = star; } @@ -136,19 +136,19 @@ public class Hero extends MongoBase { } public void setEquipByPositionMap(Map equipByPositionMap) throws Exception { - updateString(this,"equipByPositionMap",equipByPositionMap); + updateString("equipByPositionMap",equipByPositionMap); this.equipByPositionMap = equipByPositionMap; } public void updateEquipPositionMap(int position,String equipId) throws Exception { - updateString(this,"equipByPositionMap." + position ,equipId); + updateString("equipByPositionMap." + position ,equipId); this.equipByPositionMap.put(position,equipId); } public void removeEquip(int position){ String value = this.equipByPositionMap.get(position); if (value!=null){ - removeString("equipByPositionMap." + position, this); + removeString("equipByPositionMap." + position); this.equipByPositionMap.remove(position); } } @@ -158,7 +158,7 @@ public class Hero extends MongoBase { } public void setBreakId(int breakId) throws Exception { - updateString(this,"breakId",breakId); + updateString("breakId",breakId); this.breakId = breakId; } @@ -167,19 +167,19 @@ public class Hero extends MongoBase { } public void updateEnergy(int energy,int updateTime) throws Exception { - updateString(this,"energy",energy); - updateString(this,"lastUpdateEnergyTime",energy); + updateString("energy",energy); + updateString("lastUpdateEnergyTime",energy); this.energy = energy; this.lastUpdateEnergyTime = updateTime; } public void setCreateTime(int createTime) throws Exception { - updateString(this,"createTime",createTime); + updateString("createTime",createTime); this.createTime = createTime; } public void setLastUpdateEnergyTime(int lastUpdateEnergyTime) throws Exception { - updateString(this,"lastUpdateEnergyTime",lastUpdateEnergyTime); + updateString("lastUpdateEnergyTime",lastUpdateEnergyTime); this.lastUpdateEnergyTime = lastUpdateEnergyTime; } @@ -190,4 +190,5 @@ public class Hero extends MongoBase { public int getCreateTime() { return createTime; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java index 7af700733..30639b2dd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java @@ -1,15 +1,20 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; import java.util.HashMap; import java.util.Map; public class HeroManager extends MongoBase { + private Map heroMap; public HeroManager() { heroMap = new HashMap(); + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.heroManager); } public Map getItemMap() { @@ -22,7 +27,7 @@ public class HeroManager extends MongoBase { public void addHero(Hero hero) throws Exception { //绑定关系 - hero.init(hero.getId(),hero.get_myMongoTemplate(), hero.getRootCollection(),getMongoKey() + ".heroMap." + hero.getId()); + hero.init(hero.getId(),getMongoKey() + ".heroMap." + hero.getId()); updateString("heroMap." + hero.getId(), hero); heroMap.put(hero.getId(), hero); } @@ -32,16 +37,14 @@ public class HeroManager extends MongoBase { } public void removeHero(String heroId) { - Hero hero = heroMap.get(heroId); - if (hero!=null){ - removeString("heroMap." + heroId, hero); + if (heroMap.containsKey(heroId)){ + removeString("heroMap." + heroId); heroMap.remove(heroId); } } - - public Map getHeroMap() { return heroMap; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java index 33c22c4ab..44abfc22b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java @@ -28,7 +28,7 @@ public class Item extends MongoBase { } public void setItemId(int itemId) throws Exception { - updateString(this,"itemId", itemId); + updateString("itemId", itemId); this.itemId = itemId; } @@ -37,7 +37,7 @@ public class Item extends MongoBase { } public void setItemNum(int itemNum) throws Exception { - updateString(this,"itemNum", itemNum); + updateString("itemNum", itemNum); this.itemNum = itemNum; } @@ -46,7 +46,7 @@ public class Item extends MongoBase { } public void setEndingTime(int endingTime) throws Exception { - updateString(this,"endingTime", endingTime); + updateString("endingTime", endingTime); this.endingTime = endingTime; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java index 21f2cf27a..9e18afeb8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java @@ -1,17 +1,19 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; -import com.ljsd.jieling.config.SItem; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class ItemManager extends MongoBase { + private Map itemMap = new ConcurrentHashMap<>(); public ItemManager() { - itemMap = new HashMap(); + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.itemManager); } public Map getItemMap() { @@ -23,7 +25,7 @@ public class ItemManager extends MongoBase { } public void addItem(Item item) throws Exception { - item.init(item.getRootId(),item.get_myMongoTemplate(), item.getRootCollection(), getMongoKey() + ".itemMap." + item.getItemId()); + item.init(item.getRootId(), getMongoKey() + ".itemMap." + item.getItemId()); updateString("itemMap." + item.getItemId(), item); itemMap.put(item.getItemId(), item); } @@ -36,7 +38,7 @@ public class ItemManager extends MongoBase { Item item = itemMap.get(key); if (item!=null){ itemMap.remove(key); - removeString(getMongoKey() + ".itemMap." + key, item); + removeString(getMongoKey() + ".itemMap." + key); } } @@ -45,5 +47,4 @@ public class ItemManager extends MongoBase { addItem(item); return item; } - } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Mail.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Mail.java index 1f9c9c9de..691db9321 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Mail.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Mail.java @@ -42,7 +42,7 @@ public class Mail extends MongoBase { this.mailType = mailType; } public void setState(int state) throws Exception { - updateString(this,"state", state); + updateString("state", state); this.state = state; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailManager.java index ce310108f..938319237 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailManager.java @@ -1,21 +1,27 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; -import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class MailManager extends MongoBase { + private Map mailMap = new ConcurrentHashMap<>(); + public MailManager(){ + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.mailManager); + } + public Map getMailMap() { return mailMap; } public void addMail(Mail mail) throws Exception { - mail.init(mail.getId(),mail.get_myMongoTemplate(),mail.getRootCollection(), getMongoKey() + ".mailMap." + mail.getId()); + mail.init(mail.getId(), getMongoKey() + ".mailMap." + mail.getId()); updateString("mailMap." + mail.getId(), mail); mailMap.put(mail.getId(), mail); } @@ -23,10 +29,9 @@ public class MailManager extends MongoBase { return mailMap.get(key); } public void removeMail(String key) { - Mail mail = mailMap.get(key); - if (mail!=null){ + if (mailMap.containsKey(key)){ mailMap.remove(key); - removeString(getMongoKey() + ".mailMap." + key, mail); + removeString(getMongoKey() + ".mailMap." + key); } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystem.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystem.java deleted file mode 100644 index eccf5044c..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystem.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ljsd.jieling.logic.dao; - -import com.ljsd.GameApplication; -import com.ljsd.common.mogodb.LjsdMongoTemplate; -import com.ljsd.common.mogodb.MongoRoot; - -public class MailingSystem extends MongoRoot { - public static final String _COLLECTION_NAME = "mailingSystem"; - - private static LjsdMongoTemplate _myMongoDBPool; - private SystemMailManager systemMailManager; - private SysMailManager sysMailManager; - private AutoIncrementManager cAutoIncrementManager; - @Override - public String getCollection() { - return _COLLECTION_NAME; - } - public static String getCollectionName() { - return _COLLECTION_NAME; - } - - - public MailingSystem(){ - String id = Integer.toString(GameApplication.serverId); - setId(id); - systemMailManager = new SystemMailManager(); - sysMailManager = new SysMailManager(); - cAutoIncrementManager = new AutoIncrementManager(); - - //綁定关系 - systemMailManager.init(id, _myMongoDBPool, _COLLECTION_NAME,"systemMailManager", false); - sysMailManager.init(id, _myMongoDBPool, _COLLECTION_NAME,"sysMailManager", false); - cAutoIncrementManager.init(id, _myMongoDBPool, _COLLECTION_NAME,"autoIncrementManager", false); - } - public static void init(LjsdMongoTemplate ljsdMongoTemplate) { - _myMongoDBPool = ljsdMongoTemplate; - } - public SystemMailManager getSystemMailManager() { - return systemMailManager; - } - - public SysMailManager getSysMailManager() { - return sysMailManager; - } - - public AutoIncrementManager getcAutoIncrementManager() { - return cAutoIncrementManager; - } -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystemManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystemManager.java index e6c7fc6af..32c9b665e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystemManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystemManager.java @@ -1,7 +1,9 @@ package com.ljsd.jieling.logic.dao; -import com.ljsd.common.mogodb.LjsdMongoTemplate; +import com.ljsd.GameApplication; +import com.ljsd.jieling.db.mongo.MongoUtil; +import com.ljsd.jieling.logic.dao.root.MailingSystem; import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.util.TimeUtils; import org.springframework.context.ConfigurableApplicationContext; @@ -14,27 +16,24 @@ public class MailingSystemManager { private static Map mailingSystemMap = new ConcurrentHashMap<>(); - public static LjsdMongoTemplate ljsdMongoTemplate; public static void init(ConfigurableApplicationContext configurableApplicationContext) throws Exception { - ljsdMongoTemplate =configurableApplicationContext.getBean(LjsdMongoTemplate.class); - MailingSystem.init(ljsdMongoTemplate); //TODO 测试用 //初始化系统邮件信息 - MailingSystem mailingSystem = ljsdMongoTemplate.findById(MailingSystem.getCollectionName(), Integer.toString(1), MailingSystem.class); + MailingSystem mailingSystem = MongoUtil.getInstence().getMyMongoTemplate().findById(MailingSystem.getCollectionName(), Integer.toString(1), MailingSystem.class); if (mailingSystem == null){ mailingSystem = new MailingSystem(); addMailingSystem(mailingSystem); int nowTime = (int)(TimeUtils.now()/1000); mailingSystem.getSysMailManager().addSystemMail(new SysMail(1)); - MailingSystemManager.ljsdMongoTemplate.lastUpdate(); +// MailingSystemManager.ljsdMongoTemplate.lastUpdate(); MailLogic.getInstance().sendSystemMail("开服邮件",new ArrayList<>(),"DSKGSD",nowTime,"1#5000|2#100",30*24*60*60,"IDIP",0,"0"); } } public static void addMailingSystem(MailingSystem mailingSystem) throws Exception { mailingSystemMap.put(Integer.valueOf(mailingSystem.getId()), mailingSystem); - ljsdMongoTemplate.save(mailingSystem); + MongoUtil.getInstence().getMyMongoTemplate().save(mailingSystem); } public static boolean isUserExist(int id) { @@ -42,6 +41,6 @@ public class MailingSystemManager { } public static MailingSystem getMailingSystem() { - return mailingSystemMap.get(1); + return mailingSystemMap.get(GameApplication.serverId); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index b88196fde..012c327ce 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -2,8 +2,8 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; -import com.ljsd.jieling.config.SWorkShopSetting; -import com.ljsd.jieling.util.MathUtils; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; public class PlayerManager extends MongoBase { @@ -33,8 +33,10 @@ public class PlayerManager extends MongoBase { private String clientVersion; - - + public PlayerManager(){ + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.playerManager); + } public String getOpenId() { return openId; @@ -49,7 +51,7 @@ public class PlayerManager extends MongoBase { } public void setNickName(String nickName) throws Exception { - updateString(this,"nickName", nickName); + updateString("nickName", nickName); this.nickName = nickName; } @@ -58,7 +60,7 @@ public class PlayerManager extends MongoBase { } public void setLevel(int level) throws Exception { - updateString(this,"level", level); + updateString("level", level); this.level = level; } @@ -67,7 +69,7 @@ public class PlayerManager extends MongoBase { } public void setExp(int exp) throws Exception { - updateString(this,"exp", exp); + updateString("exp", exp); this.exp = exp; } @@ -76,7 +78,7 @@ public class PlayerManager extends MongoBase { } public void setVipLevel(int vipLevel) throws Exception { - updateString(this,"vipLevel", vipLevel); + updateString("vipLevel", vipLevel); this.vipLevel = vipLevel; } @@ -85,7 +87,7 @@ public class PlayerManager extends MongoBase { } public void setFamilyId(String familyId) throws Exception { - updateString(this,"familyId", familyId); + updateString("familyId", familyId); this.familyId = familyId; } @@ -94,7 +96,7 @@ public class PlayerManager extends MongoBase { } public void setHead(String head) throws Exception { - updateString(this,"head", head); + updateString("head", head); this.head = head; } @@ -103,7 +105,7 @@ public class PlayerManager extends MongoBase { } public void setGold(long gold) throws Exception { - updateString(this,"gold", gold); + updateString("gold", gold); this.gold = gold; } @@ -112,7 +114,7 @@ public class PlayerManager extends MongoBase { } public void setGem(int gem) throws Exception { - updateString(this,"gem", gem); + updateString("gem", gem); this.gem = gem; } @@ -121,7 +123,7 @@ public class PlayerManager extends MongoBase { } public void setChargeGem(int chargeGem) throws Exception { - updateString(this,"chargeGem", chargeGem); + updateString("chargeGem", chargeGem); this.chargeGem = chargeGem; } @@ -130,12 +132,12 @@ public class PlayerManager extends MongoBase { } public void setMapId(int mapId) throws Exception { - updateString(this,"mapId", mapId); + updateString("mapId", mapId); this.mapId = mapId; } public void setCreateTime(long createTime) throws Exception { - updateString(this,"createTime", createTime); + updateString("createTime", createTime); this.createTime = createTime; } @@ -148,7 +150,7 @@ public class PlayerManager extends MongoBase { } public void setClientVersion(String clientVersion) throws Exception { - updateString(this,"clientVersion", clientVersion); + updateString("clientVersion", clientVersion); this.clientVersion = clientVersion; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Pokemon.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Pokemon.java index 2fb3146aa..4dcfb973b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Pokemon.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Pokemon.java @@ -26,7 +26,7 @@ public class Pokemon extends MongoBase { if( integer != null){ level = integer+1 ; } - updateString(this,"comonpentsLevelMap."+comonpentId,level); + updateString("comonpentsLevelMap."+comonpentId,level); this.comonpentsLevelMap.put(comonpentId,level); } @@ -35,7 +35,7 @@ public class Pokemon extends MongoBase { } public void setAllStage(int allStage) throws Exception { - updateString(this,"allStage."+allStage,allStage); + updateString("allStage."+allStage,allStage); this.allStage = allStage; } @@ -46,4 +46,5 @@ public class Pokemon extends MongoBase { public Map getComonpentsLevelMap() { return comonpentsLevelMap; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java index 65601a822..2fc50bbc9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java @@ -1,6 +1,8 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; import java.util.HashMap; import java.util.Map; @@ -9,11 +11,14 @@ public class PokemonManager extends MongoBase { private Map pokemonMap; public PokemonManager() { + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.pokemonManager); + this.pokemonMap = new HashMap<>(); } public void addPokemon(Pokemon pokemon) throws Exception { - updateString("pokemonMap." + pokemon.getId(),pokemon); + updateString("pokemonMap." + pokemon.getId(), this); pokemonMap.put(pokemon.getId(),pokemon); } @@ -21,4 +26,5 @@ public class PokemonManager extends MongoBase { public Map getPokemonMap() { return pokemonMap; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Skill.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Skill.java index f90818da2..6bf460d01 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Skill.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Skill.java @@ -23,7 +23,7 @@ public class Skill extends MongoBase { } public void setSkillId(int skillId) throws Exception { - updateString(this,"skillId", skillId); + updateString("skillId", skillId); this.skillId = skillId; } @@ -32,7 +32,7 @@ public class Skill extends MongoBase { } public void setSkillType(int skillType) throws Exception { - updateString(this,"skillType",skillType); + updateString("skillType",skillType); this.skillType = skillType; } @@ -41,7 +41,7 @@ public class Skill extends MongoBase { } public void setLevel(int level) throws Exception { - updateString(this,"level",level); + updateString("level",level); this.level = level; } @@ -50,7 +50,7 @@ public class Skill extends MongoBase { } public void setStar(int star) throws Exception { - updateString(this,"star",star); + updateString("star",star); this.star = star; } @@ -61,4 +61,5 @@ public class Skill extends MongoBase { public void setEffectIdList(List effectIdList) { this.effectIdList = effectIdList; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMail.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMail.java index 407ff20b6..40ec74e11 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMail.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMail.java @@ -15,7 +15,7 @@ public class SysMail extends MongoBase { } public void setSysMailIds(List sysMailIds) throws Exception { - updateString(this,"sysMailIds", sysMailIds); + updateString("sysMailIds", sysMailIds); this.sysMailIds = sysMailIds; } @@ -31,4 +31,5 @@ public class SysMail extends MongoBase { this.roleUid = uid; this.sysMailIds = new CopyOnWriteArrayList<>(); } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMailManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMailManager.java index 587766a01..7a2cc00f1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMailManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMailManager.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.logic.dao.root.MailingSystem; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -8,12 +9,18 @@ import java.util.concurrent.ConcurrentHashMap; public class SysMailManager extends MongoBase { private Map sysMailMap = new ConcurrentHashMap<>(); + public SysMailManager(){ + this.setRootCollection(MailingSystem._COLLECTION_NAME); + this.setMongoKey("sysMailManager"); + } + + public Map getSystemMailMap() { return sysMailMap; } public void addSystemMail(SysMail sysMail) throws Exception { - sysMail.init(sysMail.getRootId(),sysMail.get_myMongoTemplate(),sysMail.getRootCollection(), getMongoKey() + ".sysMailMap." + sysMail.getRoleUid()); + sysMail.init(sysMail.getRootId(), getMongoKey() + ".sysMailMap." + sysMail.getRoleUid()); updateString("sysMailMap." + sysMail.getRoleUid(), sysMail); sysMailMap.put(sysMail.getRoleUid(),sysMail); } @@ -29,4 +36,5 @@ public class SysMailManager extends MongoBase { } return sysMail; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SystemMail.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SystemMail.java index 83b8219c4..7e88852c0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SystemMail.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SystemMail.java @@ -87,4 +87,5 @@ public class SystemMail extends MongoBase { public String getVersion() { return version; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SystemMailManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SystemMailManager.java index 65d533504..252544a34 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SystemMailManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SystemMailManager.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.logic.dao.root.MailingSystem; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -8,6 +9,11 @@ import java.util.concurrent.ConcurrentHashMap; public class SystemMailManager extends MongoBase { private Map systemMailMap = new ConcurrentHashMap<>(); + public SystemMailManager(){ + this.setRootCollection(MailingSystem._COLLECTION_NAME); + this.setMongoKey("systemMailManager"); + } + public Map getSystemMailMap() { return systemMailMap; } @@ -23,4 +29,5 @@ public class SystemMailManager extends MongoBase { public String getName (){ return "systemMail"; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java index 482284c28..de1758904 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java @@ -1,6 +1,8 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.CommonProto; import java.util.*; @@ -12,6 +14,8 @@ public class TeamPosManager extends MongoBase { private Map> teamPosForPoken; public TeamPosManager(){ + this.setRootCollection(User._COLLECTION_NAME); + this.setMongoKey(MongoKey.missionManager); teamNames = new HashMap<>(3); teamPosForHero = new HashMap<>(3); teamPosForPoken = new HashMap<>(3); @@ -19,7 +23,7 @@ public class TeamPosManager extends MongoBase { public void changeName(int teamId,String teamName) throws Exception { teamNames.put(teamId,teamName); - updateString(this,"teamNames",teamNames); + updateString("teamNames",teamNames); } public void changeTeamInfo(int teamId, List heroIds, List pokemonoIds) throws Exception { @@ -35,8 +39,8 @@ public class TeamPosManager extends MongoBase { } teamPosForHero.put(teamId,teamPosHeroInfoList); teamPosForPoken.put(teamId,teamPosForPokenInfos); - updateString(this,"teamPosForHero",teamPosForHero); - updateString(this,"teamPosForPoken",teamPosForPoken); + updateString("teamPosForHero",teamPosForHero); + updateString("teamPosForPoken",teamPosForPoken); } @@ -51,7 +55,7 @@ public class TeamPosManager extends MongoBase { teamPosHeroInfoList.add(teamPosHeroInfo); } teamPosForHero.put(1,teamPosHeroInfoList); - updateString(this,"teamPosForHero",teamPosForHero); + updateString("teamPosForHero",teamPosForHero); } @@ -66,4 +70,5 @@ public class TeamPosManager extends MongoBase { public Map> getTeamPosForPoken() { return teamPosForPoken; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 9cff41edf..43c4714da 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -1,56 +1,50 @@ package com.ljsd.jieling.logic.dao; -import com.ljsd.common.mogodb.LjsdMongoTemplate; import com.ljsd.jieling.config.SGameSetting; +import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionManager; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.TimeUtils; -import org.springframework.context.ConfigurableApplicationContext; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UserManager { - private static Map userMap = new ConcurrentHashMap<>(); + private static Map userMap = new ConcurrentHashMap<>(); - public static LjsdMongoTemplate ljsdMongoTemplate; - - public static void init(ConfigurableApplicationContext configurableApplicationContext) { - ljsdMongoTemplate =configurableApplicationContext.getBean(LjsdMongoTemplate.class); - User.init(ljsdMongoTemplate); - } public static void addUser(User user) { - userMap.put(user._getIntId(), user); + userMap.put(user.getId(), user); } public static boolean isUserExist(int uid) { return userMap.containsKey(uid); } - public static User getUserForLogin(int uid) throws Exception { - User user = userMap.get(uid); - if (user != null) { - user = ljsdMongoTemplate.findById(User.getCollectionName(), Integer.toString(uid), User.class); - } - if (user == null) { - user = registerUser(uid); - }else{ - refreshUserLoginInfo(user); - } - return user; - } - - private static void refreshUserLoginInfo(User user) { - //TODO - } +// public static User getUserForLogin(int uid) throws Exception { +// User user = userMap.get(uid); +// if (user != null) { +// user = MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), Integer.toString(uid), User.class); +// } +// if (user == null) { +// user = registerUser(uid); +// }else{ +// refreshUserLoginInfo(user); +// } +// return user; +// } +// +// private static void refreshUserLoginInfo(User user) { +// //TODO +// } public static User userLogin(int uid) throws Exception { - User user = ljsdMongoTemplate.findById(User.getCollectionName(), Integer.toString(uid), User.class); + User user = MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), Integer.toString(uid), User.class); if (user == null) { user = registerUser(uid); }else { @@ -66,7 +60,7 @@ public class UserManager { User user = new User(uid); initPlayer(user); UserManager.addUser(user); - ljsdMongoTemplate.save(user); + MongoUtil.getInstence().getMyMongoTemplate().save(user); return user; } @@ -104,7 +98,7 @@ public class UserManager { if (user != null) { return user; } - user =ljsdMongoTemplate.findById(User.getCollectionName(), Integer.toString(uid), User.class); + user = MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), Integer.toString(uid), User.class); if (user == null) { throw new Exception("UserManager::getUser null exception"); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java index f8722b1da..4dd41f686 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java @@ -2,6 +2,8 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; import com.ljsd.jieling.config.SWorkShopSetting; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.MailingSystem; import com.ljsd.jieling.util.MathUtils; import java.util.ArrayList; @@ -20,7 +22,11 @@ public class WorkShopController extends MongoBase { private int cookExp; public WorkShopController(){ + this.setRootCollection(MailingSystem._COLLECTION_NAME); + this.setMongoKey(MongoKey.workShopController); + this.openBlueStateMap = new HashMap<>(); + } public void add(int type,int openId) throws Exception { @@ -28,7 +34,7 @@ public class WorkShopController extends MongoBase { openBlueStateMap.put(type,new ArrayList<>()); } openBlueStateMap.get(type).add(openId); - updateString(this,"openBlueStateMap." + type, openBlueStateMap.get(type)); + updateString("openBlueStateMap." + type, openBlueStateMap.get(type)); } public void addWorkShopExp(int addExp) throws Exception { @@ -88,7 +94,7 @@ public class WorkShopController extends MongoBase { } public void setWorkShopLevel(int workShopLevel) throws Exception { - updateString(this,"workShopLevel", workShopLevel); + updateString("workShopLevel", workShopLevel); this.workShopLevel = workShopLevel; } @@ -97,17 +103,17 @@ public class WorkShopController extends MongoBase { } public void setWorkShopExp(int workShopExp) throws Exception { - updateString(this,"workShopExp", workShopExp); + updateString("workShopExp", workShopExp); this.workShopExp = workShopExp; } public void setCookLevel(int cookLevel) throws Exception { - updateString(this,"cookLevel", cookLevel); + updateString("cookLevel", cookLevel); this.cookLevel = cookLevel; } public void setCookExp(int cookExp) throws Exception { - updateString(this,"cookExp", cookExp); + updateString("cookExp", cookExp); this.cookExp = cookExp; } @@ -122,4 +128,5 @@ public class WorkShopController extends MongoBase { public int getCookExp() { return cookExp; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/MailingSystem.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/MailingSystem.java new file mode 100644 index 000000000..28b688ddd --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/MailingSystem.java @@ -0,0 +1,55 @@ +package com.ljsd.jieling.logic.dao.root; + +import com.ljsd.GameApplication; +import com.ljsd.common.mogodb.LjsdMongoTemplate; +import com.ljsd.common.mogodb.MongoRoot; +import com.ljsd.jieling.logic.dao.AutoIncrementManager; +import com.ljsd.jieling.logic.dao.SysMailManager; +import com.ljsd.jieling.logic.dao.SystemMailManager; + +public class MailingSystem { + public static final String _COLLECTION_NAME = "mailingSystem"; + + private String id; + + private SystemMailManager systemMailManager; + private SysMailManager sysMailManager; + private AutoIncrementManager cAutoIncrementManager; + + + public MailingSystem(){ + this.id = Integer.toString(GameApplication.serverId); + systemMailManager = new SystemMailManager(); + sysMailManager = new SysMailManager(); + cAutoIncrementManager = new AutoIncrementManager(); + + //綁定关系 + systemMailManager.init(id,"systemMailManager"); + sysMailManager.init(id,"sysMailManager"); + cAutoIncrementManager.init(id,"autoIncrementManager"); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public static String getCollectionName() { + return _COLLECTION_NAME; + } + + public SystemMailManager getSystemMailManager() { + return systemMailManager; + } + + public SysMailManager getSysMailManager() { + return sysMailManager; + } + + public AutoIncrementManager getcAutoIncrementManager() { + return cAutoIncrementManager; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/User.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java similarity index 66% rename from serverlogic/src/main/java/com/ljsd/jieling/logic/dao/User.java rename to serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java index aa830be99..ed751c9ad 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/User.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java @@ -1,15 +1,16 @@ -package com.ljsd.jieling.logic.dao; +package com.ljsd.jieling.logic.dao.root; -import com.ljsd.common.mogodb.LjsdMongoTemplate; import com.ljsd.common.mogodb.MongoRoot; +import com.ljsd.jieling.db.mongo.MongoKey; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.handler.mission.MissionManager; +import com.ljsd.jieling.logic.dao.*; -public class User extends MongoRoot { +public class User { public static final String _COLLECTION_NAME = "user"; - private static LjsdMongoTemplate _myMongoDBPool; + private String id; private PlayerManager playerManager; @@ -34,10 +35,12 @@ public class User extends MongoRoot { private WorkShopController workShopController; + //构造函数必须要声明,否则从mongodb读出来反编译成类不通过 + public User(){ + } public User(int uid){ - String suid = Integer.toString(uid); - setId(suid); + this.id = Integer.toString(uid); this.playerManager = new PlayerManager(); this.itemManager = new ItemManager(); this.heroManager = new HeroManager(); @@ -51,27 +54,25 @@ public class User extends MongoRoot { this.workShopController = new WorkShopController(); //綁定关系 - this.playerManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"playerManager", false); - this.itemManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"itemManager", false); - this.heroManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"heroManager", false); - this.mapManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"mapManager", false); - this.missionManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"missionManager", false); - this.teamPosManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"teamPosManager",false); - this.mailManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"mailManager",false); - this.equipManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"equipManager",false); - this.adventureManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"adventureManager",false); - this.pokemonManager.init(suid, _myMongoDBPool, _COLLECTION_NAME,"pokemonManager",false); - this.workShopController.init(suid, _myMongoDBPool, _COLLECTION_NAME,"workShopController",false); + this.playerManager.init(id, MongoKey.playerManager); + this.itemManager.init(id, MongoKey.itemManager); + this.heroManager.init(id, MongoKey.heroManager); + this.mapManager.init(id, MongoKey.mapManager); + this.missionManager.init(id, MongoKey.missionManager); + this.teamPosManager.init(id, MongoKey.teamPosManager); + this.mailManager.init(id, MongoKey.mailManager); + this.equipManager.init(id, MongoKey.equipManager); + this.adventureManager.init(id, MongoKey.adventureManager); + this.pokemonManager.init(id, MongoKey.pokemonManager); + this.workShopController.init(id, MongoKey.workShopController); } - - public static void init(LjsdMongoTemplate ljsdMongoTemplate) { - _myMongoDBPool = ljsdMongoTemplate; + public String getId() { + return id; } - @Override - public String getCollection() { - return _COLLECTION_NAME; + public void setId(String id) { + this.id = id; } public static String getCollectionName() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index fb4144668..3d66ecbd0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -6,6 +6,8 @@ import com.ljsd.jieling.config.SAdventureSetting; import com.ljsd.jieling.config.SFoodsConfig; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 6b3de215e..853dbd329 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -5,6 +5,8 @@ import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.HeroInfoProto; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 0c4b6f270..dba4daf44 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -1,14 +1,13 @@ package com.ljsd.jieling.logic.item; import com.ljsd.jieling.config.*; -import com.ljsd.jieling.globals.GlobalItemType; -import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.protocols.PlayerInfoProto; import com.ljsd.jieling.util.*; -import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java index 8fa0d06c2..2a64374a5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java @@ -2,12 +2,11 @@ package com.ljsd.jieling.logic.item; import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.GlobalsDef; -import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.globals.GlobalItemType; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; -import com.ljsd.jieling.protocols.HeroInfoProto; import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.protocols.PlayerInfoProto; import com.ljsd.jieling.util.CBean2Proto; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java index 057c8c667..dcb5db2b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java @@ -2,6 +2,9 @@ package com.ljsd.jieling.logic.mail; import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.root.MailingSystem; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; @@ -186,7 +189,7 @@ public class MailLogic { SystemMailManager systemMailManager = mailingSystem.getSystemMailManager(); int id = getSystemMailId(autoIncrementManager,name); systemMailManager.addSystemMail(new SystemMail(id,title,userList,content,sendTime,reward,effectiveTime,sendName,registerEndTime,version)); - MailingSystemManager.ljsdMongoTemplate.lastUpdate(); +// MailingSystemManager.ljsdMongoTemplate.lastUpdate(); } private static int getSystemMailId(AutoIncrementManager autoIncrementManager,String name) throws Exception { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java index de75c507c..3512f1a97 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java @@ -100,7 +100,7 @@ public class ProtocolsManager implements ProtocolsAbstract { packetNetData.getMsgId()== MessageTypeProto.MessageType.RECONNECT_REQUEST_VALUE){ //初始化session - if (sessionInit(session,packetNetData)){ + if (!sessionInit(session,packetNetData)){ MessageUtil.sendErrorCode(session,0,"您的账号token不正确,请退出游戏重新登陆!"); return; } @@ -120,10 +120,10 @@ public class ProtocolsManager implements ProtocolsAbstract { return; } //检查token - if (checkToken(session,packetNetData) != 0 ){ - MessageUtil.sendErrorCode(session,0,"您的账号token不正确,请退出游戏重新登陆!"); - return; - } +// if (checkToken(session,packetNetData) != 0 ){ +// MessageUtil.sendErrorCode(session,0,"您的账号token不正确,请退出游戏重新登陆!"); +// return; +// } if (checkIndex(session,packetNetData) != 0){ return; } @@ -155,7 +155,7 @@ public class ProtocolsManager implements ProtocolsAbstract { int token = packetNetData.getToken(); session.setUid(uid); String tokenKey = RedisKey.getKey(RedisKey.TOKEN, String.valueOf(uid),false); - int serverToken = (int)RedisUtil.getInstence().get(tokenKey); + int serverToken = Integer.parseInt((String)RedisUtil.getInstence().get(tokenKey)); if (token == serverToken){ session.setToken(token); return true; @@ -193,6 +193,7 @@ public class ProtocolsManager implements ProtocolsAbstract { } private void dealHeartBeat(ISession session) { + session.setHeartBreatNums(3); MessageUtil.sendHeartBeat(session); } @@ -273,8 +274,8 @@ public class ProtocolsManager implements ProtocolsAbstract { @Override public void readIdel(GameSession gameSession) { // TODO - final ISession session = (ISession) gameSession; - readIdea(session); +// final ISession session = (ISession) gameSession; +// readIdea(session); } public BaseHandler getHandler(MessageTypeProto.MessageType messageType) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index c0a1ca102..950dfbb53 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -5,6 +5,7 @@ import com.ljsd.jieling.config.SItem; import com.ljsd.jieling.config.SRewardGroup; import com.ljsd.jieling.globals.GlobalItemType; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.CommonProto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java index b0712c2c7..1d79ecb44 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -1,7 +1,7 @@ package com.ljsd.jieling.util; import com.google.protobuf.GeneratedMessage; -import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.netty.PackageConstant; import com.ljsd.jieling.netty.cocdex.Tea; import com.ljsd.jieling.network.session.ISession; @@ -48,7 +48,7 @@ public class MessageUtil { public static void sendMessage(ISession session, int result, int msgId, GeneratedMessage generatedMessage, boolean flush) { byte[] byteBuf = wrappedBuffer(session.getUid(), session.getToken(), session.getIndex(), result, msgId, generatedMessage); try { - UserManager.ljsdMongoTemplate.lastUpdate(); + MongoUtil.getInstence().lastUpdate(); } catch (Exception e) { e.printStackTrace(); }