diff --git a/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs b/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
index cde387c..98df22b 100644
--- a/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
+++ b/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
@@ -91,7 +91,7 @@ namespace JiShe.CollectBus.Subscribers
             }
             else
             {
-                var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.FocusAddress);
+                var device = await _deviceRepository.FirstOrDefaultAsync(a => a.Number == receivedMessage.FocusAddress);
                 if (device != null)
                 {
                     await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
@@ -118,7 +118,7 @@ namespace JiShe.CollectBus.Subscribers
             }
             else
             {
-                var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.FocusAddress);
+                var device = await _deviceRepository.FirstOrDefaultAsync(a => a.Number == receivedMessage.FocusAddress);
                 if (device != null)
                 {
                     await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
diff --git a/src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs b/src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs
index 7940a79..addb7c0 100644
--- a/src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs
+++ b/src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs
@@ -31,57 +31,57 @@ public class CollectBusMongoDbContext : AbpMongoDbContext, ICollectBusMongoDbCon
        
     protected override void CreateModel(IMongoModelBuilder modelBuilder)
     {
-        modelBuilder.Entity<MeterReadingRecords>(builder =>
-        {
-            builder.CreateCollectionOptions.Collation = new Collation(locale: "en_US", strength: CollationStrength.Secondary);
-            builder.ConfigureIndexes(indexes =>
-            {
-                indexes.CreateOne(
-                    new CreateIndexModel<BsonDocument>(
-                        Builders<BsonDocument>.IndexKeys.Ascending("MyProperty"),
-                        new CreateIndexOptions { Unique = true }
-                    )
-                );
-            }
-            );
+        //modelBuilder.Entity<MeterReadingRecords>(builder =>
+        //{
+        //    builder.CreateCollectionOptions.Collation = new Collation(locale: "en_US", strength: CollationStrength.Secondary);
+        //    builder.ConfigureIndexes(indexes =>
+        //    {
+        //        indexes.CreateOne(
+        //            new CreateIndexModel<BsonDocument>(
+        //                Builders<BsonDocument>.IndexKeys.Ascending("MyProperty"),
+        //                new CreateIndexOptions { Unique = true }
+        //            )
+        //        );
+        //    }
+        //    );
 
-            //// 创建索引
-            //builder.ConfigureIndexes(index =>
-            //{
+        //    //// 创建索引
+        //    //builder.ConfigureIndexes(index =>
+        //    //{
 
 
-            //    //List<CreateIndexModel<BsonDocument>> createIndexModels = new List<CreateIndexModel<BsonDocument>>();
-            //    //createIndexModels.Add(new CreateIndexModel<BsonDocument>(
-            //    //        Builders<BsonDocument>.IndexKeys.Ascending(nameof(MeterReadingRecords)),
-            //    //        new CreateIndexOptions
-            //    //        {
-            //    //            Unique = true
-            //    //        }
-            //    //    ));
+        //    //    //List<CreateIndexModel<BsonDocument>> createIndexModels = new List<CreateIndexModel<BsonDocument>>();
+        //    //    //createIndexModels.Add(new CreateIndexModel<BsonDocument>(
+        //    //    //        Builders<BsonDocument>.IndexKeys.Ascending(nameof(MeterReadingRecords)),
+        //    //    //        new CreateIndexOptions
+        //    //    //        {
+        //    //    //            Unique = true
+        //    //    //        }
+        //    //    //    ));
 
 
-            //    //var indexKeys = Builders<BsonDocument>.IndexKeys
-            //    //.Ascending("CreationTime")
-            //    //.Ascending("OrderNumber");
+        //    //    //var indexKeys = Builders<BsonDocument>.IndexKeys
+        //    //    //.Ascending("CreationTime")
+        //    //    //.Ascending("OrderNumber");
 
-            //    //var indexOptions = new CreateIndexOptions
-            //    //{
-            //    //    Background = true,
-            //    //    Name = "IX_CreationTime_OrderNumber"
-            //    //};
-            //    //index.CreateOne(
-            //    //new CreateIndexModel<BsonDocument>(indexKeys, indexOptions));
+        //    //    //var indexOptions = new CreateIndexOptions
+        //    //    //{
+        //    //    //    Background = true,
+        //    //    //    Name = "IX_CreationTime_OrderNumber"
+        //    //    //};
+        //    //    //index.CreateOne(
+        //    //    //new CreateIndexModel<BsonDocument>(indexKeys, indexOptions));
 
-            //    //index.CreateOne(new CreateIndexModel<BsonDocument>(
-            //    //        Builders<BsonDocument>.IndexKeys.Ascending(nameof(MeterReadingRecords)),
-            //    //        new CreateIndexOptions
-            //    //        {
-            //    //            Unique = true
-            //    //        }
-            //    //    ));
-            //});
+        //    //    //index.CreateOne(new CreateIndexModel<BsonDocument>(
+        //    //    //        Builders<BsonDocument>.IndexKeys.Ascending(nameof(MeterReadingRecords)),
+        //    //    //        new CreateIndexOptions
+        //    //    //        {
+        //    //    //            Unique = true
+        //    //    //        }
+        //    //    //    ));
+        //    //});
 
-        });
+        //});
 
         base.CreateModel(modelBuilder); 
         modelBuilder.ConfigureCollectBus();