preview release

.github/workflows/upload_artifact.yml

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

appmanage/Dockerfile

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

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

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:

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 = {}

version.json

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