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

0.8.8

Browse source
This commit is contained in:
qiaofeng1227 2023-07-27 09:43:19 +08:00
parent ac1ca018ef
commit ef51dc032b
7 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
## 0.8.8 release on 2023-07-27
fixed update search api bug
## 0.8.5 release on 2023-07-26 ## 0.8.5 release on 2023-07-26
add docs add docs

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

@ -41,14 +41,14 @@ def appstore_update():
# 当点击appstore升级时，是无条件升级，不需要做版本的判定 # 当点击appstore升级时，是无条件升级，不需要做版本的判定
download_url = const.ARTIFACT_URL + "/plugin/appstore/appstore-latest.zip" download_url = const.ARTIFACT_URL + "/plugin/appstore/appstore-latest.zip"
cmd = "cd /opt && wget " + download_url + " && unzip appstore-latest.zip " cmd = "cd /opt && rm -rf /opt/appstore* && wget " + download_url + " && unzip appstore-latest.zip "
shell_execute.execute_command_output_all(cmd) shell_execute.execute_command_output_all(cmd)
shell_execute.execute_command_output_all("rm -rf /usr/share/cockpit/appstore && cp /opt/appstore /usr/share/cockpit") shell_execute.execute_command_output_all("rm -rf /usr/share/cockpit/appstore && cp -r /opt/appstore /usr/share/cockpit")
shell_execute.execute_command_output_all("rm -rf /opt/appstore*") shell_execute.execute_command_output_all("rm -rf /opt/appstore*")
library_url = const.ARTIFACT_URL + "/plugin/library/library-latest.zip" library_url = const.ARTIFACT_URL + "/plugin/library/library-latest.zip"
library_cmd = "cd /opt && wget " + library_url + " && unzip library-latest.zip " library_cmd = "cd /opt && rm -rf /opt/library* && wget " + library_url + " && unzip library-latest.zip "
shell_execute.execute_command_output_all(library_cmd) shell_execute.execute_command_output_all(library_cmd)
shell_execute.execute_command_output_all("rm -rf /data/library && cp -r /opt/library /data") shell_execute.execute_command_output_all("rm -rf /data/library && cp -r /opt/library /data")
shell_execute.execute_command_output_all("rm -rf /opt/library*") shell_execute.execute_command_output_all("rm -rf /opt/library*")
@ -98,7 +98,7 @@ def AppStoreUpdate():
core_support = AppStoreCore() core_support = AppStoreCore()
if core_support == "-1": if core_support == "-1":
raise CommandException(const.ERRORMESSAGE_SERVER_VERSION_NOTSUPPORT, "You must upgrade websoft9 core", "You must upgrade websoft9 core") raise CommandException(const.ERRORMESSAGE_SERVER_VERSION_NEEDUPGRADE, "You must upgrade websoft9 core", "You must upgrade websoft9 core")
elif core_support == "1": elif core_support == "1":
raise CommandException(const.ERRORMESSAGE_SERVER_VERSION_NOTSUPPORT, "core not support,can not upgrade", "core not support,can not upgrade") raise CommandException(const.ERRORMESSAGE_SERVER_VERSION_NOTSUPPORT, "core not support,can not upgrade", "core not support,can not upgrade")
appstore_update() appstore_update()
@ -119,7 +119,7 @@ def get_update_list():
ret['local_version'] = local_version ret['local_version'] = local_version
ret['target_version'] = version ret['target_version'] = version
content = [] content = []
cmd = "curl" + const.ARTIFACT_URL + "/CHANGELOG.md" cmd = "curl " + const.ARTIFACT_URL + "/CHANGELOG.md"
change_log_contents = shell_execute.execute_command_output_all(cmd)['result'] change_log_contents = shell_execute.execute_command_output_all(cmd)['result']
change_log = change_log_contents.split('## ')[1].split('\n') change_log = change_log_contents.split('## ')[1].split('\n')
date = change_log[0].split()[-1] date = change_log[0].split()[-1]

1
appmanage/api/utils/const.py
View file

@ -19,6 +19,7 @@ ERRORMESSAGE_SERVER_COMMAND="Server.Container.Error"
ERRORMESSAGE_SERVER_SYSTEM="Server.SystemError" ERRORMESSAGE_SERVER_SYSTEM="Server.SystemError"
ERRORMESSAGE_SERVER_RESOURCE="Server.ResourceError" ERRORMESSAGE_SERVER_RESOURCE="Server.ResourceError"
ERRORMESSAGE_SERVER_VERSION_NOTSUPPORT="Server.Version.NotSupport" ERRORMESSAGE_SERVER_VERSION_NOTSUPPORT="Server.Version.NotSupport"
ERRORMESSAGE_SERVER_VERSION_NEEDUPGRADE="Server.Version.NeedUpgradeCore"
# 应用状态定义 # 应用状态定义
# 应用启动中 installing # 应用启动中 installing

6
appmanage/api/v1/routers/apps.py
View file

@ -52,13 +52,13 @@ domain = "  Domain_set：{\n\n" \
"    domains：域名列表\n\n" \ "    domains：域名列表\n\n" \
"    default_domain：默认域名\n\n  }\n\n}\n\n" "    default_domain：默认域名\n\n  }\n\n}\n\n"
update = "  Compare_content: 内容比较{\n\n" \ update = "  Compare_content: 内容比较 {\n\n" \
"    local_version: 当前版本,\n\n" \ "    local_version: 当前版本,\n\n" \
"    &target_version: 最新版本\n\n" \ "    target_version: 最新版本\n\n" \
"    content: 更新内容\n\n" \ "    content: 更新内容\n\n" \
"    date: 更新日期\n\n" \ "    date: 更新日期\n\n" \
"    update: 是否有更新\n\n" \ "    update: 是否有更新\n\n" \
"    core_compare: 是否支持升级(-1:需要升级内核 0:可以升级 1:无法支持)\n\n    }\n\n" "    core_compare: 是否支持升级(-1:需要升级内核 0:可以升级 1:无法支持)\n\n    }\n\n}\n\n"
appstore_update = "  Update_flag: 更新结果(成功或失败)\n\n}\n\n" appstore_update = "  Update_flag: 更新结果(成功或失败)\n\n}\n\n"
auto = "  auto_update: 目前的自动更新状态\n\n}\n\n" auto = "  auto_update: 目前的自动更新状态\n\n}\n\n"

2
changelog_latest.md
View file

@ -1 +1 @@
新增接口 docs 文档：appstore 更新信息查询 fixed update search api bug

2
docker/w9appmanage/.env
View file

@ -1,4 +1,4 @@
APP_NAME=websoft9-appmanage APP_NAME=websoft9-appmanage
APP_VERSION=0.8.5 APP_VERSION=0.8.8
APP_HTTP_PORT=5000 APP_HTTP_PORT=5000
APP_NETWORK=websoft9 APP_NETWORK=websoft9

4
version.json
View file

@ -2,7 +2,7 @@
"SERVICES": { "SERVICES": {
"PORTAINER": "2.18.3", "PORTAINER": "2.18.3",
"NGINX": "2.10.3", "NGINX": "2.10.3",
"APPMANAGE": "0.8.5", "APPMANAGE": "0.8.8",
"REDIS": "7.0.11" "REDIS": "7.0.11"
}, },
"PLUGINS": { "PLUGINS": {
@ -39,5 +39,5 @@
"18.04" "18.04"
] ]
}, },
"VERSION": "0.8.5" "VERSION": "0.8.8"
} }