From a9e34a55469edace0db6f4ee8c355a4490371f76 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Mon, 3 Nov 2025 15:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IoTHttpApiHostModule.cs                   | 15 -------
 host/JiShe.IoT.HttpApi.Host/Program.cs        | 41 ++-----------------
 2 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs
index d152922..a41013c 100644
--- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs
+++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs
@@ -56,21 +56,6 @@ namespace JiShe.IoT
             {
                 configuration.GetSection(nameof(DataChannelOptions)).Bind(options);
             });
-
-            Configure<Volo.Abp.Json.SystemTextJson.AbpSystemTextJsonSerializerOptions>(options =>
-            {
-                options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.Never;
-                options.JsonSerializerOptions.WriteIndented = false;// 设置格式化输出
-                options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);// 允许特殊字符
-                options.JsonSerializerOptions.IgnoreReadOnlyFields = true;
-                options.JsonSerializerOptions.IgnoreReadOnlyProperties = true;
-                options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString; // 允许数字字符串
-                options.JsonSerializerOptions.AllowTrailingCommas = true; // 忽略尾随逗号
-                options.JsonSerializerOptions.ReadCommentHandling = JsonCommentHandling.Skip; // 忽略注释
-                options.JsonSerializerOptions.PropertyNameCaseInsensitive = true; // 属性名称大小写不敏感
-                options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase; // 属性名称使用驼峰命名规则
-                options.JsonSerializerOptions.DefaultBufferSize = 4096;
-            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
diff --git a/host/JiShe.IoT.HttpApi.Host/Program.cs b/host/JiShe.IoT.HttpApi.Host/Program.cs
index 43f69e0..9ee82f8 100644
--- a/host/JiShe.IoT.HttpApi.Host/Program.cs
+++ b/host/JiShe.IoT.HttpApi.Host/Program.cs
@@ -1,6 +1,3 @@
-using JiShe.ServicePro.Core;
-using JiShe.ServicePro.Encrypt;
-
 namespace JiShe.IoT;
 
 public class Program
@@ -9,37 +6,6 @@ public class Program
     {
         try
         {
-            //var options = new Yitter.IdGenerator.IdGeneratorOptions(2);
-            //Yitter.IdGenerator.YitIdHelper.SetIdGenerator(options);
-            //long nanosecondsFromSnowflakeId = ServicePro.Core.TimestampHelper.NextUnixNanosecondsFromSnowflakeId();
-            //long nanosecondsDateOffset = ServicePro.Core.TimestampHelper.ToUnixTimeNanoseconds(DateTimeOffset.UtcNow);
-
-            BusinessSystemAggregation.Dto.BatchQueryDeviceDataInfoInput batchQueryDeviceDataInfoInput = new BusinessSystemAggregation.Dto.BatchQueryDeviceDataInfoInput()
-            {
-                DeviceType = ServicePro.Enums.DeviceTypeEnum.SUB_DEVICE,
-                DeviceAddresses = new List<string>()
-                {
-                    "000000000001"
-                },
-                BeginTime = new DateTime(2025,10,29),
-                EndTime = new DateTime(2025, 10, 31),
-                IoTDataType = "Data",
-            };
-            OpenApiRequest openApiRequest = new OpenApiRequest()
-            {
-                Message = batchQueryDeviceDataInfoInput.Serialize(),
-                Signature = "admin:admin123",
-                Timestamp = 1762185062034,
-                Nonce = "44110100",
-            };
-
-            var signature = EncryptUtil.OpenApiSignature(openApiRequest.Message, openApiRequest.Timestamp, "SIcPQnpMgaFDmNlIjNmzq5smshz7cKrh", openApiRequest.Nonce);
-            openApiRequest.Signature = signature.Item2;
-
-            string signatureSTR = openApiRequest.Serialize();
-
-
-            //string text = Convert.ToBase64String(Encoding.UTF8.GetBytes("admin:admin123"));
             Log.Information("JiShe.IoT.HttpApi.Host.");
             var builder = WebApplication.CreateBuilder(args);
             builder.Host
@@ -53,11 +19,10 @@ public class Program
                 })
                 .ConfigureAppConfiguration((context, builder) =>
                 {
-                    var env = context.HostingEnvironment.EnvironmentName;
-                    Log.Information("当前环境 ：" + env);
-                    string[] filePathArray = new string[] { Environment.CurrentDirectory, "configs" };
+                    var env = context.HostingEnvironment.EnvironmentName; 
+                    string[] filePathArray = new string[] { System.AppDomain.CurrentDomain.BaseDirectory, "configs" };
                     string jsonPath = Path.Combine(filePathArray);
-
+                    Log.Warning($"当前环境 ：{env}，配置文件路径：{jsonPath}");
                     builder.AddJsonFile(Path.Combine(jsonPath, "appsettings.json"), false, true);
                     builder.AddJsonFile(Path.Combine(jsonPath, $"appsettings.{env}.json"), false, true);
                 });