beenull/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2024-11-26 09:30:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
TooY 2023-04-18 14:04:51 +08:00
parent 48a109f81e
commit c5801776e0
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
from pydantic import BaseModel
from api.model.running_info import RunningInfo
from api.model.config import Config
from api.model.status_reason import StatusReason
class App(BaseModel):
@ -8,7 +8,7 @@ class App(BaseModel):
customer_name: str
trade_mark: str
status: str
status_reason: StatusReason
status_reason: StatusReason = None
official_app: bool
image_url: str
running_info: RunningInfo
config: Config = None

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

@ -13,7 +13,7 @@ from threading import Thread
from api.utils import shell_execute, docker, const
from api.model.app import App
from api.model.response import Response
from api.model.running_info import RunningInfo
from api.model.config import Config
from api.model.status_reason import StatusReason
from api.utils.common_log import myLogger
from redis import Redis
@ -321,16 +321,19 @@ def get_apps_from_compose():
except IndexError:
pass
running_info = RunningInfo(port=port, compose_file=volume, url=url, admin_url=admin_url,
if status in ['running', 'exited']:
config = Config(port=port, compose_file=volume, url=url, admin_url=admin_url,
user_name=user_name, password=password, default_domain="", set_domain="")
else:
config = None
if status == "failed":
status_reason = StatusReason(Code=const.ERROR_SERVER_SYSTEM, Message="system original error", Detail="unknown error")
else:
status_reason = StatusReason(Code="", Message="", Detail="")
status_reason = None
app = App(app_id=app_id, app_name=app_name, customer_name=customer_name, trade_mark=trade_mark, status=status,
status_reason=status_reason, official_app=official_app, image_url=image_url,
running_info=running_info)
config=config)
app_list.append(app.dict())
return app_list
@ -439,12 +442,11 @@ def get_rq_app(id, status, code, message, detail):
trade_mark = ""
image_url = get_Image_url(app_name)
running_info = RunningInfo(port=0, compose_file="", url="", admin_url="",
user_name="", password="", default_domain="", set_domain="")
config = None
status_reason = StatusReason(Code=code, Message=message, Detail=detail)
app = App(app_id=id, app_name=app_name, customer_name=customer_name, trade_mark=trade_mark,
status=status, status_reason=status_reason, official_app=True, image_url=image_url,
running_info=running_info)
config=config)
return app.dict()
def get_Image_url(app_name):