github_mirrors/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2025-01-24 10:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

domain

Browse Source
This commit is contained in:
qiaofeng1227 2023-05-16 17:36:59 +08:00
parent e784ed0301
commit 8a203c2a81
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appmanage/Dockerfile
View File

@ -10,7 +10,7 @@ COPY static ./static
COPY requirements.txt main.py ./ COPY requirements.txt main.py ./
RUN apt update RUN apt update
# Install supervisord # Install supervisords
RUN apt install -y supervisor RUN apt install -y supervisor
COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY config/cmd.sh /cmd.sh COPY config/cmd.sh /cmd.sh

9
appmanage/api/service/manage.py
View File

@ -547,7 +547,7 @@ def app_domain_list(app_id):
customer_name = app_id.split('_')[1] customer_name = app_id.split('_')[1]
app_url = shell_execute.execute_command_output_all("cat /data/apps/" + customer_name +"/.env")["result"] app_url = shell_execute.execute_command_output_all("cat /data/apps/" + customer_name +"/.env")["result"]
if "APP_URL" in app_url: if "APP_URL" in app_url:
url = shell_execute.execute_command_output_all("cat /data/apps/" + customer_name +"/.env |grep APP_URL=")["result"] url = shell_execute.execute_command_output_all("cat /data/apps/" + customer_name +"/.env |grep APP_URL=")["result"].rstrip('\n')
default_domain = url.split('=')[1] default_domain = url.split('=')[1]
ret['default_domain'] = default_domain ret['default_domain'] = default_domain
myLogger.info_logger(ret) myLogger.info_logger(ret)
@ -642,7 +642,7 @@ def app_domain_delete(app_id, domain):
def app_domain_update(app_id, domain_old, domain_new): def app_domain_update(app_id, domain_old, domain_new):
myLogger.info_logger("app_domain_update")
domain_list = [] domain_list = []
domain_list.append(domain_old) domain_list.append(domain_old)
domain_list.append(domain_new) domain_list.append(domain_new)
@ -699,11 +699,12 @@ def app_domain_update(app_id, domain_old, domain_new):
raise CommandException(const.ERROR_CONFIG_NGINX, response.json().get("error").get("message"), "") raise CommandException(const.ERROR_CONFIG_NGINX, response.json().get("error").get("message"), "")
domain_set = app_domain_list(app_id) domain_set = app_domain_list(app_id)
default_domain = domain_set['default_domain'] default_domain = domain_set['default_domain']
myLogger.info_logger("default_domain=" + default_domain + ",domain_old="+domain_old)
# 如果被修改的域名是默认域名，修改后也设置为默认域名 # 如果被修改的域名是默认域名，修改后也设置为默认域名
if default_domain == domain_old: if default_domain == domain_old:
set_domain(domain_new, app_id) set_domain(domain_new, app_id)
else: else:
raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "domain is not binded", "") raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "edit domain is not exist", "")
def app_domain_add(app_id, domain): def app_domain_add(app_id, domain):
@ -937,7 +938,7 @@ def app_domain_set(domain, app_id):
set_domain(domain, app_id) set_domain(domain, app_id)
def set_domain(domain, app_id): def set_domain(domain, app_id):
myLogger.info_logger("set_domain start")
old_domains = get_all_domains(app_id) old_domains = get_all_domains(app_id)
if domain != "": if domain != "":
if domain not in old_domains: if domain not in old_domains: