Merge remote-tracking branch 'github-pro/main' into feature/translate

# Conflicts:
#	.github/ISSUE_TEMPLATE/bug_report.yml
#	.github/ISSUE_TEMPLATE/request_help.yml

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -45,19 +45,18 @@ body:
           label: Steps to Reproduce
           description: Share the steps you took so that we can reproduce the issue. Reports without proper steps details will likely be closed.
           placeholder: |
-              1. Run apinto via the Docker image.
-              2. Create a Route with the Admin API.
-              3. Try configuring ...
-              4. ...
+              1. Run APIPark via the Docker image.
+              2. Try configuring ...
+              3. ...
       validations:
-          required: true
+          required: false
     - type: textarea
       id: environment
       attributes:
           label: Environment
           description: Share your environment details. Reports without proper environment details will likely be closed.
           value: |
-              - APINTO Dashboard version (run `apinto dashboard version`):
+              - APINTO Dashboard version:
               - Operating system (run `uname -a`):
       validations:
           required: true

.github/ISSUE_TEMPLATE/request_help.yml

@@ -25,7 +25,7 @@ body:
       label: Environment
       description: Share your environment details. Reports without proper environment details will likely be closed.
       value: |
-        - APIPark version (run `apinto dashboard version`):
+        - APIPark version:
         - Operating system (run `uname -a`):
     validations:
       required: true

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
           echo "Build frontend..."
           cd ./frontend && pnpm run build
       - name: upload frontend release
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: frontend-package
           path: frontend/dist
@@ -41,7 +41,7 @@ jobs:
       - name: Checkout  #Checkout代码
         uses: actions/checkout@v3
       - name: download frontend release
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-package
           path: frontend/dist
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: download frontend release
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-package
           path: frontend/dist

ai-provider/model-runtime/model-providers/openAI/openai.yaml

@@ -69,15 +69,6 @@ provider_credential_schema:
       placeholder:
         zh_Hans: 在此输入您的 API Key
         en_US: Enter your API Key
-    - variable: openai_organization
-      label:
-        zh_Hans: 组织 ID
-        en_US: Organization
-      type: text-input
-      required: false
-      placeholder:
-        zh_Hans: 在此输入您的组织 ID
-        en_US: Enter your Organization ID
     - variable: openai_api_base
       label:
         zh_Hans: API Base

ai-provider/model-runtime/model-providers/zhinao/zhinao.yaml

@@ -30,4 +30,4 @@ provider_credential_schema:
       placeholder:
         zh_Hans: 在此输入您的 API Key
         en_US: Enter your API Key
-address: https://api.openai.com
+address: https://api.360.cn

common/version/version.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli"
 )
 
 // These should be set via go build -ldflags -X 'xxxx'.
@@ -20,7 +20,7 @@ var profileInfo []byte
 
 func init() {
 	buffer := &bytes.Buffer{}
-	fmt.Fprintf(buffer, "Apinto version: %s\n", Version)
+	fmt.Fprintf(buffer, "APIPark version: %s\n", Version)
 	fmt.Fprintf(buffer, "Golang version: %s\n", goVersion)
 	fmt.Fprintf(buffer, "Git commit hash: %s\n", gitCommit)
 	fmt.Fprintf(buffer, "Built on: %s\n", BuildTime)

controller/service/iml.go

@@ -151,8 +151,9 @@ func (i *imlServiceController) createAIService(ctx *gin.Context, teamID string,
 			Prompt: "You need to translate {{source_lang}} into {{target_lang}}, and the following is the content that needs to be translated.\n---\n{{text}}",
 		}
 		aiModel := &ai_api_dto.AiModel{
-			Id:     m.ID(),
-			Config: m.DefaultConfig(),
+			Id:       m.ID(),
+			Config:   m.DefaultConfig(),
+			Provider: *input.Provider,
 		}
 		name := "Demo Translation API"
 		description := "A demo that shows you how to use a prompt to create a Translation API."

controller/system/iml.go

@@ -381,8 +381,9 @@ func (i *imlInitController) createAIService(ctx context.Context, teamID string,
 			Prompt: "You need to translate {{source_lang}} into {{target_lang}}, and the following is the content that needs to be translated.\n---\n{{text}}",
 		}
 		aiModel := &ai_api_dto.AiModel{
-			Id:     m.ID(),
-			Config: m.DefaultConfig(),
+			Id:       m.ID(),
+			Config:   m.DefaultConfig(),
+			Provider: providerId,
 		}
 		name := "Demo Translation API"
 		description := "A demo that shows you how to use a prompt to create a Translation API."

frontend/.gitignore

@@ -27,4 +27,5 @@ packages/core/public/tinymce/
 *.sln
 *.sw?
 
+
 /pnpm-lock.yaml

frontend/README.md

@@ -1,10 +1,17 @@
 # 部署
 
 ## 安装依赖
-    建议使用pnpm
-    `npm install -g pnpm`
-    使用pnpm安装依赖
-    `pnpm install`
+ 建议使用 pnpm
+ ```
+ npm install -g pnpm
+```
+ 
+ 使用pnpm安装依赖
+ ```
+ pnpm install
+```
     
 ## 编译
-    `pnpm run build`
+```
+   pnpm run build
+```

frontend/jest.config.js

@@ -1,10 +1,3 @@
-/*
- * @Date: 2024-05-10 14:19:56
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-05-10 15:55:29
- * @FilePath: \frontend\jest.config.js
- */
-
 module.exports = {
   roots: ['<rootDir>/packages'],
   testMatch: ['**/__tests__/**/*.+(ts|tsx|js)', '**/?(*.)+(spec|test).+(ts|tsx|js)'],
@@ -15,4 +8,4 @@ module.exports = {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
   testPathIgnorePatterns: ['/node_modules/', '/dist/'],
   setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
-};
+};

frontend/jest.setup.js

@@ -1,7 +1 @@
-/*
- * @Date: 2024-05-10 14:22:41
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-05-10 15:49:31
- * @FilePath: \frontend\jest.setup.js
- */
-// import '@testing-library/jest-dom/extend-expect';
+// import '@testing-library/jest-dom/extend-expect';

frontend/lerna.json

@@ -3,4 +3,5 @@
     "packages/*"
   ],
   "version": "independent"
+  
 }

frontend/packages/businessEntry/.gitignore

@@ -6,7 +6,6 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
-
 node_modules
 dist
 dist-ssr

frontend/packages/businessEntry/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/frontend/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>APIPark - 企业API数据开放平台</title>
+    <title>APIPark</title>
   </head>
   <body>
     <div id="root"></div>

frontend/packages/businessEntry/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": " vite   --port 5000 --strictPort",
+    "dev": " vite  --port 5000 --strictPort",
     "build": "vite build ",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview --port 5000 --strictPort",

frontend/packages/businessEntry/postcss.config.js

