qiaofeng1227 2 年之前
父节点
当前提交
3993a3476d
共有 3 个文件被更改,包括 10 次插入9 次删除
  1. 1 1
      appmanage/Dockerfile
  2. 1 1
      appmanage/api/service/manage.py
  3. 8 7
      appmanage/api/v1/routers/apps.py

+ 1 - 1
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

+ 1 - 1
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...")
 

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