From db5395b9a868a0ab415cce43096dc63dfaa3332a Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Wed, 24 Sep 2025 11:08:27 +0800
Subject: [PATCH] 更新多个.DS_Store文件，调整MqttPublisherService以支持生产环境配置，优化UavAdvertisementService以处理字符串到整数的转换，修复UavAgentProfitConfigService中的返回值格式，更新UavAdvertisementCrInput以使用字符串类型的isEnabled属性。

---
 .DS_Store                                                                                        | Bin 12292 -> 0 bytes
 netcore/.DS_Store                                                                                | Bin 10244 -> 0 bytes
 netcore/src/.DS_Store                                                                            | Bin 12292 -> 0 bytes
 netcore/src/Application/.DS_Store                                                                | Bin 10244 -> 0 bytes
 netcore/src/Application/NCC.API/.DS_Store                                                        | Bin 14340 -> 0 bytes
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavAdvertisement/Dto/UavAdvertisementCrInput.cs |  4 ++--
 netcore/src/Modularity/Extend/NCC.Extend/MqttPublisherService.cs                                 |  2 +-
 netcore/src/Modularity/Extend/NCC.Extend/UavAdvertisementService.cs                              | 14 +++++++++++++-
 netcore/src/Modularity/Extend/NCC.Extend/UavAgentProfitConfigService.cs                          |  2 +-
 9 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 452424f..208dc9d 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/netcore/.DS_Store b/netcore/.DS_Store
index f8dd301..3a397e9 100644
Binary files a/netcore/.DS_Store and b/netcore/.DS_Store differ
diff --git a/netcore/src/.DS_Store b/netcore/src/.DS_Store
index 17ffdf9..ec8e04f 100644
Binary files a/netcore/src/.DS_Store and b/netcore/src/.DS_Store differ
diff --git a/netcore/src/Application/.DS_Store b/netcore/src/Application/.DS_Store
index 5d08f80..d40ccc5 100644
Binary files a/netcore/src/Application/.DS_Store and b/netcore/src/Application/.DS_Store differ
diff --git a/netcore/src/Application/NCC.API/.DS_Store b/netcore/src/Application/NCC.API/.DS_Store
index 18b3f1c..8a823bf 100644
Binary files a/netcore/src/Application/NCC.API/.DS_Store and b/netcore/src/Application/NCC.API/.DS_Store differ
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavAdvertisement/Dto/UavAdvertisementCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavAdvertisement/Dto/UavAdvertisementCrInput.cs
index 3c53809..465e84c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavAdvertisement/Dto/UavAdvertisementCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavAdvertisement/Dto/UavAdvertisementCrInput.cs
@@ -23,6 +23,7 @@ namespace NCC.Extend.Entitys.Dto.UavAdvertisement
         /// 广告排序
         /// </summary>
         public string sortOrder { get; set; }
+
         /// <summary>
         /// 代理商ID
         /// </summary>
@@ -36,7 +37,6 @@ namespace NCC.Extend.Entitys.Dto.UavAdvertisement
         /// <summary>
         /// 是否启用（1=启用，0=禁用）
         /// </summary>
-        public int isEnabled { get; set; }
-
+        public string isEnabled { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/MqttPublisherService.cs b/netcore/src/Modularity/Extend/NCC.Extend/MqttPublisherService.cs
index c5b6f79..7fca299 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/MqttPublisherService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/MqttPublisherService.cs
@@ -96,7 +96,7 @@ public class MqttPublisherService : IMqttPublisherService, ITransient, IDisposab
     private string GetClientId()
     {
         // 手动设置：true为生产环境，false为开发环境
-        bool isProduction = false; // 这里可以手动调整
+        bool isProduction = true; // 这里可以手动调整
         
         if (isProduction)
         {
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/UavAdvertisementService.cs b/netcore/src/Modularity/Extend/NCC.Extend/UavAdvertisementService.cs
index ce27785..6cf9321 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/UavAdvertisementService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/UavAdvertisementService.cs
@@ -149,9 +149,21 @@ namespace NCC.Extend.UavAdvertisement
         {
             var entity = input.Adapt<UavAdvertisementEntity>();
             entity.Id = YitIdHelper.NextId().ToString();
-            entity.ImageUrl = entity.ImageUrl.Replace("\"", "");
+            entity.ImageUrl = entity.ImageUrl?.Replace("\"", "");
             entity.AgentId = _userManager.UserId;
             entity.CreateUser = _userManager.UserId;
+            entity.CreateTime = DateTime.Now;
+            // 字符串到整数的强制转换
+            if (!string.IsNullOrEmpty(input.isEnabled) && int.TryParse(input.isEnabled, out int isEnabledValue))
+            {
+                entity.IsEnabled = isEnabledValue;
+            }
+
+            if (!string.IsNullOrEmpty(input.sortOrder) && int.TryParse(input.sortOrder, out int sortOrderValue))
+            {
+                entity.SortOrder = sortOrderValue;
+            }
+
             var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
         }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/UavAgentProfitConfigService.cs b/netcore/src/Modularity/Extend/NCC.Extend/UavAgentProfitConfigService.cs
index 8ca438b..b67f79b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/UavAgentProfitConfigService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/UavAgentProfitConfigService.cs
@@ -320,7 +320,7 @@ namespace NCC.Extend.UavAgentProfitConfig
                  prevLoginIPAddress = a.PrevLogIP,
                  openId = a.OpenId
              }).FirstAsync();
-             return data;
+            return data;
         }
         #endregion
     }
--
libgit2 0.21.4