Update manage.py

appmanage/api/service/manage.py

@@ -225,7 +225,7 @@ def if_app_exits(app_name):
         return True
 
 
-def start_app(app_name):
+def start_app(app_id):
     ret = Response(code=const.RETURN_FAIL, message="")
     if if_app_exits(app_name):
         docker.check_app_compose(app_name)
@@ -242,7 +242,7 @@ def start_app(app_name):
     return ret
 
 
-def stop_app(app_name):
+def stop_app(app_id):
     ret = Response(code=const.RETURN_FAIL, message="")
     if if_app_exits(app_name):
         cmd = "docker compose -f /data/apps/"+app_name+"/docker-compose.yml stop"
@@ -258,7 +258,7 @@ def stop_app(app_name):
     return ret
 
 
-def restart_app(app_name):
+def restart_app(app_id):
     ret = Response(code=const.RETURN_FAIL, message="")
     if if_app_exits(app_name):
         cmd = "docker compose -f /data/apps/"+app_name+"/docker-compose.yml restart"
@@ -274,16 +274,17 @@ def restart_app(app_name):
     return ret
 
 
-def uninstall_app(app_name, delete_flag):
+def uninstall_app(app_id, delete_flag):
     ret = Response(code=const.RETURN_FAIL, message="")
-    if_stopped = stop_app(app_name)
+    if_stopped = stop_app(app_id)
     if if_stopped["code"] == 0:
         if delete_flag == 0:
-            cmd = "docker compose -f /data/apps/"+app_name+"/docker-compose.yml down"
+            cmd = "docker compose -f /data/apps/"+app_id+"/docker-compose.yml down"
         elif delete_flag == 1:
-            cmd = "docker compose -f /data/apps/"+app_name+"/docker-compose.yml down -v"
+            cmd = "docker compose -f /data/apps/"+app_id+"/docker-compose.yml down -v"
+            cmd = cmd + " && sudo rm -rf /data/apps/" + app_id
         else:
-            cmd = "docker compose -f /data/apps/"+app_name+"/docker-compose.yml down"
+            cmd = "docker compose -f /data/apps/"+app_id+"/docker-compose.yml down"
         output = shell_execute.execute_command_output_all(cmd)
         if int(output["code"]) == 0:
             ret.code = 0