From 3993a3476d67496946e20c7b1da9666a97faa8c9 Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Wed, 26 Jul 2023 17:51:28 +0800
Subject: [PATCH] 0.8.7

---
 appmanage/Dockerfile             |  2 +-
 appmanage/api/service/manage.py  |  2 +-
 appmanage/api/v1/routers/apps.py | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile
index c2d8e3f4..4d9b7fc9 100644
--- a/appmanage/Dockerfile
+++ b/appmanage/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.10-slim
 LABEL maintainer="Websoft9<help@websoft9.com>"
-LABEL version="0.8.6"
+LABEL version="0.8.7"
 
 # Create API Directory
 WORKDIR /usr/src/app
diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py
index 45ce8ce4..1ba16dd0 100644
--- a/appmanage/api/service/manage.py
+++ b/appmanage/api/service/manage.py
@@ -50,7 +50,7 @@ def appstore_update():
     library_url = const.ARTIFACT_URL + "/plugin/library/library-latest.zip"
     library_cmd = "cd /opt && wget " + library_url + " && unzip  library-latest.zip "
     shell_execute.execute_command_output_all(library_cmd)
-    shell_execute.execute_command_output_all("rm -rf /data/library && cp /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*")        
     myLogger.info_logger("auto update success...")
 
diff --git a/appmanage/api/v1/routers/apps.py b/appmanage/api/v1/routers/apps.py
index c38f1c6a..98c11c13 100644
--- a/appmanage/api/v1/routers/apps.py
+++ b/appmanage/api/v1/routers/apps.py
@@ -52,12 +52,13 @@ domain = "&emsp;&emsp;Domain_set：{\n\n" \
          "&emsp;&emsp;&emsp;&emsp;domains：域名列表\n\n" \
          "&emsp;&emsp;&emsp;&emsp;default_domain：默认域名\n\n&emsp;&emsp;}\n\n}\n\n"
 
-update = "&emsp;&emsp;Compare_content: 新旧版本内容{\n\n" \
-         "&emsp;&emsp;&emsp;&emsp;current_version: 当前版本,\n\n" \
-         "&emsp;&emsp;&emsp;&emsp;Update_content: {\n\n" \
-         "&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;version: 最新版本\n\n" \
-         "&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;date: 更新日期\n\n" \
-         "&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;content: 更新内容\n\n&emsp;&emsp;&emsp;&emsp;}\n\n&emsp;&emsp;}\n\n}\n\n"
+update = "&emsp;&emsp;Compare_content: 内容比较{\n\n" \
+         "&emsp;&emsp;&emsp;&emsp;local_version: 当前版本,\n\n" \
+         "&emsp;&emsp;&emsp;&emsp;&target_version: 最新版本\n\n" \
+         "&emsp;&emsp;&emsp;&emsp;content: 更新内容\n\n" \
+         "&emsp;&emsp;&emsp;&emsp;date: 更新日期\n\n" \
+         "&emsp;&emsp;&emsp;&emsp;update: 是否有更新\n\n" \
+         "&emsp;&emsp;&emsp;&emsp;core_compare: 是否支持升级(-1:需要升级内核 0:可以升级 1:无法支持)\n\n&emsp;&emsp;&emsp;&emsp;}\n\n"
 
 appstore_update = "&emsp;&emsp;Update_flag:  更新结果(成功或失败)\n\n}\n\n"
 auto = "&emsp;&emsp;auto_update: 目前的自动更新状态\n\n}\n\n"
@@ -440,7 +441,7 @@ def AppAutoUpdate(request: Request,auto_update: Optional[str] = Query(default=No
         get_headers(request)
         ret = {}
         ret['ResponseData'] = {}
-        ret['ResponseData']['auto_update'] = manage.AppAutoUpdate(auto_update)
+        ret['ResponseData']['auto_update'] = "api is not available"
         response = JSONResponse(content=ret)
     except CommandException as ce:
         ret = {}