Просмотр исходного кода

修复DBProxyComponent有三个泛型约束错了

tanghai 8 лет назад
Родитель
Сommit
ad860ccc70

+ 6 - 6
Server/Model/Module/DB/DBCacheComponent.cs

@@ -97,10 +97,10 @@ namespace Model
 
 		public Task<Disposer> Get(string collectionName, long id)
 		{
-			Disposer entity = GetFromCache(collectionName, id);
-			if (entity != null)
+			Disposer disposer = GetFromCache(collectionName, id);
+			if (disposer != null)
 			{
-				return Task.FromResult(entity);
+				return Task.FromResult(disposer);
 			}
 
 			TaskCompletionSource<Disposer> tcs = new TaskCompletionSource<Disposer>();
@@ -116,13 +116,13 @@ namespace Model
 			bool isAllInCache = true;
 			foreach (long id in idList)
 			{
-				Disposer entity = this.GetFromCache(collectionName, id);
-				if (entity == null)
+				Disposer disposer = this.GetFromCache(collectionName, id);
+				if (disposer == null)
 				{
 					isAllInCache = false;
 					break;
 				}
-				disposers.Add(entity);
+				disposers.Add(disposer);
 			}
 
 			if (isAllInCache)

+ 3 - 3
Server/Model/Module/DB/DBProxyComponent.cs

@@ -51,14 +51,14 @@ namespace Model
 			await session.Call(new DBSaveRequest { Disposer = disposer,  NeedCache = false, CollectionName = "Log" });
 		}
 
-		public async Task<T> Query<T>(long id, bool needCache = true) where T: Entity
+		public async Task<T> Query<T>(long id, bool needCache = true) where T: Disposer
 		{
 			Session session = Game.Scene.GetComponent<NetInnerComponent>().Get(dbAddress);
 			DBQueryResponse dbQueryResponse = (DBQueryResponse)await session.Call(new DBQueryRequest { CollectionName = typeof(T).Name, Id = id, NeedCache = needCache });
 			return (T)dbQueryResponse.Disposer;
 		}
 
-		public async Task<List<T>> QueryBatch<T>(List<long> ids, bool needCache = true) where T : Entity
+		public async Task<List<T>> QueryBatch<T>(List<long> ids, bool needCache = true) where T : Disposer
 		{
 			List<T> list = new List<T>();
 			Session session = Game.Scene.GetComponent<NetInnerComponent>().Get(dbAddress);
@@ -70,7 +70,7 @@ namespace Model
 			return list;
 		}
 
-		public async Task<List<T>> QueryJson<T>(string json, bool needCache = true) where T : Entity
+		public async Task<List<T>> QueryJson<T>(string json, bool needCache = true) where T : Disposer
 		{
 			List<T> list = new List<T>();
 			Session session = Game.Scene.GetComponent<NetInnerComponent>().Get(dbAddress);