Merge pull request #114 from APIParkLab/feature/permission

update remark
Merge pull request #113 from APIParkLab/feature/v1.2
2026-06-14 20:41:15 +08:00 · 2024-10-28 18:41:17 +08:00 · 2024-10-28 18:40:48 +08:00 · 2024-10-28 18:39:55 +08:00 · 2024-10-28 18:34:19 +08:00 · 2024-10-28 18:33:42 +08:00
107 changed files with 932 additions and 935 deletions
@@ -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
@@ -3,4 +3,3 @@
 /config.yml
 /build/
 /apipark
-/aoplatform
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="800px" height="800px" viewBox="0 0 512 512"  xml:space="preserve">
+<style type="text/css">
+<![CDATA[
+	.st0{fill:#000000;}
+]]>
+</style>
+    <g>
+	<path class="st0" d="M485.016,220.691c12.422-8.422,22.188-57.266,7.797-87.016c-26.859,28.125-80.109,49.859-142,72.922
+		c-64.656,24.078-71.531,41.859-94.813,42.172c-23.297-0.313-30.156-18.094-94.813-42.172c-61.891-23.063-115.141-44.797-142-72.922
+		c-14.406,29.75-4.625,78.594,7.781,87.016C13.484,214.332,0,210.051,0,210.051s3.813,68.172,33.25,106.563
+		c24.953,32.547,86.984,72.906,145.828,58.828c62.219-14.875,62.344-41.406,76.922-41.266c14.563-0.141,14.688,26.391,76.906,41.266
+		c58.844,14.078,120.875-26.281,145.844-58.828C508.156,278.223,512,210.051,512,210.051S498.5,214.332,485.016,220.691z
+		 M131.438,318.848c-25.109-11.641-46.063-37.422-43.188-73.891c12.813,5.078,48.844,9.406,69.094,17.281
+		c23,8.953,46.031,23.984,48.922,41.25C205.313,317.879,170.75,337.066,131.438,318.848z M380.563,318.848
+		c-39.344,18.219-73.875-0.969-74.828-15.359c2.891-17.266,25.891-32.297,48.922-41.25c20.25-7.875,56.281-12.203,69.094-17.281
+		C426.625,281.426,405.656,307.207,380.563,318.848z"/>
+</g>
+</svg>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="800px" height="800px" viewBox="0 0 512 512"  xml:space="preserve">
+<style type="text/css">
+<![CDATA[
+	.st0{fill:#000000;}
+]]>
+</style>
+    <g>
+	<path class="st0" d="M485.016,220.691c12.422-8.422,22.188-57.266,7.797-87.016c-26.859,28.125-80.109,49.859-142,72.922
+		c-64.656,24.078-71.531,41.859-94.813,42.172c-23.297-0.313-30.156-18.094-94.813-42.172c-61.891-23.063-115.141-44.797-142-72.922
+		c-14.406,29.75-4.625,78.594,7.781,87.016C13.484,214.332,0,210.051,0,210.051s3.813,68.172,33.25,106.563
+		c24.953,32.547,86.984,72.906,145.828,58.828c62.219-14.875,62.344-41.406,76.922-41.266c14.563-0.141,14.688,26.391,76.906,41.266
+		c58.844,14.078,120.875-26.281,145.844-58.828C508.156,278.223,512,210.051,512,210.051S498.5,214.332,485.016,220.691z
+		 M131.438,318.848c-25.109-11.641-46.063-37.422-43.188-73.891c12.813,5.078,48.844,9.406,69.094,17.281
+		c23,8.953,46.031,23.984,48.922,41.25C205.313,317.879,170.75,337.066,131.438,318.848z M380.563,318.848
+		c-39.344,18.219-73.875-0.969-74.828-15.359c2.891-17.266,25.891-32.297,48.922-41.25c20.25-7.875,56.281-12.203,69.094-17.281
+		C426.625,281.426,405.656,307.207,380.563,318.848z"/>
+</g>
+</svg>
@@ -0,0 +1,30 @@
+provider: fakegpt
+label:
+  en_US: FakeGPT
+description:
+  en_US: FakeGPT is a fake model provider that does not actually connect to any model service. It is useful for testing and development purposes.
+icon_small:
+  en_US: icon_s_en.svg
+icon_large:
+  en_US: icon_l_en.svg
+background: "#FCFDFF"
+help:
+  title:
+    en_US: Get your Access Details from Google
+  url:
+    en_US: https://apipark.com
+supported_model_types:
+  - llm
+  - text-embedding
+configurate_methods:
+  - predefined-model
+provider_credential_schema:
+  credential_form_schemas:
+    - variable: apikey
+      label:
+        en_US: API Key
+      type: secret-input
+      required: true
+      placeholder:
+        en_US: Enter your API key
+address: https://apipark.com
@@ -0,0 +1,51 @@
+model: fakegpt-1.0
+label:
+  en_US: FakeGPT 1.0
+model_type: llm
+features:
+  - agent-thought
+  - vision
+model_properties:
+  mode: chat
+  context_size: 200000
+parameter_rules:
+  - name: max_tokens
+    use_template: max_tokens
+    required: true
+    type: int
+    default: 4096
+    min: 1
+    max: 4096
+    help:
+      zh_Hans: 停止前生成的最大令牌数。
+      en_US: The maximum number of tokens to generate before stopping.
+  - name: temperature
+    use_template: temperature
+    required: false
+    type: float
+    default: 1
+    min: 0.0
+    max: 1.0
+    help:
+      zh_Hans: 生成内容的随机性。
+      en_US: The amount of randomness injected into the response.
+  - name: top_p
+    required: false
+    type: float
+    default: 0.999
+    min: 0.000
+    max: 1.000
+    help:
+      zh_Hans: 在核采样中，按概率递减顺序计算每个后续标记的所有选项的累积分布，并在达到 top_p 指定的特定概率时将其切断。您应该更改温度或top_p，但不能同时更改两者。
+      en_US: In nucleus sampling, computes the cumulative distribution over all the options for each subsequent token in decreasing probability order and cuts it off once it reaches a particular probability specified by top_p. You should alter either temperature or top_p, but not both.
+  - name: top_k
+    required: false
+    type: int
+    default: 0
+    min: 0
+    # tip docs from aws has error, max value is 500
+    max: 500
+    help:
+      zh_Hans: 对于每个后续标记，仅从前 K 个选项中进行采样。使用 top_k 删除长尾低概率响应。
+      en_US: Only sample from the top K options for each subsequent token. Use top_k to remove long tail low probability responses.
+
@@ -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
@@ -24,7 +24,7 @@ parameter_rules:
    use_template: presence_penalty
  - name: frequency_penalty
    use_template: frequency_penalty
-  - name: max_output_tokens
+  - name: max_tokens
    use_template: max_tokens
    required: true
    default: 2048
@@ -23,7 +23,7 @@ parameter_rules:
    use_template: presence_penalty
  - name: frequency_penalty
    use_template: frequency_penalty
-  - name: max_output_tokens
+  - name: max_tokens
    use_template: max_tokens
    required: true
    default: 8192
@@ -24,7 +24,7 @@ parameter_rules:
    use_template: presence_penalty
  - name: frequency_penalty
    use_template: frequency_penalty
-  - name: max_output_tokens
+  - name: max_tokens
    use_template: max_tokens
    required: true
    default: 8192
@@ -24,7 +24,7 @@ parameter_rules:
    use_template: presence_penalty
  - name: frequency_penalty
    use_template: frequency_penalty
-  - name: max_output_tokens
+  - name: max_tokens
    use_template: max_tokens
    required: true
    default: 8192
@@ -24,7 +24,7 @@ parameter_rules:
    use_template: presence_penalty
  - name: frequency_penalty
    use_template: frequency_penalty
-  - name: max_output_tokens
+  - name: max_tokens
    use_template: max_tokens
    required: true
    default: 8192
@@ -24,7 +24,7 @@ parameter_rules:
    use_template: presence_penalty
  - name: frequency_penalty
    use_template: frequency_penalty
-  - name: max_output_tokens
+  - name: max_tokens
    use_template: max_tokens
    required: true
    default: 8192
@@ -24,7 +24,7 @@ parameter_rules:
    use_template: presence_penalty
  - name: frequency_penalty
    use_template: frequency_penalty
-  - name: max_output_tokens
+  - name: max_tokens
    use_template: max_tokens
    required: true
    default: 8192
@@ -24,7 +24,7 @@ parameter_rules:
    use_template: presence_penalty
  - name: frequency_penalty
    use_template: frequency_penalty
-  - name: max_output_tokens
+  - name: max_tokens
    use_template: max_tokens
    required: true
    default: 8192
@@ -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."
@@ -319,12 +319,12 @@ func (i *imlInitController) OnInit() {
 }
 func (i *imlInitController) createAIService(ctx context.Context, teamID string, input *service_dto.CreateService) error {

-	providerId := "openai"
-	err := i.providerModule.UpdateProviderConfig(ctx, "openai", &ai_dto.UpdateConfig{
-		Config: "{\n  \"openai_api_base\": \"API Base\",\n  \"openai_api_key\": \"API Key\",\n  \"openai_organization\": \"Organization\"\n}",
+	providerId := "fakegpt"
+	err := i.providerModule.UpdateProviderConfig(ctx, providerId, &ai_dto.UpdateConfig{
+		Config: "{\n  \"apikey\": \"xxx\" \n}",
 	})
 	if err != nil {
-		return fmt.Errorf("update openai config error: %v", err)
+		return fmt.Errorf("update %s config error: %v", providerId, err)
 	}
 	input.Provider = &providerId
 	if input.Id == "" {
@@ -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."
@@ -27,4 +27,5 @@ packages/core/public/tinymce/
 *.sln
 *.sw?

+
 /pnpm-lock.yaml
@@ -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
+```
@@ -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'],
-};
+};
@@ -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';
@@ -3,4 +3,5 @@
    "packages/*"
  ],
  "version": "independent"
+  
 }
@@ -6,7 +6,6 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
-
 node_modules
 dist
 dist-ssr
@@ -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>
@@ -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",
@@ -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': {},
@@ -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';

@@ -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': {},
@@ -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]);



@@ -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("审核意见"
@@ -137,6 +137,28 @@ export const TranslateWord = ()=>{
            {$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('申请方消费者')}
            
        </>
    )
@@ -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'],
@@ -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": {
@@ -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
@@ -7,6 +7,8 @@ export type UserInfoType = {
    email: string
    phone: string
    avatar: string
+    type:string
+
 }

 export type UserProfileProps = {
@@ -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 };
-// };
@@ -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;
@@ -212,6 +212,28 @@
  "鉴权数量": "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",
@@ -627,10 +649,10 @@
  "搜索服务": "K66ea2f0",
  "审核中": "K8adf7f8b",
  "添加消费者": "K84c4dc71",
-  "暂无服务描述": "Ka4b45550",
+  "暂无消费者描述": "Kc3b7bfa8",
  "创建并管理自己的消费者实体，每个消费者可以订阅多个API服务，确保在调用之前已获得相应权限。你可以为消费者生成 API 密钥等鉴权方式，用于安全地调用 API 服务": "K5c4e2865",
  "订阅的服务数量：已通过 (0) 个，申请中 (1) 个": "K3c7b175f",
-  "输入名称、ID 查找服务": "K40a89bd8",
+  "输入名称、ID 查找消费者": "K3a6f905d",
  "退出测试": "Kbe3e9335",
  "服务市场": "K370a3eb2",
  "服务详情": "Kf7ec36d",
@@ -645,6 +667,7 @@
  "版本": "K81634069",
  "更新时间": "Keefda53d",
  "无标签": "K96a2f1c8",
+  "暂无服务描述": "Ka4b45550",
  "API 数量": "K72b0c0b3",
  "接入消费者数量": "K70b79760",
  "关联标签": "K96059c69",
@@ -580,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",
@@ -607,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",
@@ -654,5 +654,29 @@
  "K6e32a344": "Number of Services",
  "Ka701316": "Number of Auths",
  "K9eaa2eb6": "List",
-  "Kfaec39e9": "Block"
+  "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"
 }
@@ -672,8 +672,33 @@
  "K67b530f": "コンシューマー名",
  "K11f34de": "コンシューマー ID",
  "Kc01002": "コンシューマーを削除",
-  "K84c4dc71": "コンシューマーエンティティを作成および管理し、各コンシューマーは複数の API サービスにサブスクライブできます。呼び出し前に適切な権限が付与されていることを確認してください。コンシューマー用に API キーなどの認証方法を生成して、安全に API サービスを呼び出せます。",
  "K40a89bd8": "名前または ID を入力してサービスを検索",
  "Kba74f26d": "コンシューマーを接続",
-  "K70b79760": "接続コンシューマー数"
+  "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": "申請側コンシューマー"
 }
@@ -1,32 +1 @@
-{
-  "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": "接入消费者数量"
-}
+{}
@@ -1,7 +1,26 @@
 {
-  "K93c2696e": "上线结果",
-  "K6e32a344": "订阅服务数量",
-  "Ka701316": "鉴权数量",
-  "K9eaa2eb6": "列表",
-  "Kfaec39e9": "块"
+  "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 查找消费者"
 }
@@ -1,32 +1 @@
-{
-  "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": "接入消费者数量"
-}
+{}
@@ -1,24 +1,3 @@
 {
-  "Kfe93ef35": "Application",
-  "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",
-  "K9bdd8403": "To securely call APIs, you need to create an application and a token.",
-  "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.",
-  "Ka0a8840a": "Review subscription requests from other applications. Only approved requests can initiate API calls.",
-  "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.",
-  "K1512e983": "Application Call Statistics",
-  "Kb4d2007f": "Please Select Application",
-  "Kc0915603": "Application Top 10",
-  "Kd8a7a689": "Search or Select Application",
-  "Kb7e869a4": "Application Settings",
-  "K5168eb63": "Application Name",
-  "K546e46f": "Application ID",
-  "K95764d1d": "Delete Application",
-  "K667bbbe7": "Add Application",
-  "K8723422e": "Access Application",
-  "K93d5a66e": "Number of Access Applications",
-  "K216a1ac7": "Application Developer",
-  "K27924db": "Application Administrator",
-  "Kd55c6887": "Review",
-  "K831aa6c0": "Applicant - Application"
+  "K40a89bd8": "Enter Name, ID to Search Member"
 }
@@ -20,5 +20,6 @@
  "K216a1ac7": "アプリケーション開発者",
  "K27924db": "アプリケーション管理者",
  "Kd55c6887": "レビュー",
-  "K831aa6c0": "申請元-アプリケーション"
+  "K831aa6c0": "申請元-アプリケーション",
+  "K40a89bd8": "名前または ID を入力してサービスを検索"
 }
@@ -20,5 +20,6 @@
  "K216a1ac7": "消费者开发者",
  "K27924db": "消费者管理员",
  "Kd55c6887": "审核",
-  "K831aa6c0": "申请方-消费者"
+  "K831aa6c0": "申请方-消费者",
+  "K40a89bd8": "输入名称、ID 查找服务"
 }
@@ -20,5 +20,6 @@
  "K216a1ac7": "應用程式開發者",
  "K27924db": "應用程式管理員",
  "Kd55c6887": "審核",
-  "K831aa6c0": "申請方-應用程式"
+  "K831aa6c0": "申請方-應用程式",
+  "K40a89bd8": "輸入名稱、ID 查找服務"
 }
@@ -676,5 +676,29 @@
  "K5c4e2865": "創建並管理自己的消費者實體，每個消費者可以訂閱多個API服務，確保在調用之前已獲得相應權限。你可以為消費者生成 API 密鑰等鑒權方式，用於安全地調用 API 服務",
  "K40a89bd8": "輸入名稱、ID 查找服務",
  "Kba74f26d": "接入消費者",
-  "K70b79760": "接入消費者數量"
+  "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": "申請方消費者"
  }
@@ -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,
@@ -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>
@@ -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': {},
@@ -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>)
@@ -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'),
@@ -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))
@@ -18,6 +18,7 @@ export type AiServiceRouterModelConfigProps = {
 }

 type AiServiceRouterModelConfigField = {
+    provider:string
    id:string
    config:string
 }
@@ -70,6 +71,10 @@ const AiServiceRouterModelConfig = forwardRef<AiServiceRouterModelConfigHandle,
        getLlmList(provider)
    }

+    useEffect(()=>{
+        getLlmList(entity.provider)
+    },[])
+
    return (
        <Form
                    layout='vertical'
@@ -146,7 +146,7 @@ const AiSettingList = ()=>{
                                }
                                   
                                </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>
@@ -106,10 +106,7 @@ const AiSettingModalContent = forwardRef<AiSettingModalContentHandle,AiSettingMo
                                    label:<div className="flex items-center gap-[10px]">
                                            <span>{x.id}</span>
                                            {x?.scopes?.map(s=><Tag >{s?.toLocaleUpperCase()}</Tag>)}
-                                            </div>}))}
-                                onChange={(e)=>{
-                                    form.setFieldValue('config',llmList?.find(x=>x.id===e)?.config)
-                                }}>
+                                            </div>}))}>
                            </Select>
                        </Form.Item>

@@ -45,7 +45,7 @@ const LogSettings = ()=>{
                undefined,
                undefined,
                undefined,
-                'system.devops.log_configuration.view')
+                'system.settings.log_configuration.view')
        })
        return newMenu
    },[state.language,menuItems])
@@ -346,7 +346,7 @@ const MemberList = ()=>{
                        <WithPermission access="system.organization.member.edit">
                            <Select
                                className="w-full"
-                                mode="multiple"
+                                mode="multiple" 
                                value={entity.roles?.map((x:EntityItem)=>x.id)}
                                options={roleSelectableList?.map((x:{id:string,name:string})=>({label:(x.name), value:x.id}))}
                                onChange={(value)=>{
@@ -47,7 +47,7 @@ const LogSettings = ()=>{
                undefined,
                undefined,
                undefined,
-                'system.devops.log_configuration.view')
+                'system.settings.log_configuration.view')
        })
        return newMenu
    },[state.language,menuItems])
@@ -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()

@@ -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>
@@ -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>)
@@ -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'),
@@ -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"
                >
@@ -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>
@@ -252,6 +252,7 @@ const TeamInsideMember:FC = ()=>{
                            <Select
                                className="w-full"
                                mode="multiple"
+                                maxTagCount="responsive"
                                value={entity.roles?.map((x:EntityItem)=>x.id)}
                                options={roleList?.map((x:{id:string,name:string})=>({label:(x.name), value:x.id}))}
                                onChange={(value)=>{
@@ -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>
    )
@@ -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';

@@ -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 {
@@ -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': {},
@@ -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))'}}>
                {/* 请求统计饼图 */}
@@ -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 && <>
                    {
@@ -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 {
@@ -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': {},
@@ -25,7 +25,6 @@ export const SERVICE_HUB_TABLE_COLUMNS: PageProColumns<ServiceHubTableListItem>[
        title:('团队'),
        dataIndex: ['team','name'],
        ellipsis:true,
-        renderText:(_,entity:ServiceHubTableListItem)=>entity.tags?.map(x=>x.name).join(',') || '-'
    },
    {
        title:('订阅服务数量'),
@@ -37,13 +37,14 @@ export default function ServiceHubManagement() {
    const [tableListDataSource, setTableListDataSource] = useState<ServiceHubAppListItem[]>([]);
    const [tableSearchWord, setTableSearchWord] = useState<string>('')

-const getServiceList = ()=>{
+const getServiceList = (dataType?:'block'|'list')=>{
+    dataType = dataType ?? dataShowType
    if(!accessInit){
-        getGlobalAccessData()?.then?.(()=>{getServiceList()})
+        getGlobalAccessData()?.then?.(()=>{getServiceList(dataType)})
        return Promise.resolve({data:[], success:false})
    }
    
-    if(dataShowType === 'list' && !tableHttpReload){
+    if(dataType === 'list' && !tableHttpReload){
        setTableHttpReload(true)
        return Promise.resolve({
            data: tableListDataSource,
@@ -52,7 +53,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','auth_num']}).then(response=>{
+        return fetchData<BasicResponse<{apps:ServiceHubAppListItem}>>(!checkPermission('system.workspace.application.view_all') ? 'my_apps':'apps',{method:'GET',eoParams:{ team: dataType === 'list' ? undefined : teamId,keyword:tableSearchWord},eoTransformKeys:['api_num','subscribe_num','subscribe_verify_num','auth_num','create_time','can_delete']}).then(response=>{
        const {code,data,msg} = response
        if(code === STATUS_CODE.SUCCESS){
            setServiceList([...data.apps,{type:'addNewItem'}])
@@ -75,26 +76,69 @@ const getServiceList = ()=>{
  };

  
-  const getTeamsList = ()=>{
-    if(!accessInit){
-        getGlobalAccessData()?.then?.(()=>{getTeamsList()})
-        return
-    }
-    setPageLoading(true)
-    fetchData<BasicResponse<{ teams: SimpleTeamItem[] }>>(!checkPermission('system.workspace.team.view_all') ?'simple/teams/mine' :'simple/teams',{method:'GET',eoTransformKeys:['app_num','subscribe_num']}).then(response=>{
-        const {code,data,msg} = response
-        if(code === STATUS_CODE.SUCCESS){
-            setTeamList(data.teams.map((x:SimpleTeamItem)=>({label:<div className="flex items-center justify-between "><span  className="w-[calc(100%-42px)] truncate" title={x.name}>{x.name}</span><span className="bg-[#fff] rounded-[5px] h-[20px] w-[30px] flex items-center justify-center">{x.appNum || 0}</span></div>, key:x.id})))
-            if(!teamId && data.teams?.[0]?.id){
-                navigateTo(data.teams[0].id)
+  const getTeamsList = () => {
+    setPageLoading(true);
+
+    const fetchTeams = () => {
+        fetchData<BasicResponse<{ teams: SimpleTeamItem[] }>>(
+            !checkPermission('system.workspace.team.view_all') 
+                ? 'simple/teams/mine' 
+                : 'simple/teams',
+            {
+                method: 'GET',
+                eoTransformKeys: ['app_num', 'subscribe_num'],
            }
-        }else{
-            message.error(msg || $t(RESPONSE_TIPS.error))
-        }
-    }).finally(()=>{
-        setPageLoading(false)
-    })
-}
+        )
+        .then(response => {
+            const { code, data, msg } = response;
+            if (code === STATUS_CODE.SUCCESS) {
+                setTeamList(
+                    data.teams.map((x: SimpleTeamItem) => ({
+                        label: (
+                            <div className="flex items-center justify-between">
+                                <span className="w-[calc(100%-42px)] truncate" title={x.name}>
+                                    {x.name}
+                                </span>
+                                <span className="bg-[#fff] rounded-[5px] h-[20px] w-[30px] flex items-center justify-center">
+                                    {x.appNum || 0}
+                                </span>
+                            </div>
+                        ),
+                        key: x.id,
+                    }))
+                );
+                if (!teamId && data.teams?.[0]?.id) {
+                    navigateTo(data.teams[0].id);
+                }
+            } else {
+                message.error(msg || $t(RESPONSE_TIPS.error));
+            }
+        })
+        .finally(() => {
+            setPageLoading(false);
+        });
+    };
+
+    if (!accessInit) {
+        const checkAccessData = () => {
+            const accessInitd = getGlobalAccessData();
+            if (!accessInitd) {
+                setTimeout(checkAccessData, 100);
+                return;
+            }
+
+            if (typeof accessInitd.then === 'function') {
+                accessInitd.then(fetchTeams);
+            } else {
+                fetchTeams();
+            }
+        };
+
+        checkAccessData();
+    } else {
+        fetchTeams();
+    }
+};
  
  
  const openModal = async (type:'add'|'edit'|'delete')=>{
@@ -196,7 +240,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>
                            );
@@ -241,13 +285,13 @@ useEffect(() => {
            customBtn={
                <Radio.Group
                  options={dataShowTypeOptions}
-                  onChange={(e)=>setDataShowType(e.target.value)}
+                  onChange={(e)=>{setDataShowType(e.target.value); setTableHttpReload(true); if(e.target.value === 'block'){getServiceList(e.target.value)}}}
                  value={dataShowType}
                  optionType="button"
                  buttonStyle="solid"
                />}
            >{
-                dataShowType === 'block' ? <BlockArea /> : <TableArea language={state.language} getServiceList={getServiceList} addNewApp={()=>openModal('add')} setTableHttpReload={setTableHttpReload} setTableSearchWord={setTableSearchWord} editApp={(row:ServiceHubAppListItem)=>{setAppName(row.name);navigateTo(`/consumer/${row.team.id}/inside/${row.id}/service`)}}/>
+                dataShowType === 'block' ? <BlockArea /> : <TableArea language={state.language} getServiceList={()=>getServiceList('list')} addNewApp={()=>openModal('add')} setTableHttpReload={setTableHttpReload} setTableSearchWord={setTableSearchWord} editApp={(row:ServiceHubAppListItem)=>{setAppName(row.name);navigateTo(`/consumer/${row.team.id}/inside/${row.id}/service`)}}/>
            }
    </InsidePage> :
        <Empty className="mt-[100px]" image={Empty.PRESENTED_IMAGE_SIMPLE} />
@@ -293,8 +337,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)
@@ -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': {},
@@ -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 {
@@ -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': {},
@@ -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 {
@@ -1,2 +1,3 @@
 packages:
-  - "packages/*"
+  - "packages/*"
+  
@@ -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 = {
@@ -11,4 +11,5 @@
  },
  "include": ["**/*.test.ts", "**/*.test.tsx", "jest.setup.js"],
  "exclude": ["node_modules"]
+  
 }
@@ -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
@@ -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=
@@ -1,5 +1,6 @@
 package main

+// init module
 import (
 	_ "github.com/APIParkLab/APIPark/frontend"
 	_ "github.com/APIParkLab/APIPark/gateway/apinto"
@@ -9,5 +9,4 @@ import (
 )

 func doCheck() {
-
 }
@@ -6,6 +6,11 @@ import (
 	"bytes"
 	"encoding/csv"
 	"fmt"
+	"os"
+	"sort"
+	"strings"
+	"time"
+
 	_ "github.com/APIParkLab/APIPark/resources/access"
 	_ "github.com/APIParkLab/APIPark/resources/permit"
 	_ "github.com/APIParkLab/APIPark/resources/plugin"
@@ -14,19 +19,15 @@ import (
 	"github.com/eolinker/go-common/permit"
 	"github.com/eolinker/go-common/pm3"
 	"github.com/eolinker/go-common/utils"
-	"os"
-	"sort"
-	"strings"
-	"time"
 )

 const unsetValue = "-"

 func doCheck() {
 	accessConf, unset := loadAccess()
-	
+
 	drivers := pm3.List()
-	
+
 	newAccess := 0
 	for _, p := range drivers {
 		if ac, ok := p.(pm3.AccessConfig); ok {
@@ -39,9 +40,9 @@ func doCheck() {
 					}
 				}
 			}
-			
+
 		}
-		
+
 	}
 	for asKey := range permit.All() {
 		key := strings.ToLower(asKey)
@@ -53,12 +54,11 @@ func doCheck() {
 	if newAccess > 0 || unset > 0 {
 		f := accessFile()
 		fmt.Printf("%d access need set, see : %s and %s", newAccess+unset, saveTemplate(accessConf, f), saveCsv(accessConf, f))
-		
 	}
 	os.Exit(0)
 }
 func accessFile() string {
-	
+
 	if version == "" {
 		return time.Now().Format("20060102-150405")
 	}
@@ -84,7 +84,7 @@ func saveCsv(as map[string]*Access, key string) string {
 	err = os.WriteFile(filePath, buf.Bytes(), 0666)
 	if err != nil {
 		log.Fatal(err)
-		
+
 	}
 	return filePath
 }
@@ -111,9 +111,9 @@ func (ls AccessListSort) Swap(i, j int) {

 func saveTemplate(as map[string]*Access, key string) string {
 	out := make(map[string][]access.Access)
-	
+
 	for _, a := range as {
-		
+
 		out[a.Group] = append(out[a.Group], access.Access{
 			Name:  a.Name,
 			CName: a.Cname,
@@ -130,7 +130,7 @@ func saveTemplate(as map[string]*Access, key string) string {
 	err = os.WriteFile(filePath, buf.Bytes(), 0666)
 	if err != nil {
 		log.Fatal(err)
-		
+
 	}
 	return filePath
 }
@@ -3,13 +3,14 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net"
+	"net/http"
+
 	"github.com/eolinker/eosc/log"
 	"github.com/eolinker/go-common/autowire"
 	"github.com/eolinker/go-common/cftool"
 	"github.com/eolinker/go-common/permit"
 	"github.com/eolinker/go-common/server"
-	"net"
-	"net/http"
 )

 var (
@@ -54,7 +55,6 @@ func main() {
 	for access, paths := range srv.Permits() {
 		permit.AddPermitRule(access, paths...)
 	}
-
 	err = http.Serve(ln, srv)
 	if err != nil {
 		log.Fatal(err)
@@ -3,7 +3,7 @@ package permit_middleware
 import (
 	"net/http"
 	"reflect"
-	
+
 	permit_identity "github.com/APIParkLab/APIPark/middleware/permit/identity"
 	"github.com/eolinker/eosc/log"
 	"github.com/eolinker/go-common/autowire"
@@ -42,11 +42,11 @@ func (p *PermitMiddleware) Sort() int {
 func (p *PermitMiddleware) Check(method string, path string) (bool, []gin.HandlerFunc) {
 	// 当前路径是否有配置权限
 	accessRules, has := permit.GetPathRule(method, path)
-	
+
 	if !has || len(accessRules) == 0 {
 		return false, nil
 	}
-	
+
 	return true, []gin.HandlerFunc{
 		func(ginCtx *gin.Context) {
 			userId := utils.UserId(ginCtx)
@@ -56,19 +56,14 @@ func (p *PermitMiddleware) Check(method string, path string) (bool, []gin.Handle
 				ginCtx.Abort()
 				return
 			}
-			
-			//if userId == "admin" {
-			//	// 超级管理员不校验
-			//	return
-			//}
-			
+
 			for _, group := range checkSort {
 				accessList, has := accessRules[group]
 				if !has {
 					// 当前分组没有配置权限
 					continue
 				}
-				
+
 				domainHandler, has := permit.SelectDomain(group)
 				if !has {
 					// 当前分组没有配置身份handler
@@ -9,6 +9,7 @@ type Kind int

 func (k *Kind) UnmarshalJSON(bytes []byte) error {
 	str := ""
+
 	err := json.Unmarshal(bytes, &str)
 	if err != nil {
 		return err
@@ -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()
@@ -147,7 +148,11 @@ func (i *imlProviderModule) Provider(ctx context.Context, id string) (*ai_dto.Pr
 	}
 	defaultLLM, has := p.GetModel(info.DefaultLLM)
 	if !has {
-		return nil, fmt.Errorf("ai provider llm not found")
+		model, has := p.DefaultModel(model_runtime.ModelTypeLLM)
+		if !has {
+			return nil, fmt.Errorf("ai provider llm not found")
+		}
+		defaultLLM = model
 	}
 	return &ai_dto.Provider{
 		Id:               info.Id,
@@ -197,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
@@ -275,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(),
@@ -340,20 +348,13 @@ func (i *imlProviderModule) UpdateProviderDefaultLLM(ctx context.Context, id str
 	})
 }

-func (i *imlProviderModule) getAiProviders(ctx context.Context, clusterId string) ([]*gateway.DynamicRelease, error) {
-	list, err := i.providerService.List(ctx, clusterId)
-	if err != nil {
-		return nil, err
-	}
+func (i *imlProviderModule) getAiProviders(ctx context.Context) ([]*gateway.DynamicRelease, error) {
+	list, err := i.providerService.List(ctx)
 	if err != nil {
 		return nil, err
 	}
 	providers := make([]*gateway.DynamicRelease, 0, len(list))
 	for _, p := range list {
-		if !p.Status {
-			// 关闭
-			continue
-		}
 		cfg := make(map[string]interface{})
 		err = json.Unmarshal([]byte(p.Config), &cfg)
 		if err != nil {
@@ -376,7 +377,7 @@ func (i *imlProviderModule) getAiProviders(ctx context.Context, clusterId string
 	return providers, nil
 }
 func (i *imlProviderModule) initGateway(ctx context.Context, clusterId string, clientDriver gateway.IClientDriver) error {
-	providers, err := i.getAiProviders(ctx, clusterId)
+	providers, err := i.getAiProviders(ctx)
 	if err != nil {
 		return err
 	}
@@ -393,7 +394,7 @@ func (i *imlProviderModule) initGateway(ctx context.Context, clusterId string, c
 		if err != nil {
 			return err
 		}
-		err = client.Online(ctx, providers...)
+		err = client.Online(ctx, p)
 		if err != nil {
 			return err
 		}
@@ -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
@@ -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
-      - name: Data Source
-#        cname: '数据源'
+              - system.settings.ssl_certificate.view
+      - name: data source
        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"
-      - name: subscription management
-#        cname: 订阅方管理
+            dependents:
+              - team.service.release.view
+      - name: subscription review
        value: 'subscription'
        children:
          - name: view
-#            cname: 查看
            value: 'view'
            guest_allow: true
            apis:
@@ -363,50 +275,48 @@ 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
+      - name: subscription service
        cname: 订阅服务
        value: 'subscription'
        children:
-          - name: view
-#            cname: 查看
-            value: 'view'
+          - name: allow subscribe service
+            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 +324,61 @@ 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"
-      - name: team
-#        cname: 团队管理
+            dependents:
+              - team.team.member.view
+      - name: team settings
        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:
+              - team.team.team.view
@@ -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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dot.L	47f6519006	Merge pull request #114 from APIParkLab/feature/permission update remark	2024-10-28 18:41:17 +08:00
Maggie	9679376cb2	Merge pull request #113 from APIParkLab/feature/v1.2 fix: table fields	2024-10-28 18:40:48 +08:00
Liujian	087e598be0	update remark	2024-10-28 18:39:55 +08:00
Dot.L	31aa8243ee	Merge pull request #112 from APIParkLab/feature/permission Feature/permission	2024-10-28 18:34:19 +08:00
Liujian	d3d05ef539	Merge remote-tracking branch 'github-pro/main' into feature/permission # Conflicts: # resources/access/access.yaml	2024-10-28 18:33:42 +08:00
maggieyyy	d6062ea4e7	fix: table fields	2024-10-28 18:32:20 +08:00
Liujian	7949748951	update permission	2024-10-28 18:27:37 +08:00
Maggie	0d737bad57	Merge pull request #111 from APIParkLab/feature/v1.2 Feature/v1.2	2024-10-28 16:22:58 +08:00
maggieyyy	e5d85bb3df	fix: Modify access fields	2024-10-28 16:15:38 +08:00
maggieyyy	0f0204b647	fix: cosumer list bug	2024-10-28 16:00:15 +08:00
maggieyyy	44f0b70461	fix: Consumer list bugs	2024-10-28 15:44:10 +08:00
Dot.L	588cf839e3	Merge pull request #110 from APIParkLab/feature/translate Feature/translate	2024-10-28 15:07:35 +08:00
Liujian	76872b3a97	Merge remote-tracking branch 'github-pro/main' into feature/translate # Conflicts: # .github/ISSUE_TEMPLATE/bug_report.yml # .github/ISSUE_TEMPLATE/request_help.yml	2024-10-28 15:06:24 +08:00
Dot.L	d253d68a12	Merge pull request #96 from sunanzhi/main fix:issue template content	2024-10-28 15:03:56 +08:00
Liujian	4de0d29f30	update access	2024-10-28 15:03:04 +08:00
Maggie	0f0480db63	Merge pull request #108 from APIParkLab/feature/v1.2 Feature/v1.2	2024-10-28 15:02:37 +08:00
maggieyyy	68309ac582	fix: Modify access	2024-10-28 15:00:59 +08:00
maggieyyy	522183eb4d	fix: update message	2024-10-28 13:39:47 +08:00
maggieyyy	4f6fee4d73	fix: Delete operation from team & Delete comments from publish	2024-10-28 11:52:51 +08:00
Liujian	c5fecf73c8	update action	2024-10-28 10:53:28 +08:00
Liujian	ee8e93d1e8	update action	2024-10-28 10:46:17 +08:00
Liujian	9d0fa5ea4a	Merge remote-tracking branch 'origin/main' into feature/translate	2024-10-28 10:43:23 +08:00
Dot.L	b0b9affbe7	Merge pull request #1 from Dot-Liu/feature/translate Feature/translate	2024-10-28 10:01:46 +08:00
Liujian	1d1c7c78e8	update go.mod	2024-10-28 10:00:34 +08:00
杨梦洁	d7f5b87e70	Merge branch 'feature/v1.2' into 'main' fix: Modify publish and title & add debug See merge request apipark/APIPark!54	2024-10-28 09:59:00 +08:00
maggieyyy	1048666972	fix: Modify publish and title & add debug	2024-10-28 09:58:04 +08:00
Liujian	217f5d61c7	Merge remote-tracking branch 'origin/main' into feature/translate	2024-10-27 00:48:03 +08:00
Liujian	2f1677f581	role update	2024-10-27 00:47:48 +08:00
刘健	afd7ea6a1c	Merge branch 'feature/translate' into 'main' create ai service add provider See merge request apipark/APIPark!53	2024-10-26 21:25:40 +08:00
Liujian	7155e14e64	create ai service add provider	2024-10-26 21:25:13 +08:00
刘健	68e5b49f46	Merge branch 'feature/translate' into 'main' update translate See merge request apipark/APIPark!52	2024-10-25 18:47:48 +08:00
Liujian	c01e95c716	update translate	2024-10-25 18:45:38 +08:00
杨梦洁	ffa7e5130e	Merge branch 'feature/v1.2' into 'main' fix: update translation See merge request apipark/APIPark!51	2024-10-25 16:35:30 +08:00
Maggie	7ce33bfd4c	Merge pull request #101 from APIParkLab/feature/v1.2 fix: update translation	2024-10-25 16:35:27 +08:00
maggieyyy	0c64fa9986	fix: update translation	2024-10-25 16:34:06 +08:00
Maggie	07e8b347e1	Merge pull request #100 from APIParkLab/feature/v1.2 fix: update translation	2024-10-25 16:20:02 +08:00
杨梦洁	38a402adef	Merge branch 'feature/v1.2' into 'main' Feature/v1.2 See merge request apipark/APIPark!50	2024-10-25 16:18:59 +08:00
maggieyyy	7ab2e29101	fix: update translation	2024-10-25 16:16:15 +08:00
Maggie	b96796793b	Merge pull request #99 from APIParkLab/docs-update-frontend-README docs: Update README.md	2024-10-25 15:48:21 +08:00
Scarqin	baa073b05d	Update README.md	2024-10-25 15:44:42 +08:00
Maggie	c944f9de52	Merge pull request #95 from APIParkLab/feature/v1.2 fix: Remove guest's account setting & update translation	2024-10-25 15:24:37 +08:00
杨梦洁	5567a65e4b	Merge branch 'feature/v1.2' into 'main' Feature/v1.2 See merge request apipark/APIPark!49	2024-10-25 15:23:51 +08:00
maggieyyy	c6c775f436	fix: Remove guest's account setting & update translation	2024-10-25 15:22:06 +08:00
sunanzhi	c0c43be6b9	fix:issue template content	2024-10-25 15:16:47 +08:00
刘健	9b6074318a	Merge branch 'feature/issue-templete' into 'main' update ao-account dependent version See merge request apipark/APIPark!48	2024-10-25 14:32:33 +08:00
Liujian	ada121015d	update ao-account dependent version	2024-10-25 14:32:11 +08:00
JackLiu	9d7b6c4bc6	Merge pull request #86 from rolealiu/main update translation	2024-10-25 14:31:56 +08:00
JackLiu	c262fc4f4d	Merge branch 'APIParkLab:main' into main	2024-10-25 14:31:26 +08:00
刘健	335317bd86	Merge branch 'feature/issue-templete' into 'main' update ao-account dependent version See merge request apipark/APIPark!47	2024-10-25 14:31:21 +08:00
Liujian	396464c573	update ao-account dependent version	2024-10-25 14:30:58 +08:00
HaoZhen Liu	d93c76ca36	update translation	2024-10-25 14:30:57 +08:00
刘健	60ad6007e5	Merge branch 'feature/issue-templete' into 'main' Feature/issue templete See merge request apipark/APIPark!46	2024-10-25 14:22:21 +08:00
Liujian	ceee520102	tmp commit	2024-10-25 14:21:50 +08:00
Maggie	a053557000	Merge pull request #83 from APIParkLab/feature/v1.2 fix: AI Model config bug	2024-10-25 14:07:39 +08:00
杨梦洁	e7c14b0817	Merge branch 'feature/v1.2' into 'main' fix: AI Model config bug See merge request apipark/APIPark!45	2024-10-25 14:04:00 +08:00
maggieyyy	727fd0bd36	fix: AI Model config bug	2024-10-25 14:02:23 +08:00
Maggie	4ba2b0c9ab	Merge pull request #70 from APIParkLab/feature/v1.2 fix: update translation	2024-10-25 09:28:32 +08:00
杨梦洁	b3672b8c66	Merge branch 'feature/v1.2' into 'main' Feature/v1.2 See merge request apipark/APIPark!44	2024-10-25 09:28:13 +08:00
maggieyyy	b33dda4a32	fix: update translation	2024-10-25 09:27:00 +08:00
刘健	450e565718	Merge branch 'feature/ai-service' into 'main' Feature/ai service See merge request apipark/APIPark!43	2024-10-24 23:43:36 +08:00
Liujian	00bd72c1e4	fix get llm error	2024-10-24 23:42:55 +08:00
Dot.L	81da1f45f1	Merge pull request #68 from APIParkLab/feature/ai-service Feature/ai service	2024-10-24 23:31:32 +08:00
Liujian	fd3d6433e2	finish fake ai	2024-10-24 23:30:25 +08:00
Liujian	9592a0ddda	Merge remote-tracking branch 'origin/main' into feature/ai-service	2024-10-23 18:41:14 +08:00