@@ -1,9 +1,3 @@
-/*
- * @Date: 2023-11-27 17:31:54
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:42:18
- * @FilePath: \frontend\packages\core\postcss.config.js
- */
 export default {
     plugins: {
       'postcss-import': {},

frontend/packages/businessEntry/start-vite.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2024-06-05 09:35:25
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:50:12
- * @FilePath: \frontend\packages\core\start-vite.js
- */
+
 // start-vite.js// start-vite.js
 import { exec } from 'child_process';
 

frontend/packages/common/postcss.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:54
- * @LastEditors: maggieyyy
- * @LastEditTime: 2023-11-29 15:49:05
- * @FilePath: \applatform\frontend\packages\core\postcss.config.js
- */
+
 export default {
     plugins: {
       'postcss-import': {},

frontend/packages/common/src/components/aoplatform/BasicLayout.tsx

@@ -1,19 +1,15 @@
 import { 
-    ConfigProvider,
-    Dropdown, 
     MenuProps,
     App,
-    Button} from 'antd';
+    Button,
+    ConfigProvider,
+    Dropdown} from 'antd';
+import { Outlet, useLocation, useNavigate} from "react-router-dom";
 import Logo from '@common/assets/layout-logo.png';
 import AvatarPic from '@common/assets/default-avatar.png'
-import {Outlet, useLocation, useNavigate} from "react-router-dom";
-import { useEffect, useMemo, useState} from "react";
+import {  useEffect, useMemo, useState} from "react";
 import { useGlobalContext } from '@common/contexts/GlobalStateContext.tsx';
 import { PERMISSION_DEFINITION } from '@common/const/permissions.ts';
-  import {
-    ProConfigProvider,
-    ProLayout,
-  } from '@ant-design/pro-components';
 import { BasicResponse, RESPONSE_TIPS, routerKeyMap, STATUS_CODE } from '@common/const/const.tsx';
 import { UserInfoType } from '@common/const/type.ts';
 import { useFetch } from '@common/hooks/http.ts';
@@ -21,6 +17,7 @@ import { ProjectFilled } from '@ant-design/icons';
 import { getNavItem } from '@common/utils/navigation';
 import { Icon } from '@iconify/react';
 import { $t } from '@common/locales';
+import { ProConfigProvider, ProLayout } from '@ant-design/pro-components';
 import LanguageSetting from './LanguageSetting';
 
 const APP_MODE = import.meta.env.VITE_APP_MODE;
@@ -41,9 +38,8 @@ const themeToken = {
      const navigator = useNavigate()
      const location = useLocation()
      const currentUrl = location.pathname
-    const { state,accessData,checkPermission,accessInit} = useGlobalContext()
-    const [pathname, setPathname] = useState(currentUrl);
-     const mainPage = project === 'core' ?'/service/list':'/serviceHub/list'
+    const { state,accessData,checkPermission,accessInit,dispatch,resetAccess,getGlobalAccessData} = useGlobalContext()
+    const [pathname, setPathname] = useState(currentUrl);     const mainPage = project === 'core' ?'/service/list':'/serviceHub/list'
 
    const TOTAL_MENU_ITEMS:MenuProps['items'] =  useMemo(() => [
     getNavItem($t('工作空间'), 'workspace','/guide/page',<Icon icon="ic:baseline-space-dashboard" width="18" height="18"/>, [
@@ -52,27 +48,27 @@ const themeToken = {
         getNavItem(<a>{$t('消费者')}</a>, 'consumer','/consumer',<Icon icon="ic:baseline-apps" width="18" height="18"/>,undefined,undefined,'all'),
         getNavItem(<a>{$t('团队')}</a>, 'team','/team',<Icon icon="ic:baseline-people-alt" width="18" height="18"/>,undefined,undefined,'all'),
     ]),
-    getNavItem($t('API 市场'), 'serviceHub','/serviceHub',<Icon icon="ic:baseline-hub" width="18" height="18"/>,undefined,undefined,'system.workspace.api_market.view'),
+    getNavItem($t('API 市场'), 'serviceHub','/serviceHub',<Icon icon="ic:baseline-hub" width="18" height="18"/>,undefined,undefined,'system.api_portal.api_portal.view'),
 
      getNavItem($t('仪表盘'), 'mainPage', APP_MODE === 'pro' ? '/analytics' : '/analytics/total',<Icon icon="ic:baseline-bar-chart" width="18" height="18"/>,[
-      getNavItem(<a >{$t('运行视图')}</a>, 'analytics',APP_MODE === 'pro' ? '/analytics' : '/analytics/total' ,<ProjectFilled />,undefined,undefined,'system.dashboard.run_view.view'),
+      getNavItem(<a >{$t('运行视图')}</a>, 'analytics',APP_MODE === 'pro' ? '/analytics' : '/analytics/total' ,<ProjectFilled />,undefined,undefined,'system.analysis.run_view.view'),
       APP_MODE === 'pro' ? getNavItem(<a >{$t('系统拓扑图')}</a>, 'systemrunning','/systemrunning',<ProjectFilled />,undefined,undefined,'system.dashboard.systemrunning.view') : null,
-    ],undefined,'system.dashboard.run_view.view'),
+    ],undefined,'system.analysis.run_view.view'),
   
     getNavItem($t('系统设置'), 'operationCenter','/commonsetting',<Icon icon="ic:baseline-settings" width="18" height="18"/>, [
             getNavItem($t('系统'), 'serviceHubSetting','/commonsetting',null,[
             getNavItem(<a>{$t('常规')}</a>, 'commonsetting','/commonsetting',<Icon icon="ic:baseline-hub" width="18" height="18"/>,undefined,undefined,'system.api_market.service_classification.view'),
-            getNavItem(<a>{$t('API 网关')}</a>, 'cluster','/cluster',<Icon icon="ic:baseline-device-hub" width="18" height="18"/>,undefined,undefined,'system.devops.cluster.view'),
-            getNavItem(<a>{$t('AI 模型')}</a>, 'aisetting','/aisetting',<Icon icon="hugeicons:ai-network" width="18" height="18"/>,undefined,undefined,'system.devops.cluster.view'),
+            getNavItem(<a>{$t('API 网关')}</a>, 'cluster','/cluster',<Icon icon="ic:baseline-device-hub" width="18" height="18"/>,undefined,undefined,'system.settings.api_gateway.view'),
+            getNavItem(<a>{$t('AI 模型')}</a>, 'aisetting','/aisetting',<Icon icon="hugeicons:ai-network" width="18" height="18"/>,undefined,undefined,'system.settings.api_gateway.view'),
         ],undefined,'system.api_market.service_classification.view'),
       getNavItem($t('用户'), 'organization','/member',null,[
-        getNavItem(<a>{$t('账号')}</a>, 'member','/member',<Icon icon="ic:baseline-people-alt" width="18" height="18"/>,undefined,undefined,'system.organization.member.view'),
+        getNavItem(<a>{$t('账号')}</a>, 'member','/member',<Icon icon="ic:baseline-people-alt" width="18" height="18"/>,undefined,undefined,'system.settings.account.view'),
         getNavItem(<a>{$t('角色')}</a>, 'role','/role',<Icon icon="ic:baseline-verified-user" width="18" height="18"/>,undefined,undefined,'system.organization.role.view'),
       ],undefined,''),
       getNavItem($t('集成'), 'maintenanceCenter','/datasourcing', null, [
-        getNavItem(<a>{$t('数据源')}</a>, 'datasourcing','/datasourcing',<Icon icon="ic:baseline-monitor-heart" width="18" height="18"/>,undefined,undefined,'system.devops.data_source.view'),
-        getNavItem(<a>{$t('证书')}</a>, 'cert','/cert',<Icon icon="ic:baseline-security" width="18" height="18"/>,undefined,undefined,'system.devops.ssl_certificate.view'),
-        getNavItem(<a>{$t('日志')}</a>, 'logsettings','/logsettings',<Icon icon="ic:baseline-sticky-note-2" width="18" height="18"/>,undefined,undefined,'system.devops.log_configuration.view'),
+        getNavItem(<a>{$t('数据源')}</a>, 'datasourcing','/datasourcing',<Icon icon="ic:baseline-monitor-heart" width="18" height="18"/>,undefined,undefined,'system.settings.data_source.view'),
+        getNavItem(<a>{$t('证书')}</a>, 'cert','/cert',<Icon icon="ic:baseline-security" width="18" height="18"/>,undefined,undefined,'system.settings.ssl_certificate.view'),
+        getNavItem(<a>{$t('日志')}</a>, 'logsettings','/logsettings',<Icon icon="ic:baseline-sticky-note-2" width="18" height="18"/>,undefined,undefined,'system.settings.log_configuration.view'),
         APP_MODE === 'pro' ? getNavItem(<a>{$t('资源')}</a>, 'resourcesettings','/resourcesettings',null,undefined,undefined,'system.partition.self.view'):null,
         APP_MODE === 'pro' ? getNavItem(<a>{$t('Open API')}</a>, 'openapi','/openapi',null,undefined,undefined,'system.openapi.self.view'):null,
       ]),
@@ -126,7 +122,6 @@ const themeToken = {
 
      
     const { message } = App.useApp()
-    const { dispatch,resetAccess,getGlobalAccessData} = useGlobalContext()
     const [userInfo,setUserInfo] = useState<UserInfoType>()
     const {fetchData} = useFetch()
     const navigate = useNavigate();
@@ -163,8 +158,8 @@ const themeToken = {
         })
     }
 
-    const items: MenuProps['items'] = [
-        {
+    const items: MenuProps['items'] = useMemo(() => [
+        userInfo?.type !== 'guest' && {
             key: '2',
             label: (
                 <Button key="changePsw" type="text" className="flex items-center p-0 bg-transparent border-none " onClick={()=>navigator('/userProfile/changepsw')}>
@@ -178,7 +173,7 @@ const themeToken = {
                 {$t('退出登录')}
                 </Button>)
         },
-    ];
+    ].filter(Boolean), [userInfo]);
 
 
 

frontend/packages/common/src/components/aoplatform/PublishApprovalModalContent.tsx

@@ -219,12 +219,12 @@ export const PublishApprovalModalContent = forwardRef<PublishApprovalModalHandle
                                     /></Row>
                             </>
                         }
-                <Form.Item
+                {/* <Form.Item
                     label={$t("备注")}
                     name="remark"
                 >
                     <Input.TextArea className="w-INPUT_NORMAL" disabled={type !== 'add' && type !== 'publish'} placeholder={$t(PLACEHOLDER.input)} />
-                </Form.Item>
+                </Form.Item> */}
 {/* 
                 {type !== 'add' && type !== 'publish' && <Form.Item
                     label={$t("审核意见"

frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx

@@ -132,6 +132,33 @@ export const TranslateWord = ()=>{
             {$t('每小时')}
             {$t('每天')}
             {$t('每周')}
+            {$t('上线结果')}
+            {$t('订阅服务数量')}
+            {$t('鉴权数量')}
+            {$t('列表')}
+            {$t('块')}
+            {$t('HTTP 请求头')}
+            {$t('全等匹配')}
+            {$t('前缀匹配')}
+            {$t('后缀匹配')}
+            {$t('子串匹配')}
+            {$t('非等匹配')}
+            {$t('空值匹配')}
+            {$t('存在匹配')}
+            {$t('不存在匹配')}
+            {$t('区分大小写的正则匹配')}
+            {$t('不区分大小写的正则匹配')}
+            {$t('任意匹配')}
+            {$t('驳回')}
+            {$t('已订阅')}
+            {$t('取消申请')}
+            {$t('透传客户端请求 Host')}
+            {$t('使用上游服务 Host')}
+            {$t('重写 Host')}
+            {$t('动态服务发现')}
+            {$t('地址')}
+            {$t('新增')}
+            {$t('申请方消费者')}
             
         </>
     )

frontend/packages/common/src/const/approval/const.tsx

@@ -343,11 +343,6 @@ export const PUBLISH_APPROVAL_RECORD_INNER_TABLE_COLUMN : PageProColumns<Publish
         dataIndex: 'status',
         ellipsis:true,
     },
-    {
-        title:('备注'),
-        dataIndex: 'comments',
-        ellipsis:true
-    },
     {
         title:('申请人'),
         dataIndex: ['applicant','name'],

frontend/packages/common/src/const/permissions.ts

@@ -4,84 +4,84 @@
 
 export const PERMISSION_DEFINITION = [
     {
-      "system.organization.member.view": {
+      "system.settings.account.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.view"] }]
+          "anyOf": [{ "backend": ["system.settings.account.view"] }]
         }
       },
       "system.organization.member.add": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.account.manager"] }]
         }
       },
       "system.organization.member.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.account.manager"] }]
         }
       },
       "system.organization.member.remove": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.account.manager"] }]
         }
       },
       "system.organization.member.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.account.manager"] }]
         }
       },
       "system.organization.member.block": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.account.manager"] }]
         }
       },
       "system.organization.member.department.add": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.account.manager"] }]
         }
       },
       "system.organization.member.department.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.account.manager"] }]
         }
       },
       "system.organization.member.department.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.member.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.account.manager"] }]
         }
       },
-      "system.organization.team.view": {
+      "system.workspace.team.view_all": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.team.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.view_all"] }]
         }
       },
       "system.organization.team.add": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.team.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.create"] }]
         }
       },
       "system.organization.team.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.team.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.manager"] }]
         }
       },
       "system.organization.team.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.team.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.manager"] }]
         }
       },
       "system.organization.team.running": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.team.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.manager"] }]
         }
       },
       "system.organization.role.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.role.view_system_role","system.organization.role.view_team_role"] }]
+          "anyOf": [{ "backend": ["system.settings.role.view"] }]
         }
       },
       "system.organization.role.system.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.role.view_system_role"] }]
+          "anyOf": [{ "backend": ["system.settings.role.view"] }]
         }
       },
       "system.organization.role.system.add": {
@@ -101,7 +101,7 @@ export const PERMISSION_DEFINITION = [
       },
       "system.organization.role.team.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.organization.role.view_team_role"] }]
+          "anyOf": [{ "backend": ["system.settings.role.view"] }]
         }
       },
       "system.organization.role.team.add": {
@@ -121,22 +121,22 @@ export const PERMISSION_DEFINITION = [
       },
       "system.api_market.service_classification.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.settings.service_classification.view"] }]
+          "anyOf": [{ "backend": ["system.settings.general.view"] }]
         }
       },
       "system.api_market.service_classification.add": {
         "granted": {
-          "anyOf": [{ "backend": ["system.settings.service_classification.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.general.manager"] }]
         }
       },
       "system.api_market.service_classification.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.settings.service_classification.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.general.manager"] }]
         }
       },
       "system.api_market.service_classification.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["system.settings.service_classification.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.general.manager"] }]
         }
       },
       "system.devops.system_setting.view": {
@@ -149,94 +149,94 @@ export const PERMISSION_DEFINITION = [
           "anyOf": [{ "backend": ["system.settings.general.manager"] }]
         }
       },
-      "system.dashboard.run_view.view":{
+      "system.analysis.run_view.view":{
         "granted": {
-          "anyOf": [{ "backend": ['system.dashboard.run_view.view'] }]
+          "anyOf": [{ "backend": ['system.analysis.run_view.view'] }]
         }
       },
-      "system.devops.data_source.view":{
+      "system.settings.data_source.view":{
         "granted":{
-          "anyOf":[{"backend":['system.devops.data_source.view']}]
+          "anyOf":[{"backend":['system.settings.data_source.view']}]
         }
       },
       "system.devops.data_source.edit":{
         "granted":{
-          "anyOf":[{"backend":['system.devops.data_source.manager']}]
+          "anyOf":[{"backend":['system.settings.data_source.manager']}]
         }
       },
-      "system.devops.cluster.view": {
+      "system.settings.api_gateway.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.cluster.view"] }]
+          "anyOf": [{ "backend": ["system.settings.api_gateway.view"] }]
         }
       },
       "system.devops.cluster.add": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.cluster.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.api_gateway.manager"] }]
         }
       },
       "system.devops.cluster.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.cluster.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.api_gateway.manager"] }]
         }
       },
       "system.devops.cluster.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.cluster.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.api_gateway.manager"] }]
         }
       },
-      "system.devops.ai_provider.view": {
+      "system.settings.ai_provider.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.ai_provider.view"] }]
+          "anyOf": [{ "backend": ["system.settings.ai_provider.view"] }]
         }
       },
       "system.devops.ai_provider.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.ai_provider.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.ai_provider.manager"] }]
         }
       },
-      "system.devops.ssl_certificate.view": {
+      "system.settings.ssl_certificate.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.ssl_certificate.view"] }]
+          "anyOf": [{ "backend": ["system.settings.ssl_certificate.view"] }]
         }
       },
       "system.devops.ssl_certificate.add": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.ssl_certificate.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.ssl_certificate.manager"] }]
         }
       },
       "system.devops.ssl_certificate.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.ssl_certificate.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.ssl_certificate.manager"] }]
         }
       },
       "system.devops.ssl_certificate.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.ssl_certificate.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.ssl_certificate.manager"] }]
         }
       },
-      "system.devops.log_configuration.view": {
+      "system.settings.log_configuration.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.log_configuration.view"] }]
+          "anyOf": [{ "backend": ["system.settings.log_configuration.view"] }]
         }
       },
       "system.devops.log_configuration.add": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.log_configuration.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.log_configuration.manager"] }]
         }
       },
       "system.devops.log_configuration.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.log_configuration.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.log_configuration.manager"] }]
         }
       },
       "system.devops.log_configuration.publish": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.log_configuration.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.log_configuration.manager"] }]
         }
       },
       "system.devops.log_configuration.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["system.devops.log_configuration.manager"] }]
+          "anyOf": [{ "backend": ["system.settings.log_configuration.manager"] }]
         }
       },
       "system.workspace.application.view_all": {
@@ -244,19 +244,24 @@ export const PERMISSION_DEFINITION = [
           "anyOf": [{ "backend": ["system.workspace.application.view_all"] }]
         }
       },
+      "system.workspace.application.edit": {
+        "granted": {
+          "anyOf": [{ "backend": ["system.workspace.application.manager_all"] }]
+        }
+      },
       "system.workspace.service.view_all": {
         "granted": {
           "anyOf": [{ "backend": ["system.workspace.service.view_all"] }]
         }
       },
-      "system.workspace.team.view_all": {
+      "system.workspace.service.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["system.workspace.team.view_all"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all"] }]
         }
       },
-      "system.workspace.api_market.view": {
+      "system.api_portal.api_portal.view": {
         "granted": {
-          "anyOf": [{ "backend": ["system.workspace.api_market.view"] }]
+          "anyOf": [{ "backend": ["system.api_portal.api_portal.view"] }]
         }
       },
       "system.dashboard.dashboard.view": {
@@ -284,6 +289,21 @@ export const PERMISSION_DEFINITION = [
           "anyOf": [{ "backend": ["team.service.api_doc.manager"] }]
         }
       },
+      "team.service.service_intro.view": {
+        "granted": {
+          "anyOf": [{ "backend": ["team.service.service_intro.view"] }]
+        }
+      },
+      "team.service.service_intro.add": {
+        "granted": {
+          "anyOf": [{ "backend": [" team.service.service_intro.manager"] }]
+        }
+      },
+      "team.service.service_intro.edit": {
+        "granted": {
+          "anyOf": [{ "backend": [" team.service.service_intro.manager"] }]
+        }
+      },
       "team.service.api_doc.import": {
         "granted": {
           "anyOf": [{ "backend": ["team.service.api_doc.manager"] }]
@@ -291,22 +311,22 @@ export const PERMISSION_DEFINITION = [
       },
       "team.service.router.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.router.view"] }]
+          "anyOf": [{ "backend": ["team.service.api.view"] }]
         }
       },
       "team.service.router.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.router.manager"] }]
+          "anyOf": [{ "backend": ["team.service.api.manager"] }]
         }
       },
       "team.service.router.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.router.manager"] }]
+          "anyOf": [{ "backend": ["team.service.api.manager"] }]
         }
       },
       "team.service.router.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.router.manager"] }]
+          "anyOf": [{ "backend": ["team.service.api.manager"] }]
         }
       },
       "team.service.upstream.view": {
@@ -391,92 +411,92 @@ export const PERMISSION_DEFINITION = [
       },
       "team.service.service.view": {
         "granted": {
-          "anyOf": [{ "backend": [""] }]
+          "anyOf": [{ "backend": ["team.team.service.view"] }]
         }
       },
       "team.service.service.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.service.manager"] }]
+          "anyOf": [{ "backend": ["team.team.service.manager","team.service.service.manager"] }]
         }
       },
       "team.service.service.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.service.manager"] }]
+          "anyOf": [{ "backend": ["team.team.service.manager","team.service.service.manager"] }]
         }
       },
       "team.service.service.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.service.manager"] }]
+          "anyOf": [{ "backend": ["team.team.service.manager","team.service.service.manager"] }]
         }
       },
       "team.application.subscription.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.subscription.view"] }]
+          "anyOf": [{ "backend": ["team.consumer.subscription.view_subscribed_service"] }]
         }
       },
       "team.application.subscription.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.subscription.manager"] }]
+          "anyOf": [{ "backend": ["team.consumer.subscription.subscribe"] }]
         }
       },
       "team.application.subscription.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.subscription.manager"] }]
+          "anyOf": [{ "backend": ["team.consumer.subscription.manager_subscribed_services"] }]
         }
       },
       "team.application.subscription.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.subscription.manager"] }]
+          "anyOf": [{ "backend": ["team.team.consumer.subscription.manager_subscribed_services"] }]
         }
       },
       "team.application.application.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.application.view"] }]
+          "anyOf": [{ "backend": ["team.team.consumer.view"] }]
         }
       },
       "team.application.application.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.application.manager"] }]
+          "anyOf": [{ "backend": ['team.team.consumer.manager',"team.consumer.application.manager"] }]
         }
       },
       "team.application.application.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.application.manager"] }]
+          "anyOf": [{ "backend": ['team.team.consumer.manager',"team.consumer.application.manager"] }]
         }
       },
       "team.application.application.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.application.manager"] }]
+          "anyOf": [{ "backend": ['team.team.consumer.manager',"team.consumer.application.manager"] }]
         }
       },
-      "team.application.authorization.view": {
+      "team.consumer.authorization.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.authorization.view"] }]
+          "anyOf": [{ "backend": ["team.consumer.authorization.view"] }]
         }
       },
       "team.application.authorization.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.authorization.manager"] }]
+          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
         }
       },
       "team.application.authorization.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.authorization.manager"] }]
+          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
         }
       },
       "team.application.authorization.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.authorization.manager"] }]
+          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
         }
       },
       "team.application.authorization.cancelSubApply": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.authorization.manager"] }]
+          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
         }
       },
       "team.application.authorization.cancelSub": {
         "granted": {
-          "anyOf": [{ "backend": ["team.application.authorization.manager"] }]
+          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
         }
       },
       "team.team.team.view": {

frontend/packages/common/src/const/permissions.yaml

@@ -7,7 +7,7 @@ system:
         cname: '成员'
         value: 'member'
         access:
-          - system.organization.member.view
+          - system.settings.account.view
           - system.organization.member.add
           - system.organization.member.edit
           - system.organization.member.delete
@@ -18,7 +18,7 @@ system:
       - name: team_manager
         cname: '团队管理'
         desc: '团队管理'
-        - system.organization.team.view
+        - system.workspace.team.view_all
         - system.organization.team.add
         - system.organization.team.edit
         - system.organization.team.delete
@@ -55,7 +55,7 @@ system:
           cname: 集群
           value: 'cluster'
           children:
-            - system.devops.cluster.view
+            - system.settings.api_gateway.view
             - system.devops.cluster.add
             - system.devops.cluster.edit
             - system.devops.cluster.delete
@@ -63,7 +63,7 @@ system:
           cname: 证书
           value: 'ssl_certificate'
           children:
-            - system.devops.ssl_certificate.view
+            - system.settings.ssl_certificate.view
             - system.devops.ssl_certificate.add
             - system.devops.ssl_certificate.edit
             - system.devops.ssl_certificate.delete
@@ -71,7 +71,7 @@ system:
           cname: 日志
           value: 'log_configuration'
           children:
-            - system.devops.log_configuration.view
+            - system.settings.log_configuration.view
             - system.devops.log_configuration.add
             - system.devops.log_configuration.edit
             - system.devops.log_configuration.publish
@@ -99,7 +99,7 @@ system:
         cname: API市场
         value: 'api_market'
         children:
-          - system.workspace.api_market.view
+          - system.api_portal.api_portal.view
 team:
   - name: service
     cname: 服务
@@ -172,8 +172,8 @@ team:
         cname: 访问授权
         value: 'authorization'
         children:
-          - team.application.authorization.view
-          - team.application.authorization.manager
+          - team.consumer.authorization.view
+          - team.consumer.authorization.manager
           - team.application.authorization.add
           - team.application.authorization.edit
           - team.application.authorization.delete

frontend/packages/common/src/const/type.ts

@@ -7,6 +7,8 @@ export type UserInfoType = {
     email: string
     phone: string
     avatar: string
+    type:string
+
 }
 
 export type UserProfileProps = {

frontend/packages/common/src/hooks/crypto.ts

@@ -1,26 +0,0 @@
-/*
- * @Date: 2024-01-31 15:00:11
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-05-10 17:03:03
- * @FilePath: \frontend\packages\core\src\hooks\crypto.ts
- */
-// import CryptoJS from 'crypto-js';
-
-// export const useCrypto = () => {
-//     const key = '1e42=7838a1vfc6n';
-
-//     const encryptByEnAES = (secretKey: string, data: string, initializationVector?: string): string => {
-//         const iv = CryptoJS.enc.Latin1.parse(initializationVector || key);
-//         const keyForEncryption = CryptoJS.enc.Latin1.parse(CryptoJS.MD5(secretKey).toString());
-
-//         const cipher = CryptoJS.AES.encrypt(data, keyForEncryption, {
-//             iv,
-//             mode: CryptoJS.mode.CBC,
-//             padding: CryptoJS.pad.Pkcs7,
-//         });
-
-//         return CryptoJS.enc.Base64.stringify(cipher.ciphertext);
-//     };
-
-//     return { encryptByEnAES };
-// };

frontend/packages/common/src/index.css

@@ -1,9 +1,4 @@
-/*
- * @Date: 2024-06-04 14:58:33
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-04 15:39:24
- * @FilePath: \frontend\packages\common\src\index.css
- */
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;

frontend/packages/common/src/locales/keyHashMap.json

@@ -1,8 +1,8 @@
 {
   "工作空间": "Kc0e5ef9f",
   "首页": "K4de11e23",
-  "消费者": "Kfe93ef35",
   "服务": "Kb58e0c3f",
+  "消费者": "K7acfcfad",
   "团队": "Kc9e489f5",
   "API 市场": "K61c89f5f",
   "仪表盘": "K16d71239",
@@ -95,8 +95,8 @@
   "只读成员": "Ke41d7451",
   "服务管理员": "Kf99e8b66",
   "服务开发者": "Kda8db57a",
-  "消费者开发者": "K216a1ac7",
-  "消费者管理员": "K27924db",
+  "消费者开发者": "Kc8054dba",
+  "消费者管理员": "Keb1673a6",
   "驱动名称": "K8dc5c723",
   "请求失败数": "Kda249fe8",
   "转发失败数": "Kcf2df651",
@@ -131,8 +131,8 @@
   "上传 OpenAPI 文档 (.json/.yaml)": "K6206e4ad",
   "替换 OpenAPI 文档 (.json/.yaml)": "Kfba46e6d",
   "打开 OpenAPI YAML 编辑器": "Kdac8ce7e",
-  "无需审核：允许任何消费者调用该服务": "Kffd7e274",
-  "人工审核：仅允许通过人工审核的消费者调用该服务": "K8a8b13e4",
+  "无需审核：允许任何消费者调用该服务": "K1fc2cc28",
+  "人工审核：仅允许通过人工审核的消费者调用该服务": "K8dabb98e",
   "永久": "Kbfe02d7f",
   "否": "K1e9c479e",
   "是": "Kaddfcb6b",
@@ -150,7 +150,7 @@
   "版本状态": "Kcbf39b82",
   "创建人": "K339d15b5",
   "审核时间": "K7194cea2",
-  "申请方-消费者": "K831aa6c0",
+  "申请方-消费者": "K7c1fb123",
   "审核状态": "K7ad449bc",
   "审核人": "K3b3a98ce",
   "来源": "K61b62ace",
@@ -207,6 +207,33 @@
   "每小时": "Kf00f01ca",
   "每天": "Kfcda87fc",
   "每周": "K29ec75dc",
+  "上线结果": "K93c2696e",
+  "订阅服务数量": "K6e32a344",
+  "鉴权数量": "Ka701316",
+  "列表": "K9eaa2eb6",
+  "块": "Kfaec39e9",
+  "HTTP 请求头": "K76036e25",
+  "全等匹配": "K44607e3f",
+  "前缀匹配": "Kc287500a",
+  "后缀匹配": "Kfc0b1147",
+  "子串匹配": "Ka4a92043",
+  "非等匹配": "K30b2e44f",
+  "空值匹配": "Kb1587991",
+  "存在匹配": "K1e97dbd8",
+  "不存在匹配": "Kc8ee3e62",
+  "区分大小写的正则匹配": "K87c5a801",
+  "不区分大小写的正则匹配": "K95f062f1",
+  "任意匹配": "Kfbd230a5",
+  "驳回": "Kd85208a3",
+  "已订阅": "Kad6aa439",
+  "取消申请": "K9a68443b",
+  "透传客户端请求 Host": "Kaeba0229",
+  "使用上游服务 Host": "K6d7e2fd0",
+  "重写 Host": "K31332633",
+  "动态服务发现": "K2c2bc64f",
+  "地址": "K78b1ca25",
+  "新增": "K1644b775",
+  "申请方消费者": "Kec91f0db",
   "暂无操作权限，请联系管理员分配。": "K23fda291",
   "微信小程序": "K4618cb0a",
   "获取文件,需填路径": "Ka854f511",
@@ -369,7 +396,7 @@
   "创建 AI 服务和 API": "Kc057704a",
   "创建 AI 类型的服务，并且你可以将 Prompt 提示词设置为一个 API，简化使用 AI 的流程。": "K76bb4a09",
   "创建调用 Token": "K71b2c70f",
-  "为了安全地调用 API，你需要创建一个消费者以及Token。": "K9bdd8403",
+  "为了安全地调用 API，你需要创建一个消费者以及Token。": "Kdea9a418",
   "调用": "Kc5738b6c",
   "现在你可以通过 Token 来调用这些 API。": "Kd6d7ca1f",
   "快速接入 REST API": "K86cf95f",
@@ -379,13 +406,13 @@
   "核心功能": "K2cdbb773",
   "账号与角色": "K3378c50d",
   "邀请你的团队成员加入 APIPark，共同管理和调用 API。": "Kda5bb930",
-  "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。": "Kc8239422",
+  "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。": "Keee27105",
   "服务内包含一组 API，并且可以发布到 API 市场被其他团队使用。": "Kd5be0cd7",
   "权限管理": "K62e89ee7",
   "订阅服务": "K8f7808e6",
   "如果需要调用某个服务的 API，需要先订阅该服务，并且等待提供服务的团队审核后才可发起 API 请求。": "Kf2410413",
   "审核订阅申请": "K6c2e44b8",
-  "提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的消费者才可发起 API 请求。": "Ka0a8840a",
+  "提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的消费者才可发起 API 请求。": "Kaa717866",
   "APIPark 提供详尽的 API 调用日志，帮助企业监控、分析和审计 API 的运行状况。": "K3453272",
   "Hello！欢迎使用 APIPark": "Kd518ba3e",
   "你能通过 APIPark 快速在企业内部构建 API 开放门户/市场，享受极致的转发性能、API 可观测、服务治理、多租户管理、订阅审核流程等诸多好处。": "K7e04ea16",
@@ -396,10 +423,10 @@
   "了解 APIPark 如何更好地管理 API 和 AI": "K1afaf20e",
   "了解更多功能": "K48f7e21f",
   "隐藏该教程": "K698296e2",
-  "登录": "Kd2c1a316",
   "请输入账号": "Kf076f63c",
   "请输入密码": "K25c895d5",
   "密码": "K551b0348",
+  "登录": "Kd2c1a316",
   "访客模式": "K192b3e38",
   "您可通过访客模式查看所有页面和功能，但是无法编辑数据。访客模式仅用于了解产品功能，您可以在正式产品中关闭该功能。": "K91aa4801",
   "Version (0)-(1)": "K480045ce",
@@ -480,6 +507,8 @@
   "只允许上传PNG、JPG或SVG格式的图片": "Ka9c08390",
   "服务名称": "K413b9869",
   "服务类型": "K9919285b",
+  "AI 服务": "Kd2c34e2c",
+  "REST 服务": "K62840d62",
   "默认 AI 供应商": "Kcef64f4d",
   "创建 API 时会默认选择该供应商，修改默认供应商不会影响现有 API": "K300c89d4",
   "未配置任何 AI 模型供应商，": "Kcab588a9",
@@ -518,7 +547,7 @@
   "添加成员": "Kec46a57f",
   "输入姓名查找": "K48724410",
   "搜索用户名、邮箱": "Kb9052305",
-  "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。": "K5ece3bac",
+  "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。": "K4c72fb6f",
   "添加团队": "K510cdd27",
   "输入名称、ID、负责人查找团队": "K9244ae14",
   "配置团队": "Kc7b24b4b",
@@ -538,8 +567,8 @@
   "导出": "Ka2c794a2",
   "退出全屏": "Kaf70c3b",
   "(0)调用详情": "Kd22841a4",
-  "消费者调用统计": "K1512e983",
-  "请选择消费者": "Kb4d2007f",
+  "消费者调用统计": "K61cca533",
+  "请选择消费者": "Kdfff59d4",
   "调用趋势": "K8c7f2d2e",
   "(0)-(1)调用趋势": "K657c3452",
   "调用量统计": "Kc04efb87",
@@ -562,7 +591,7 @@
   "请选择服务": "Kffcfe375",
   "调用详情": "Ka65f739c",
   "API 请求量 Top10": "K89b7ac79",
-  "消费者调用量 Top10": "Kc0915603",
+  "消费者调用量 Top10": "K386857bd",
   "服务被调用量 Top10": "Kf90b54",
   "暂无请求统计数据": "Kfb26388",
   "请求统计": "Kc8cbd8f8",
@@ -585,9 +614,9 @@
   "万": "Ke6a935d",
   "搜索分类或标签": "Kd59290a2",
   "暂无API数据": "K6b75bdbc",
-  "搜索或选择消费者": "Kd8a7a689",
+  "搜索或选择消费者": "Kb684c806",
   "申请理由": "K4b15d6f5",
-  "消费者管理": "Kb7e869a4",
+  "消费者管理": "Ke0fbd1c8",
   "鉴权类型": "Kb71b5a13",
   "Iss": "K4d1465ee",
   "签名算法": "K5dcd7ed8",
@@ -600,9 +629,9 @@
   "SK": "K31418470",
   "Apikey": "Kbfeb5297",
   "隐藏鉴权信息": "Ke64e43a",
-  "消费者名称": "K5168eb63",
-  "消费者 ID": "K546e46f",
-  "删除消费者": "K95764d1d",
+  "消费者名称": "K67b530f",
+  "消费者 ID": "K11f34de",
+  "删除消费者": "Kc01002",
   "鉴权详情": "K217cb125",
   "添加鉴权": "K2bb63eca",
   "编辑鉴权": "Kd74d69b7",
@@ -619,9 +648,11 @@
   "请确认是否取消订阅申请？": "K1856c229",
   "搜索服务": "K66ea2f0",
   "审核中": "K8adf7f8b",
-  "添加消费者": "K667bbbe7",
-  "暂无服务描述": "Ka4b45550",
+  "添加消费者": "K84c4dc71",
+  "暂无消费者描述": "Kc3b7bfa8",
+  "创建并管理自己的消费者实体，每个消费者可以订阅多个API服务，确保在调用之前已获得相应权限。你可以为消费者生成 API 密钥等鉴权方式，用于安全地调用 API 服务": "K5c4e2865",
   "订阅的服务数量：已通过 (0) 个，申请中 (1) 个": "K3c7b175f",
+  "输入名称、ID 查找消费者": "K3a6f905d",
   "退出测试": "Kbe3e9335",
   "服务市场": "K370a3eb2",
   "服务详情": "Kf7ec36d",
@@ -630,14 +661,15 @@
   "Base URL": "Kc29dabf2",
   "申请": "K4aa9ed2c",
   "服务信息": "K6c060779",
-  "接入消费者": "K8723422e",
+  "接入消费者": "Kba74f26d",
   "供应方": "Kb97544cb",
   "分类": "Kb32f0afe",
   "版本": "K81634069",
   "更新时间": "Keefda53d",
   "无标签": "K96a2f1c8",
+  "暂无服务描述": "Ka4b45550",
   "API 数量": "K72b0c0b3",
-  "接入消费者数量": "K93d5a66e",
+  "接入消费者数量": "K70b79760",
   "关联标签": "K96059c69",
   "更新者": "K8b7c2592",
   "添加 Open Api": "K32263abd",

frontend/packages/common/src/locales/scan/en-US.json

@@ -1,7 +1,6 @@
 {
   "Kc0e5ef9f": "Workspace",
   "K4de11e23": "Home",
-  "Kfe93ef35": "Application",
   "Kb58e0c3f": "Service",
   "Kc9e489f5": "Team",
   "K61c89f5f": "API Portal",
@@ -91,8 +90,6 @@
   "K6206e4ad": "Upload OpenAPI File (.json/.yaml)",
   "Kfba46e6d": "Replace OpenAPI File (.json/.yaml)",
   "Kdac8ce7e": "Open OpenAPI YAML Editor",
-  "Kffd7e274": "No Review: All applications are allowed to subscribe to this service",
-  "K8a8b13e4": "Manual Review: Only reviewed and approved applications can subscribe to this service",
   "Kbfe02d7f": "Permanent",
   "K1e9c479e": "No",
   "Kaddfcb6b": "Yes",
@@ -259,7 +256,6 @@
   "Kc057704a": "Create AI Services and APIs",
   "K76bb4a09": "Create AI-based services, and you can set the prompt as an API to simplify the process of using AI.",
   "K71b2c70f": "Create Call Token",
-  "K9bdd8403": "To securely call APIs, you need to create an application and a token.",
   "Kc5738b6c": "Call",
   "Kd6d7ca1f": "You can now call these APIs with the token.",
   "K86cf95f": "Quickly Integrate REST API",
@@ -269,13 +265,11 @@
   "K2cdbb773": "Core Features",
   "K3378c50d": "Account and Role",
   "Kda5bb930": "Invite your team members to APIPark to collaboratively manage and call APIs.",
-  "Kc8239422": "Teams include personnel, applications, and services. Data between different teams is isolated, and can be used to manage different departments/project teams/teams within the enterprise.",
   "Kd5be0cd7": "Services include a set of APIs and can be published to the API Marketplace for use by other teams.",
   "K62e89ee7": "Permission Management",
   "K8f7808e6": "Subscribe to Services",
   "Kf2410413": "To call an API from a service, you need to subscribe to that service and wait for approval from the providing team before initiating the API request.",
   "K6c2e44b8": "Review Subscription",
-  "Ka0a8840a": "Review subscription requests from other applications. Only approved requests can initiate API calls.",
   "K3453272": "APIPark provides detailed API call logs, helping enterprises monitor, analyze, and audit API operations.",
   "Kd518ba3e": "Hello! Welcome to APIPark",
   "K7e04ea16": "🦄 APIPark is an open-source, all-in-one AI gateway and API developer portal, enabling enterprises and developers to quickly integrate over 100 AI models, combine AI models and prompts into new APIs, and standardize all AI request data formats, ensuring that switching AI models or adjusting prompts does not affect your APP or microservice. Additionally, APIPark’s developer portal allows you to share APIs within your team, manage applications that call your APIs, and ensure API security, while monitoring your AI API usage with clear charts.",
@@ -405,7 +399,6 @@
   "Kec46a57f": "Add Member",
   "K48724410": "Enter Name to Search",
   "Kb9052305": "Search Username, Email",
-  "K5ece3bac": "Set up teams and members. You can then create services and applications, subscribe to APIs within the team. Members can only see services and applications within their team.",
   "K510cdd27": "Add Team",
   "K9244ae14": "Enter Name, ID, Person in Charge to Search Teams",
   "Kc7b24b4b": "Configure Team",
@@ -425,8 +418,6 @@
   "Ka2c794a2": "Export",
   "Kaf70c3b": "Exit Fullscreen",
   "Kd22841a4": "(0) Call Details",
-  "K1512e983": "Application Call Statistics",
-  "Kb4d2007f": "Please Select Application",
   "K8c7f2d2e": "Call Trend",
   "K657c3452": "(0)-(1) Call Trend",
   "Kc04efb87": "Call Volume Statistics",
@@ -449,7 +440,6 @@
   "Kffcfe375": "Please Select Service",
   "Ka65f739c": "Call Details",
   "K89b7ac79": "API Top 10",
-  "Kc0915603": "Application Top 10",
   "Kf90b54": "Service Top 10",
   "Kfb26388": "No Request Data",
   "Kc8cbd8f8": "Request Statistics",
@@ -472,9 +462,7 @@
   "Ke6a935d": "Ten Thousand",
   "Kd59290a2": "Search Category or Tag",
   "K6b75bdbc": "No API Data",
-  "Kd8a7a689": "Search or Select Application",
   "K4b15d6f5": "Application Reason",
-  "Kb7e869a4": "Application Settings",
   "Kb71b5a13": "Authentication Type",
   "K4d1465ee": "ISS",
   "K5dcd7ed8": "Signature Algorithm",
@@ -488,9 +476,6 @@
   "Kbfeb5297": "API Key",
   "K1a78e6f0": "Expiration Time",
   "Ke64e43a": "Hide Authentication Info",
-  "K5168eb63": "Application Name",
-  "K546e46f": "Application ID",
-  "K95764d1d": "Delete Application",
   "K217cb125": "Authentication Details",
   "K2bb63eca": "Add Authentication",
   "Kd74d69b7": "Edit Authentication",
@@ -507,7 +492,6 @@
   "K1856c229": "Are you sure you want to cancel the subscription request?",
   "K66ea2f0": "Search Services",
   "K8adf7f8b": "Under Review",
-  "K667bbbe7": "Add Application",
   "Ka4b45550": "No Service Description",
   "K3c7b175f": "Number of Subscribed Services: (0) Approved, (1) Pending",
   "Kbe3e9335": "Exit Test",
@@ -517,7 +501,6 @@
   "K59cdbec3": "Intro",
   "K4aa9ed2c": "Subscribe",
   "K6c060779": "Service Information",
-  "K8723422e": "Access Application",
   "Kb97544cb": "Provider",
   "Kb32f0afe": "Category",
   "K81634069": "Version",
@@ -525,7 +508,6 @@
   "Keefda53d": "Update Time",
   "K96a2f1c8": "No Tags",
   "K72b0c0b3": "Number of APIs",
-  "K93d5a66e": "Number of Access Applications",
   "K96059c69": "Associated Tags",
   "K32263abd": "Add Open API",
   "K7829bb78": "Configure Open API",
@@ -546,8 +528,6 @@
   "Ke41d7451": "Read-Only Member",
   "Kf99e8b66": "Service Administrator",
   "Kda8db57a": "Service Developer",
-  "K216a1ac7": "Application Developer",
-  "K27924db": "Application Administrator",
   "K8dc5c723": "Driver Name",
   "Kda249fe8": "Failure",
   "Kcf2df651": "Failure",
@@ -575,7 +555,6 @@
   "K593e0c7e": "No Review Required",
   "Ke2d747d9": "Review Required",
   "Kc29dabf2": "Base URL",
-  "Kd55c6887": "Review",
   "K300c89d4": "When creating an API, this provider is selected by default. Changing the default provider will not affect existing APIs.",
   "Kefaf9956": "Create Time",
   "Kad1c674c": "Protocol",
@@ -589,7 +568,6 @@
   "Kcbf39b82": "Status",
   "K339d15b5": "Creator",
   "K7194cea2": "Review Time",
-  "K831aa6c0": "Applicant - Application",
   "K7ad449bc": "Status",
   "K3b3a98ce": "Reviewer",
   "K61b62ace": "Source",
@@ -602,8 +580,8 @@
   "Kd7d84192": "Name",
   "Kc88e03b6": "Team Roles",
   "Ke08ff808": "Addition Date",
-  "K19a3ebe0": "Successful Requests",
-  "Kcaa8259": "Successful Forwards",
+  "K19a3ebe0": "Success",
+  "Kcaa8259": "Success",
   "K17f93984": "API",
   "K888f038f": "Failed Status Code Count",
   "Ke792d01c": "Service Association",
@@ -629,7 +607,7 @@
   "Ke108c369": "Success",
   "K9168d3e": "Redirecting to Login Page",
   "K2f8a7ab7": "Review Comments Not Provided",
-  "Kb858d78a": "Copy Successful",
+  "Kb858d78a": "Copied",
   "K26e85d15": "Copy Failed, Please Copy Manually",
   "Kd60d204": "Service Team",
   "K823bfe63": "Online",
@@ -646,5 +624,59 @@
   "K29ec75dc": "Per Week",
   "Kac172626": "Please provide a reason when rejecting the request.",
   "Ke1b1865": "Private",
-  "K4786c57c": "Public"
+  "K4786c57c": "Public",
+  "K7acfcfad": "Consumer",
+  "Kc8054dba": "Consumer Developer",
+  "Keb1673a6": "Consumer Administrator",
+  "K1fc2cc28": "No Review: All consumers are allowed to subscribe to this service",
+  "K8dabb98e": "Manual Review: Only reviewed and approved consumers can subscribe to this service",
+  "K7c1fb123": "Applicant - Application",
+  "Kdea9a418": "To securely call APIs, you need to create an consumer and a token.",
+  "Keee27105": "Teams include personnel, consumers, and services. Data between different teams is isolated, and can be used to manage different departments/project teams/teams within the enterprise.",
+  "Kaa717866": "Review subscription requests from other consumers. Only approved requests can initiate API calls.",
+  "Kd2c34e2c": "AI Service",
+  "K62840d62": "REST Service",
+  "K4c72fb6f": "Set up teams and members. You can then create services and consumers, subscribe to APIs within the team. Members can only see services and applications within their team.",
+  "K61cca533": "Consumer Call Statistics",
+  "Kdfff59d4": "Please Select Consumer",
+  "K386857bd": "Consumer Top 10",
+  "Kb684c806": "Search or Select Consumer",
+  "Ke0fbd1c8": "Consumer Settings",
+  "K67b530f": "Consumer Name",
+  "K11f34de": "Consumer ID",
+  "Kc01002": "Delete Consumer",
+  "K84c4dc71": "Add Consumer",
+  "K5c4e2865": "Create and manage your own consumer entities, with each consumer able to subscribe to multiple API services, ensuring the necessary permissions are obtained before making any calls. You can generate API keys or other credentials for consumers to securely call API services.",
+  "K40a89bd8": "Enter Name, ID to Search Member",
+  "Kba74f26d": "Access Consumer",
+  "K70b79760": "Number of Access Consumers",
+  "K93c2696e": "Online Result",
+  "K6e32a344": "Number of Services",
+  "Ka701316": "Number of Auths",
+  "K9eaa2eb6": "List",
+  "Kfaec39e9": "Block",
+  "Kc3b7bfa8": "No Consumer Description",
+  "K3a6f905d": "Enter Name, ID to Search Consumer",
+  "K76036e25": "HTTP Request Header",
+  "K44607e3f": "Exact Match",
+  "Kc287500a": "Prefix Match",
+  "Kfc0b1147": "Suffix Match",
+  "Ka4a92043": "Substring Match",
+  "K30b2e44f": "Non-Exact Match",
+  "Kb1587991": "Null Match",
+  "K87c5a801": "Case-Sensitive Regex Match",
+  "K95f062f1": "Case-Insensitive Regex Match",
+  "Kfbd230a5": "Any Match",
+  "Kd85208a3": "Reject",
+  "Kad6aa439": "Subscribed",
+  "K9a68443b": "Cancel Request",
+  "Kaeba0229": "Pass-through Client Request Host",
+  "K6d7e2fd0": "Use Upstream Service Host",
+  "K31332633": "Rewrite Host",
+  "K2c2bc64f": "Dynamic Service Discovery",
+  "K78b1ca25": "Address",
+  "K1644b775": "Add",
+  "Kc8ee3e62": "Non-Existence",
+  "K1e97dbd8": "Existence",
+  "Kec91f0db": "Applicant Consumer"
 }

frontend/packages/common/src/locales/scan/ja-JP.json

@@ -646,5 +646,59 @@
   "Kfcda87fc": "毎日",
   "K29ec75dc": "毎週",
   "Ke1b1865": "プライベート",
-  "K4786c57c": "パブリック"
+  "K4786c57c": "パブリック",
+  "K7acfcfad": "コンシューマー",
+  "Kc8054dba": "コンシューマー開発者",
+  "Keb1673a6": "コンシューマー管理者",
+  "K1fc2cc28": "審査不要：どのコンシューマーでもこのサービスを呼び出せます",
+  "K8dabb98e": "手動審査：手動審査に合格したコンシューマーのみ、このサービスを呼び出せます",
+  "K7c1fb123": "申請元-コンシューマー",
+  "K93c2696e": "オンライン結果",
+  "K6e32a344": "サブスクライブサービス数",
+  "Ka701316": "認証数",
+  "K9eaa2eb6": "リスト",
+  "Kfaec39e9": "ブロック",
+  "Kdea9a418": "API を安全に呼び出すためには、コンシューマーとトークンを作成する必要があります。",
+  "Keee27105": "チームにはメンバー、コンシューマー、サービスが含まれ、異なるチームのコンシューマーとサービスデータは分離されています。企業内の部門やプロジェクトチームの管理に役立ちます。",
+  "Kaa717866": "サービスを提供するチームは、他のチームからのサブスクリプション申請を審査できます。審査に合格したコンシューマーのみ API リクエストを行うことができます。",
+  "Kd2c34e2c": "AI サービス",
+  "K62840d62": "REST サービス",
+  "K4c72fb6f": "チームとメンバーを設定してから、チーム内でサービスとコンシューマーを作成し、API をサブスクライブできます。メンバーは所属チーム内のサービスとコンシューマーのみを表示できます。",
+  "K61cca533": "コンシューマー呼び出し統計",
+  "Kdfff59d4": "コンシューマーを選択してください",
+  "K386857bd": "コンシューマー呼び出し量トップ10",
+  "Kb684c806": "コンシューマーを検索または選択",
+  "Ke0fbd1c8": "コンシューマー管理",
+  "K67b530f": "コンシューマー名",
+  "K11f34de": "コンシューマー ID",
+  "Kc01002": "コンシューマーを削除",
+  "K40a89bd8": "名前または ID を入力してサービスを検索",
+  "Kba74f26d": "コンシューマーを接続",
+  "K70b79760": "接続コンシューマー数",
+  "K5c4e2865": "コンシューマーエンティティを作成および管理し、各コンシューマーは複数の API サービスにサブスクライブできます。呼び出し前に適切な権限が付与されていることを確認してください。コンシューマー用に API キーなどの認証方法を生成して、安全に API サービスを呼び出せます。",
+  "K84c4dc71": "コンシューマーを追加",
+  "Kc3b7bfa8": "コンシューマーの説明がありません",
+  "K3a6f905d": "名前、IDを入力してコンシューマーを検索",
+  "K76036e25": "HTTPリクエストヘッダー",
+  "K44607e3f": "完全一致",
+  "Kc287500a": "プレフィックス一致",
+  "Kfc0b1147": "サフィックス一致",
+  "Ka4a92043": "部分一致",
+  "K30b2e44f": "非完全一致",
+  "Kb1587991": "ヌル一致",
+  "K87c5a801": "大文字小文字を区別する正規表現一致",
+  "K95f062f1": "大文字小文字を区別しない正規表現一致",
+  "Kfbd230a5": "任意一致",
+  "Kd85208a3": "拒否",
+  "Kad6aa439": "申し込み済み",
+  "K9a68443b": "申し込み取消",
+  "Kaeba0229": "クライアントリクエストホストのパススルー",
+  "K6d7e2fd0": "上位サービスホストの使用",
+  "K31332633": "ホストの書き換え",
+  "K2c2bc64f": "動的サービス発見",
+  "K78b1ca25": "アドレス",
+  "K1644b775": "追加",
+  "Kc8ee3e62": "存在しない",
+  "K1e97dbd8": "存在する",
+    "Kec91f0db": "申請側コンシューマー"
 }

frontend/packages/common/src/locales/scan/newJson/en-US.json

@@ -0,0 +1 @@
+{}

frontend/packages/common/src/locales/scan/newJson/ja-JP.json

@@ -0,0 +1 @@
+{}

frontend/packages/common/src/locales/scan/newJson/zh-CN.json

@@ -0,0 +1,26 @@
+{
+  "K76036e25": "HTTP 请求头",
+  "K44607e3f": "全等匹配",
+  "Kc287500a": "前缀匹配",
+  "Kfc0b1147": "后缀匹配",
+  "Ka4a92043": "子串匹配",
+  "K30b2e44f": "非等匹配",
+  "Kb1587991": "空值匹配",
+  "K1e97dbd8": "存在匹配",
+  "Kc8ee3e62": "不存在匹配",
+  "K87c5a801": "区分大小写的正则匹配",
+  "K95f062f1": "不区分大小写的正则匹配",
+  "Kfbd230a5": "任意匹配",
+  "Kd85208a3": "驳回",
+  "Kad6aa439": "已订阅",
+  "K9a68443b": "取消申请",
+  "Kaeba0229": "透传客户端请求 Host",
+  "K6d7e2fd0": "使用上游服务 Host",
+  "K31332633": "重写 Host",
+  "K2c2bc64f": "动态服务发现",
+  "K78b1ca25": "地址",
+  "K1644b775": "新增",
+  "Kec91f0db": "申请方消费者",
+  "Kc3b7bfa8": "暂无消费者描述",
+  "K3a6f905d": "输入名称、ID 查找消费者"
+}

frontend/packages/common/src/locales/scan/newJson/zh-TW.json

@@ -0,0 +1 @@
+{}

frontend/packages/common/src/locales/scan/oldJson/en-US.json

@@ -0,0 +1,3 @@
+{
+  "K40a89bd8": "Enter Name, ID to Search Member"
+}

frontend/packages/common/src/locales/scan/oldJson/ja-JP.json

@@ -0,0 +1,25 @@
+{
+  "Kfe93ef35": "Application",
+  "Kffd7e274": "無審査：すべてのアプリケーションがこのサービスにサブスクライブできます",
+  "K8a8b13e4": "手動審査：承認されたアプリケーションのみがこのサービスにサブスクライブできます",
+  "K9bdd8403": "API を安全に呼び出すためには、アプリケーションとトークンを作成する必要があります。",
+  "Kc8239422": "チームにはユーザー、アプリケーション、サービスが含まれ、異なるチームのアプリケーションとサービスのデータは分離されています。企業内の部門/プロジェクトグループ/チームの管理に使用できます。",
+  "Ka0a8840a": "他のアプリケーションのサブスクリプション申請をレビューし、承認後に API リクエストが発行できます。",
+  "K5ece3bac": "チームとメンバーを設定してから、チーム内でサービスとアプリケーションを作成し、API をサブスクライブできます。メンバーは所属チーム内のサービスとアプリケーションのみを表示できます。",
+  "K1512e983": "アプリケーション呼び出し統計",
+  "Kb4d2007f": "Application を選択",
+  "Kc0915603": "Application トップ10",
+  "Kd8a7a689": "アプリケーションを検索または選択",
+  "Kb7e869a4": "アプリケーション管理",
+  "K5168eb63": "Application 名",
+  "K546e46f": "Application ID",
+  "K95764d1d": "Application を削除",
+  "K667bbbe7": "Application を追加",
+  "K8723422e": "アプリケーションを接続",
+  "K93d5a66e": "接続アプリケーション数",
+  "K216a1ac7": "アプリケーション開発者",
+  "K27924db": "アプリケーション管理者",
+  "Kd55c6887": "レビュー",
+  "K831aa6c0": "申請元-アプリケーション",
+  "K40a89bd8": "名前または ID を入力してサービスを検索"
+}

frontend/packages/common/src/locales/scan/oldJson/zh-CN.json

@@ -0,0 +1,25 @@
+{
+  "Kfe93ef35": "消费者",
+  "Kffd7e274": "无审核：允许所有消费者订阅该服务",
+  "K8a8b13e4": "人工审核：仅允许审核通过的消费者订阅该服务",
+  "K9bdd8403": "为了安全地调用 API，你需要创建一个消费者以及Token。",
+  "Kc8239422": "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。",
+  "Ka0a8840a": "审核其他消费者的订阅申请，审核通过后的才可发起 API 请求。",
+  "K5ece3bac": "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。",
+  "K1512e983": "消费者调用统计",
+  "Kb4d2007f": "请选择消费者",
+  "Kc0915603": "消费者 Top10",
+  "Kd8a7a689": "搜索或选择消费者",
+  "Kb7e869a4": "消费者管理",
+  "K5168eb63": "消费者名称",
+  "K546e46f": "消费者 ID",
+  "K95764d1d": "删除消费者",
+  "K667bbbe7": "添加消费者",
+  "K8723422e": "接入消费者",
+  "K93d5a66e": "接入消费者数量",
+  "K216a1ac7": "消费者开发者",
+  "K27924db": "消费者管理员",
+  "Kd55c6887": "审核",
+  "K831aa6c0": "申请方-消费者",
+  "K40a89bd8": "输入名称、ID 查找服务"
+}

frontend/packages/common/src/locales/scan/oldJson/zh-TW.json

@@ -0,0 +1,25 @@
+{
+  "Kfe93ef35": "應用程式",
+  "Kffd7e274": "無審核：允許所有應用程式訂閱該服務",
+  "K8a8b13e4": "人工審核：僅允許審核通過的應用程式訂閱該服務",
+  "K9bdd8403": "為了安全地調用 API，你需要創建一個應用以及Token。",
+  "Kc8239422": "團隊中包含了人員、應用程式和服務，不同團隊之間的應用程式和服務數據是隔離的，可用於管理企業內部不同的部門/項目組/團隊。",
+  "Ka0a8840a": "審核其他應用程式的訂閱申請，審核通過後的才可發起 API 請求。",
+  "K5ece3bac": "設置團隊和成員，然後你可以在團隊內創建服務和應用程式、訂閱API，成員只能看到所屬團隊內的服務和應用程式。",
+  "K1512e983": "應用程式調用統計",
+  "Kb4d2007f": "請選擇應用程式",
+  "Kc0915603": "應用程式 Top10",
+  "Kd8a7a689": "搜索或選擇應用程式",
+  "Kb7e869a4": "應用程式管理",
+  "K5168eb63": "應用程式名稱",
+  "K546e46f": "應用程式 ID",
+  "K95764d1d": "刪除應用程式",
+  "K667bbbe7": "添加應用程式",
+  "K8723422e": "接入應用程式",
+  "K93d5a66e": "接入應用程式數量",
+  "K216a1ac7": "應用程式開發者",
+  "K27924db": "應用程式管理員",
+  "Kd55c6887": "審核",
+  "K831aa6c0": "申請方-應用程式",
+  "K40a89bd8": "輸入名稱、ID 查找服務"
+}

frontend/packages/common/src/locales/scan/zh-CN.json

@@ -646,5 +646,35 @@
     "Kfcda87fc": "每天",
     "K29ec75dc": "每周",
     "Ke1b1865": "私有",
-    "K4786c57c": "公共"
+    "K4786c57c": "公共",
+    "K7acfcfad": "消费者",
+    "Kc8054dba": "消费者开发者",
+    "Keb1673a6": "消费者管理员",
+    "K1fc2cc28": "无需审核：允许任何消费者调用该服务",
+    "K8dabb98e": "人工审核：仅允许通过人工审核的消费者调用该服务",
+    "K7c1fb123": "申请方-消费者",
+    "Kdea9a418": "为了安全地调用 API，你需要创建一个消费者以及Token。",
+    "Keee27105": "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。",
+    "Kaa717866": "提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的消费者才可发起 API 请求。",
+    "Kd2c34e2c": "AI 服务",
+    "K62840d62": "REST 服务",
+    "K4c72fb6f": "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。",
+    "K61cca533": "消费者调用统计",
+    "Kdfff59d4": "请选择消费者",
+    "K386857bd": "消费者调用量 Top10",
+    "Kb684c806": "搜索或选择消费者",
+    "Ke0fbd1c8": "消费者管理",
+    "K67b530f": "消费者名称",
+    "K11f34de": "消费者 ID",
+    "Kc01002": "删除消费者",
+    "K84c4dc71": "添加消费者",
+    "K5c4e2865": "创建并管理自己的消费者实体，每个消费者可以订阅多个API服务，确保在调用之前已获得相应权限。你可以为消费者生成 API 密钥等鉴权方式，用于安全地调用 API 服务",
+    "K40a89bd8": "输入名称、ID 查找服务",
+    "Kba74f26d": "接入消费者",
+    "K70b79760": "接入消费者数量",
+  "K93c2696e": "上线结果",
+  "K6e32a344": "订阅服务数量",
+  "Ka701316": "鉴权数量",
+  "K9eaa2eb6": "列表",
+  "Kfaec39e9": "块"
   }

frontend/packages/common/src/locales/scan/zh-TW.json

@@ -646,5 +646,59 @@
   "Kfcda87fc": "每天",
   "K29ec75dc": "每週",
   "Ke1b1865": "私有",
-  "K4786c57c": "公共"
+  "K4786c57c": "公共",
+  "K7acfcfad": "消費者",
+  "Kc8054dba": "消費者開發者",
+  "Keb1673a6": "消費者管理員",
+  "K1fc2cc28": "無需審核：允許任何消費者調用該服務",
+  "K8dabb98e": "人工審核：僅允許通過人工審核的消費者調用該服務",
+  "K7c1fb123": "申請方-消費者",
+  "K93c2696e": "上線結果",
+  "K6e32a344": "訂閱服務數量",
+  "Ka701316": "鑒權數量",
+  "K9eaa2eb6": "列表",
+  "Kfaec39e9": "塊",
+  "Kdea9a418": "為了安全地調用 API，你需要創建一個消費者以及Token。",
+  "Keee27105": "團隊中包含了人員、消費者和服務，不同團隊之間的消費者和服務數據是隔離的，可用於管理企業內部不同的部門/項目組/團隊。",
+  "Kaa717866": "提供服務的團隊可以審核來自其他團隊的訂閱申請，審核通過後的消費者才可發起 API 請求。",
+  "Kd2c34e2c": "AI 服務",
+  "K62840d62": "REST 服務",
+  "K4c72fb6f": "設置團隊和成員，然後你可以在團隊內創建服務和消費者、訂閱API，成員只能看到所屬團隊內的服務和消費者。",
+  "K61cca533": "消費者調用統計",
+  "Kdfff59d4": "請選擇消費者",
+  "K386857bd": "消費者調用量 Top10",
+  "Kb684c806": "搜索或選擇消費者",
+  "Ke0fbd1c8": "消費者管理",
+  "K67b530f": "消費者名稱",
+  "K11f34de": "消費者 ID",
+  "Kc01002": "刪除消費者",
+  "K84c4dc71": "添加消費者",
+  "K5c4e2865": "創建並管理自己的消費者實體，每個消費者可以訂閱多個API服務，確保在調用之前已獲得相應權限。你可以為消費者生成 API 密鑰等鑒權方式，用於安全地調用 API 服務",
+  "K40a89bd8": "輸入名稱、ID 查找服務",
+  "Kba74f26d": "接入消費者",
+  "K70b79760": "接入消費者數量",
+  "Kc3b7bfa8": "暫無消費者描述",
+  "K3a6f905d": "輸入名稱、ID 查找消費者",
+  "K76036e25": "HTTP請求頭",
+  "K44607e3f": "全等匹配",
+  "Kc287500a": "前綴匹配",
+  "Kfc0b1147": "後綴匹配",
+  "Ka4a92043": "子串匹配",
+  "K30b2e44f": "非等匹配",
+  "Kb1587991": "空值匹配",
+  "K87c5a801": "區分大小寫的正則匹配",
+  "K95f062f1": "不區分大小寫的正則匹配",
+  "Kfbd230a5": "任意匹配",
+  "Kd85208a3": "駁回",
+  "Kad6aa439": "已訂閱",
+  "K9a68443b": "取消申請",
+  "Kaeba0229": "透傳客戶端請求Host",
+  "K6d7e2fd0": "使用上游服務Host",
+  "K31332633": "重寫Host",
+  "K2c2bc64f": "動態服務發現",
+  "K78b1ca25": "位址",
+  "K1644b775": "新增",
+  "Kc8ee3e62": "不存在匹配",
+  "K1e97dbd8": "存在匹配",
+  "Kec91f0db": "申請方消費者"
   }

frontend/packages/common/tailwind.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2024-06-04 15:05:05
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-08-01 17:59:56
- * @FilePath: \frontend\packages\common\tailwind.config.js
- */
+
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   important:true,

frontend/packages/core/index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/frontend/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>APIPark - 企业API数据开放平台</title>
+    <title>APIPark</title>
   </head>
   <body>
     <div id="root"></div>

frontend/packages/core/postcss.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:54
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:42:18
- * @FilePath: \frontend\packages\core\postcss.config.js
- */
+
 export default {
     plugins: {
       'postcss-import': {},

frontend/packages/core/src/pages/aiService/AiServiceInsideDocument.tsx

@@ -137,7 +137,7 @@ const ServiceInsideDocument = ()=>{
             <div className=" pl-[8px] py-btnbase ">
                     <div className="flex justify-between items-center">
                         <p className="text-[14px] leading-[20px] text-[#999999]"><span className="mr-[20px]">{$t('最近一次更新者')}：{updater || '-'}</span><span>{$t('最近一次更新时间')}：{updateTime || '-'}</span></p>
-                        <WithPermission access="team.service.service.edit"><Button type="primary" className="mr-btnbase" onClick={save}>{$t('保存')}</Button></WithPermission>
+                        <WithPermission access="team.service.service_intro.edit"><Button type="primary" className="mr-btnbase" onClick={save}>{$t('保存')}</Button></WithPermission>
                     </div>
                 </div>
         </div>)

frontend/packages/core/src/pages/aiService/AiServiceInsidePage.tsx

@@ -62,7 +62,7 @@ const AiServiceInsidePage:FC = ()=> {
         [
             getItem(<Link to="./route">{$t('API 路由')}</Link>, 'route',undefined,undefined,undefined,'team.service.router.view'),
             getItem(<Link to="./api">{$t('API 文档')}</Link>, 'api',undefined,undefined,undefined,'team.service.api_doc.view'),
-            getItem(<Link to="./document">{$t('使用说明')}</Link>, 'document',undefined,undefined,undefined,''),
+            getItem(<Link to="./document">{$t('使用说明')}</Link>, 'document',undefined,undefined,undefined,'team.service.service_intro.view'),
             getItem(<Link to="./publish">{$t('发布')}</Link>, 'publish',undefined,undefined,undefined,'team.service.release.view'),
             ],
         'group'),

frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx

@@ -256,7 +256,7 @@ const AiServiceInsideRouterCreate = () => {
                             </Form.Item>
                             
                             
-                        <Form.Item label={$t("请求路径")}>
+                        <Form.Item  className="flex-1" label={$t("请求路径")}>
                             <Space.Compact block>
                                 <Form.Item
                                         name="pathMatch"
@@ -276,7 +276,7 @@ const AiServiceInsideRouterCreate = () => {
                                         }]}
                                         noStyle
                                     >
-                                    <Input  prefix={(prefixForce ? `${apiPrefix}/` :"/")} className="w-INPUT_NORMAL" 
+                                    <Input  prefix={(prefixForce ? `${apiPrefix}/` :"/")} 
                                         placeholder={$t(PLACEHOLDER.input)} onChange={(e)=>{
                                             if((e.target.value as string).endsWith('/*')){
                                                 form.setFieldValue('path',e.target.value.slice(0,-2))

frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterModelConfig.tsx

@@ -18,6 +18,7 @@ export type AiServiceRouterModelConfigProps = {
 }
 
 type AiServiceRouterModelConfigField = {
+    provider:string
     id:string
     config:string
 }
@@ -57,6 +58,7 @@ const AiServiceRouterModelConfig = forwardRef<AiServiceRouterModelConfigHandle,
             const {code,data,msg} = response
             if(code === STATUS_CODE.SUCCESS){
                 setLlmList(data.llms)
+                console.log(data)
                 form.setFieldsValue({
                     id:data.provider.defaultLlm,
                     config:data.llms.find(x=>x.id===data.provider.defaultLlm)?.config})
@@ -70,6 +72,10 @@ const AiServiceRouterModelConfig = forwardRef<AiServiceRouterModelConfigHandle,
         getLlmList(provider)
     }
 
+    useEffect(()=>{
+        getLlmList(entity.provider)
+    },[])
+
     return (
         <Form
                     layout='vertical'

frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx

@@ -4,12 +4,11 @@ import { BasicResponse, STATUS_CODE, RESPONSE_TIPS } from "@common/const/const";
 import { useFetch } from "@common/hooks/http";
 import { $t } from "@common/locales";
 import { Icon } from "@iconify/react/dist/iconify.js";
-import { App, Spin, Card, Tag, Select, Button, Empty, Divider } from "antd";
+import { App, Spin, Card, Tag, Button, Empty, Divider } from "antd";
 import { memo, useEffect, useRef, useState } from "react";
 import AiSettingModalContent, { AiSettingModalContentHandle } from "./AiSettingModal";
 import WithPermission from "@common/components/aoplatform/WithPermission";
 import { useGlobalContext } from "@common/contexts/GlobalStateContext";
-import { DefaultOptionType } from "antd/es/select";
 import { checkAccess } from "@common/utils/permission";
 
 export type AiSettingListItem = {
@@ -90,7 +89,7 @@ const AiSettingList = ()=>{
         }
         modal.confirm({
             title:$t('模型配置'),
-            content:<AiSettingModalContent ref={modalRef} entity={data.provider} readOnly={!checkAccess('system.devops.ai_provider.edit', accessData)}/>,
+            content:<AiSettingModalContent ref={modalRef} entity={{...data.provider,defaultLlm:entity.defaultLlm}} readOnly={!checkAccess('system.devops.ai_provider.edit', accessData)}/>,
             onOk:()=>{
                 return modalRef.current?.save().then((res)=>{if(res === true) 
                     setAiConfigFlushed(true)
@@ -125,48 +124,12 @@ const AiSettingList = ()=>{
     }, []);
 
     const CardBox = memo(({provider}:{provider:AiSettingListItem})=>{
-        const [options, setOptions] = useState<DefaultOptionType[]>([])
-        const [loading, setLoading] = useState<boolean>(false)
-        const [defaultLlm, setDefaultLlm] = useState<string>(provider.defaultLlm)
-
-        const getLlmList = ()=>{
-            if(options.length > 0) return
-            setLoading(true)
-            fetchData<BasicResponse<{llms:AiProviderLlmsItems[]}>>(`ai/provider/llms`,{method:'GET',eoParams:{provider:provider.id}}).then(response=>{
-               const {code,data,msg} = response
-               if(code === STATUS_CODE.SUCCESS){
-                setOptions(data.llms?.map((x:AiProviderLlmsItems)=>({
-                           label:<span className="w-full truncate">{x.id}</span>, 
-                           value:x.id})))
-               }else{
-                   message.error(msg || $t(RESPONSE_TIPS.error))
-               }
-            }).finally(()=>{
-                setLoading(false)
-            })
-       }
-
-       
-        const changeDefaultModel = (value: string, entity:AiSettingListItem) => {
-            setLoading(true)
-            return fetchData<BasicResponse<null>>(`ai/provider/default-llm`,{method:'PUT', eoBody:{llm:value}, eoParams:{provider:entity.id}}).then(response=>{
-                const {code,msg} = response
-                if(code === STATUS_CODE.SUCCESS){
-                    setDefaultLlm(value)
-                    message.success(msg || $t(RESPONSE_TIPS.success))
-                }else{
-                    message.error(msg || $t(RESPONSE_TIPS.error))
-                }
-            }).finally(()=>setLoading(false))
-        };
-    
-        
         return (
             <Card title={
-                    <div className="flex items-center justify-between">
-                        <div className="flex items-center  gap-[4px]">
+                    <div className="flex w-full items-center justify-between gap-[4px]">
+                        <div className="flex flex-1 overflow-hidden items-center  gap-[4px]">
                             <span className=" flex items-center h-[22px]  ai-setting-svg-container" dangerouslySetInnerHTML={{ __html: provider.logo }}  ></span>
-                            <span className="font-normal">{provider.name}</span>
+                            <span className="font-normal truncate">{provider.name}</span>
                         </div>
                         <Tag bordered={false} color={provider.configured ? 'green' : undefined} className="h-[22px] px-[4px] text-center">
                             {provider.configured ? $t('已配置') : $t('未配置')}
@@ -178,23 +141,12 @@ const AiSettingList = ()=>{
                         <div className="flex flex-col justify-between h-full gap-btnbase ">
                             <div className="flex items-center w-full h-[32px]  flex-1">{
                                 provider.configured && <><label className="text-nowrap">{$t('默认')}：</label>
-                                    <WithPermission access="system.devops.ai_provider.edit">
-                                        <Select
-                                            value={defaultLlm}
-                                            variant="borderless"
-                                            className="flex-1 overflow-hidden"
-                                            // style={{ width: '100%' }}
-                                            onChange={(value)=>changeDefaultModel(value, provider)}
-                                            options={options}
-                                            onFocus={()=> getLlmList()}
-                                            loading={loading }
-                                            />
-                                    </WithPermission>
+                                <span className="flex-1 overflow-hidden truncate">{provider.defaultLlm}</span>
                                 </> 
                                 }
                                    
                                 </div>
-                            <WithPermission access="system.devops.ai_provider.view">
+                            <WithPermission access="system.settings.ai_provider.view">
                                 <Button block icon={<Icon icon="ic:outline-settings"  width={18} height={18}/>} onClick={()=>openModal(provider)} classNames={{icon:'h-[18px]'}}>{$t('设置')}</Button>
                             </WithPermission>
                         </div>
@@ -248,8 +200,8 @@ const AiSettingList = ()=>{
                         aiSettingList.filter((item)=>!item.configured).length > 0 && <>
                             <Divider style={{margin:'20px 0 !important;'}} />
                             <p className="text-[14px] text-[#666]  mb-[4px] mt-[20px]  font-bold">{$t('未配置')}</p>
-                            <ModelCardArea modelList={aiSettingList.filter((item)=>!item.configured) || [] }/>
-                        </>
+                                <ModelCardArea modelList={aiSettingList.filter((item)=>!item.configured) || [] }/>
+                            </>
                     }
             </div>:<Empty  image={Empty.PRESENTED_IMAGE_SIMPLE}/>}
         </Spin>

frontend/packages/core/src/pages/aiSetting/AiSettingModal.tsx

@@ -1,15 +1,14 @@
-import WithPermission from "@common/components/aoplatform/WithPermission";
-import { BasicResponse, STATUS_CODE, RESPONSE_TIPS } from "@common/const/const";
+import { BasicResponse, STATUS_CODE, RESPONSE_TIPS, PLACEHOLDER } from "@common/const/const";
 import { useFetch } from "@common/hooks/http";
 import { $t } from "@common/locales";
-import { App } from "antd";
+import { App, Form, Select, Tag } from "antd";
 import { forwardRef, useEffect, useImperativeHandle, useState } from "react";
-import { AiProviderConfig } from "./AiSettingList";
+import { AiProviderConfig, AiProviderLlmsItems } from "./AiSettingList";
 import { Codebox } from "@common/components/postcat/api/Codebox";
 
 
 export type AiSettingModalContentProps = {
-    entity:AiProviderConfig
+    entity:AiProviderConfig & {defaultLlm:string}
     readOnly:boolean
 }
 
@@ -17,31 +16,65 @@ export type AiSettingModalContentHandle = {
     save:()=>Promise<boolean|string>
 }
 
+type AiSettingModalContentField = {
+    config:string
+    defaultLlm:string
+}
+
 const AiSettingModalContent = forwardRef<AiSettingModalContentHandle,AiSettingModalContentProps>((props,ref)=>{
+    const [form] = Form.useForm();
     const { message } = App.useApp()
     const {entity,readOnly} = props
     const {fetchData} = useFetch()
-    const [code, setCode] = useState<string>()
+    const [llmList, setLlmList] = useState<AiProviderLlmsItems[]>()
+    const [loading, setLoading] = useState<boolean>(false)
+
+    
+    const getLlmList = ()=>{
+        setLoading(true)
+        fetchData<BasicResponse<{llms:AiProviderLlmsItems[]}>>(`ai/provider/llms`,{method:'GET',eoParams:{provider:entity.id}}).then(response=>{
+           const {code,data,msg} = response
+           if(code === STATUS_CODE.SUCCESS){
+            setLlmList(data.llms)
+           }else{
+               message.error(msg || $t(RESPONSE_TIPS.error))
+           }
+        }).finally(()=>{
+            setLoading(false)
+        })
+   }
+
 
     useEffect(() => {
+        getLlmList()
         try{
-            entity!.config && setCode(JSON.stringify(JSON.parse(entity!.config),null,2))
+            form.setFieldsValue({
+                defaultLlm:entity.defaultLlm,
+                config:entity!.config ? JSON.stringify(JSON.parse(entity!.config),null,2) : ''
+            })
         }catch(e){
-            setCode('')
+            form.setFieldsValue({
+                defaultLlm:entity.defaultLlm,
+                config: ''
+            })
         }
     }, []);
 
     const save: ()=>Promise<boolean | string> = ()=>{
-        return fetchData<BasicResponse<null>>('ai/provider/config',{method:'PUT',eoParams:{provider:entity?.id}, eoBody:({config:code})}).then(response=>{
-            const {code,msg} = response
-            if(code === STATUS_CODE.SUCCESS){
-                message.success(msg || $t(RESPONSE_TIPS.success))
-                return Promise.resolve(true)
-            }else{
-                message.error(msg || $t(RESPONSE_TIPS.error))
-                return Promise.reject(msg || $t(RESPONSE_TIPS.error))
-            }
-        }).catch((errorInfo)=> Promise.reject(errorInfo))
+        return new Promise((resolve, reject)=>{
+            form.validateFields().then((value)=>{ 
+                fetchData<BasicResponse<null>>('ai/provider/config',{method:'PUT',eoParams:{provider:entity?.id}, eoBody:value, eoTransformKeys:['defaultLlm']}).then(response=>{
+                const {code,msg} = response
+                if(code === STATUS_CODE.SUCCESS){
+                    message.success(msg || $t(RESPONSE_TIPS.success))
+                    resolve(true)
+                }else{
+                    message.error(msg || $t(RESPONSE_TIPS.error))
+                    reject(msg || $t(RESPONSE_TIPS.error))
+                }
+                 }).catch((errorInfo)=> reject(errorInfo))
+        }).catch((errorInfo)=> reject(errorInfo))
+    })
     }
 
     useImperativeHandle(ref, ()=>({
@@ -50,8 +83,41 @@ const AiSettingModalContent = forwardRef<AiSettingModalContentHandle,AiSettingMo
     )
 
     return (
-            <Codebox editorTheme="vs-dark" readOnly={readOnly}
-                value={code} onChange={setCode} width="100%" height="300px" language='json' enableToolbar={false} />
+        <Form
+                    layout='vertical'
+                    labelAlign='left'
+                    scrollToFirstError
+                    form={form}
+                    className="mx-auto  flex flex-col  h-full"
+                    name="aiServiceInsideRouterModalConfig"
+                    autoComplete="off"
+                >
+
+                        <Form.Item<AiSettingModalContentField>
+                            label={$t("模型")}
+                            name="defaultLlm"
+                            rules={[{ required: true }]}
+                        >
+                            <Select className="w-INPUT_NORMAL" 
+                                placeholder={$t(PLACEHOLDER.select)} 
+                                loading={loading}
+                                options={llmList?.map(x=>({
+                                    value:x.id, 
+                                    label:<div className="flex items-center gap-[10px]">
+                                            <span>{x.id}</span>
+                                            {x?.scopes?.map(s=><Tag >{s?.toLocaleUpperCase()}</Tag>)}
+                                            </div>}))}>
+                            </Select>
+                        </Form.Item>
+
+                        <Form.Item<AiSettingModalContentField>
+                            label={$t("参数")}
+                            name="config"
+                        >
+                            <Codebox editorTheme="vs-dark" readOnly={readOnly}
+                                width="100%" height="300px" language='json' enableToolbar={false} />
+                        </Form.Item>
+                    </Form>
   )
 })
 

frontend/packages/core/src/pages/logsettings/LogSettings.tsx

@@ -45,7 +45,7 @@ const LogSettings = ()=>{
                 undefined,
                 undefined,
                 undefined,
-                'system.devops.log_configuration.view')
+                'system.settings.log_configuration.view')
         })
         return newMenu
     },[state.language,menuItems])

frontend/packages/core/src/pages/resourcesettings/ResourceSettings.tsx

@@ -47,7 +47,7 @@ const LogSettings = ()=>{
                 undefined,
                 undefined,
                 undefined,
-                'system.devops.log_configuration.view')
+                'system.settings.log_configuration.view')
         })
         return newMenu
     },[state.language,menuItems])

frontend/packages/core/src/pages/role/RoleConfig.tsx

@@ -176,13 +176,17 @@ const RoleConfig = ()=>{
     },[permissionInfo, state.language])
 
     useEffect(() => {
-        getPermissionTemplate()
         form.setFieldsValue({name:'',permits:[]})
         if(roleId){
             getPermissionInfo()
         }
     }, []);
 
+    useEffect(()=>{
+        getPermissionTemplate()
+
+    },[state.language])
+
     const onFinish =async() => {
             const body = await form.validateFields()
 

frontend/packages/core/src/pages/system/SystemConfig.tsx

@@ -292,7 +292,7 @@ const SystemConfig = forwardRef<SystemConfigHandle>((_,ref) => {
 
     return (
         <>
-                <WithPermission access={onEdit ? 'team.service.service.edit' :''}>
+                <WithPermission access={onEdit ? ['team.service.service.edit'] :''}>
                 <Form
                     layout='vertical'
                     labelAlign='left'
@@ -460,7 +460,7 @@ const SystemConfig = forwardRef<SystemConfigHandle>((_,ref) => {
                         <Row className="mb-[10px]"
                             // wrapperCol={{ offset: 5, span: 19 }}
                             >
-                        <WithPermission access={onEdit ? 'team.service.service.edit' :''}>
+                        <WithPermission access={onEdit ? ['team.service.service.edit'] :''}>
                             <Button type="primary" htmlType="submit">
                                 {$t('保存')}
                             </Button>
@@ -468,11 +468,11 @@ const SystemConfig = forwardRef<SystemConfigHandle>((_,ref) => {
                         </Row></>}
                     </div>
                     {onEdit && <>
-                        <WithPermission access="team.service.service.delete" showDisabled={false}>
+                        <WithPermission access={["team.service.service.delete"]} showDisabled={false}>
                             <div className="bg-[rgb(255_120_117_/_5%)] rounded-[10px] mt-[50px] p-btnrbase pb-0">
                             <p className="text-left"><span className="font-bold">{$t('删除服务')}：</span>{$t('删除操作不可恢复，请谨慎操作！')}</p>
                                 <div className="text-left">
-                                    <WithPermission access="team.service.service.delete">
+                                    <WithPermission access={["team.service.service.delete"]}>
                                         <Button className="m-auto mt-[16px] mb-[20px]" type="default"  danger={true} onClick={deleteSystemModal}>{$t('删除服务')}</Button>
                                         </WithPermission>
                                 </div>

frontend/packages/core/src/pages/system/SystemInsideDocument.tsx

@@ -137,7 +137,7 @@ const ServiceInsideDocument = ()=>{
             <div className=" pl-[8px] py-btnbase ">
                     <div className="flex justify-between items-center">
                         <p className="text-[14px] leading-[20px] text-[#999999]"><span className="mr-[20px]">{$t('最近一次更新者')}：{updater || '-'}</span><span>{$t('最近一次更新时间')}：{updateTime || '-'}</span></p>
-                        <WithPermission access="team.service.service.edit"><Button type="primary" className="mr-btnbase" onClick={save}>{$t('保存')}</Button></WithPermission>
+                        <WithPermission access="team.service.service_intro.edit"><Button type="primary" className="mr-btnbase" onClick={save}>{$t('保存')}</Button></WithPermission>
                     </div>
                 </div>
         </div>)

frontend/packages/core/src/pages/system/SystemInsidePage.tsx

@@ -62,7 +62,7 @@ const SystemInsidePage:FC = ()=> {
             getItem(<Link to="./route">{$t('API 路由')}</Link>, 'route',undefined,undefined,undefined,'team.service.router.view'),
             getItem(<Link to="./api">{$t('API 文档')}</Link>, 'api',undefined,undefined,undefined,'team.service.api_doc.view'),
             getItem(<Link to="./upstream">{$t('上游')}</Link>, 'upstream',undefined,undefined,undefined,'team.service.upstream.view'),
-            getItem(<Link to="./document">{$t('使用说明')}</Link>, 'document',undefined,undefined,undefined,''),
+            getItem(<Link to="./document">{$t('使用说明')}</Link>, 'document',undefined,undefined,undefined,'team.service.service_intro.view'),
             getItem(<Link to="./publish">{$t('发布')}</Link>, 'publish',undefined,undefined,undefined,'team.service.release.view'),
             ],
         'group'),

frontend/packages/core/src/pages/system/SystemList.tsx

@@ -153,7 +153,7 @@ const SystemList:FC = ()=>{
                 
             <InsidePage 
                 pageTitle={$t('服务')} 
-                description={'APIPark '+$t("服务提供了高性能 API 网关，并且可以无缝接入多种大型 AI 模型，并将这些 AI 能力打包成 API 进行调用，从而大幅简化了 AI 模型的使用门槛。同时，我们的平台提供了完善的 API 管理功能，支持 API 的创建、监控、访问控制等，保障开发者可以高效、安全地开发和管理 API 服务。")}
+                description={$t("服务提供了高性能 API 网关，并且可以无缝接入多种大型 AI 模型，并将这些 AI 能力打包成 API 进行调用，从而大幅简化了 AI 模型的使用门槛。同时，我们的平台提供了完善的 API 管理功能，支持 API 的创建、监控、访问控制等，保障开发者可以高效、安全地开发和管理 API 服务。")}
                 showBorder={false}
                 contentClassName=" pr-PAGE_INSIDE_X pb-PAGE_INSIDE_B"
                 >

frontend/packages/core/src/pages/team/TeamConfig.tsx

@@ -3,7 +3,7 @@ import {App, Button, Form, Input, Row, Select} from "antd";
 import {Link, useLocation, useNavigate, useParams} from "react-router-dom";
 import {RouterParams} from "@core/components/aoplatform/RenderRoutes.tsx";
 import { v4 as uuidv4 } from 'uuid'
-import {BasicResponse, PLACEHOLDER, RESPONSE_TIPS, STATUS_CODE, VALIDATE_MESSAGE} from "@common/const/const.tsx";
+import {BasicResponse, PLACEHOLDER, RESPONSE_TIPS, STATUS_CODE} from "@common/const/const.tsx";
 import {MemberItem} from "@common/const/type.ts";
 import {useFetch} from "@common/hooks/http.ts";
 import {DefaultOptionType} from "antd/es/cascader";
@@ -37,7 +37,7 @@ const TeamConfig= forwardRef<TeamConfigHandle,TeamConfigProps>((props,ref) => {
     const {checkPermission,accessInit} = useGlobalContext()
     const pageType= useMemo(()=>{
         if(!accessInit) return 'myteam'
-        return checkPermission('system.organization.team.view') ? 'manage' : 'myteam'
+        return checkPermission('system.workspace.team.view_all') ? 'manage' : 'myteam'
     },[checkPermission,accessInit]) 
     
     const [canDelete, setCanDelete] = useState<boolean>(false)
@@ -197,7 +197,7 @@ const TeamConfig= forwardRef<TeamConfigHandle,TeamConfigProps>((props,ref) => {
                         <p className="text-left"><span className="font-bold">{$t('删除团队')}：</span>{$t('删除操作不可恢复，请谨慎操作！')}</p>
                             <div className="text-left">
                             <WithPermission access="system.organization.team.delete" disabled={!canDelete}  tooltip={canDelete ? '':$t('服务数据清除后，方可删除')}>
-                                <Button className="m-auto mt-[16px] mb-[20px]" type="default" danger onClick={()=>deleteTeam(entity!)}>{$t('删除')}</Button>
+                                <Button className="m-auto mt-[16px] mb-[20px]" type="default" danger onClick={()=>deleteTeam()}>{$t('删除')}</Button>
                                 </WithPermission>
                             </div>
                         </div>

frontend/packages/core/src/pages/team/TeamList.tsx

@@ -1,16 +1,15 @@
 
-import PageList, { PageProColumns } from "@common/components/aoplatform/PageList.tsx"
+import PageList from "@common/components/aoplatform/PageList.tsx"
 import {ActionType} from "@ant-design/pro-components";
 import  {FC, useEffect, useMemo, useRef, useState} from "react";
 import {useLocation, useNavigate} from "react-router-dom";
 import {useBreadcrumb} from "@common/contexts/BreadcrumbContext.tsx";
-import {App, Divider, Modal} from "antd";
-import {BasicResponse, COLUMNS_TITLE, DELETE_TIPS, RESPONSE_TIPS, STATUS_CODE} from "@common/const/const.tsx";
+import {App, Modal} from "antd";
+import {BasicResponse, DELETE_TIPS, RESPONSE_TIPS, STATUS_CODE} from "@common/const/const.tsx";
 import { SimpleMemberItem } from "@common/const/type.ts";
 import {useFetch} from "@common/hooks/http.ts";
 import { TEAM_TABLE_COLUMNS } from "../../const/team/const.tsx";
 import { TeamConfigFieldType, TeamConfigHandle, TeamTableListItem } from "../../const/team/type.ts";
-import TableBtnWithPermission from "@common/components/aoplatform/TableBtnWithPermission.tsx";
 import { useGlobalContext } from "@common/contexts/GlobalStateContext.tsx";
 import { checkAccess } from "@common/utils/permission.ts";
 import TeamConfig from "./TeamConfig.tsx";
@@ -131,21 +130,6 @@ const TeamList:FC = ()=>{
         })
     }
 
-    const operation:PageProColumns<TeamTableListItem>[] =[
-        {
-            title: COLUMNS_TITLE.operate,
-            key: 'option',
-            fixed:'right',
-            btnNums:2,
-            valueType: 'option',
-            render: (_: React.ReactNode, entity: TeamTableListItem) => [
-                    <TableBtnWithPermission  access="" key="view" btnType="view" navigateTo={`../inside/${entity.id}/setting`} btnTitle="查看"/>,
-                    <Divider type="vertical" className="mx-0"  key="div2"/>,
-                    <TableBtnWithPermission  access="system.organization.team.delete" key="delete" btnType="delete" disabled={!entity.canDelete} tooltip="服务数据清除后，方可删除" onClick={()=>{openModal('delete',entity)}} btnTitle="删除"/>,
-            ],
-        }
-    ]
-
     useEffect(() => {
         setBreadcrumb([
             {title: $t('团队')}
@@ -173,7 +157,7 @@ const TeamList:FC = ()=>{
                 id="global_team"
                 className="pl-btnbase"
                 ref={pageListRef}
-                columns = {[...columns,...operation]}
+                columns = {[...columns]}
                 request = {()=>getTeamList()}
                 showPagination={false}
                 addNewBtnTitle={$t('添加团队')}
@@ -207,7 +191,7 @@ const TeamList:FC = ()=>{
                     }
                     return res})}
             >
-                <TeamConfig ref={teamConfigRef} inModal entity={modalType === 'add' ? undefined : curTeam} />
+                <TeamConfig ref={teamConfigRef} entity={modalType === 'add' ? undefined : curTeam} />
             </Modal>
         </InsidePage>
     )

frontend/packages/core/start-vite.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2024-06-05 09:35:25
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:50:12
- * @FilePath: \frontend\packages\core\start-vite.js
- */
+
 // start-vite.js// start-vite.js
 import { exec } from 'child_process';
 

frontend/packages/core/tailwind.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:44
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:36:46
- * @FilePath: \frontend\packages\core\tailwind.config.js
- */
+
 /** @type {import('tailwindcss').Config} */
 
 export default {

frontend/packages/dashboard/postcss.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:54
- * @LastEditors: maggieyyy
- * @LastEditTime: 2023-11-29 15:49:05
- * @FilePath: \applatform\frontend\packages\core\postcss.config.js
- */
+
 export default {
     plugins: {
       'postcss-import': {},

frontend/packages/dashboard/src/component/MonitorTotalPage.tsx

@@ -231,9 +231,9 @@ const MonitorTotalPage = (props:MonitorTotalPageProps) => {
     }
 
       return (
-        <div className={`h-full overflow-hidden pb-btnybase flex flex-col  bg-[#fff]`}>
+        <div className={`h-full overflow-hidden pb-btnybase flex flex-col  bg-[#fff] `}>
           <ScrollableSection>
-          <div className="flex items-center flex-wrap pb-[10px] px-btnbase content-before bg-MAIN_BG">
+          <div className="flex items-center flex-wrap pb-[10px] px-btnbase content-before bg-MAIN_BG pr-PAGE_INSIDE_X  ">
             <TimeRangeSelector 
               labelSize="small"
               initialTimeButton={timeButton}
@@ -247,7 +247,7 @@ const MonitorTotalPage = (props:MonitorTotalPageProps) => {
           </div>
           <Spin wrapperClassName={`flex-1 ${totalEmpty ?'':'overflow-auto'}`} indicator={<LoadingOutlined style={{ fontSize: 24 }} spin/>} spinning={queryBtnLoading}>
             {totalEmpty ?<Empty className="mt-[100px]" image={Empty.PRESENTED_IMAGE_SIMPLE} />:
-              <div className=" h-full scroll-area">
+              <div className=" h-full scroll-area pr-PAGE_INSIDE_X ">
               {/* 图表区域 */}
               <div className=" px-btnbase  mt-[12px] mb-[16px] grid gap-[20px]" style={{ gridTemplateColumns: 'repeat(auto-fill, minmax(570px, 1fr))'}}>
                 {/* 请求统计饼图 */}

frontend/packages/dashboard/src/pages/Dashboard.tsx

@@ -10,7 +10,6 @@ import { reject } from "lodash-es";
 import { EntityItem } from "@common/const/type";
 import { LoadingOutlined } from "@ant-design/icons";
 import DashboardInstruction from "./DashboardInstruction";
-import cluster from "cluster";
 
 export default function Dashboard(){
     const { setBreadcrumb } = useBreadcrumb()
@@ -47,7 +46,7 @@ export default function Dashboard(){
 
     return (
         <>
-            <Spin wrapperClassName="h-full w-full pr-PAGE_INSIDE_X pb-PAGE_INSIDE_B " indicator={<LoadingOutlined style={{ fontSize: 24 }} spin/>} spinning={loading}>
+            <Spin wrapperClassName="h-full w-full pb-PAGE_INSIDE_B " indicator={<LoadingOutlined style={{ fontSize: 24 }} spin/>} spinning={loading}>
             {
                 !loading && <>
                     {

frontend/packages/dashboard/tailwind.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:44
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:36:11
- * @FilePath: \frontend\packages\market\tailwind.config.js
- */
+
 /** @type {import('tailwindcss').Config} */
 
 export default {

frontend/packages/market/postcss.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:54
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:42:18
- * @FilePath: \frontend\packages\core\postcss.config.js
- */
+
 export default {
     plugins: {
       'postcss-import': {},

frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx

@@ -52,7 +52,7 @@ const getServiceList = ()=>{
     }
     
     setServiceLoading(true)
-        return fetchData<BasicResponse<{apps:ServiceHubAppListItem}>>(!checkPermission('system.workspace.application.view_all') ? 'my_apps':'apps',{method:'GET',eoParams:{ team:teamId,keyword:tableSearchWord},eoTransformKeys:['api_num','subscribe_num','subscribe_verify_num']}).then(response=>{
+        return fetchData<BasicResponse<{apps:ServiceHubAppListItem}>>(!checkPermission('system.workspace.application.view_all') ? 'my_apps':'apps',{method:'GET',eoParams:{ team:teamId,keyword:tableSearchWord},eoTransformKeys:['api_num','subscribe_num','subscribe_verify_num','auth_num']}).then(response=>{
         const {code,data,msg} = response
         if(code === STATUS_CODE.SUCCESS){
             setServiceList([...data.apps,{type:'addNewItem'}])
@@ -77,7 +77,9 @@ const getServiceList = ()=>{
   
   const getTeamsList = ()=>{
     if(!accessInit){
-        getGlobalAccessData()?.then?.(()=>{getTeamsList()})
+        setTimeout(()=>{
+            getGlobalAccessData()?.then?.(()=>{getTeamsList()})
+    },200)
         return
     }
     setPageLoading(true)
@@ -167,6 +169,7 @@ useEffect(() => {
     )
     getTeamsList()
     setAppName('')
+    console.log()
 }, []);
 
 
@@ -196,7 +199,7 @@ useEffect(() => {
                             item.type === 'addNewItem' ?<WithPermission access="team.application.application.add" showDisabled={false}><Card className="shadow-[0_5px_10px_0_rgba(0,0,0,0.05)] rounded-[10px] overflow-visible cursor-pointer h-[180px]  transition duration-500 hover:shadow-[0_5px_20px_0_rgba(0,0,0,0.15)] hover:scale-[1.05]" classNames={{body:'h-[180px] flex items-center justify-center cursor-pointer'}} onClick={()=>{openModal('add')}}>
                                     <div className="flex items-center"><Icon icon="ic:baseline-add" width="18" height="18"/><span>{$t('添加消费者')}</span></div>
                             </Card></WithPermission> : <Card title={CardTitle(item)} className="shadow-[0_5px_10px_0_rgba(0,0,0,0.05)] rounded-[10px] overflow-visible cursor-pointer h-[180px]  transition duration-500 hover:shadow-[0_5px_20px_0_rgba(0,0,0,0.15)] hover:scale-[1.05]" classNames={{header:'border-b-[0px] p-[20px] ', body:"pt-0"}} onClick={()=>{setAppName(item.name);navigateTo(`/consumer/${teamId}/inside/${item.id}/service`)}}>
-                            <span className="line-clamp-3 break-all">{item.description || $t('暂无服务描述')}</span> 
+                            <span className="line-clamp-3 break-all">{item.description || $t('暂无消费者描述')}</span> 
 
                                 </Card>}</div>
                             );
@@ -293,8 +296,8 @@ const TableArea = memo(({language, getServiceList, addNewApp, setTableHttpReload
         id="service_hub_list"
         columns={[...columns]}
         request={()=>getServiceList()}
-        addNewBtnTitle={$t("添加服务")}
-        searchPlaceholder={$t("输入名称、ID 查找服务")}
+        addNewBtnTitle={$t("添加消费者")}
+        searchPlaceholder={$t("输入名称、ID 查找消费者")}
         onAddNewBtnClick={addNewApp}
         onChange={() => {
             setTableHttpReload(false)

frontend/packages/openApi/postcss.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:54
- * @LastEditors: maggieyyy
- * @LastEditTime: 2023-11-29 15:49:05
- * @FilePath: \applatform\frontend\packages\core\postcss.config.js
- */
+
 export default {
     plugins: {
       'postcss-import': {},

frontend/packages/openApi/tailwind.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:44
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:36:11
- * @FilePath: \frontend\packages\market\tailwind.config.js
- */
+
 /** @type {import('tailwindcss').Config} */
 
 export default {

frontend/packages/systemRunning/postcss.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:54
- * @LastEditors: maggieyyy
- * @LastEditTime: 2023-11-29 15:49:05
- * @FilePath: \applatform\frontend\packages\core\postcss.config.js
- */
+
 export default {
     plugins: {
       'postcss-import': {},

frontend/packages/systemRunning/tailwind.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:44
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 10:36:11
- * @FilePath: \frontend\packages\market\tailwind.config.js
- */
+
 /** @type {import('tailwindcss').Config} */
 
 export default {

frontend/pnpm-workspace.yaml

@@ -1,2 +1,3 @@
 packages:
-  - "packages/*"
+  - "packages/*"
+  

frontend/tailwind.config.js

@@ -1,9 +1,4 @@
-/*
- * @Date: 2023-11-27 17:31:44
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-04 15:03:36
- * @FilePath: \frontend\tailwind.config.js
- */
+
 /** @type {import('tailwindcss').Config} */
 
 module.exports = {

frontend/tsconfig.json

@@ -11,4 +11,5 @@
   },
   "include": ["**/*.test.ts", "**/*.test.tsx", "jest.setup.js"],
   "exclude": ["node_modules"]
+  
 }

go.mod

@@ -5,7 +5,7 @@ go 1.21
 //toolchain go1.21.1
 
 require (
-	github.com/eolinker/ap-account v1.0.13
+	github.com/eolinker/ap-account v1.0.14
 	github.com/eolinker/eosc v0.17.3
 	github.com/eolinker/go-common v1.1.0
 	github.com/gabriel-vasile/mimetype v1.4.4
@@ -13,7 +13,7 @@ require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
 	github.com/influxdata/influxdb-client-go/v2 v2.14.0
-	github.com/urfave/cli/v2 v2.27.2
+	github.com/urfave/cli v1.22.16
 	golang.org/x/crypto v0.24.0
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/gorm v1.25.5
@@ -26,7 +26,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
@@ -62,7 +62,6 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
-	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect

go.sum

@@ -1,3 +1,4 @@
+github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
@@ -18,8 +19,8 @@ github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -27,8 +28,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eolinker/ap-account v1.0.13 h1:6iWdyxLAIkJfgw9JvkHEq0t2m8Levpg30kSx5pTK2wY=
-github.com/eolinker/ap-account v1.0.13/go.mod h1:qLKg4xervGHTNBWaGckfPkQb+FZT0XfhwPEdNpzvsjE=
+github.com/eolinker/ap-account v1.0.14 h1:QE9LWx9F/t/BbTeBcjPX+Alzh3mdlHv+BVvKcBwr5dc=
+github.com/eolinker/ap-account v1.0.14/go.mod h1:qLKg4xervGHTNBWaGckfPkQb+FZT0XfhwPEdNpzvsjE=
 github.com/eolinker/eosc v0.17.3 h1:sr2yT+v/AsqEdciRaaZZj0zL9pTufR5RvDW6+65hraQ=
 github.com/eolinker/eosc v0.17.3/go.mod h1:xgq816hpanlMXFtZw7Ztdctb1eEk9UPHchY4NfFO6Cw=
 github.com/eolinker/go-common v1.1.0 h1:n/XXK7yVRen3jhNG/SfZGXJA+KNnaYf0XTDfMeviaBw=
@@ -139,10 +140,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
-github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
-github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
-github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
+github.com/urfave/cli v1.22.16 h1:MH0k6uJxdwdeWQTwhSO42Pwr4YLrNLwBtg1MRgTqPdQ=
+github.com/urfave/cli v1.22.16/go.mod h1:EeJR6BKodywf4zciqrdw6hpCPk68JO9z5LazXZMn5Po=
 go.etcd.io/etcd/client/pkg/v3 v3.5.13 h1:RVZSAnWWWiI5IrYAXjQorajncORbS0zI48LQlE2kQWg=
 go.etcd.io/etcd/client/pkg/v3 v3.5.13/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=

module/ai/iml.go

@@ -85,10 +85,7 @@ func (i *imlProviderModule) Providers(ctx context.Context) ([]*ai_dto.ProviderIt
 	})
 	items := make([]*ai_dto.ProviderItem, 0, len(providers))
 	for _, v := range providers {
-		defaultLLM, has := v.DefaultModel(model_runtime.ModelTypeLLM)
-		if !has {
-			continue
-		}
+
 		item := &ai_dto.ProviderItem{
 			Id:        v.ID(),
 			Name:      v.Name(),
@@ -97,6 +94,10 @@ func (i *imlProviderModule) Providers(ctx context.Context) ([]*ai_dto.ProviderIt
 			Sort:      v.Sort(),
 		}
 		if info, has := providerMap[v.ID()]; has {
+			defaultLLM, has := v.GetModel(info.DefaultLLM)
+			if !has {
+				continue
+			}
 			item.Configured = true
 			item.DefaultLLM = defaultLLM.ID()
 			item.DefaultLLMLogo = defaultLLM.Logo()
@@ -201,7 +202,7 @@ func (i *imlProviderModule) LLMs(ctx context.Context, driver string) ([]*ai_dto.
 			DefaultLLMLogo: defaultLLM.Logo(),
 			Logo:           p.Logo(),
 			Configured:     false,
-		}, err
+		}, nil
 	}
 
 	return items, &ai_dto.ProviderItem{Id: info.Id, Name: info.Name, DefaultLLM: info.DefaultLLM, Logo: p.Logo(), Configured: true}, nil
@@ -279,10 +280,13 @@ func (i *imlProviderModule) UpdateProviderConfig(ctx context.Context, id string,
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return err
 		}
-		//defaultLLm, ok := p.DefaultModel(model_runtime.ModelTypeLLM)
-		//if !ok {
-		//	return fmt.Errorf("ai provider default llm not found")
-		//}
+		if input.DefaultLLM == "" {
+			defaultLLM, has := p.DefaultModel(model_runtime.ModelTypeLLM)
+			if !has {
+				return fmt.Errorf("ai provider default llm not found")
+			}
+			input.DefaultLLM = defaultLLM.ID()
+		}
 		info = &ai.Provider{
 			Id:         id,
 			Name:       p.Name(),

module/team/iml.go

@@ -111,13 +111,13 @@ func (m *imlTeamModule) Create(ctx context.Context, input *team_dto.CreateTeam)
 		if err != nil {
 			return err
 		}
-		supperRole, err := m.roleService.GetSupperRole(ctx, role.GroupTeam)
+		superRole, err := m.roleService.GetSupperRole(ctx, role.GroupTeam)
 		if err != nil {
 			return err
 		}
 
 		return m.roleMemberService.Add(ctx, &role.AddMember{
-			Role:   supperRole.Id,
+			Role:   superRole.Id,
 			User:   input.Master,
 			Target: role.TeamTarget(input.Id),
 		})
@@ -145,7 +145,8 @@ func (m *imlTeamModule) Edit(ctx context.Context, id string, input *team_dto.Edi
 func (m *imlTeamModule) Delete(ctx context.Context, id string) error {
 	err := m.transaction.Transaction(ctx, func(ctx context.Context) error {
 		count, err := m.serviceService.Count(ctx, "", map[string]interface{}{
-			"team": id,
+			"team":      id,
+			"is_delete": false,
 		})
 		if err != nil {
 			return err

resources/access/access.yaml

@@ -1,21 +1,75 @@
 system:
-  - name: organization
-#    cname: '组织管理'
-    value: 'organization'
+  - name: workspace
+    value: 'workspace'
     children:
-      - name: member
-#        cname: '成员'
-        value: 'member'
+      - name: consumer
+        value: 'application'
+        children:
+          - name: view all consumer
+            value: 'view_all'
+            guest_allow: true
+          - name: manager all consumer
+            value: "manager_all"
+            dependents:
+              - system.workspace.consumer.view_all
+      - name: service
+        value: 'service'
+        children:
+          - name: view all service
+            value: 'view_all'
+            guest_allow: true
+          - name: manager all consumer
+            value: "manager_all"
+            dependents:
+              - system.workspace.service.view_all
+      - name: team
+        value: 'team'
+        children:
+          - name: view all team
+            value: 'view_all'
+            guest_allow: true
+          - name: create
+            value: 'create'
+          - name: manager
+            value: 'manager'
+            dependents:
+              - system.workspace.team.view_all
+  - name: api portal
+    value: 'api_portal'
+    children:
+      - name: api portal
+        value: 'api_portal'
+        children:
+          - name: view
+            value: 'view'
+            guest_allow: true
+  - name: analysis
+    value: 'analysis'
+    children:
+      - name: run view
+        value: 'run_view'
+        children:
+          - name: view
+            value: 'view'
+            guest_allow: true
+  - name: system settings
+    value: 'settings'
+    children:
+      - name: general
+        value: 'general'
+        children:
+          - name: view
+            value: 'view'
+            guest_allow: true
+          - name: manager
+            value: 'manager'
+      - name: account
+        value: 'account'
         children:
           - name: view
-#            cname: '查看'
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/user/accounts"
-              - "GET:/api/v1/user/departments"
           - name: manager
-#            cname: '管理'
             value: 'manager'
             apis:
               - "POST:/api/v1/user/account"
@@ -31,93 +85,20 @@ system:
               - "POST:/api/v1/user/department/member/remove"
               - "POST:/api/v1/account/role"
             dependents:
-              - system.organization.member.view
-      - name: team
-        cname: '团队'
-        value: 'team'
-        children:
-          - name: view
-#            cname: '查看'
-            value: 'view'
-            guest_allow: true
-            apis:
-              - "GET:/api/v1/manager/teams"
-              - "GET:/api/v1/manager/team"
-          - name: manager
-#            cname: '管理'
-            value: 'manager'
-            apis:
-              - "POST:/api/v1/manager/team"
-              - "PUT:/api/v1/manager/team"
-              - "DELETE:/api/v1/manager/team"
-            dependents:
-              - system.organization.team.view
+              - system.settings.account.view
       - name: role
-#        cname: '角色'
         value: 'role'
         children:
-          - name: view system role
-            cname: '查看系统角色'
+          - name: view
             guest_allow: true
-            value: 'view_system_role'
+            value: 'view'
             apis:
               - "GET:/api/v1/system/roles"
               - "GET:/api/v1/system/role"
-          - name: view team role
-            cname: '查看团队角色'
-            guest_allow: true
-            value: 'view_team_role'
-            apis:
               - "GET:/api/v1/team/roles"
               - "GET:/api/v1/team/role"
-  - name: System Settings
-#    cname: '系统设置'
-    value: 'settings'
-    children:
-      - name: service classification
-#        cname: '服务分类'
-        value: 'service_classification'
-        children:
-          - name: view
-#            cname: '查看'
-            value: 'view'
-            guest_allow: true
-#            apis:
-#              - "GET:/api/v1/catalogues"
-          - name: manager
-#            cname: '管理'
-            value: 'manager'
-            apis:
-              - "POST:/api/v1/catalogue"
-              - "PUT:/api/v1/catalogue"
-              - "DELETE:/api/v1/catalogue"
-              - "PUT:/api/v1/catalogue/sort"
-            dependents:
-              - system.settings.service_classification.view
-      - name: General
-#        cname: 常规设置
-        value: 'general'
-        children:
-          - name: view
-#            cname: 查看
-            value: 'view'
-            guest_allow: true
-            apis:
-#              - "GET:/api/v1/setting"
-          - name: manager
-#            cname: 管理
-            value: 'manager'
-            apis:
-#              - "PUT:/api/v1/setting"
-            dependents:
-              - system.settings.general.view
-  - name: Devops
-#    cname: 运维
-    value: 'devops'
-    children:
-      - name: cluster
-        cname: 集群
-        value: 'cluster'
+      - name: api gateway
+        value: 'api_gateway'
         children:
           - name: view
             cname: 查看
@@ -126,53 +107,63 @@ system:
             apis:
               - "GET:/api/v1/cluster/nodes"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "PUT:/api/v1/cluster/reset"
               - "POST:/api/v1/cluster/check"
+      - name: ai provider
+        value: 'ai_provider'
+        children:
+          - name: view
+            value: 'view'
+            guest_allow: true
+            apis:
+              - "GET:/api/v1/ai/providers"
+              - "GET:/api/v1/ai/provider/config"
+          - name: manager
+            value: 'manager'
+            apis:
+              - "PUT:/api/v1/ai/provider/config"
+              - "PUT:/api/v1/ai/provider/default-llm"
+            dependents:
+              - system.settings.ai_provider.view
       - name: ssl certificate
         cname: 证书
         value: 'ssl_certificate'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
             apis:
               - "GET:/api/v1/certificates"
               - "GET:/api/v1/certificate"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "POST:/api/v1/certificate"
               - "PUT:/api/v1/certificate"
               - "DELETE:/api/v1/certificate"
             dependents:
-              - system.devops.ssl_certificate.view
+              - system.settings.ssl_certificate.view
       - name: Data Source
-#        cname: '数据源'
         value: 'data_source'
         children:
           - name: view
-#            cname: '查看'
             value: 'view'
             guest_allow: true
             apis:
               - "GET:/api/v1/monitor/config"
           - name: manager
-#            cname: '管理'
             value: 'manager'
             apis:
               - "POST:/api/v1/monitor/config"
               - "PUT:/api/v1/monitor/config"
+            dependents:
+              - system.settings.data_source.view
       - name: log configuration
-#        cname: 日志
         value: 'log_configuration'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
             apis:
@@ -180,7 +171,6 @@ system:
               - "GET:/api/v1/dynamic/{name}/list"
               - "GET:/api/v1/dynamic/{name}/render"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "POST:/api/v1/dynamic/{name}"
@@ -189,100 +179,15 @@ system:
               - "PUT:/api/v1/dynamic/{name}/online"
               - "PUT:/api/v1/dynamic/{name}/offline"
             dependents:
-              - system.devops.log_configuration.view
-      - name: ai provider
-#        cname: AI 模型供应商
-        value: 'ai_provider'
-        children:
-          - name: view
-#            cname: 查看
-            value: 'view'
-            guest_allow: true
-            apis:
-              - "GET:/api/v1/ai/providers"
-              - "GET:/api/v1/ai/provider/config"
-          - name: manager
-#            cname: 管理
-            value: 'manager'
-            apis:
-              - "PUT:/api/v1/ai/provider/config"
-              - "PUT:/api/v1/ai/provider/default-llm"
-            dependents:
-              - system.devops.ai_provider.view
-
-  - name: dashboard
-#    cname: 仪表盘
-    value: 'dashboard'
-    children:
-      - name: run view
-#        cname: 运行视图
-        value: 'run_view'
-        children:
-          - name: view
-#            cname: 查看
-            value: 'view'
-            guest_allow: true
-            apis:
-              - "GET:/api/v1/monitor/overview/invoke"
-              - "GET:/api/v1/monitor/overview/message"
-              - "GET:/api/v1/monitor/overview/top10"
-              - "GET:/api/v1/monitor/overview/summary"
-  - name: workspace
-#    cname: 工作空间
-    value: 'workspace'
-    children:
-      - name: application
-#        cname: 应用
-        value: 'application'
-        children:
-          - name: view all application
-#            cname: 查看所有应用
-            value: 'view_all'
-            guest_allow: true
-            apis:
-              - "GET:/api/v1/apps"
-      - name: service
-#        cname: 服务
-        value: 'service'
-        children:
-          - name: view all service
-#            cname: 查看所有服务
-            value: 'view_all'
-            guest_allow: true
-            apis:
-              - "GET:/api/v1/services"
-      - name: team
-#        cname: 团队
-        value: 'team'
-        children:
-          - name: view all team
-#            cname: 查看所有团队
-            value: 'view_all'
-            guest_allow: true
-            apis:
-              - "GET:/api/v1/manager/teams"
-      - name: api market
-#        cname: API市场
-        value: 'api_market'
-        children:
-          - name: view
-#            cname: 查看
-            value: 'view'
-            guest_allow: true
-            apis:
-              - "GET:/api/v1/catalogue/services"
-              - "GET:/api/v1/catalogue/service"
+              - system.settings.log_configuration.view
 team:
   - name: service
-#    cname: 服务
     value: 'service'
     children:
-      - name: router
-#        cname: 路由
-        value: 'router'
+      - name: api
+        value: 'api'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
             apis:
@@ -291,49 +196,58 @@ team:
               - "GET:/api/v1/service/router/detail/simple"
               - "GET:/api/v1/service/router/define"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "POST:/api/v1/service/router"
               - "PUT:/api/v1/service/router"
               - "DELETE:/api/v1/service/router"
+            dependents:
+                - team.service.api.view
       - name: api doc
         cname: API文档
         value: 'api_doc'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
             apis:
               - "GET:/api/v1/service/api_doc"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "PUT:/api/v1/service/api_doc"
               - "POST:/api/v1/service/api_doc/upload"
+            dependents:
+                - team.service.api_doc.view
+      - name: service intro
+        value: 'service_intro'
+        children:
+          - name: view
+            value: 'view'
+            guest_allow: true
+          - name: manager
+            value: 'manager'
+            dependents:
+                - team.service.service_intro.view
       - name: upstream
         cname: 上游
         value: 'upstream'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
             apis:
               - "GET:/api/v1/service/upstream"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "PUT:/api/v1/service/upstream"
+            dependents:
+                - team.service.upstream.view
       - name: release
-#        cname: 发布
         value: 'release'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
             apis:
@@ -344,18 +258,16 @@ team:
               - "GET:/api/v1/service/release/preview"
               - "GET:/api/v1/service/publish/status"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "POST:/api/v1/service/publish/release/do"
-#              - "PUT:/api/v1/service/publish/execute"
               - "DELETE:/api/v1/service/release"
+            dependents:
+              - team.service.release.view
       - name: subscription management
-#        cname: 订阅方管理
         value: 'subscription'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
             apis:
@@ -363,50 +275,49 @@ team:
               - "GET:/api/v1/service/approval/subscribe"
               - "GET:/api/v1/service/subscribers"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "POST:/api/v1/service/approval/subscribe"
               - "POST:/api/v1/service/subscriber"
               - "DELETE:/api/v1/service/subscriber"
+            dependents:
+                - team.service.subscription.view
       - name: service
-#        cname: 服务管理
         value: 'service'
         children:
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "PUT:/api/v1/service/info"
               - "POST:/api/v1/team/service"
               - "DELETE:/api/v1/team/service"
-  - name: application
-    cname: 应用
-    value: 'application'
+            dependents:
+              - team.service.service.manager
+  - name: consumer
+    value: 'consumer'
     children:
       - name: subscription Service
         cname: 订阅服务
         value: 'subscription'
         children:
-          - name: view
-#            cname: 查看
-            value: 'view'
+          - name: subscribe
+            value: 'subscribe'
+
+          - name: view subscribed services
+            value: 'view_subscribed_service'
             guest_allow: true
             apis:
-              - "GET:/api/v1/application/subscriptions"
-          - name: manager
-#            cname: 管理
-            value: 'manager'
+              - "GET:/api/v1/application/subscription"
+          - name: manager subscribed services
+            value: 'manager_subscribed_services'
             apis:
               - "POST:/api/v1/catalogue/service/subscribe"
               - "POST:/api/v1/application/subscription/cancel"
               - "POST:/api/v1/application/subscription/cancel_apply"
       - name: authorization
-#        cname: 访问授权
         value: 'authorization'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
             apis:
@@ -414,60 +325,66 @@ team:
               - "GET:/api/v1/app/authorizations"
               - "GET:/api/v1/app/authorization/details"
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "POST:/api/v1/app/authorization"
               - "PUT:/api/v1/app/authorization"
               - "DELETE:/api/v1/app/authorization"
-      - name: application
-#        cname: 应用
+      - name: consumer
         value: 'application'
         children:
           - name: manager
-#            cname: 管理
             value: 'manager'
             apis:
               - "PUT:/api/v1/app/info"
               - "POST:/api/v1/team/app"
-              - "DELETE:/api/v1/app"
   - name: team
-#    cname: 团队
     value: 'team'
     children:
+      - name: service
+        value: 'service'
+        children:
+          - name: view
+            value: 'view'
+            guest_allow: true
+          - name: manager
+            value: 'manager'
+            dependents:
+              - team.team.service.view
+      - name: consumer
+        value: 'consumer'
+        children:
+          - name: view
+            value: 'view'
+            guest_allow: true
+          - name: manager
+            value: 'manager'
+            dependents:
+              - team.team.consumer.view
       - name: member
-#        cname: 成员
         value: 'member'
         children:
           - name: view
-#            cname: 查看
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/team/members"
-              - "GET:/api/v1/team/members/toadd"
           - name: manager
-#            cname: 管理
             value: 'manager'
-            apis:
-              - "POST:/api/v1/team/member"
-              - "DELETE:/api/v1/team/member"
-              - "PUT:/api/v1/team/member/role"
+            dependents:
+              - team.team.member.view
       - name: team
-#        cname: 团队管理
         value: 'team'
         children:
           - name: view
-#            cname: '查看'
             value: 'view'
             guest_allow: true
             apis:
               - "GET:/api/v1/manager/teams"
               - "GET:/api/v1/manager/team"
           - name: manager
-#            cname: '管理'
             value: 'manager'
             apis:
               - "POST:/api/v1/manager/team"
               - "PUT:/api/v1/manager/team"
-              - "DELETE:/api/v1/manager/team"
+              - "DELETE:/api/v1/manager/team"
+            dependents:
+              - team.team.team.view

resources/access/role.yaml

@@ -1,164 +1,160 @@
 system:
-  - name: supper admin
-    value: supper_admin
+  - name: super admin
+    value: super_admin
     permits:
-      - system.dashboard.run_view.view
-      - system.devops.ai_provider.manager
-      - system.devops.ai_provider.view
-      - system.devops.cluster.manager
-      - system.devops.cluster.view
-      - system.devops.data_source.manager
-      - system.devops.data_source.view
-      - system.devops.log_configuration.manager
-      - system.devops.log_configuration.view
-      - system.devops.ssl_certificate.manager
-      - system.devops.ssl_certificate.view
-      - system.organization.member.manager
-      - system.organization.member.view
-      - system.organization.role.view_system_role
-      - system.organization.role.view_team_role
-      - system.organization.team.manager
-      - system.organization.team.view
+      - system.analysis.run_view.view
+      - system.api_portal.api_portal.view
+      - system.settings.account.manager
+      - system.settings.account.view
+      - system.settings.ai_provider.manager
+      - system.settings.ai_provider.view
+      - system.settings.api_gateway.manager
+      - system.settings.api_gateway.view
+      - system.settings.data_source.manager
+      - system.settings.data_source.view
       - system.settings.general.manager
       - system.settings.general.view
-      - system.settings.service_classification.manager
-      - system.settings.service_classification.view
-      - system.workspace.api_market.view
+      - system.settings.log_configuration.manager
+      - system.settings.log_configuration.view
+      - system.settings.role.view
+      - system.settings.ssl_certificate.manager
+      - system.settings.ssl_certificate.view
+      - system.workspace.application.manager_all
       - system.workspace.application.view_all
+      - system.workspace.service.manager_all
       - system.workspace.service.view_all
+      - system.workspace.team.create
+      - system.workspace.team.manager
       - system.workspace.team.view_all
     supper: true
   - name: team admin
     value: team_admin
     permits:
-      - system.organization.role.view_team_role
-      - system.organization.team.manager
-      - system.organization.team.view
-      - system.workspace.api_market.view
-      - system.workspace.application.view_all
-      - system.workspace.service.view_all
-      - system.workspace.team.view_all
+      - system.api_portal.api_portal.view
+      - system.workspace.team.create
   - name: devops admin
     value: devops_admin
     permits:
-      - system.dashboard.run_view.view
-      - system.devops.ai_provider.manager
-      - system.devops.ai_provider.view
-      - system.devops.cluster.manager
-      - system.devops.cluster.view
-      - system.devops.data_source.manager
-      - system.devops.data_source.view
-      - system.devops.log_configuration.manager
-      - system.devops.log_configuration.view
-      - system.devops.ssl_certificate.manager
-      - system.devops.ssl_certificate.view
-      - system.workspace.api_market.view
+      - system.analysis.run_view.view
+      - system.api_portal.api_portal.view
+      - system.settings.ai_provider.manager
+      - system.settings.ai_provider.view
+      - system.settings.api_gateway.manager
+      - system.settings.api_gateway.view
+      - system.settings.data_source.manager
+      - system.settings.data_source.view
+      - system.settings.general.manager
+      - system.settings.general.view
+      - system.settings.log_configuration.manager
+      - system.settings.log_configuration.view
+      - system.settings.ssl_certificate.manager
+      - system.settings.ssl_certificate.view
       - system.workspace.application.view_all
       - system.workspace.service.view_all
       - system.workspace.team.view_all
-      - system.settings.general.manager
-      - system.settings.general.view
-      - system.settings.service_classification.manager
-      - system.settings.service_classification.view
   - name: general member
     value: member
     permits:
-    - system.workspace.api_market.view
+      - system.api_portal.api_portal.view
     default: true
-  - name: guest
-    value: guest
-    permits:
-      - system.settings.service_classification.view
-      - system.devops.cluster.view
-      - system.devops.log_configuration.view
-      - system.devops.ssl_certificate.view
-      - system.devops.monitor.view
-      - system.organization.member.view
-      - system.organization.role.view_system_role
-      - system.organization.role.view_team_role
-      - system.organization.team.view
-      - system.workspace.api_market.view
-      - system.workspace.application.view_all
-      - system.workspace.service.view_all
-      - system.workspace.team.view_all
-      - system.dashboard.run_view.view
+
 team:
   - name: team admin
     value: team_admin
     permits:
-      - team.application.application.manager
-      - team.application.authorization.manager
-      - team.application.authorization.view
-      - team.application.subscription.manager
-      - team.application.subscription.view
-      - team.service.api_doc.view
+      - team.consumer.application.manager
+      - team.consumer.authorization.manager
+      - team.consumer.authorization.view
+      - team.consumer.subscription.manager_subscribed_services
+      - team.consumer.subscription.subscribe
+      - team.consumer.subscription.view_subscribed_service
+      - team.service.api.manager
+      - team.service.api.view
       - team.service.api_doc.manager
-      - team.service.router.manager
-      - team.service.router.view
+      - team.service.api_doc.view
       - team.service.release.manager
       - team.service.release.view
       - team.service.service.manager
+      - team.service.service_intro.manager
+      - team.service.service_intro.view
       - team.service.subscription.manager
       - team.service.subscription.view
       - team.service.upstream.manager
       - team.service.upstream.view
+      - team.team.consumer.manager
+      - team.team.consumer.view
       - team.team.member.manager
       - team.team.member.view
+      - team.team.service.manager
+      - team.team.service.view
       - team.team.team.manager
       - team.team.team.view
     supper: true
   - name: service admin
     value: service_admin
     permits:
-      - team.service.service.manager
-      - team.service.upstream.manager
-      - team.service.upstream.view
-      - team.service.api_doc.view
+      - team.service.api.manager
+      - team.service.api.view
       - team.service.api_doc.manager
-      - team.service.router.manager
-      - team.service.router.view
-      - team.service.subscription.manager
-      - team.service.subscription.view
+      - team.service.api_doc.view
       - team.service.release.manager
       - team.service.release.view
+      - team.service.service.manager
+      - team.service.service_intro.manager
+      - team.service.service_intro.view
+      - team.service.subscription.manager
+      - team.service.subscription.view
+      - team.service.upstream.manager
+      - team.service.upstream.view
+      - team.team.consumer.view
       - team.team.member.view
+      - team.team.service.manager
+      - team.team.service.view
+      - team.team.team.view
   - name: service developer
     value: service_developer
     permits:
-      - team.service.upstream.manager
-      - team.service.upstream.view
-      - team.service.api_doc.view
+      - team.service.api.manager
+      - team.service.api.view
       - team.service.api_doc.manager
-      - team.service.router.manager
-      - team.service.router.view
+      - team.service.api_doc.view
       - team.service.release.manager
       - team.service.release.view
-      - team.team.member.view
-  - name: application admin
-    value: application_admin
-    permits:
-      - team.application.application.manager
-      - team.application.authorization.manager
-      - team.application.authorization.view
-      - team.application.subscription.manager
-      - team.application.subscription.view
-      - team.team.member.view
-  - name: application developer
-    value: application_developer
-    permits:
-      - team.application.authorization.view
-      - team.application.subscription.manager
-      - team.application.subscription.view
-      - team.team.member.view
-    default: true
-  - name: guest
-    value: guest
-    permits:
-      - team.application.authorization.view
-      - team.application.subscription.view
-      - team.service.router.view
-      - team.service.release.view
+      - team.service.service.manager
+      - team.service.service_intro.manager
+      - team.service.service_intro.view
+      - team.service.subscription.manager
       - team.service.subscription.view
+      - team.service.upstream.manager
       - team.service.upstream.view
+      - team.team.consumer.view
       - team.team.member.view
-      - team.team.team.view
+      - team.team.service.view
+      - team.team.team.view
+  - name: consumer admin
+    value: consumer_admin
+    permits:
+      - team.consumer.application.manager
+      - team.consumer.authorization.manager
+      - team.consumer.authorization.view
+      - team.consumer.subscription.manager_subscribed_services
+      - team.consumer.subscription.subscribe
+      - team.consumer.subscription.view_subscribed_service
+      - team.team.consumer.manager
+      - team.team.consumer.view
+      - team.team.member.view
+      - team.team.service.view
+      - team.team.team.view
+  - name: consumer developer
+    value: consumer_developer
+    permits:
+      - team.consumer.application.manager
+      - team.consumer.authorization.manager
+      - team.consumer.authorization.view
+      - team.consumer.subscription.subscribe
+      - team.consumer.subscription.view_subscribed_service
+      - team.team.consumer.view
+      - team.team.member.view
+      - team.team.service.view
+      - team.team.team.view
+    default: true

resources/locale/i18n/en-US.json

@@ -1,6 +1,6 @@
 {
   "ai provider": "AI Provider",
-  "api market": "API Market",
+  "api market": "API Portal",
   "api doc": "API Documentation",
   "application": "Application",
   "application admin": "Application Administrator",
@@ -29,7 +29,7 @@
   "ssl certificate": "SSL Certificate",
   "subscription management": "Subscription Management",
   "subscription service": "Subscription Service",
-  "supper admin": "Super Administrator",
+  "super admin": "Super Administrator",
   "system settings": "System Settings",
   "team": "Team",
   "team admin": "Team Administrator",

resources/locale/i18n/ja-JP.json

@@ -29,7 +29,7 @@
   "ssl certificate": "SSL証明書",
   "subscription management": "サブスクリプション管理",
   "subscription service": "サブスクリプションサービス",
-  "supper admin": "スーパ管理者",
+  "super admin": "スーパ管理者",
   "system settings": "システム設定",
   "team": "チーム",
   "team admin": "チーム管理者",

resources/locale/i18n/zh-CN.json

@@ -1,6 +1,6 @@
 {
   "ai provider": "AI供应商",
-  "api market": "API市场",
+  "api market": "API门户",
   "api doc": "API文档",
   "application": "应用",
   "application admin": "应用管理员",
@@ -29,7 +29,7 @@
   "ssl certificate": "SSL证书",
   "subscription management": "订阅方管理",
   "subscription service": "订阅服务",
-  "supper admin": "超级管理员",
+  "super admin": "超级管理员",
   "system settings": "系统设置",
   "team": "团队",
   "team admin": "团队管理员",

resources/locale/i18n/zh-TW.json

@@ -29,7 +29,7 @@
   "ssl certificate": "SSL證書",
   "subscription management": "訂閱方管理",
   "subscription service": "訂閱服務",
-  "supper admin": "超級管理員",
+  "super admin": "超級管理員",
   "system settings": "系統設置",
   "team": "團隊",
   "team admin": "團隊管理員",

service/service/iml.go

@@ -68,6 +68,7 @@ func (i *imlServiceService) SearchPublicServices(ctx context.Context, keyword st
 func (i *imlServiceService) ServiceCountByTeam(ctx context.Context, teamId ...string) (map[string]int64, error) {
 	w := map[string]interface{}{
 		"as_server": true,
+		"is_delete": false,
 	}
 	if len(teamId) > 0 {
 		w["team"] = teamId
@@ -77,7 +78,8 @@ func (i *imlServiceService) ServiceCountByTeam(ctx context.Context, teamId ...st
 
 func (i *imlServiceService) AppCountByTeam(ctx context.Context, teamId ...string) (map[string]int64, error) {
 	w := map[string]interface{}{
-		"as_app": true,
+		"as_app":    true,
+		"is_delete": false,
 	}
 	if len(teamId) > 0 {
 		w["team"] = teamId