diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile index 7a4cb109..8b1d2295 100644 --- a/appmanage/Dockerfile +++ b/appmanage/Dockerfile @@ -10,7 +10,7 @@ COPY static ./static COPY requirements.txt main.py database.sqlite ./ RUN apt update -# Install supervisord +# Install supervisords RUN apt install -y supervisor COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/cmd.sh /cmd.sh diff --git a/appmanage/api/service/db.py b/appmanage/api/service/db.py index 6693758c..94c2cce6 100644 --- a/appmanage/api/service/db.py +++ b/appmanage/api/service/db.py @@ -1,5 +1,7 @@ from fastapi import FastAPI from pydantic import BaseModel +from api.exception.command_exception import CommandException +from api.utils import const from api.model.user import User import sqlite3 @@ -17,6 +19,8 @@ def AppUpdateUser(user_name, password): conn.close() def AppSearchUsers(user_type): + if user_type != "nginx" or user_type != "portainer": + raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "This plugin doesn't exist!", "This plugin doesn't exist!") conn = sqlite3.connect('/usr/src/app/database.sqlite') conn.row_factory = dict_factory cursor = conn.cursor() diff --git a/appmanage/api/v1/routers/apps.py b/appmanage/api/v1/routers/apps.py index 3a2bf3bf..67511b41 100644 --- a/appmanage/api/v1/routers/apps.py +++ b/appmanage/api/v1/routers/apps.py @@ -61,7 +61,7 @@ update = "  Compare_content: 新旧版本内容{\n\n" \ appstore_update = "  Update_content: [] 更新内容\n\n}\n\n" auto = "  auto_update: 目前的自动更新状态\n\n}\n\n" -user = "  user: 用户信息\n\n" \ +user = "  user: 用户信息{\n\n" \ "      username: 用户名\n\n" \ "      password: 密码\n\n" \ "      nick_name: 昵称\n\n    }\n\n}\n\n" @@ -431,7 +431,7 @@ def AppAutoUpdate(request: Request,auto_update: Optional[str] = Query(default=No return response @router.api_route("/AppSearchUsers", methods=["GET", "POST"], summary="获取appstore用户信息", response_model=Response, response_description=rd_user_list) -def AppSearchUsers(request: Request, plugin_name: Optional[str] = Query(default=None, description="用户名")): +def AppSearchUsers(request: Request, plugin_name: Optional[str] = Query(default=None, description="插件名(仅支持portainer,nginx)")): try: myLogger.info_logger("Receive request: /AppSearchUsers")