admin/JiShe.IOT.Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善配置文件获取

Browse Source
This commit is contained in:
ChenYi 2025-11-03 15:03:04 +08:00
parent 7d2b0422c8
commit a9e34a5546
2 changed files with 3 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs
View File

@ -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)

39
host/JiShe.IoT.HttpApi.Host/Program.cs
View File

@ -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
@ -54,10 +20,9 @@ public class Program
.ConfigureAppConfiguration((context, builder) =>
{
var env = context.HostingEnvironment.EnvironmentName;
Log.Information("当前环境 ：" + env);
string[] filePathArray = new string[] { Environment.CurrentDirectory, "configs" };
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);
});