Merge pull request #149 from AOEIUVBPMFDTNL/master

feat: add api group i18n trans
suyuan32 · Jul 4, 2023 · 0bf7ed1 · 0bf7ed1
2 parents c1cddd7 + 2a0bd36
commit 0bf7ed1
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 3 deletions.
diff --git a/api/internal/i18n/locale/en.json b/api/internal/i18n/locale/en.json
@@ -18,6 +18,25 @@
 		"validationError": "Operation failed: Validation failed",
 		"notSingularError": "Operation failed: Data not unique"
 	},
+	"apiGroup":{
+		"member_rank": "Member Rank",
+		"member": "Member",
+		"tag": "Tag",
+		"file": "File",
+		"task_log": "Task Log",
+		"task": "Task",
+		"position": "Position",
+		"department": "Department",
+		"token": "Token",
+		"oauth": "Oauth",
+		"dictionary": "Dictionary",
+		"api": "API",
+		"authority": "Authority",
+		"captcha": "Captcha",
+		"menu": "Menu",
+		"role": "Role",
+		"user": "User"
+	},
 	"apiDesc": {
 		"createTag": "Create a tag",
 		"updateTag": "Update the tag",

diff --git a/api/internal/i18n/locale/zh.json b/api/internal/i18n/locale/zh.json
@@ -18,6 +18,25 @@
 		"validationError": "操作失败: 校验失败",
 		"notSingularError": "操作失败: 数据不唯一"
 	},
+	"apiGroup":{
+		"member_rank": "等级管理",
+		"member": "会员管理",
+		"tag": "标签管理",
+		"file": "文件管理",
+		"task_log": "任务日志",
+		"task": "任务管理",
+		"position": "职位管理",
+		"department": "部门管理",
+		"token": "令牌管理",
+		"oauth": "认证管理",
+		"dictionary": "字典管理",
+		"api": "接口管理",
+		"authority": "授权管理",
+		"captcha": "验证代码",
+		"menu": "菜单管理",
+		"role": "角色管理",
+		"user": "用户管理"
+	},
 	"apiDesc": {
 		"createTag": "创建文件标签",
 		"updateTag": "更新文件标签",

diff --git a/api/internal/logic/api/get_api_list_logic.go b/api/internal/logic/api/get_api_list_logic.go
@@ -43,7 +43,20 @@ func (l *GetApiListLogic) GetApiList(req *types.ApiListReq) (resp *types.ApiList
 	resp.Msg = l.svcCtx.Trans.Trans(l.ctx, i18n.Success)
 	resp.Data.Total = data.GetTotal()
 
+	// 接口分组翻译
+	var group = make(map[string]string)
 	for _, v := range data.Data {
+		// 在角色管理页面调用该接口时为了获取所有接口，每页大小被设置为10000
+		// 因此可以根据每页数据大小来判断，该请求是否为来自角色管理页面
+		// 如果是来自API管理的请求则不去获取分组翻译，直接显示原本字段
+		if req.PageSize > 1000 {
+			// 检测是否存在分组翻译，避免多次获取
+			if _, exist := group[*v.ApiGroup]; !exist {
+				group[*v.ApiGroup] = l.svcCtx.Trans.Trans(l.ctx, "apiGroup."+*v.ApiGroup)
+			}
+			// 直接将分组字段更新为分组翻译内容
+			*v.ApiGroup = group[*v.ApiGroup]
+		}
 		resp.Data.Data = append(resp.Data.Data,
 			types.ApiInfo{
 				BaseIDInfo: types.BaseIDInfo{
@@ -54,7 +67,7 @@ func (l *GetApiListLogic) GetApiList(req *types.ApiListReq) (resp *types.ApiList
 				Path:        v.Path,
 				Trans:       l.svcCtx.Trans.Trans(l.ctx, *v.Description),
 				Description: v.Description,
-				Group:       v.ApiGroup,
+				Group:       v.ApiGroup, // 根据页大小决定显示原本字段还是分组字段
 				Method:      v.Method,
 			})
 	}

diff --git a/api/internal/types/types.go b/api/internal/types/types.go