From 3a45c760a5c8e108eb7bff357b7ba4b970f625a4 Mon Sep 17 00:00:00 2001
From: likun <906102152@qq.com>
Date: Tue, 6 May 2025 09:07:44 +0800
Subject: [PATCH] optimize

---
 admin/apps/user/domain/comm_resource.go | 15 ++++++++++++++-
 ui/src/permission.js                    |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/admin/apps/user/domain/comm_resource.go b/admin/apps/user/domain/comm_resource.go
index d09057d..2fd8ad3 100644
--- a/admin/apps/user/domain/comm_resource.go
+++ b/admin/apps/user/domain/comm_resource.go
@@ -36,6 +36,19 @@ func (svc *CommonResourceService) List(resource string, pageNo, pageLen int, ext
 	}
 	retList := make([]dto.CommonDtoValues, 0, len(etList))
 	for _, v := range etList {
+		dtoObj := v.ToCommonDto()
+		if resource == consts.ResourcesName_SysUser {
+			if name, find := dtoObj["UserName"]; find && name == "admin" {
+				// 不显示初始管理员数据
+				continue
+			}
+		}
+		if resource == consts.ResourcesName_SysCharacter {
+			if name, find := dtoObj["Name"]; find && name == "admin" {
+				// 不显示初始管理员数据
+				continue
+			}
+		}
 		retList = append(retList, v.ToCommonDto())
 	}
 
@@ -53,7 +66,7 @@ func (svc *CommonResourceService) GetById(resource string, id int) ([]*dto.Commo
 
 func (svc *CommonResourceService) Create(resource string, dtoObj dto.CommonDtoValues) (dto.CommonDtoValues, *entity.CommonResource, error) {
 	if resource == consts.ResourcesName_SysUser {
-		
+
 	}
 
 	et, err := findCommResourceRepo(resource).Create(dtoObj)
diff --git a/ui/src/permission.js b/ui/src/permission.js
index 8b62643..d118ee1 100644
--- a/ui/src/permission.js
+++ b/ui/src/permission.js
@@ -2,12 +2,13 @@ import router, {isGetUserInfo, projectOpTreeRoutes, setProjectOperationRoutes} f
 import {cachedProject, cachedProjectResource} from '@/stores/project.js'
 import {getUserInfo} from "@/api/sys.js";
 import LocalCache from "@/stores/localCache.js";
+import ExpireCache from "@/stores/expireCache.js";
 
 router.beforeEach((to, from, next) => {
     if (to.path === '/login') {
         next()
     } else {
-        const token = LocalCache.getCache("token");
+        const token = ExpireCache.getCache("token");
         if (!token) {
             // 没有token
             console.log("重定向到login")