Merge remote-tracking branch 'origin/main'

main
陈伟 2025-11-29 15:29:22 +08:00
commit f574964a36
2 changed files with 4 additions and 3 deletions

View File

@ -22,11 +22,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
private readonly string ak = "e3d019924e7f40089bcffba4"; private readonly string ak = "e3d019924e7f40089bcffba4";
private readonly string sk = "cf83a12caa155b994eb34fa9"; private readonly string sk = "cf83a12caa155b994eb34fa9";
private readonly string baseUrl = "https://123.132.248.154:6405"; private readonly string baseUrl = "https://123.132.248.154:6405";
private readonly RabbitMqListenerService _listener; //private readonly RabbitMqListenerService _listener;
private readonly DaHuaAiApp _app; private readonly DaHuaAiApp _app;
//public DaHuaAiController(RabbitMqListenerService listener, DaHuaAiApp app)
public DaHuaAiController(RabbitMqListenerService listener, DaHuaAiApp app) public DaHuaAiController(RabbitMqListenerService listener, DaHuaAiApp app)
{ {
_listener = listener; //_listener = listener;
_app = app; _app = app;
} }
private async Task<Response<string>> PostJsonAsync(string path, object body) private async Task<Response<string>> PostJsonAsync(string path, object body)

View File

@ -29,7 +29,7 @@ namespace OpenAuth.WebApi.Model.mqtt
TaskId = root["TaskId"]?.ToString() ?? "", TaskId = root["TaskId"]?.ToString() ?? "",
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
CreateId = long.Parse((root["CreateId"]?.ToString() ?? "0")), CreateId = long.Parse((root["CreateId"]?.ToString() ?? "0")),
Data = Newtonsoft.Json.JsonConvert.SerializeObject(root["Data"]), Data = root["Data"]?.ToJsonString() ?? ""
}); });
//var info = Newtonsoft.Json.JsonConvert.DeserializeObject<LasaControlOperation>(payload); //var info = Newtonsoft.Json.JsonConvert.DeserializeObject<LasaControlOperation>(payload);
//info.Id = Guid.NewGuid().ToString(); //info.Id = Guid.NewGuid().ToString();