diff --git a/.github/workflows/upload_artifact.yml b/.github/workflows/upload_artifact.yml index 42051308..3d777435 100644 --- a/.github/workflows/upload_artifact.yml +++ b/.github/workflows/upload_artifact.yml @@ -3,7 +3,7 @@ name: upload_artifact on: workflow_dispatch: push: - branches: [main1] + branches: [main] paths: - "version.json" diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile index 9205883f..a1cb1e7b 100644 --- a/appmanage/Dockerfile +++ b/appmanage/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.10-slim LABEL maintainer="Websoft9" -LABEL version="0.8.15" +LABEL version="0.8.16" # Create API Directory WORKDIR /usr/src/app diff --git a/appmanage/api/service/db.py b/appmanage/api/service/db.py index 8724b13f..c7072f7d 100644 --- a/appmanage/api/service/db.py +++ b/appmanage/api/service/db.py @@ -30,7 +30,7 @@ def AppSearchPreview(): conn = sqlite3.connect('/usr/src/app/db/database.sqlite') conn.row_factory = dict_factory 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() conn.close() return rows diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py index 6f62995d..3ac90593 100644 --- a/appmanage/api/service/manage.py +++ b/appmanage/api/service/manage.py @@ -37,6 +37,7 @@ q = Queue(connection=redis_conn, default_timeout=3600) def get_release_url(): preview = db.AppSearchPreview().get("preview") + myLogger.info_logger(preview) if preview == "false": return const.ARTIFACT_URL_DEV else: diff --git a/appmanage/api/v1/routers/apps.py b/appmanage/api/v1/routers/apps.py index 5c315b10..9cc05f4f 100644 --- a/appmanage/api/v1/routers/apps.py +++ b/appmanage/api/v1/routers/apps.py @@ -61,7 +61,7 @@ update = "  Compare_content: 内容比较 {\n\n" \ "    core_compare: 是否支持升级(-1:需要升级内核 0:可以升级 1:无法支持)\n\n    }\n\n}\n\n" appstore_update = "  Update_flag: 更新结果(成功或失败)\n\n}\n\n" -auto = "  auto_update: 目前的自动更新状态\n\n}\n\n" +auto = "  reviewUpdate: 目前的预览版状态\n\n}\n\n" user = "  user: 用户信息{\n\n" \ "      username: 用户名\n\n" \ "      password: 密码\n\n" \ @@ -441,7 +441,7 @@ def AppPreviewUpdate(request: Request,preview: Optional[str] = Query(default=Non get_headers(request) ret = {} ret['ResponseData'] = {} - ret['ResponseData']['reviewUpdate'] = "api is not available" + ret['ResponseData']['reviewUpdate'] = manage.AppPreviewUpdate(preview) response = JSONResponse(content=ret) except CommandException as ce: ret = {} diff --git a/version.json b/version.json index 3ab6c363..49a0aad8 100644 --- a/version.json +++ b/version.json @@ -43,5 +43,5 @@ "18.04" ] }, - "VERSION": "0.8.18" + "VERSION": "0.8.10" } \ No newline at end of file