From bb4b5d40ff686da13ff1b6d965f7495659efda81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=80=86=E6=B5=81=E8=80=8C=E4=B8=8A?= <1666888816@qq.com> Date: Fri, 31 May 2024 14:49:00 +0800 Subject: [PATCH] fix: gateway domain split "-" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ι€†ζ΅θ€ŒδΈŠ <1666888816@qq.com> --- console/services/app_config/domain_service.py | 3 ++- console/services/app_config/port_service.py | 5 +++-- console/services/groupapp_recovery/groupapps_migrate.py | 3 ++- console/services/market_app/new_components.py | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/console/services/app_config/domain_service.py b/console/services/app_config/domain_service.py index 32b450a70..ef6b26db7 100644 --- a/console/services/app_config/domain_service.py +++ b/console/services/app_config/domain_service.py @@ -904,7 +904,8 @@ def create_default_gateway_rule(self, tenant, region_info, service, port): service_id = service.service_id service_name = service.service_alias container_port = port.container_port - domain_name = str(service_name) + "." + str(region_info.httpdomain) + domain_name = str(service_name) + "-" + str(container_port) + "-" + str(tenant.tenant_name) + "-" + str( + region_info.httpdomain) create_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') protocol = "http" http_rule_id = make_uuid(domain_name) diff --git a/console/services/app_config/port_service.py b/console/services/app_config/port_service.py index b17d58084..473175b6a 100644 --- a/console/services/app_config/port_service.py +++ b/console/services/app_config/port_service.py @@ -465,7 +465,7 @@ def __open_outer(self, tenant, service, region, deal_port, user_name='', app=Non if deal_port.protocol == "http": service_name = service.service_alias container_port = deal_port.container_port - domain_name = str(service_name) + "." + str(region.httpdomain) + domain_name = str(service_name) + "-" + str(container_port) + "-" + str(tenant.tenant_name) + "-" + str(region.httpdomain) protocol = "http" service_id = service.service_id http_rule_id = make_uuid(domain_name) @@ -488,7 +488,8 @@ def __open_outer(self, tenant, service, region, deal_port, user_name='', app=Non service_id = service.service_id service_name = service.service_alias container_port = deal_port.container_port - domain_name = str(service_name) + "." + str(region.httpdomain) + domain_name = str(service_name) + "-" + str(container_port) + "-" + str(tenant.tenant_name) + "-" + str( + region.httpdomain) domain_repo.create_service_domains(service_id, service_name, domain_name, create_time, container_port, protocol, http_rule_id, tenant_id, service_alias, region_id) diff --git a/console/services/groupapp_recovery/groupapps_migrate.py b/console/services/groupapp_recovery/groupapps_migrate.py index e0ebe563d..71572934c 100644 --- a/console/services/groupapp_recovery/groupapps_migrate.py +++ b/console/services/groupapp_recovery/groupapps_migrate.py @@ -482,7 +482,8 @@ def __save_port(self, service_id = service.service_id service_name = service.service_alias container_port = port.container_port - domain_name = str(service_name) + "." + str(region.httpdomain) + domain_name = str(service_name) + "-" + str(container_port) + "-" + str( + tenant.tenant_name) + "-" + str(region.httpdomain) create_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') protocol = "http" http_rule_id = make_uuid(domain_name) diff --git a/console/services/market_app/new_components.py b/console/services/market_app/new_components.py index ce5b9c189..a21e71cc7 100644 --- a/console/services/market_app/new_components.py +++ b/console/services/market_app/new_components.py @@ -539,8 +539,7 @@ def _contains_default_rule(rules: [ServiceDomain]): return False def _create_default_domain(self, service_alias: str, port: int): - return str(service_alias) + "." + str(self.region.httpdomain) - # return str(port) + "." + service_alias + "." + self.tenant.tenant_name + "." + self.region.httpdomain + return service_alias + "-" + str(port) + "-" + self.tenant.tenant_name + "-" + self.region.httpdomain @staticmethod def _domain_cookie_or_header(items):