0ct0pu5/websoft9
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update manage.py

Browse source
This commit is contained in:
qiaofeng1227 2023-05-11 10:08:20 +08:00 • committed by GitHub
parent 6514e57048
commit 99b28461fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
appmanage/api/service/manage.py
View file

@ -525,7 +525,7 @@ def app_domain_list(app_id):
if code == None: if code == None:
info, flag = app_exits_in_docker(app_id) info, flag = app_exits_in_docker(app_id)
if flag: if flag:
myLogger.info_logger("Check app_id ok") myLogger.info_logger("Check app_id ok[app_domain_list]")
else: else:
raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "APP is not exist", "") raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "APP is not exist", "")
else: else:
@ -543,7 +543,7 @@ def app_domain_delete(app_id):
if code == None: if code == None:
info, flag = app_exits_in_docker(app_id) info, flag = app_exits_in_docker(app_id)
if flag: if flag:
myLogger.info_logger("Check app_id ok") myLogger.info_logger("Check app_id ok[app_domain_delete]")
else: else:
raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "APP is not exist", "") raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "APP is not exist", "")
else: else:
@ -562,6 +562,8 @@ def app_domain_delete(app_id):
else: else:
raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "App has no proxy", "") raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "App has no proxy", "")
set_domain("", app_id)
def app_domain_update(app_id, domains): def app_domain_update(app_id, domains):
check_domains(domains) check_domains(domains)
@ -609,7 +611,7 @@ def app_domain_update(app_id, domains):
} }
requests.put(url, data=json.dumps(data), headers=headers) requests.put(url, data=json.dumps(data), headers=headers)
set_domain(domain[0],app_id) set_domain(domain[0], app_id)
return domains return domains
else: else:
raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "App has no proxy", "") raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "App has no proxy", "")
@ -659,7 +661,7 @@ def app_domain_add(app_id, domains):
} }
requests.post(url, data=json.dumps(data), headers=headers) requests.post(url, data=json.dumps(data), headers=headers)
set_domain(domain[0],app_id) set_domain(domain[0], app_id)
return domains return domains
def check_domains(domains): def check_domains(domains):
@ -676,7 +678,8 @@ def check_domains(domains):
def is_valid_domain(domain): 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,}$" 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)) #return bool(re.match(pattern, domain))
return True
def check_real_domain(domain): def check_real_domain(domain):
domain_real = True domain_real = True
@ -730,5 +733,11 @@ def get_proxy(app_id):
def set_domain(domain,app_id): def set_domain(domain,app_id):
customer_name = app_id.split('_')[1] customer_name = app_id.split('_')[1]
cmd = "sed -i 's/APP_URL=.*/APP_URL=" + domain + "/g /data/apps/" + customer_name +"/.env" if domain == "":
shell_execute.execute_command_output_all(cmd) ip_result = shell_execute.execute_command_output_all("cat /data/apps/stackhub/docker/w9appmanage/public_ip")
domain = ip_result["result"].rstrip('\n')
cmd = "sed -i 's/APP_URL=.*/APP_URL=" + domain + "/g /data/apps/" + customer_name +"/.env"
shell_execute.execute_command_output_all(cmd)
else:
cmd = "sed -i 's/APP_URL=.*/APP_URL=" + domain + "/g /data/apps/" + customer_name +"/.env"
shell_execute.execute_command_output_all(cmd)