yawaflua/SpCloudCore
1
0
Fork 0
mirror of https://github.com/yawaflua/SpCloudCore.git synced 2026-02-04 02:44:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bug with dll selecting in create_service_file_dotnet

Browse Source
This commit is contained in:
Hepatica
2024-08-18 08:30:16 +02:00
parent ef3ccfa686
commit 52e612d957
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
SpCloudMain/Controllers/PublishController.cpp
View File

@@ -45,28 +45,36 @@ public:
file_processing->unzip(filename, this->publish_app_path + app_final_file_path);
check_port_and_increase_if_not_available();//
file_processing->adjust_nginx_configuration_and_reloud(app->get_name(), std::to_string(last_available_port));//
file_processing->create_service_file(this->publish_app_path, app_final_file_path, std::to_string(last_available_port));
if (app->get_target() == "dotnet network")
{
this->dotnet_publish(this->publish_app_path + app_final_file_path, last_available_port);
check_port_and_increase_if_not_available();
file_processing->adjust_nginx_configuration_and_reloud(app->get_name(), std::to_string(last_available_port));//
file_processing->create_service_file_dotnet(this->publish_app_path, app_final_file_path,
std::to_string(last_available_port), true);
//this->dotnet_publish(this->publish_app_path + app_final_file_path, last_available_port);//Test
app->set_url("https://" + app->get_name() + ".almavid.ru/");
app->set_url_on_local_machine("http://localhost:" + std::to_string(last_available_port));
}
if (app->get_target() == "dotnet")
{
this->dotnet_publish(this->publish_app_path + app_final_file_path);
file_processing->create_service_file_dotnet(this->publish_app_path, app_final_file_path,
std::to_string(last_available_port), false);
//this->dotnet_publish(this->publish_app_path + app_final_file_path);//Test
app->set_url("Worker Service");
app->set_url_on_local_machine("Worker Service");
}
file_processing->delete_file(filename);
app->set_url("https://" + app->get_name() + ".almavid.ru/");//
app->set_url_on_local_machine("http://localhost:" + std::to_string(last_available_port));//
app->set_service_name(app_final_file_path);
return "Publish successfully: " + filename;
@@ -125,8 +133,6 @@ public:
file_processing->stop_service_file(app_final_file_path);
//file_processing->stop_and_start_service_file(app_final_file_path);
return "Success";
}