From a9a83fa187180e7acbb00ac87c4d93e80db141a6 Mon Sep 17 00:00:00 2001 From: Liujian <824010343@qq.com> Date: Fri, 25 Jul 2025 23:17:22 +0800 Subject: [PATCH] Fix the issue where the user list includes the admin account --- scripts/quick-start.sh | 4 ++-- scripts/version.json | 6 +++--- services/admin_service/repositories/user_repository.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/quick-start.sh b/scripts/quick-start.sh index e508931..0547bdb 100644 --- a/scripts/quick-start.sh +++ b/scripts/quick-start.sh @@ -926,8 +926,8 @@ print_xpack_mcp_market_info() { webPort=$(read_env_var ${ENV_XPACK_MCP_MARKET_WEB_PORT}) echo_pass "XPack MCP Market has run successfully." echo_info "The Web UI access information is as follows:" - echo_info "Internal network access address: http://$(read_env_var ${ENV_LAN_IP}):${webPort}/admin-signin" - echo_info "External network access address: http://$(read_env_var ${ENV_EXTERNAL_IP}):${webPort}/admin-signin" + echo_info "Internal network access address: http://$(read_env_var ${ENV_LAN_IP}):${webPort}/admin" + echo_info "External network access address: http://$(read_env_var ${ENV_EXTERNAL_IP}):${webPort}/admin" echo_info "Inital Username: admin" echo_info "Inital Password: 123456789" echo "" diff --git a/scripts/version.json b/scripts/version.json index a481d80..bc46dca 100644 --- a/scripts/version.json +++ b/scripts/version.json @@ -1,11 +1,11 @@ { - "version": "v0.1", - "releaseDate": "2025-07-20", + "version": "v0.2", + "releaseDate": "2025-07-24", "description": "This is the latest release of the application.", "downloads": { "program": { "xpack_mcp_market": { - "version": "v0.1.0", + "version": "v0.2.1", "docker": "xpackai/xpack-mcp-market", "tar": "xpack-mcp-market.tar.gz", "url": "https://public.eolinker.com/xpack/images/xpack-mcp-market.${VERSION}.${ARCH}.tar.gz" diff --git a/services/admin_service/repositories/user_repository.py b/services/admin_service/repositories/user_repository.py index 42e6cb1..6ae75ab 100644 --- a/services/admin_service/repositories/user_repository.py +++ b/services/admin_service/repositories/user_repository.py @@ -78,9 +78,9 @@ class UserRepository: return user def get_user_list(self, offset: int, limit: int) -> tuple[int, list[User]]: - total = self.db.query(User).filter(User.is_deleted == 0 and User.role_id == 2).count() + total = self.db.query(User).filter(User.is_deleted == 0, User.role_id == 2).count() - users = self.db.query(User).filter(User.is_deleted == 0 and User.role_id == 2).offset(offset).limit(limit).all() + users = self.db.query(User).filter(User.is_deleted == 0, User.role_id == 2).offset(offset).limit(limit).all() return total, users def get_admin_user(self) -> Optional[User]: