qiaofeng1227 2 jaren geleden
bovenliggende
commit
1384671a9a
2 gewijzigde bestanden met toevoegingen van 65 en 1 verwijderingen
  1. 64 0
      appmanage/api/service/manage.py
  2. 1 1
      appmanage/api/v1/routers/apps.py

+ 64 - 0
appmanage/api/service/manage.py

@@ -517,3 +517,67 @@ def get_error_info(code, message, detail):
     error['Message'] = message
     error['Detail'] = detail
     return error
+
+def app_domain_list(app_id):
+
+    code, message = docker.check_app_id(app_id)
+    if code == None:
+        info, flag = app_exits_in_docker(app_id)
+        if flag:
+            domains = List[str]
+            return domains
+        else:
+            raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "APP is not exist", "")
+    else:
+        raise CommandException(code, message, "")
+
+
+def app_domain_delete(app_id):
+
+
+def app_domain_update(app_id, domains):
+
+    check_domains(domains)
+    
+    code, message = docker.check_app_id(app_id)
+    if code == None:
+        info, flag = app_exits_in_docker(app_id)
+        if flag:
+            return domains
+        else:
+            raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "APP is not exist", "")
+    else:
+        raise CommandException(code, message, "")
+
+def app_domain_add(app_id, domains):
+
+    check_domains(domains)
+
+    code, message = docker.check_app_id(app_id)
+    if code == None:
+        info, flag = app_exits_in_docker(app_id)
+        if flag:
+            return domains
+        else:
+            raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "APP is not exist", "")
+    else:
+        raise CommandException(code, message, "")
+
+def check_domains(domains):
+    if domains is None or len(domains) == 0:
+        raise CommandException(const.ERROR_CLIENT_PARAM_BLANK, "Domains is blank", "")
+    else:
+        for domain in domains:
+            if is_valid_domain(domain):
+            else:
+                raise CommandException(const.ERROR_CLIENT_PARAM_Format, "Domains format error", "")
+
+
+def is_valid_domain(domain):
+    pattern = r"^[a-zA-Z0-9][a-zA-Z0-9\-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$"
+    return bool(re.match(pattern, domain))
+
+def check_real_domain(domain):
+    domain_real = True
+
+    return domain_real

+ 1 - 1
appmanage/api/v1/routers/apps.py

@@ -280,7 +280,7 @@ def AppDomainDelete(request: Request, app_id: Optional[str] = Query(default=None
 
     return JSONResponse(content=ret)
 
-@router.api_route("/AppDomainList", methods=["GET", "POST"], summary="绑定域名",  response_model=Response)
+@router.api_route("/AppDomainList", methods=["GET", "POST"], summary="查询App对应域名",  response_model=Response)
 def AppDomainList(request: Request, app_id: Optional[str] = Query(default=None, description="应用ID")):
 
     try: