From 4137a63852153e1ad0c4634fd649fab693a994ff Mon Sep 17 00:00:00 2001 From: wizardchen Date: Tue, 16 Sep 2025 15:39:34 +0800 Subject: [PATCH] feat(ui): Add tenant info --- frontend/nginx.conf | 1 - frontend/src/api/auth/index.ts | 5 + frontend/src/components/menu.vue | 144 +++++-- frontend/src/router/index.ts | 6 + frontend/src/stores/menu.ts | 3 +- frontend/src/views/tenant/TenantInfo.vue | 496 +++++++++++++++++++++++ internal/application/service/user.go | 4 +- internal/handler/auth.go | 32 +- 8 files changed, 637 insertions(+), 54 deletions(-) create mode 100644 frontend/src/views/tenant/TenantInfo.vue diff --git a/frontend/nginx.conf b/frontend/nginx.conf index ad9a469..e855553 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -8,7 +8,6 @@ server { add_header X-Content-Type-Options "nosniff" always; add_header X-XSS-Protection "1; mode=block" always; add_header Referrer-Policy "strict-origin-when-cross-origin" always; - add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data: https: http:; font-src 'self' data:; connect-src 'self' http: https: ws: wss:; frame-ancestors 'self';" always; # 错误日志配置 error_log /var/log/nginx/error.log warn; diff --git a/frontend/src/api/auth/index.ts b/frontend/src/api/auth/index.ts index bc2a8d0..4fe4767 100644 --- a/frontend/src/api/auth/index.ts +++ b/frontend/src/api/auth/index.ts @@ -74,8 +74,13 @@ export interface UserInfo { export interface TenantInfo { id: string name: string + description?: string api_key: string + status?: string + business?: string owner_id: string + storage_quota?: number + storage_used?: number created_at: string updated_at: string knowledge_bases?: KnowledgeBaseInfo[] diff --git a/frontend/src/components/menu.vue b/frontend/src/components/menu.vue index 7627737..ede1d29 100644 --- a/frontend/src/components/menu.vue +++ b/frontend/src/components/menu.vue @@ -3,50 +3,71 @@
-
-
-
-
- + + +
+
+
+
+
+ +
+ {{ item.title }}
- {{ item.title }} + +
+ +
+
- -
- -
- -
-
-
-
- - - {{ subitem.title }} - - -
- -
- - +
+
+
+ + + {{ subitem.title }} + + +
+ +
+ + +
+ + +
+
+
+
+
+ +
+ {{ item.title }} +
+
+
+
+
@@ -78,6 +99,19 @@ const totalPages = computed(() => Math.ceil(total.value / page_size.value)); const hasMore = computed(() => currentPage.value < totalPages.value); const { menuArr } = storeToRefs(usemenuStore); let activeSubmenu = ref(-1); + +// 分离上下两部分菜单 +const topMenuItems = computed(() => { + return menuArr.value.filter(item => + item.path === 'knowledgeBase' || item.path === 'creatChat' + ); +}); + +const bottomMenuItems = computed(() => { + return menuArr.value.filter(item => + item.path !== 'knowledgeBase' && item.path !== 'creatChat' + ); +}); const loading = ref(false) const uploadFile = () => { uploadInput.value.click() @@ -167,12 +201,14 @@ let knowledgeIcon = ref('zhishiku-green.svg'); let prefixIcon = ref('prefixIcon.svg'); let settingIcon = ref('setting.svg'); let logoutIcon = ref('logout.svg'); +let tenantIcon = ref('setting.svg'); // 暂时使用setting图标 let pathPrefix = ref(route.name) const getIcon = (path) => { fileAddIcon.value = path == 'knowledgeBase' ? 'file-add-green.svg' : 'file-add.svg'; knowledgeIcon.value = path == 'knowledgeBase' ? 'zhishiku-green.svg' : 'zhishiku.svg'; prefixIcon.value = path == 'creatChat' ? 'prefixIcon-green.svg' : path == 'knowledgeBase' ? 'prefixIcon-grey.svg' : 'prefixIcon.svg'; settingIcon.value = path == 'settings' ? 'setting-green.svg' : 'setting.svg'; + tenantIcon.value = path == 'tenant' ? 'setting-green.svg' : 'setting.svg'; // 暂时使用setting图标 logoutIcon.value = 'logout.svg'; } getIcon(route.name) @@ -221,6 +257,10 @@ const mouseleaveMenu = (path) => { padding: 8px; background: #fff; box-sizing: border-box; + height: 100vh; + overflow: hidden; + display: flex; + flex-direction: column; .logo_box { height: 80px; @@ -250,9 +290,28 @@ const mouseleaveMenu = (path) => { line-height: 21.7px; } + .menu_top { + flex: 1; + display: flex; + flex-direction: column; + overflow: hidden; + min-height: 0; + } + + .menu_bottom { + flex-shrink: 0; + display: flex; + flex-direction: column; + } + .menu_box { display: flex; flex-direction: column; + + &.has-submenu { + flex: 1; + min-height: 0; + } } @@ -358,12 +417,11 @@ const mouseleaveMenu = (path) => { font-family: "PingFang SC"; font-size: 14px; font-style: normal; - font-family: "PingFang SC"; - font-size: 14px; - font-style: normal; - overflow-y: scroll; + overflow-y: auto; scrollbar-width: none; - height: calc(98vh - 276px); + flex: 1; + min-height: 0; + margin-left: 4px; } .submenu_item_p { diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 9ec0e55..f0a4b4a 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -35,6 +35,12 @@ const router = createRouter({ component: () => import("../views/platform/index.vue"), meta: { requiresInit: true, requiresAuth: true }, children: [ + { + path: "tenant", + name: "tenant", + component: () => import("../views/tenant/TenantInfo.vue"), + meta: { requiresInit: true, requiresAuth: true } + }, { path: "knowledgeBase", name: "knowledgeBase", diff --git a/frontend/src/stores/menu.ts b/frontend/src/stores/menu.ts index a50e0f2..0b9b93e 100644 --- a/frontend/src/stores/menu.ts +++ b/frontend/src/stores/menu.ts @@ -13,6 +13,7 @@ export const useMenuStore = defineStore('menuStore', { childrenPath: 'chat', children: reactive([]), }, + { title: '账户信息', icon: 'tenant', path: 'tenant' }, { title: '系统设置', icon: 'setting', path: 'settings' }, { title: '退出登录', icon: 'logout', path: 'logout' } ]), @@ -31,7 +32,7 @@ export const useMenuStore = defineStore('menuStore', { this.menuArr[1].children?.unshift(item) }, updatasessionTitle(session_id: string, title: string) { - this.menuArr[1].children?.forEach(item => { + this.menuArr[1].children?.forEach((item: any) => { if (item.id == session_id) { item.title = title; item.isNoTitle = false; diff --git a/frontend/src/views/tenant/TenantInfo.vue b/frontend/src/views/tenant/TenantInfo.vue new file mode 100644 index 0000000..6379b15 --- /dev/null +++ b/frontend/src/views/tenant/TenantInfo.vue @@ -0,0 +1,496 @@ + + + + + diff --git a/internal/application/service/user.go b/internal/application/service/user.go index e9fc4d8..a0475b6 100644 --- a/internal/application/service/user.go +++ b/internal/application/service/user.go @@ -399,10 +399,10 @@ func (s *userService) RevokeToken(ctx context.Context, tokenString string) error // GetCurrentUser gets current user from context func (s *userService) GetCurrentUser(ctx context.Context) (*types.User, error) { - userID, ok := ctx.Value("user_id").(string) + user, ok := ctx.Value("user").(*types.User) if !ok { return nil, errors.New("user not found in context") } - return s.userRepo.GetUserByID(ctx, userID) + return user, nil } diff --git a/internal/handler/auth.go b/internal/handler/auth.go index 2e23447..622e9fb 100644 --- a/internal/handler/auth.go +++ b/internal/handler/auth.go @@ -16,17 +16,20 @@ import ( // Provides functionality for user registration, login, logout, and token management // through the REST API endpoints type AuthHandler struct { - userService interfaces.UserService + userService interfaces.UserService + tenantService interfaces.TenantService } -// NewAuthHandler creates a new auth handler instance with the provided service +// NewAuthHandler creates a new auth handler instance with the provided services // Parameters: // - userService: An implementation of the UserService interface for business logic +// - tenantService: An implementation of the TenantService interface for tenant management // // Returns a pointer to the newly created AuthHandler -func NewAuthHandler(userService interfaces.UserService) *AuthHandler { +func NewAuthHandler(userService interfaces.UserService, tenantService interfaces.TenantService) *AuthHandler { return &AuthHandler{ - userService: userService, + userService: userService, + tenantService: tenantService, } } @@ -214,7 +217,7 @@ func (h *AuthHandler) RefreshToken(c *gin.Context) { func (h *AuthHandler) GetCurrentUser(c *gin.Context) { ctx := c.Request.Context() - logger.Info(ctx, "Get current user info") + logger.Debugf(ctx, "Get current user info") // Get current user from service (which extracts from context) user, err := h.userService.GetCurrentUser(ctx) @@ -225,10 +228,25 @@ func (h *AuthHandler) GetCurrentUser(c *gin.Context) { return } - logger.Infof(ctx, "Retrieved current user info: %s", user.Email) + // Get tenant information + var tenant *types.Tenant + if user.TenantID > 0 { + tenant, err = h.tenantService.GetTenantByID(ctx, user.TenantID) + if err != nil { + logger.Warnf(ctx, "Failed to get tenant info for user %s, tenant ID %d: %v", user.Email, user.TenantID, err) + // Don't fail the request if tenant info is not available + } else { + logger.Debugf(ctx, "Retrieved tenant info for user %s: %s", user.Email, tenant.Name) + } + } + + logger.Debugf(ctx, "Retrieved current user info: %s", user.Email) c.JSON(http.StatusOK, gin.H{ "success": true, - "user": user.ToUserInfo(), + "data": gin.H{ + "user": user.ToUserInfo(), + "tenant": tenant, + }, }) }