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

preview release

Browse source
This commit is contained in:
qiaofeng1227 2023-08-18 16:55:32 +08:00
parent d0f60992ca
commit cb477b8ab1
6 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/upload_artifact.yml vendored
View file

@ -3,7 +3,7 @@ name: upload_artifact
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [main1] branches: [main]
paths: paths:
- "version.json" - "version.json"

2
appmanage/Dockerfile
View file

@ -1,6 +1,6 @@
FROM python:3.10-slim FROM python:3.10-slim
LABEL maintainer="Websoft9<help@websoft9.com>" LABEL maintainer="Websoft9<help@websoft9.com>"
LABEL version="0.8.15" LABEL version="0.8.16"
# Create API Directory # Create API Directory
WORKDIR /usr/src/app WORKDIR /usr/src/app

2
appmanage/api/service/db.py
View file

@ -30,7 +30,7 @@ def AppSearchPreview():
conn = sqlite3.connect('/usr/src/app/db/database.sqlite') conn = sqlite3.connect('/usr/src/app/db/database.sqlite')
conn.row_factory = dict_factory conn.row_factory = dict_factory
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("SELECT preview FROM app_preview WHERE module='appstore'", ()) cursor.execute("SELECT preview FROM app_preview WHERE module='appstore'")
rows = cursor.fetchone() rows = cursor.fetchone()
conn.close() conn.close()
return rows return rows

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

@ -37,6 +37,7 @@ q = Queue(connection=redis_conn, default_timeout=3600)
def get_release_url(): def get_release_url():
preview = db.AppSearchPreview().get("preview") preview = db.AppSearchPreview().get("preview")
myLogger.info_logger(preview)
if preview == "false": if preview == "false":
return const.ARTIFACT_URL_DEV return const.ARTIFACT_URL_DEV
else: else:

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

@ -61,7 +61,7 @@ update = "&emsp;&emsp;Compare_content: 内容比较 {\n\n" \
"&emsp;&emsp;&emsp;&emsp;core_compare: 是否支持升级(-1:需要升级内核 0:可以升级 1:无法支持)\n\n&emsp;&emsp;&emsp;&emsp;}\n\n}\n\n" "&emsp;&emsp;&emsp;&emsp;core_compare: 是否支持升级(-1:需要升级内核 0:可以升级 1:无法支持)\n\n&emsp;&emsp;&emsp;&emsp;}\n\n}\n\n"
appstore_update = "&emsp;&emsp;Update_flag: 更新结果(成功或失败)\n\n}\n\n" appstore_update = "&emsp;&emsp;Update_flag: 更新结果(成功或失败)\n\n}\n\n"
auto = "&emsp;&emsp;auto_update: 目前的自动更新状态\n\n}\n\n" auto = "&emsp;&emsp;reviewUpdate: 目前的预览版状态\n\n}\n\n"
user = "&emsp;&emsp;user: 用户信息{\n\n" \ user = "&emsp;&emsp;user: 用户信息{\n\n" \
"&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;username: 用户名\n\n" \ "&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;username: 用户名\n\n" \
"&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;password: 密码\n\n" \ "&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;password: 密码\n\n" \
@ -441,7 +441,7 @@ def AppPreviewUpdate(request: Request,preview: Optional[str] = Query(default=Non
get_headers(request) get_headers(request)
ret = {} ret = {}
ret['ResponseData'] = {} ret['ResponseData'] = {}
ret['ResponseData']['reviewUpdate'] = "api is not available" ret['ResponseData']['reviewUpdate'] = manage.AppPreviewUpdate(preview)
response = JSONResponse(content=ret) response = JSONResponse(content=ret)
except CommandException as ce: except CommandException as ce:
ret = {} ret = {}

2
version.json
View file

@ -43,5 +43,5 @@
"18.04" "18.04"
] ]
}, },
"VERSION": "0.8.18" "VERSION": "0.8.10"
} }