beenull/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2024-11-22 23:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update app.py manage.py

Browse source
This commit is contained in:
童颖佳 2023-03-15 11:57:52 +08:00 committed by GitHub
parent 76348ada2e
commit 1d0bbe7422
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appmanage/api/model/app.py
View file

@ -1,7 +1,7 @@
from pydantic import BaseModel
class App(BaseModel):
id: str
app_id: str
name: str
customer_name: str
trade_mark: str

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

@ -52,7 +52,7 @@ def set_app_info(output_list):
image_url = "https://libs.websoft9.com/Websoft9/logo/product/" + real_name + "-websoft9.png"
# get trade_mark
trade_mark = docker.read_var(app_name, 'trademark')
id = app_name # id
app_id = real_name + "_" + app_name # app_id
case = app_info.split()[1].split("(")[0] # case
if case == "running":
case_code = const.RETURN_RUNNING # case_code
@ -98,8 +98,7 @@ def set_app_info(output_list):
except IndexError:
pass
real_name = docker.read_var(app_name, 'name')
app = App(id=id, name=real_name, customer_name=app_name, status_code=case_code, status=case, port=port, volume=volume, url=url,
app = App(app_id=app_id, name=real_name, customer_name=app_name, status_code=case_code, status=case, port=port, volume=volume, url=url,
image_url=image_url, admin_url=admin_url, trade_mark=trade_mark, user_name=user_name, password=password)
app_list.append(app.dict())
@ -110,8 +109,8 @@ def set_app_info(output_list):
image_url = "https://libs.websoft9.com/Websoft9/logo/product/" + \
running_app_name + "-websoft9.png"
trade_mark = docker.read_var(running_app_name, 'trademark')
true_name = docker.read_var(running_app_name, 'name')
app = App(id=running_app_name, name=true_name, customer_name=running_app_name, status_code=const.RETURN_READY, status="installing", port=0, volume="-",
real_name = docker.read_var(running_app_name, 'name')
app = App(app_id=real_name + "_" + running_app_name, name=real_name, customer_name=running_app_name, status_code=const.RETURN_READY, status="installing", port=0, volume="-",
url="-", image_url=image_url, admin_url="-", trade_mark=trade_mark, user_name="-", password="-")
app_list.append(app.dict())
return app_list