Merge branch 'main-github' into feature/permit

# Conflicts:
#	go.mod

.gitignore

@@ -3,3 +3,4 @@
 /config.yml
 /build/
 /apipark
+.gitlab-ci.yml

.gitlab-ci.yml

@@ -1,98 +0,0 @@
-variables:
-  PATH: /opt/go-1.21/go/bin/:/opt/node/node/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin
-  GOROOT: /opt/go-1.21/go
-  GOPROXY: https://goproxy.cn
-  VERSION: $CI_COMMIT_SHORT_SHA 
-  APP: apipark
-  APP_PRE: ${APP}_${VERSION}
-  BUILD_DIR: ${APP}-build
-  DEPLOY_DESC: "DEV 环境"
-  VIEW_ADDR: http://172.18.166.219:8288
-  SAVE_DIR: /opt/${APP}
-  NODE_OPTIONS: --max_old_space_size=8192
-
-stages:
-  - notice
-  - prefix
-  - build
-  - deploy
-  - webhook
-
-feishu-informer: # 飞书回调
-  stage: notice
-  variables:
-    DIFF_URL: "$CI_MERGE_REQUEST_PROJECT_URL/-/merge_requests/$CI_MERGE_REQUEST_IID/diffs"
-  rules:
-    - if: $CI_PIPELINE_SOURCE=="merge_request_event" && $CI_COMMIT_BRANCH =~ "main"
-  script:
-    - echo "merge request"
-    - |
-      curl -X POST -H "Content-Type: application/json" \
-      -d "{\"msg_type\":\"text\",\"content\":{\"text\":\"项目：${CI_PROJECT_NAME}\\n提交人：${GITLAB_USER_NAME}\\n提交信息：${CI_MERGE_REQUEST_TITLE}\\n合并分支信息：${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} -> ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}\\n差异性地址：${DIFF_URL}\\n请及时review代码\"}}" \
-      https://open.feishu.cn/open-apis/bot/v2/hook/1c334752-2874-41a1-8f1b-3060f2d46b6c
-
-prebuild:
-  stage: prefix
-  rules:
-    - if:  $CI_COMMIT_BRANCH == "main"
-  script:
-    - echo "prebuild"
-    - chmod +x ./scripts/prefix.sh
-    - ./scripts/prefix.sh
-
-builder:
-  stage: build
-  rules:
-    - if: $CI_COMMIT_BRANCH == "main"
-  script:
-    - set -e
-    - |
-      if [ ! -d "../artifacts" ]; then
-        mkdir -p ../artifacts
-      fi
-      if [ -d "../artifacts/dist" ]; then
-        cp -r ../artifacts/dist frontend/dist
-      fi
-    - |
-      if [ -n "$(git diff --name-status HEAD~1 HEAD -- frontend)" ]; then
-        ./scripts/build.sh $BUILD_DIR ${VERSION} all ""
-      else
-        ./scripts/build.sh $BUILD_DIR ${VERSION}
-      fi
-      if [ -d "frontend/dist" ]; then
-        echo "copy frontend/dist to artifacts/dist"
-        rm -fr ../artifacts/dist
-        cp -r frontend/dist ../artifacts/dist
-      fi
-      cp $BUILD_DIR/${APP_PRE}_linux_amd64.tar.gz ${SAVE_DIR}
-
-deployer:
-  stage: deploy
-  rules:
-    - if: $CI_COMMIT_BRANCH == "main"
-  variables:
-    APIPARK_GUEST_MODE: allow
-    APIPARK_GUEST_ID: dklejrfbhjqwdh
-  script:
-    - cd ${SAVE_DIR};mkdir -p ${APP_PRE};tar -zxvf ${APP_PRE}_linux_amd64.tar.gz -C ${APP_PRE};cd ${APP_PRE};./install.sh ${SAVE_DIR};./run.sh restart;cd ${SAVE_DIR} && ./clean.sh ${APP_PRE}
-  when: on_success
-success:
-  stage: webhook
-  rules:
-    - if: $CI_COMMIT_BRANCH == "main"
-  script:
-    - |
-      curl -X POST -H "Content-Type: application/json" \
-      -d "{\"msg_type\":\"text\",\"content\":{\"text\":\"最近一次提交：${CI_COMMIT_TITLE}\\n提交人：${GITLAB_USER_NAME}\\n项目：${CI_PROJECT_NAME}\\n环境：${DEPLOY_DESC}\\n更新部署完成.\\n访问地址：${VIEW_ADDR}\\n工作流地址：${CI_PIPELINE_URL}\"}}" \
-      https://open.feishu.cn/open-apis/bot/v2/hook/c3672932-4dfa-4989-8023-0128bae59338
-  when: on_success
-failure:
-  stage: webhook
-  rules:
-    - if: $CI_COMMIT_BRANCH == "main"
-  script:
-    - |
-      curl -X POST -H "Content-Type: application/json" \
-      -d "{\"msg_type\":\"text\",\"content\":{\"text\":\"最近一次提交：${CI_COMMIT_TITLE}\\n提交人：${GITLAB_USER_NAME}\\n项目：${CI_PROJECT_NAME}\\n环境：${DEPLOY_DESC}\\n更新部署失败，请及时到gitlab上查看\\n工作流地址：${CI_PIPELINE_URL}\"}}" \
-      https://open.feishu.cn/open-apis/bot/v2/hook/c3672932-4dfa-4989-8023-0128bae59338
-  when: on_failure

README.md

@@ -197,7 +197,7 @@ To achieve this goal, we plan to add new features to APIPark, including:
 <br>
 
 # 📕 Documentation
-Visit [APIPark Documentation](https://docs.apipark.com/docs/install) for detailed installation guides, API references, and usage instructions.
+Visit [APIPark Documentation](https://docs.apipark.com/docs/deploy) for detailed installation guides, API references, and usage instructions.
 
 <br>
 

controller/service/iml.go

@@ -5,6 +5,9 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
+	"time"
+
+	"github.com/eolinker/eosc/log"
 
 	application_authorization "github.com/APIParkLab/APIPark/module/application-authorization"
 	application_authorization_dto "github.com/APIParkLab/APIPark/module/application-authorization/dto"
@@ -212,10 +215,7 @@ func (i *imlServiceController) createAIService(ctx *gin.Context, teamID string,
 		if err != nil {
 			return err
 		}
-		//_, err = i.upstreamModule.Save(ctx, info.Id, newAIUpstream(info.Id, *input.Provider, p.URI()))
+
-		//if err != nil {
-		//	return err
-		//}
 		return i.docModule.SaveServiceDoc(ctx, info.Id, &service_dto.SaveServiceDoc{
 			Doc: "The Translation API allows developers to translate text from one language to another. It supports multiple languages and enables easy integration of high-quality translation features into applications. With simple API requests, you can quickly translate content into different target languages.",
 		})
@@ -237,7 +237,12 @@ func (i *imlServiceController) SearchMyServices(ctx *gin.Context, teamId string,
 //}
 
 func (i *imlServiceController) Get(ctx *gin.Context, id string) (*service_dto.Service, error) {
+	now := time.Now()
+	defer func() {
+		log.Infof("get service %s cost %d ms", id, time.Since(now).Milliseconds())
+	}()
 	return i.module.Get(ctx, id)
+
 }
 
 func (i *imlServiceController) Search(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) {
@@ -279,6 +284,10 @@ type imlAppController struct {
 	authModule application_authorization.IAuthorizationModule `autowired:""`
 }
 
+func (i *imlAppController) SearchCanSubscribe(ctx *gin.Context, serviceId string) ([]*service_dto.SimpleAppItem, error) {
+	return i.module.SearchCanSubscribe(ctx, serviceId)
+}
+
 func (i *imlAppController) Search(ctx *gin.Context, teamId string, keyword string) ([]*service_dto.AppItem, error) {
 	return i.module.Search(ctx, teamId, keyword)
 }

controller/service/service.go

@@ -42,6 +42,7 @@ type IAppController interface {
 	// SimpleApps 获取简易项目列表
 	SimpleApps(ctx *gin.Context, keyword string) ([]*service_dto.SimpleAppItem, error)
 	MySimpleApps(ctx *gin.Context, keyword string) ([]*service_dto.SimpleAppItem, error)
+	SearchCanSubscribe(ctx *gin.Context, keyword string) ([]*service_dto.SimpleAppItem, error)
 	GetApp(ctx *gin.Context, appId string) (*service_dto.App, error)
 	DeleteApp(ctx *gin.Context, appId string) error
 }

frontend/packages/businessEntry/index.html

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

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

@@ -243,7 +243,7 @@ const themeToken = {
                             </div>
                         )}
                         logo={Logo}
-                        pageTitleRender={()=>$t('APIPark - 企业API数据开放平台')}
+                        pageTitleRender={()=>$t('APIPark')}
                         menuFooterRender={(props) => {
                             if (props?.collapsed) return undefined;
                         }}

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

@@ -1,27 +1,23 @@
 
-import { GetProp, TransferProps, TreeDataNode, theme, Transfer, Tree, Spin } from "antd";
+import { TransferProps, TreeDataNode, Tree, Spin, Input, Empty } from "antd";
-import { DataNode, TreeProps } from "antd/es/tree";
+import { DataNode } from "antd/es/tree";
 import {  Ref, forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
 import { ApartmentOutlined, LoadingOutlined, UserOutlined } from "@ant-design/icons";
-import { cloneDeep, debounce } from "lodash-es";
 import { ColumnsType } from "antd/es/table";
 import { $t } from "@common/locales";
 import { useGlobalContext } from "@common/contexts/GlobalStateContext";
 
-type TransferItem = GetProp<TransferProps, 'dataSource'>[number];
-
 export type TransferTableProps<T> = {
   request?:(k?:string)=>Promise<{data:T[],success:boolean}>
   columns: ColumnsType<T>
   primaryKey:string
-  onSelect:(selectedData:T[])=>void
+  onSelect:(selectedData:string[])=>void
   tableType?:'member'|'api'
   disabledData:string[]
   searchPlaceholder?:string
 }
 
 export type TransferTableHandle<T> = {
-  selectedData: () => T[];
   selectedRowKeys: () => React.Key[];
 }
 
@@ -31,10 +27,6 @@ interface TreeTransferProps {
   onChange: TransferProps['onChange'];
 }
   
-// Customize Table Transfer
-const isChecked = (selectedKeys: React.Key[], eventKey: React.Key) =>
-  selectedKeys.includes(eventKey);
-
 const generateTree = (
   treeNodes: TreeDataNode[] = [],
   checkedKeys: TreeTransferProps['targetKeys'] = [], 
@@ -73,200 +65,104 @@ const generateTree = (
     )
 };
 
-const TransferTree = (props)=>{
-  const { direction, token, tableHeight, dataSource, targetKeys, onItemSelect, onItemSelectAll,checkedKey,selectedKeys, filteredItems ,disabledData} = props;
-  const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
-
-  const getExpandedKeys = (newData:TreeDataNode[], expandedSet:Set<string> = new Set())=>{
-    newData.forEach((item)=>{
-      if(item.children && item.children.length > 0){
-        expandedSet.add(item.key)
-        getExpandedKeys(item.children,expandedSet)
-      }
-    })
-    return expandedSet
-  }
-
-  const treeData:TreeDataNode[] = useMemo(()=>{
-    const filteredSet = filteredItems && filteredItems.length > 0 ? new Set(filteredItems.map((x)=>x.id))  : new Set()
-    const res =  dataSource && dataSource.length > 0 ? generateTree(dataSource, targetKeys,direction === 'right',disabledData,filteredSet) : []
-    setExpandedKeys(Array.from(getExpandedKeys(res)))
-    return res
-  },[
-    dataSource, targetKeys,direction ,disabledData,filteredItems
-  ])
-
-  const onExpand: TreeProps['onExpand'] = (expandedKeysValue) => {
-    setExpandedKeys(expandedKeysValue as string[]);
-  };
-
-  return (
-    
-    <div style={{ padding: token.paddingXS }}>
-      <Tree
-          className="icon-tree"
-          blockNode
-          checkable
-          showIcon
-          checkedKeys={direction === 'left' ? Array.from(new Set([...checkedKey,...disabledData])) : selectedKeys }
-          defaultExpandAll
-          expandedKeys={expandedKeys}
-          onExpand={onExpand}
-          height={tableHeight}
-          icon={(props)=> { return (props.type === 'member' ? <UserOutlined /> :<ApartmentOutlined /> )} }
-          treeData={treeData}
-          onCheck={(_checkedKeys, e:{checked: boolean, checkedNodes, node, event, halfCheckedKeys}) => {
-              if(e.checked){
-                  onItemSelectAll( _checkedKeys, e.checked);
-              }else{
-                  const checkedKeyArrFromTree = e.checkedNodes.map(node => node.key)
-                  onItemSelectAll((checkedKey as string[]).filter(key => checkedKeyArrFromTree.indexOf(key) === -1),e.checked)
-              }
-          }}
-          onSelect={(_, { node: { key } }) => {
-              onItemSelect(key as string, !isChecked(checkedKey, key));
-          }}
-      />
-    </div>
-  )
-}
-
 
  const MemberTransfer= forwardRef<TransferTableHandle<{[k:string]:unknown}>, TransferTableProps<{[k:string]:unknown}>>(
   <T extends {[k:string]:unknown}>(props: TransferTableProps<T>, ref:Ref<TransferTableHandle<T>>) => {
     const {request,columns,primaryKey,onSelect,tableType,disabledData = [],searchPlaceholder} = props
-    const [tableHeight, setTableHeight] = useState(window.innerHeight * 80 / 100 - 64 - 72 - 56 - 16 -3);
     const [targetKeys, setTargetKeys] = useState<TreeTransferProps['targetKeys']>([]);
     const [dataSource, setDataSource] = useState<DataNode[] >([])
     const parentRef = useRef<HTMLDivElement>(null);
     const [loading, setLoading] = useState<boolean>(false)
     const {state} = useGlobalContext()
-    
+    const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
+    const [searchWord, setSearchWord] = useState<string>('')
     useEffect(()=>{
       setTargetKeys(disabledData)
     },[disabledData])
 
     useImperativeHandle(ref, () =>({
-      selectedData: () => dataSource,
       selectedRowKeys: () => targetKeys,}))
 
-    const onChange: TreeTransferProps['onChange'] = (keys) => {
+  const translatedDataSource = useMemo(()=>{
-      onSelect?.(new Set(keys))
+    
-      setTargetKeys(Array.from(new Set(keys)));
+    const loop = (data: DataNode[]): DataNode[] =>
-    };
+      data?.map((item) => {
+          const strTitle:string = item.name === '所有成员' ? $t(item.name) as string : item.name as string;
+          const index = strTitle.indexOf(searchWord);
+          const beforeStr = strTitle.substring(0, index);
+          const afterStr = strTitle.slice(index + searchWord.length);
+          const title =
+              index > -1 ? (
+                  <span className='w-[calc(100%-16px)] truncate' title={strTitle}>
+                      {beforeStr}
+                      <span className="text-theme">{searchWord}</span>
+                      {afterStr}
+                  </span>
+              ) : (
+                  <span className='w-[calc(100%-16px)] truncate' title={`${strTitle}`}>{strTitle}</span>
+              )
+          if (item.children) {
+              return {
+                  ...item,
+                  title, 
+                  disableCheckbox:disabledData.indexOf(item.key as string) !== -1,
+                  icon:<ApartmentOutlined />,
+                  children: loop(item.children as T[]) };
+          }
 
-  const { token } = theme.useToken();
+          return {
-
+              ...item,
-  const transferDataSource: TransferItem[] = useMemo(()=>{
+              title, 
-      function flatten(list: TreeDataNode[] = [], res:TransferItem[]) {
+              icon:<UserOutlined />,
-        list.forEach((item) => {
+              isLeaf:true,
-          res.push({...item, title:item.title === '所有成员' ? $t((item as unknown as {title:string}).title):item.title }as TransferItem);
+              disableCheckbox:disabledData.indexOf(item.key as string) !== -1
-          flatten(item.children,res);
+          };
-        });
-      }
-      const res:TransferItem[] =[]
-      flatten(dataSource,res);
-      return res
-  },[
-    dataSource, state.language
-  ])
-
-
-  const translatedDataSource = useMemo(()=>dataSource.map((item)=>({
-    ...item, 
-    name:item.name === '所有成员' ? $t((item as unknown as {name:string}).name):item.name,
-  })),[dataSource, state.language])
-
-
-
-  let memo: Record<string, boolean> = {};
-
-  const handlerFilterOption = (inputValue: string, item: any, parentResult: boolean = false, childrenSet: Set<string> = new Set()): boolean => {
-    const cacheKey = `${inputValue}_${item.key}`;
-    if (memo[cacheKey]) {
-      return memo[cacheKey];
-    }
-
-    childrenSet.add(item.key);
-    let result = item.title.includes(inputValue) || parentResult
-    if (item.children) {
-      for (const child of item.children) {
-        if (handlerFilterOption(inputValue, child, result,childrenSet)) {
-          result = true;
-        }
-      }
-    }
-  
-    if (result) {
-      memo[cacheKey] = result;
-      childrenSet.forEach((key) => {
-        memo[`${inputValue}_${key}`] = result;
       });
-    }
+  return loop(dataSource);
-    return result;
+  },[dataSource, state.language, searchWord])
-  };
+
+
+  const getInitExpandKeys = (data:T[], expandKeys:string[] = [])=>{
+    data.forEach((item)=>{
+      if(item.children?.length){
+        expandKeys.push(item.key as string)
+        getInitExpandKeys(item.children,expandKeys)
+      }
+    })
+    return expandKeys
+  }
   
   const getDataSource = ()=>{
     setLoading(true)
     request && request().then((res)=>{
         const {data,success} = res
         setDataSource(success? data : [])
+        setExpandedKeys(getInitExpandKeys(success? data:[]))
     }).finally(()=>{setLoading(false)})
-}
+  }
 
-useEffect(() => {
-  getDataSource()
-  const handleResize = () => {
-      setTableHeight(window.innerHeight * 80 / 100 - 64 - 72 - 56 - 16 -3)
-  };
 
-  const debouncedHandleResize = debounce(handleResize, 200);
+  useEffect(() => {
-
+    getDataSource()
-  // 监听窗口大小变化
+  }, []);
-  window.addEventListener('resize', debouncedHandleResize);
-  handleResize();
-  return () => {
-    window.removeEventListener('resize', debouncedHandleResize);
-  };
-}, []);
 
     return (
         <div ref={parentRef}>
         <Spin indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} spinning={loading} className=''>
-          <Transfer
+          <Input className="mb-[10px]" placeholder={searchPlaceholder} onChange={(e)=>setSearchWord(e.target.value)} value={searchWord} />
-            showSearch
+         <>{ translatedDataSource && translatedDataSource.length > 0 ? <Tree
-            onSearch={(dir)=>{
+            checkable
-              memo = {}; 
+            expandedKeys={expandedKeys}
-            }}
+            checkedKeys={targetKeys}
-            listStyle={{width:'408px'}}
+            selectable={false}
-            disabledData={disabledData}
+            onCheck={(e)=>{setTargetKeys(e);
-            filterOption={(inputValue: string, item: any) => handlerFilterOption(inputValue, item)}
+              onSelect(((e as string[])?.filter(x=>disabledData.indexOf(x as string) === -1))||[])}}
-            targetKeys={targetKeys}
+            onExpand={setExpandedKeys}
-            dataSource={transferDataSource}
+            treeData={translatedDataSource}
-            className="tree-transfer"
+            blockNode 
-            render={(item) => item.title!}
+            showIcon
-            showSelectAll={false}
+          />
-            onChange={onChange}
+            :  <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/> }</> 
-            titles={['','']}
-            >
-            {({ direction, onItemSelect, selectedKeys,onItemSelectAll ,filteredItems}) => {
-              const treeProps = {
-                dataSource:translatedDataSource, direction, onItemSelect, selectedKeys,onItemSelectAll ,filteredItems,token,tableHeight,targetKeys,disabledData
-              }
-                if (direction === 'left') {
-                    const checkedKey = [...selectedKeys, ...targetKeys as string[]];
-                    return (
-                      <TransferTree {...treeProps} checkedKey={checkedKey} />
-                    );
-                }
-                if(direction === 'right'){
-                  const checkedKey = [...selectedKeys,...targetKeys as string[]];
-                  return (
-                     <TransferTree {...treeProps} checkedKey={checkedKey} />
-                  );
-                }
-            }}
-            </Transfer>
             </Spin>
         </div>
       );

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

@@ -39,7 +39,7 @@ const WithPermission = ({access, tooltip, children,disabled, showDisabled = true
             { cloneElement(children, {disabled:true})}
              </Tooltip>}
         {!editAccess && (children?.type !== Button && children?.type !== Upload && showDisabled) && <Tooltip  title={tooltip ?? $t("暂无操作权限，请联系管理员分配。")}> 
-            { cloneElement(children, {disabled:true,okButtonProps:{disabled:true}})}
+            { cloneElement(children, {disabled:true, onClick:(e)=>e.preventDefault(),okButtonProps:{disabled:true}})}
              </Tooltip>}
         
       </>

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

@@ -276,252 +276,252 @@ export const PERMISSION_DEFINITION = [
       },
       "team.service.api_doc.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.api_doc.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.view_all","team.service.api_doc.view"] }]
         }
       },
       "team.service.api_doc.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.api_doc.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.api_doc.manager"] }]
         }
       },
       "team.service.api_doc.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.api_doc.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.api_doc.manager"] }]
         }
       },
       "team.service.service_intro.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.service_intro.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.view_all","team.service.service_intro.view"] }]
         }
       },
       "team.service.service_intro.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.service_intro.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.service_intro.manager"] }]
         }
       },
       "team.service.service_intro.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.service_intro.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.service_intro.manager"] }]
         }
       },
       "team.service.api_doc.import": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.api_doc.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.api_doc.manager"] }]
         }
       },
       "team.service.router.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.api.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.view_all","team.service.api.view"] }]
         }
       },
       "team.service.router.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.api.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.api.manager"] }]
         }
       },
       "team.service.router.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.api.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.api.manager"] }]
         }
       },
       "team.service.router.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.api.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.api.manager"] }]
         }
       },
       "team.service.upstream.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.upstream.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.view_all","team.service.upstream.view"] }]
         }
       },
       "team.service.upstream.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.upstream.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.upstream.manager"] }]
         }
       },
       "team.service.upstream.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.upstream.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.upstream.manager"] }]
         }
       },
       "team.service.upstream.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.upstream.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.upstream.manager"] }]
         }
       },
       "team.service.release.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.release.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.view_all","team.service.release.view"] }]
         }
       },
       "team.service.release.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.release.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.release.manager"] }]
         }
       },
       "team.service.release.online": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.release.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.release.manager"] }]
         }
       },
       "team.service.release.stop": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.release.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.release.manager"] }]
         }
       },
       "team.service.release.cancel": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.release.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.release.manager"] }]
         }
       },
       "team.service.release.rollback": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.release.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.release.manager"] }]
         }
       },
       "team.service.release.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.release.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.release.manager"] }]
         }
       },
       "team.service.release.approval": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.release.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.release.manager"] }]
         }
       },
       "team.service.subscription.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.subscription.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.view_all","team.service.subscription.view"] }]
         }
       },
       "team.service.subscription.approval": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.subscription.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.subscription.manager"] }]
         }
       },
       "team.service.subscription.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.subscription.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.subscription.manager"] }]
         }
       },
       "team.service.subscription.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.service.subscription.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.service.subscription.manager"] }]
         }
       },
       "team.service.service.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.service.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","system.workspace.service.view_all","team.team.service.view"] }]
         }
       },
       "team.service.service.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.service.manager","team.service.service.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.team.service.manager","team.service.service.manager"] }]
         }
       },
       "team.service.service.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.service.manager","team.service.service.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.team.service.manager","team.service.service.manager"] }]
         }
       },
       "team.service.service.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.service.manager","team.service.service.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.service.manager_all","team.team.service.manager","team.service.service.manager"] }]
         }
       },
       "team.application.subscription.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.subscription.view_subscribed_service"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.view_all","team.consumer.subscription.view_subscribed_service"] }]
         }
       },
       "team.application.subscription.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.subscription.subscribe"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.subscription.subscribe"] }]
         }
       },
       "team.application.subscription.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.subscription.manager_subscribed_services"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.subscription.manager_subscribed_services"] }]
         }
       },
       "team.application.subscription.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.consumer.subscription.manager_subscribed_services"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","team.team.consumer.subscription.manager_subscribed_services"] }]
         }
       },
       "team.application.application.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.consumer.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.view_all","team.team.consumer.view"] }]
         }
       },
       "team.application.application.add": {
         "granted": {
-          "anyOf": [{ "backend": ['team.team.consumer.manager',"team.consumer.application.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al",'team.team.consumer.manager',"team.consumer.application.manager"] }]
         }
       },
       "team.application.application.edit": {
         "granted": {
-          "anyOf": [{ "backend": ['team.team.consumer.manager',"team.consumer.application.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al",'team.team.consumer.manager',"team.consumer.application.manager"] }]
         }
       },
       "team.application.application.delete": {
         "granted": {
-          "anyOf": [{ "backend": ['team.team.consumer.manager',"team.consumer.application.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al",'team.team.consumer.manager',"team.consumer.application.manager"] }]
         }
       },
       "team.consumer.authorization.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.authorization.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","system.workspace.application.view_all","team.consumer.authorization.view"] }]
         }
       },
       "team.application.authorization.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }]
         }
       },
       "team.application.authorization.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }]
         }
       },
       "team.application.authorization.delete": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }]
         }
       },
       "team.application.authorization.cancelSubApply": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }]
         }
       },
       "team.application.authorization.cancelSub": {
         "granted": {
-          "anyOf": [{ "backend": ["team.consumer.authorization.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }]
         }
       },
       "team.team.team.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.team.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.view_all","team.team.team.view"] }]
         }
       },
       "team.team.team.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.team.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.manager","team.team.team.manager"] }]
         }
       },
       "team.team.member.view": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.member.view"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.view_all","team.team.member.view"] }]
         }
       },
       "team.team.member.add": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.member.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.manager","team.team.member.manager"] }]
         }
       },
       "team.team.member.edit": {
         "granted": {
-          "anyOf": [{ "backend": ["team.team.member.manager"] }]
+          "anyOf": [{ "backend": ["system.workspace.team.manager","team.team.member.manager"] }]
         }
       },
       "project.mySystem.topology.view": {

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

@@ -546,7 +546,7 @@
   "移除成员": "K395acc14",
   "添加成员": "Kec46a57f",
   "输入姓名查找": "K48724410",
-  "搜索用户名、邮箱": "Kb9052305",
+  "输入名称查找用户": "Kf5fd27ed",
   "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。": "K4c72fb6f",
   "添加团队": "K510cdd27",
   "输入名称、ID、负责人查找团队": "K9244ae14",

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

@@ -319,7 +319,7 @@
   "Ka46b9b24": "Data Source Type",
   "Kbb0cdcd0": "Data Source Address",
   "Kd9dfb884": "Organization",
-  "K3e770a75": "Authentication Token",
+  "K3e770a75": "Credentials Token",
   "K8ef69ee2": "Key",
   "Kba3507d6": "Upload Key",
   "K93ac0f23": "Key file suffix is usually .key",
@@ -365,7 +365,7 @@
   "Kcef64f4d": "Default AI Provider",
   "Kcab588a9": "No AI model provider set,",
   "Kb9b56111": "Set Now",
-  "Kcf756b7a": "API Call Prefix",
+  "Kcf756b7a": "API Request Prefix",
   "K13edc043": "As a prefix for all APIs in the service, e.g., host/{service_name}/{api_path}, cannot be modified once saved.",
   "Kf52a584d": "Service Category",
   "K72b21be5": "Set the category in which the service will be displayed in the service marketplace",
@@ -391,8 +391,8 @@
   "K813e1c0a": "Team Name",
   "K692f5aa6": "Team ID",
   "K5de0bc2": "Team ID can be used to retrieve the team, cannot be modified once saved.",
-  "Ka63dd985": "Team Leader",
+  "Ka63dd985": "Team Administrator",
-  "Ka6bcd272": "The leader has management authority over the team, services, and members within the team",
+  "Ka6bcd272": "The Administrator has management authority over the team, services, and members within the team",
   "Ka2012bdd": "Delete Team",
   "Kbde1f3d": "Service data must be cleared before deletion",
   "K395acc14": "Remove",
@@ -463,7 +463,7 @@
   "Kd59290a2": "Search Category or Tag",
   "K6b75bdbc": "No API Data",
   "K4b15d6f5": "Application Reason",
-  "Kb71b5a13": "Authentication Type",
+  "Kb71b5a13": "Credentials Type",
   "K4d1465ee": "ISS",
   "K5dcd7ed8": "Signature Algorithm",
   "K5b0eedd3": "Secret",
@@ -475,10 +475,10 @@
   "K31418470": "SK",
   "Kbfeb5297": "API Key",
   "K1a78e6f0": "Expiration Time",
-  "Ke64e43a": "Hide Authentication Info",
+  "Ke64e43a": "Hide Credentials Info",
-  "K217cb125": "Authentication Details",
+  "K217cb125": "Credentials Details",
-  "K2bb63eca": "Add Authentication",
+  "K2bb63eca": "Add Credentials",
-  "Kd74d69b7": "Edit Authentication",
+  "Kd74d69b7": "Edit Credentials",
   "K9cbe1e0": "Modify",
   "Kb6e9328f": "Authorization",
   "Kd23d1716": "Add Authorization",
@@ -678,5 +678,6 @@
   "K1644b775": "Add",
   "Kc8ee3e62": "Non-Existence",
   "K1e97dbd8": "Existence",
-  "Kec91f0db": "Applicant Consumer"
+  "Kec91f0db": "Applicant Consumer",
+  "Kf5fd27ed": "Enter Name to Search User"
 }

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

@@ -700,5 +700,6 @@
   "K1644b775": "追加",
   "Kc8ee3e62": "存在しない",
   "K1e97dbd8": "存在する",
-    "Kec91f0db": "申請側コンシューマー"
+  "Kec91f0db": "申請側コンシューマー",
+  "Kf5fd27ed": "名前を入力してユーザーを検索"
 }

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

@@ -1 +1,3 @@
-{}
+{
+  "Kf5fd27ed": "输入名称查找用户"
+}

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

@@ -1 +1,3 @@
-{}
+{
+  "Kf5fd27ed": "输入名称查找用户"
+}

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

@@ -21,6 +21,7 @@
   "K78b1ca25": "地址",
   "K1644b775": "新增",
   "Kec91f0db": "申请方消费者",
+  "Kf5fd27ed": "输入名称查找用户",
   "Kc3b7bfa8": "暂无消费者描述",
   "K3a6f905d": "输入名称、ID 查找消费者"
 }

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

@@ -1 +1,3 @@
-{}
+{
+  "Kf5fd27ed": "输入名称查找用户"
+}

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

@@ -1,3 +1,4 @@
 {
+  "Kb9052305": "Search Username, Email",
   "K40a89bd8": "Enter Name, ID to Search Member"
 }

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

@@ -5,6 +5,7 @@
   "K9bdd8403": "API を安全に呼び出すためには、アプリケーションとトークンを作成する必要があります。",
   "Kc8239422": "チームにはユーザー、アプリケーション、サービスが含まれ、異なるチームのアプリケーションとサービスのデータは分離されています。企業内の部門/プロジェクトグループ/チームの管理に使用できます。",
   "Ka0a8840a": "他のアプリケーションのサブスクリプション申請をレビューし、承認後に API リクエストが発行できます。",
+  "Kb9052305": "ユーザー名またはメールを検索",
   "K5ece3bac": "チームとメンバーを設定してから、チーム内でサービスとアプリケーションを作成し、API をサブスクライブできます。メンバーは所属チーム内のサービスとアプリケーションのみを表示できます。",
   "K1512e983": "アプリケーション呼び出し統計",
   "Kb4d2007f": "Application を選択",

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

@@ -5,6 +5,7 @@
   "K9bdd8403": "为了安全地调用 API，你需要创建一个消费者以及Token。",
   "Kc8239422": "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。",
   "Ka0a8840a": "审核其他消费者的订阅申请，审核通过后的才可发起 API 请求。",
+  "Kb9052305": "搜索用户名、邮箱",
   "K5ece3bac": "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。",
   "K1512e983": "消费者调用统计",
   "Kb4d2007f": "请选择消费者",

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

@@ -5,6 +5,7 @@
   "K9bdd8403": "為了安全地調用 API，你需要創建一個應用以及Token。",
   "Kc8239422": "團隊中包含了人員、應用程式和服務，不同團隊之間的應用程式和服務數據是隔離的，可用於管理企業內部不同的部門/項目組/團隊。",
   "Ka0a8840a": "審核其他應用程式的訂閱申請，審核通過後的才可發起 API 請求。",
+  "Kb9052305": "搜索用戶名、電郵",
   "K5ece3bac": "設置團隊和成員，然後你可以在團隊內創建服務和應用程式、訂閱API，成員只能看到所屬團隊內的服務和應用程式。",
   "K1512e983": "應用程式調用統計",
   "Kb4d2007f": "請選擇應用程式",

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

@@ -676,5 +676,7 @@
   "K6e32a344": "订阅服务数量",
   "Ka701316": "鉴权数量",
   "K9eaa2eb6": "列表",
-  "Kfaec39e9": "块"
+  "Kfaec39e9": "块",
+  "Kc3b7bfa8": "暂无消费者描述",
+  "K3a6f905d": "输入名称、ID 查找消费者"
   }

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

@@ -700,5 +700,6 @@
   "K1644b775": "新增",
   "Kc8ee3e62": "不存在匹配",
   "K1e97dbd8": "存在匹配",
-  "Kec91f0db": "申請方消費者"
+  "Kec91f0db": "申請方消費者",
+  "Kf5fd27ed": "輸入名稱查找使用者"
   }

frontend/packages/common/src/utils/permission.ts

@@ -13,10 +13,15 @@ export const checkAccess:(access:AccessDataType, accessData:Map<string,string[]>
         return false
     }
     const neededBackendAccessArr = PERMISSION_DEFINITION[0]?.[access]?.granted?.anyOf[0].backend || []
-    return accessData?.has(accLevel)&& accessData.get(accLevel)!.length > 0 ? hasIntersection(neededBackendAccessArr, accessData.get(accLevel)!) : false
+    let accessSet = new Set(accessData.get('system'))
+    if(accLevel === 'team'){
+      accessSet = new Set(Array.from(accessSet).concat(accessData?.get('team') || []))
+    }
+    return accessSet!.size > 0 ? hasIntersection(neededBackendAccessArr, accessSet) : false
 }
 
-const hasIntersection = (arr1:string[], arr2:string[])=> {
+const hasIntersection = (arr1:string[], set1:Set<string>)=> {
+    const arr2 = Array.from(set1)
     const set = new Set(arr1.length > arr2.length ? arr2:arr1) 
     const arr = arr1.length > arr2.length ? arr1:arr2
     for (const item of arr) {

frontend/packages/core/index.html

@@ -1,16 +1,36 @@
 
 <!doctype html>
 <html lang="en">
-  <head>
+  <head id="head">
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/frontend/favicon.ico" />
+    <link id="favicon" rel="icon" type="image/svg+xml" href="/frontend/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>APIPark</title>
   </head>
-  <body>
+  <body id="eo-body">
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
-    <script async src="/frontend/iconpark_eolink.js"></script>
+    <script>
-    <script async src="/frontend/iconpark_apinto.js"></script>
+      document.addEventListener('DOMContentLoaded', () => {
+        const eoBody = document.getElementById('eo-body');
+        const favicon = document.getElementById('favicon');
+
+        const createScript = (id, src) => {
+          const script = document.createElement('script');
+          script.id = id;
+          script.async = true;
+          script.src = src;
+          return script;
+        };
+
+        const iconparkApintoSrc = window.location.hostname === 'localhost' ? '/iconpark_apinto.js' : '/frontend/iconpark_apinto.js';
+        const iconparkEolinkSrc = window.location.hostname === 'localhost' ? '/iconpark_eolink.js' : '/frontend/iconpark_eolink.js';
+        const faviconSrc = window.location.hostname === 'localhost' ? '/favicon.ico' : '/frontend/favicon.ico';
+
+        favicon.href = faviconSrc;
+
+        eoBody.appendChild(createScript('iconpark_apinto', iconparkApintoSrc));
+        eoBody.appendChild(createScript('iconpark_eolink', iconparkEolinkSrc));
+      });
+    </script>
   </body>
 </html>

frontend/packages/core/src/App.css

@@ -290,3 +290,13 @@ a{
     transition: background-color 0s 600000s, color 0s 600000s !important;
   }
   }
+
+  .ant-select-selection-overflow-item:first-child {
+    max-width: calc(100% - 60px);
+    margin-right: 4px;
+    }
+
+    a[disabled]:hover {
+      color: #BBB;
+      cursor: not-allowed;
+  }

frontend/packages/core/src/const/member/type.ts

@@ -35,6 +35,7 @@ export type MemberDropdownModalFieldType = {
     parent?:string
     email?:string
     departmentIds?:string[]
+    password:string
 };
 
 export type MemberDropdownModalProps = {

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

@@ -42,6 +42,7 @@ const AiServiceInsidePage:FC = ()=> {
 
     
     const getApiDefine = ()=>{
+        console.log('@@@@@@@')
         setApiPrefix('')
         setPrefixForce(false)
         fetchData<BasicResponse<{ prefix:string, force:boolean }>>('service/router/define',{method:'GET',eoParams:{service:serviceId,team:teamId}}).then(response=>{
@@ -84,19 +85,22 @@ const AiServiceInsidePage:FC = ()=> {
         const filterMenu = (menu:MenuItemGroupType<MenuItemType>[])=>{
             const newMenu = cloneDeep(menu)
             return newMenu!.filter((m:MenuItemGroupType )=>{
-                if(m.children && m.children.length > 0){
+                if(m&&m.children && m.children.length > 0){
                      m.children = m.children.filter(
-                        (c)=>(c&&(c as MenuItemType&{access:string} ).access ? 
+                        (c)=>{
+                            if(!c) return false
+                            return (((c as MenuItemType&{access:string} ).access ? 
                             checkPermission((c as MenuItemType&{access:string} ).access as keyof typeof PERMISSION_DEFINITION[0]): 
-                            true))
+                            true))})
                 }
                 return m.children && m.children.length > 0
             })
         }
         const filteredMenu = filterMenu(SYSTEM_PAGE_MENU_ITEMS as MenuItemGroupType<MenuItemType>[])
-        setActiveMenu((pre)=>{
+        const menu = activeMenu ?? filteredMenu[0]?.children ? filteredMenu[0]?.children?.[0]?.key : filteredMenu[0]?.key
-            return pre ?? 'route'
+        if(menu && currentUrl.split('/')[-1] !== menu){
-        })
+            navigateTo(`/service/${teamId}/aiInside/${serviceId}/${menu}`)
+        }
         return  filteredMenu || []
     },[accessData,accessInit, SYSTEM_PAGE_MENU_ITEMS])
     
@@ -116,7 +120,7 @@ const AiServiceInsidePage:FC = ()=> {
     }, [currentUrl]);
 
     useEffect(()=>{
-        if(accessData && accessData.get('team') && accessData.get('team')?.indexOf('team.service.router.view') !== -1){
+        if(accessData && checkPermission('team.service.router.view')){
             getApiDefine()
         }
     },[accessData])

frontend/packages/core/src/pages/guide/Guide.tsx

@@ -21,22 +21,22 @@ export default function Guide(){
                 {
                     title: $t("配置你的 AI 模型"),
                     description: $t('通过 APIPark 快速接入各种 AI 模型，使用统一的格式来调用API，并且可以随意切换模型。'),
-                    link: 'https://docs.apipark.com/docs/quick/pre-work/team'
+                    link: 'https://docs.apipark.com/docs/system_setting/ai_model_providers'
                 },
                 {
                     title: $t("创建 AI 服务和 API"),
                     description: $t('创建 AI 类型的服务，并且你可以将 Prompt 提示词设置为一个 API，简化使用 AI 的流程。'),
-                    link: 'https://docs.apipark.com/docs/quick/provider/service'
+                    link: 'https://docs.apipark.com/docs/services/ai_services'
                 },
                 {
                     title: $t("创建调用 Token"),
                     description: $t('为了安全地调用 API，你需要创建一个消费者以及Token。'),
-                    link: 'https://docs.apipark.com/docs/quick/suberscriber/application'
+                    link: 'https://docs.apipark.com/docs/consumers'
                 },
                 {
                     title: $t("调用"),
                     description: $t('现在你可以通过 Token 来调用这些 API。'),
-                    link: 'https://docs.apipark.com/docs/quick/suberscriber/application'
+                    link: 'https://docs.apipark.com/docs/call_api'
                 }
             ]
         },
@@ -46,17 +46,17 @@ export default function Guide(){
                 {
                     title: $t("创建 REST 服务和 API"),
                     description: $t('创建 AI 类型的服务，并且你可以将 Prompt 提示词设置为一个 API，简化使用 AI 的流程。'),
-                    link: 'https://docs.apipark.com/docs/tutorials/api-market/service'
+                    link: 'https://docs.apipark.com/docs/services/rest_services'
                 },
                 {
                     title: $t("创建调用 Token"),
                     description: $t('为了安全地调用 API，你需要创建一个消费者以及Token。'),
-                    link: 'https://docs.apipark.com/docs/quick/suberscriber/subscribe'
+                    link: 'https://docs.apipark.com/docs/consumers'
                 },
                 {
                     title: $t("调用"),
                     description: $t('现在你可以通过 Token 来调用这些 API。'),
-                    link: 'https://docs.apipark.com/docs/quick/provider/approve'
+                    link: 'https://docs.apipark.com/docs/call_api'
                 }
             ]
         },
@@ -66,7 +66,7 @@ export default function Guide(){
                 {
                     title: $t("统计 API 调用情况"),
                     description: $t('仪表盘中提供了多种统计图表，帮助我们了解 API 的运行情况。'),
-                    link: 'https://docs.apipark.com/docs/quick/pre-work/monitor'
+                    link: 'https://docs.apipark.com/docs/analysis'
                 }
             ]
         }
@@ -78,17 +78,17 @@ export default function Guide(){
                 {
                     title: $t("账号与角色"),
                     description: $t('邀请你的团队成员加入 APIPark，共同管理和调用 API。'),
-                    link: 'https://docs.apipark.com/docs/quick/pre-work/team'
+                    link: 'https://docs.apipark.com/docs/system_setting/account_role'
                 },
                 {
                     title: $t("团队"),
                     description: $t('团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。'),
-                    link: 'https://docs.apipark.com/docs/quick/provider/service'
+                    link: 'https://docs.apipark.com/docs/teams'
                 },
                 {
                     title: $t("服务"),
                     description: $t('服务内包含一组 API，并且可以发布到 API 市场被其他团队使用。'),
-                    link: 'https://docs.apipark.com/docs/quick/suberscriber/application'
+                    link: 'https://docs.apipark.com/docs/category/-%E6%9C%8D%E5%8A%A1'
                 }
             ]
         },
@@ -98,12 +98,12 @@ export default function Guide(){
                 {
                     title: $t("订阅服务"),
                     description: $t('如果需要调用某个服务的 API，需要先订阅该服务，并且等待提供服务的团队审核后才可发起 API 请求。'),
-                    link: 'https://docs.apipark.com/docs/tutorials/api-market/service'
+                    link: 'https://docs.apipark.com/docs/developer_portal'
                 },
                 {
                     title: $t("审核订阅申请"),
                     description: $t('提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的消费者才可发起 API 请求。'),
-                    link: 'https://docs.apipark.com/docs/quick/suberscriber/subscribe'
+                    link: 'https://docs.apipark.com/docs/services/review_consumers'
                 }
             ]
         },
@@ -113,7 +113,7 @@ export default function Guide(){
                 {
                     title: $t("日志"),
                     description: $t('APIPark 提供详尽的 API 调用日志，帮助企业监控、分析和审计 API 的运行状况。'),
-                    link: 'https://docs.apipark.com/docs/quick/pre-work/monitor'
+                    link: 'https://docs.apipark.com/docs/system_setting/log/'
                 }
             ]
         }

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

@@ -1,4 +1,5 @@
 
+import WithPermission from "@common/components/aoplatform/WithPermission";
 import { useBreadcrumb } from "@common/contexts/BreadcrumbContext";
 import { $t } from "@common/locales";
 import { useEffect } from "react";
@@ -24,7 +25,7 @@ export default function LogSettingsInstruction() {
             <div className="h-[208px] w-[384px] flex flex-col items-center py-[32px] px-[24px] gap-[16px] rounded-DEFAULT bg-MENU_BG mr-[24px]">
             <p className="text-[20px] font-medium leading-[32px] text-MAIN_TEXT">环境配置</p>
                         <p className="text-[12px] font-normal leading-[20px] text-DESC_TEXT">新增集群的地址、名称、描述和其他相关属性，以确保插件能够正确识别和连接到集群</p>
-                        <p><Link to="/cluster">添加集群地址</Link></p>
+                        <p><WithPermission access="system.settings.api_gateway.view" ><Link to="/cluster">添加集群地址</Link></WithPermission></p>
             </div>
         </div>
     </div></div>

frontend/packages/core/src/pages/member/MemberDropdownModal.tsx

@@ -1,10 +1,11 @@
 import {App, Form, Input, TreeSelect} from "antd";
-import {forwardRef, useEffect, useImperativeHandle, useState} from "react";
+import {forwardRef, useEffect, useImperativeHandle, useMemo, useState} from "react";
 import {BasicResponse, PLACEHOLDER, RESPONSE_TIPS, STATUS_CODE, VALIDATE_MESSAGE} from "@common/const/const.tsx";
 import {useFetch} from "@common/hooks/http.ts";
 import { MemberDropdownModalHandle, MemberDropdownModalProps, DepartmentListItem, MemberDropdownModalFieldType, MemberTableListItem } from "../../const/member/type.ts";
 import WithPermission from "@common/components/aoplatform/WithPermission.tsx";
 import { $t } from "@common/locales/index.ts";
+import { useGlobalContext } from "@common/contexts/GlobalStateContext.tsx";
 
 export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDropdownModalProps>((props,ref)=>{
     const { message} = App.useApp()
@@ -12,6 +13,7 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
     const {type,entity,selectedMemberGroupId} = props
     const {fetchData} = useFetch()
     const [departmentList, setDepartmentList] = useState<DepartmentListItem[]>([])
+    const { state } = useGlobalContext()
 
     const save:()=>Promise<boolean | string> =  ()=>{
         let url:string
@@ -78,6 +80,15 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
         })
     }
 
+    const generateRandomString = () =>{
+        const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        let result = '';
+        for (let i = 0; i < 8; i++) {
+          result += chars.charAt(Math.floor(Math.random() * chars.length));
+        }
+        return result;
+      }
+
     useEffect(() => {
         switch(type){
             case 'addChild':
@@ -87,7 +98,7 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
                 form.setFieldsValue({id:entity!.id,name:entity!.name})
                 break
             case 'addMember':
-                form.setFieldsValue('-1' === selectedMemberGroupId ? {} : {departmentIds:selectedMemberGroupId})
+                form.setFieldsValue({...('-1' === selectedMemberGroupId ? {} : {departmentIds:selectedMemberGroupId}), password:generateRandomString()})
                 break
             case 'editMember':
                 form.setFieldsValue({...entity,departmentIds:(entity as MemberTableListItem )?.department?.map(x=>x.id)})
@@ -97,6 +108,23 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
 
     }, []);
 
+    
+    const treeData = useMemo(() => {
+        const loop = (data: DepartmentListItem[]): unknown[] =>
+            data?.map((item) => {
+                const title = ['unknown','disable'].indexOf(item.id) === -1 ?item.name :  $t(item.name) as string;
+                if (item.children) {
+                    return {...item,name:title, children:loop(item.children)}
+                }
+
+                return {
+                    ...item,
+                    name: title
+                };
+            });
+        return loop(departmentList);
+    }, [departmentList,state.language]);
+
 
     return (<WithPermission access="">
         <Form
@@ -163,6 +191,13 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
                 >
                     <Input className="w-INPUT_NORMAL" placeholder={$t(PLACEHOLDER.input)}/>
                 </Form.Item>
+                <Form.Item<MemberDropdownModalFieldType>
+                    label={$t("密码")}
+                    name="password"
+                    rules={[{required: type === 'addMember',whitespace:true }]}
+                >
+                    <Input className="w-INPUT_NORMAL" placeholder={$t(PLACEHOLDER.input)}/>
+                </Form.Item>
                 <Form.Item<MemberDropdownModalFieldType>
                     label={$t("部门")}
                     name="departmentIds"
@@ -175,7 +210,7 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
                             placeholder={$t(PLACEHOLDER.select)}
                             allowClear
                             treeDefaultExpandAll
-                            treeData={departmentList}
+                            treeData={treeData}
                             multiple
                         />
                 </Form.Item>

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

@@ -1,3 +1,4 @@
+import WithPermission from "@common/components/aoplatform/WithPermission";
 import { useBreadcrumb } from "@common/contexts/BreadcrumbContext";
 import { useEffect } from "react";
 import { Link } from "react-router-dom";
@@ -24,7 +25,7 @@ export default function ResourceSettingsInstruction() {
             <div className="h-[208px] w-[384px] flex flex-col items-center py-[32px] px-[24px] gap-[16px] rounded-DEFAULT bg-MENU_BG mr-[24px]">
             <p className="text-[20px] font-medium leading-[32px] text-MAIN_TEXT">集群配置</p>
                         <p className="text-[12px] font-normal leading-[20px] text-DESC_TEXT">新增集群地址、描述和其他相关属性，以确保插件能够正确识别和连接到集群</p>
-                        <p><Link to="/cluster">配置集群地址</Link></p>
+                        <p><WithPermission access="system.settings.data_source.view" ><Link to="/cluster">配置集群地址</Link></WithPermission></p>
             </div>
         </div>
     </div></div>

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

@@ -84,19 +84,20 @@ const SystemInsidePage:FC = ()=> {
         const filterMenu = (menu:MenuItemGroupType<MenuItemType>[])=>{
             const newMenu = cloneDeep(menu)
             return newMenu!.filter((m:MenuItemGroupType )=>{
-                if(m.children && m.children.length > 0){
+                if(m&&m.children && m.children.length > 0){
                      m.children = m.children.filter(
-                        (c)=>(c&&(c as MenuItemType&{access:string} ).access ? 
+                        (c)=>{
+                            if(!c) return false
+                            return (((c as MenuItemType&{access:string} ).access ? 
                             checkPermission((c as MenuItemType&{access:string} ).access as keyof typeof PERMISSION_DEFINITION[0]): 
-                            true))
+                            true))})
                 }
                 return m.children && m.children.length > 0
             })
         }
         const filteredMenu = filterMenu(SYSTEM_PAGE_MENU_ITEMS as MenuItemGroupType<MenuItemType>[])
-        setActiveMenu((pre)=>{
+        const menu = activeMenu ?? filteredMenu[0]?.children ? filteredMenu[0]?.children?.[0]?.key : filteredMenu[0]?.key
-            return pre ?? 'route'
+        if(menu && currentUrl.split('/')[-1] !== menu) navigateTo(`/service/${teamId}/inside/${serviceId}/${menu}`)
-        })
         return  filteredMenu || []
     },[accessData,accessInit, SYSTEM_PAGE_MENU_ITEMS])
     
@@ -116,7 +117,7 @@ const SystemInsidePage:FC = ()=> {
     }, [currentUrl]);
 
     useEffect(()=>{
-        if(accessData && accessData.get('team') && accessData.get('team')?.indexOf('team.service.router.view') !== -1){
+        if(accessData && checkPermission('team.service.router.view')){
             getApiDefine()
         }
     },[accessData])

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

@@ -34,7 +34,7 @@ const TeamConfig= forwardRef<TeamConfigHandle,TeamConfigProps>((props,ref) => {
     const [managerOption, setManagerOption] = useState<DefaultOptionType[]>([])
     const { setBreadcrumb} = useBreadcrumb()
     const { setTeamInfo } =useTeamContext()
-    const {checkPermission,accessInit} = useGlobalContext()
+    const {checkPermission,accessInit,state} = useGlobalContext()
     const pageType= useMemo(()=>{
         if(!accessInit) return 'myteam'
         return checkPermission('system.workspace.team.view_all') ? 'manage' : 'myteam'
@@ -128,7 +128,10 @@ const TeamConfig= forwardRef<TeamConfigHandle,TeamConfigProps>((props,ref) => {
             getTeamInfo();
         } else {
             setOnEdit(false);
-            form.setFieldsValue({id:uuidv4()}); // 清空 initialValues
+            form.setFieldsValue(
+                {id:uuidv4(),
+                    master:state?.userData?.uid
+                }); // 清空 initialValues
         }
         return (form.setFieldsValue({}))
     }, [teamId]);

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

@@ -20,7 +20,7 @@ import WithPermission from "@common/components/aoplatform/WithPermission.tsx";
 import { $t } from "@common/locales/index.ts";
 
 export const getDepartmentWithMember = (department:(DepartmentListItem & {type?:'department'|'member'})[],departmentMap:Map<string, (MemberItem & {type:'department'|'member'})[]>) : (DepartmentWithMemberItem | undefined)[] =>{
-    return department.map((x:DepartmentListItem & {type?:'department'|'member'})=>{
+    return department?.map((x:DepartmentListItem & {type?:'department'|'member'})=>{
         const res =  ({
             ...x,
             key:x.id,
@@ -28,7 +28,7 @@ export const getDepartmentWithMember = (department:(DepartmentListItem & {type?:
             type: x.type || 'department',
             children:((x.type === 'member' || (!x.children||x.children.length === 0 )&& (!departmentMap.get(x.id) || departmentMap.get(x.id)!.length === 0))? undefined : [...(x.children && x.children.length > 0 ? getDepartmentWithMember(x.children,departmentMap) : []),...departmentMap.get(x.id) || []])
         });
-        return res}).filter(node=>node.type === 'member' ||( node.children && node.children.length > 0))
+        return res})?.filter(node=>node.type === 'member' ||( node.children && node.children.length > 0)) || []
 }
 
 export const addMemberToDepartment = (departmentMap: Map<string, (MemberItem & {type:'department'|'member'})[]>, departmentId: string, member: MemberItem) => {
@@ -84,6 +84,7 @@ const TeamInsideMember:FC = ()=>{
                 addMemberToDepartment(departmentMap, '_withoutDepartment', member);
               }
             });
+
           
             const finalData = departmentResponse.data.department 
               ? [
@@ -93,30 +94,33 @@ const TeamInsideMember:FC = ()=>{
                     name: departmentResponse.data.department.name, 
                     title:departmentResponse.data.department.name, 
                     children: [
-                      ...getDepartmentWithMember(departmentResponse.data.department.children, departmentMap),
+                      ...getDepartmentWithMember(departmentResponse.data.department?.children || [], departmentMap),
                       ...departmentMap.get('_withoutDepartment') || []
                     ]
                   }
                 ] 
               : [...departmentMap.get('_withoutDepartment') || []];
           
-              
+              let allMemberSelectedFlag:boolean = true
               for(const [k,v] of departmentMap){
                 if(k !== '_withoutDepartment' && allMemberIds.length > 0 ){
                      // 筛选出部门内没被勾选的用户，如果不存在没勾选用户，需要将部门id放入ids中
                      if(v.filter(m => allMemberIds.indexOf(m.id) === -1).length  === 0){
                          setAllMemberSelectedDepartIds((pre)=>[...pre, k])
+                     }else if(['unknown','disable'].indexOf(k) === -1){
+                        allMemberSelectedFlag = false
                      }
                 }
              }
-             
+
-             if(!finalData[0].children || finalData[0].children.filter(m => allMemberIds.indexOf(m.id) === -1).length  === 0){
+             if(departmentMap.get('_withoutDepartment')?.filter(x=>allMemberIds.indexOf(x)!==-1).length === 0 && allMemberSelectedFlag){
-                 setAllMemberSelectedDepartIds((pre)=>[...pre, topDepartmentId])
+                setAllMemberSelectedDepartIds((pre)=>[...pre, topDepartmentId])
              }
 
               return  {data:finalData, success: true}
         }).catch(()=>({data:[], success:false}))
       }
+
       
     const getMemberList = ()=>{
         return fetchData<BasicResponse<{members:TeamMemberTableListItem}>>('team/members',{method:'GET',eoParams:{keyword:searchWord, team:teamId},eoTransformKeys:['attach_time','is_delete']}).then(response=>{
@@ -214,7 +218,6 @@ const TeamInsideMember:FC = ()=>{
 
     
     const changeMemberInfo = (value:string[],entity:TeamMemberTableListItem )=>{
-        //console.log(value)
         return new Promise((resolve, reject) => {
             fetchData<BasicResponse<null>>(`team/member/role`, {method: 'PUT',eoBody:({roles:value, users:[entity.user.id]}), eoParams: {team:teamId}}).then(response => {
                 const {code, msg} = response
@@ -273,7 +276,6 @@ const TeamInsideMember:FC = ()=>{
     },[ state.language,roleList])
 
     useEffect(() => {
-        getRoleList()
         setBreadcrumb([
             {title:<Link to="/team/list">{$t('团队')}</Link>},
             {title:$t('成员')}
@@ -281,6 +283,11 @@ const TeamInsideMember:FC = ()=>{
         manualReloadTable()
     }, [teamId]);
 
+
+    useEffect(()=>{
+        getRoleList()
+    },[state.language])
+
     const treeDisabledData = useMemo(()=>{ return [...allMemberIds,...allMemberSelectedDepartIds]},[allMemberIds,allMemberSelectedDepartIds])
     
     return (
@@ -303,7 +310,7 @@ const TeamInsideMember:FC = ()=>{
                    title={$t("添加成员")}
                    open={modalVisible}
                    destroyOnClose={true}
-                   width={900}
+                   width={600}
                    onCancel={() => cleanModalData()}
                    maskClosable={false}
                    footer={[
@@ -330,7 +337,7 @@ const TeamInsideMember:FC = ()=>{
                         const memberKeyFromModal = Array.from(selectedData)?.filter(x => allMemberIds.indexOf(x) === -1 &&selectableMemberIds.has(x)) || [];
                         setAddMemberBtnDisabled((memberKeyFromModal.length === 0));
                     }}
-                    searchPlaceholder={$t("搜索用户名、邮箱")}
+                    searchPlaceholder={$t("输入名称查找用户")}
                  />
                </Modal>
         </>

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

@@ -1,4 +1,5 @@
 
+import WithPermission from "@common/components/aoplatform/WithPermission";
 import { $t } from "@common/locales";
 import { Link } from "react-router-dom";
 
@@ -15,13 +16,13 @@ export default function DashboardInstruction({showClusterIns, showMonitorIns}:{s
                     {showClusterIns && <div className="h-[208px] w-[50%] max-w-[384px] flex flex-col items-center py-[32px] px-[24px] gap-[16px] rounded-DEFAULT bg-MENU_BG mr-[24px] justify-around">
                         <p className="text-[20px] font-medium leading-[32px] text-MAIN_TEXT">{$t('集群配置')}</p>
                         <p className="text-[12px] font-normal leading-[20px] text-DESC_TEXT">{$t('配置集群地址，以确保监控系统能够正确识别和连接到集群')}</p>
-                        <p><a href="/cluster" target="_blank">{$t('配置集群信息')}</a></p>
+                        <p><WithPermission access="system.settings.api_gateway.view" ><a href="/cluster" target="_blank">{$t('配置集群信息')}</a></WithPermission></p>
                     </div>}
                     {showMonitorIns &&
                         <div className="h-[208px] w-[50%] max-w-[384px] flex flex-col items-center py-[32px] px-[24px] gap-[16px] rounded-DEFAULT bg-MENU_BG  justify-around">
                             <p className="text-[20px] font-medium leading-[32px] text-MAIN_TEXT">{$t('监控设置')}</p>
                             <p className="text-[12px] font-normal leading-[20px] text-DESC_TEXT">{$t('设置监控报表的数据来源，设置完成之后即可获得详细的API调用统计图表。')}</p>
-                            <p><a href="/datasourcing" target="_blank">{$t('配置监控信息')}</a></p>
+                            <p><WithPermission access="system.settings.data_source.view" ><a href="/datasourcing" target="_blank">{$t('配置监控信息')}</a></WithPermission></p>
                         </div>
                     }
                     

frontend/packages/market/src/pages/serviceHub/ServiceHubDetail.tsx

@@ -89,10 +89,10 @@ const ServiceHubDetail = ()=>{
 
     const getMySelectList = ()=>{
         setMySystemOptionList([])
-        fetchData<BasicResponse<{ apps: SimpleSystemItem[] }>>('simple/apps/mine',{method:'GET'}).then(response=>{
+        fetchData<BasicResponse<{ app: EntityItem[] }>>('apps/can_subscribe',{method:'GET'}).then(response=>{
             const {code,data,msg} = response
             if(code === STATUS_CODE.SUCCESS){
-                setMySystemOptionList(data.apps?.map((x:SimpleSystemItem)=>{return {
+                setMySystemOptionList(data.app?.map((x:EntityItem)=>{return {
                     label:x.name, value:x.id
                 }}))
             }else{

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

@@ -8,6 +8,9 @@ import { useFetch } from "@common/hooks/http";
 import { useNavigate } from "react-router-dom";
 import { useTenantManagementContext } from "@market/contexts/TenantManagementContext";
 import { $t } from "@common/locales";
+import Select, { DefaultOptionType } from "antd/es/select";
+import { useGlobalContext } from "@common/contexts/GlobalStateContext";
+import { SimpleTeamItem, MemberItem } from "@common/const/type";
 
 export type ManagementConfigFieldType = {
     name:string
@@ -21,6 +24,7 @@ type ManagementConfigProps = {
     type:'add'|'edit'
     teamId:string
     appId?:string
+    dataShowType?:'block'|'list'
 }
 
 export type ManagementConfigHandle = {
@@ -30,16 +34,18 @@ export type ManagementConfigHandle = {
 
 const ManagementConfig = forwardRef<ManagementConfigHandle,ManagementConfigProps>((props, ref) => {
     const { message,modal } = App.useApp()
-    const {type,teamId,appId} = props
+    const {type,teamId,appId,dataShowType} = props
     const [form] = Form.useForm();
     const {fetchData} = useFetch()
     const [delBtnLoading, setDelBtnLoading] = useState<boolean>(false)
     const {setAppName} = type === 'edit' ? useTenantManagementContext():{setAppName:()=>{}}
     const navigate = type === 'edit' ? useNavigate() : ()=>{}
+    const [teamOptionList, setTeamOptionList] = useState<DefaultOptionType[]>()
+    const {checkPermission,accessInit, getGlobalAccessData} = useGlobalContext()
     const save:()=>Promise<boolean | string> =  ()=>{
         return new Promise((resolve, reject)=>{
             form.validateFields().then((value)=>{
-                fetchData<BasicResponse<{apps:ManagementConfigFieldType}>>(type === 'add'? 'team/app' : 'app/info',{method:type === 'add'? 'POST' : 'PUT',eoBody:(value), eoParams:type === 'add' ? {team:teamId}:{app:appId,team:teamId}}).then(response=>{
+                fetchData<BasicResponse<{apps:ManagementConfigFieldType}>>(type === 'add'? 'team/app' : 'app/info',{method:type === 'add'? 'POST' : 'PUT',eoBody:(value), eoParams:type === 'add' ? {team:dataShowType === 'list' ? value.team : teamId}:{app:appId,team:teamId}}).then(response=>{
                     const {code,data,msg} = response
                     if(code === STATUS_CODE.SUCCESS){
                         message.success(msg || $t(RESPONSE_TIPS.success))
@@ -68,6 +74,24 @@ const ManagementConfig = forwardRef<ManagementConfigHandle,ManagementConfigProps
         })
     };
     
+    const getTeamOptionList = ()=>{
+        setTeamOptionList([])
+
+        fetchData<BasicResponse<{ teams: SimpleTeamItem[] }>>(!checkPermission('system.workspace.team.view_all') ?'simple/teams/mine' :'simple/teams',{method:'GET',eoTransformKeys:[]}).then(response=>{
+            const {code,data,msg} = response
+            if(code === STATUS_CODE.SUCCESS){
+                setTeamOptionList(data.teams?.map((x:MemberItem)=>{return {...x,
+                    label:x.name, value:x.id
+                }}))
+                if(form.getFieldValue('team') === undefined&&data.teams?.length){
+                    form.setFieldValue('team',data.teams[0].id); 
+                }
+            }else{
+                message.error(msg || $t(RESPONSE_TIPS.error))
+            }
+        })
+    }
+
     const deleteApplicationModal = async ()=>{
         setDelBtnLoading(true)
         modal.confirm({
@@ -112,7 +136,17 @@ const ManagementConfig = forwardRef<ManagementConfigHandle,ManagementConfigProps
         if(type === 'edit'){
             appId && getApplicationInfo()
         }else{
-            form.setFieldValue('id',uuidv4())
+            form.setFieldsValue({
+                'id':uuidv4()})
+        }
+        if(type !== 'edit' && dataShowType === 'list'){
+            if(accessInit){
+                getTeamOptionList()
+            }else{
+                getGlobalAccessData()?.then?.(()=>{
+                    getTeamOptionList()
+                })
+            }
         }
     }, [appId]);
 
@@ -146,6 +180,16 @@ const ManagementConfig = forwardRef<ManagementConfigHandle,ManagementConfigProps
                 <Input className="w-INPUT_NORMAL" placeholder={$t(PLACEHOLDER.input)} disabled={type === 'edit'}/>
             </Form.Item>
 
+
+            {dataShowType === 'list'  && <Form.Item<ManagementConfigFieldType>
+                            label={$t("所属团队")}
+                            name="team"
+                            rules={[{ required: true }]}
+                        >
+                            <Select className="w-INPUT_NORMAL" disabled={type === 'edit'} placeholder={$t(PLACEHOLDER.input)} options={teamOptionList} >
+                            </Select>
+                        </Form.Item>}
+
             <Form.Item
                 label={$t("描述")}
                 name="description"

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

@@ -14,7 +14,9 @@ import { ManagementConfigFieldType } from "./ManagementConfig";
 import { useGlobalContext } from "@common/contexts/GlobalStateContext";
 import { $t } from "@common/locales";
 import { getItem } from "@common/utils/navigation";
-import { MenuItemType } from "antd/es/menu/interface";
+import { MenuItemGroupType, MenuItemType } from "antd/es/menu/interface";
+import { PERMISSION_DEFINITION } from "@common/const/permissions";
+import { cloneDeep } from "lodash-es";
 
 export default function ManagementInsidePage(){
     const { message } = App.useApp()
@@ -27,17 +29,29 @@ export default function ManagementInsidePage(){
     const [openKeys, setOpenKeys] = useState<string[]>([])
     const [loading, setLoading] = useState<boolean>(false)
     const {appName,setAppName} = useTenantManagementContext()
-    const {getTeamAccessData,cleanTeamAccessData,state} = useGlobalContext()
+    const {getTeamAccessData,cleanTeamAccessData,state,accessData,checkPermission,accessInit} = useGlobalContext()
     
     const TENANT_MANAGEMENT_APP_MENU: MenuProps['items'] = useMemo(()=>[
-        getItem($t('订阅的服务'), 'service'),
+        getItem($t('订阅的服务'), 'service',undefined, undefined, undefined, 'team.application.subscription.view'),
-        getItem($t('访问授权'), 'authorization'),
+        getItem($t('访问授权'), 'authorization',undefined, undefined, undefined, 'team.consumer.authorization.view'),
-        getItem($t('消费者管理'), 'setting'),
+        getItem($t('消费者管理'), 'setting',undefined, undefined, undefined, 'team.application.application.view'),
     ],[state.language]) 
 
+    
     const menuData = useMemo(()=>{
-        return  TENANT_MANAGEMENT_APP_MENU
+        const filterMenu = (menu:(MenuItemType&{access:string})[])=>{
-    },[])
+            const newMenu = cloneDeep(menu)
+            return newMenu!.filter((c:MenuItemType&{access:string} )=>{
+                    if(!c) return false
+                    return (((c as MenuItemType&{access:string} ).access ? 
+                    checkPermission((c as MenuItemType&{access:string} ).access as keyof typeof PERMISSION_DEFINITION[0]): 
+                    true))
+                })}
+        const filteredMenu = filterMenu(TENANT_MANAGEMENT_APP_MENU as (MenuItemType&{access:string})[])
+        const menu = activeMenu ?? filteredMenu[0]?.children ? filteredMenu[0]?.children?.[0]?.key : filteredMenu[0]?.key
+        if(menu && currentUrl.split('/')[-1] !== menu) navigateTo(`/consumer/${teamId}/inside/${appId}/${menu}`)
+        return  filteredMenu || []
+    },[accessData,accessInit, TENANT_MANAGEMENT_APP_MENU])
 
     useEffect(()=>{
         setActiveMenu(currentUrl.split('/').pop() || 'service')

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

@@ -1,5 +1,5 @@
 import { MenuProps, Menu, App, Avatar, Card, Tooltip, Empty, Button, Radio } from "antd";
-import { useState, forwardRef, useEffect, useRef, useMemo, memo } from "react";
+import { useState, forwardRef, useEffect, useRef, useMemo, memo, Ref, useImperativeHandle } from "react";
 import { VirtuosoGrid } from "react-virtuoso";
 import { BasicResponse, DATA_SHOW_TYPE_OPTIONS, RESPONSE_TIPS, STATUS_CODE } from "@common/const/const";
 import { ServiceHubAppListItem } from "../../../const/serviceHub/type";
@@ -17,6 +17,7 @@ import WithPermission from "@common/components/aoplatform/WithPermission";
 import InsidePage from "@common/components/aoplatform/InsidePage";
 import PageList from "@common/components/aoplatform/PageList";
 import { SERVICE_HUB_TABLE_COLUMNS } from "@market/const/serviceHub/const";
+import { ActionType } from "@ant-design/pro-components";
 
 export default function ServiceHubManagement() {
     const { message ,modal} = App.useApp()
@@ -36,23 +37,24 @@ export default function ServiceHubManagement() {
     const [tableHttpReload, setTableHttpReload] = useState(true);
     const [tableListDataSource, setTableListDataSource] = useState<ServiceHubAppListItem[]>([]);
     const [tableSearchWord, setTableSearchWord] = useState<string>('')
+    const tableRef = useRef<TableAreaHandle>(null)
 
-const getServiceList = (dataType?:'block'|'list')=>{
+    const getServiceList = (dataType?:'block'|'list')=>{
-    dataType = dataType ?? dataShowType
+        dataType = dataType ?? dataShowType
-    if(!accessInit){
+        if(!accessInit){
-        getGlobalAccessData()?.then?.(()=>{getServiceList(dataType)})
+            getGlobalAccessData()?.then?.(()=>{getServiceList(dataType)})
-        return Promise.resolve({data:[], success:false})
+            return Promise.resolve({data:[], success:false})
-    }
+        }
+        
+        if(dataType === 'list' && !tableHttpReload){
+            setTableHttpReload(true)
+            return Promise.resolve({
+                data: tableListDataSource,
+                success: true,
+            });
+        }
     
-    if(dataType === 'list' && !tableHttpReload){
+        setServiceLoading(true)
-        setTableHttpReload(true)
-        return Promise.resolve({
-            data: tableListDataSource,
-            success: true,
-        });
-    }
-    
-    setServiceLoading(true)
         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){
@@ -142,13 +144,12 @@ const getServiceList = (dataType?:'block'|'list')=>{
   
   
   const openModal = async (type:'add'|'edit'|'delete')=>{
-
     let title:string = ''
     let content:string|React.ReactNode = ''
     switch (type){
         case 'add':
             title=$t('添加消费者')
-            content=<ManagementConfig ref={addManagementRef} type={type} teamId={teamId!} />
+            content=<ManagementConfig ref={addManagementRef}  dataShowType={dataShowType} type={type} teamId={teamId!} />
             break;
         // case 'edit':{
         //     title='配置 Open Api'
@@ -174,7 +175,15 @@ const getServiceList = (dataType?:'block'|'list')=>{
         onOk:()=> {
             switch (type){
                 case 'add':
-                    return addManagementRef.current?.save().then((res)=>{if(res === true) getTeamsList();getServiceList()})
+                    return addManagementRef.current?.save().then((res)=>{if(res === true) {
+                        getTeamsList();
+                        if(dataShowType === 'list'){
+                            setTableHttpReload(true)
+                            tableRef.current?.manualReloadTable()
+                        }else{
+                            getServiceList()
+                        }
+            }})
                 // case 'edit':
                 //     return editManagementRef.current?.save().then((res)=>{if(res === true) manualReloadTable()})
                 // case 'delete':
@@ -291,7 +300,7 @@ useEffect(() => {
                   buttonStyle="solid"
                 />}
             >{
-                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`)}}/>
+                dataShowType === 'block' ? <BlockArea /> : <TableArea language={state.language} getServiceList={()=>getServiceList('list')} ref={tableRef} 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} />
@@ -325,16 +334,31 @@ type TableAreaProps = {
     editApp:(item:ServiceHubAppListItem)=>void
 }
 
-const TableArea = memo(({language, getServiceList, addNewApp, setTableHttpReload, setTableSearchWord, editApp}:TableAreaProps)=>{
+type TableAreaHandle = {
+    manualReloadTable:()=>void
+}
+
+const TableArea = memo(forwardRef((props:TableAreaProps, ref:Ref<TableAreaHandle>)=>{
+    const {language, getServiceList, addNewApp, setTableHttpReload, setTableSearchWord, editApp} = props
+    const pageListRef = useRef<ActionType>(null);
     const columns = useMemo(()=>{
         const res =  SERVICE_HUB_TABLE_COLUMNS.map(x=>{
             return {...x,title:typeof x.title  === 'string' ? $t(x.title as string) : x.title}})
         return res
     },[language])
+
+    const manualReloadTable = ()=>{
+        pageListRef.current?.reload()
+    }
     
+    useImperativeHandle(ref, () =>({
+        manualReloadTable}))
+    
+
     return (
     <PageList
         id="service_hub_list"
+        ref={pageListRef}
         columns={[...columns]}
         request={()=>getServiceList()}
         addNewBtnTitle={$t("添加消费者")}
@@ -348,4 +372,4 @@ const TableArea = memo(({language, getServiceList, addNewApp, setTableHttpReload
         }}
         onRowClick={(row:ServiceHubAppListItem)=>editApp(row)}
         />
-    )})
+    )}))

go.mod

@@ -5,9 +5,9 @@ go 1.21
 //toolchain go1.21.1
 
 require (
-	github.com/eolinker/ap-account v1.0.14
+	github.com/eolinker/ap-account v1.0.15
 	github.com/eolinker/eosc v0.17.3
-	github.com/eolinker/go-common v1.1.0
+	github.com/eolinker/go-common v1.1.1
 	github.com/gabriel-vasile/mimetype v1.4.4
 	github.com/getkin/kin-openapi v0.127.0
 	github.com/gin-gonic/gin v1.10.0
@@ -75,4 +75,6 @@ require (
 	gorm.io/driver/mysql v1.5.2 // indirect
 )
 
-//replace github.com/eolinker/ap-account => ../../eolinker/ap-account
+//replace github.com/eolinker/ap-account => ../aoaccount
+//
+//replace github.com/eolinker/go-common => ../go-common

go.sum

@@ -28,12 +28,12 @@ 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.14 h1:QE9LWx9F/t/BbTeBcjPX+Alzh3mdlHv+BVvKcBwr5dc=
+github.com/eolinker/ap-account v1.0.15 h1:n6DJeL6RHZ8eLlZUcY2U3H4d/GPaA5oelAx3R0E6yL8=
-github.com/eolinker/ap-account v1.0.14/go.mod h1:qLKg4xervGHTNBWaGckfPkQb+FZT0XfhwPEdNpzvsjE=
+github.com/eolinker/ap-account v1.0.15/go.mod h1:zm/Ivs6waJ/M/nEszhpPmM6g50y/MKO+5eABFAdeD0g=
 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=
+github.com/eolinker/go-common v1.1.1 h1:3WqqecGqcHDgpa8Ljp156c1uWeZKP1CKScdU+6sOfcc=
-github.com/eolinker/go-common v1.1.0/go.mod h1:Kb/jENMN1mApnodvRgV4YwO9FJby1Jkt2EUjrBjvSX4=
+github.com/eolinker/go-common v1.1.1/go.mod h1:Kb/jENMN1mApnodvRgV4YwO9FJby1Jkt2EUjrBjvSX4=
 github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
 github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
 github.com/getkin/kin-openapi v0.127.0 h1:Mghqi3Dhryf3F8vR370nN67pAERW+3a95vomb3MAREY=

init.go

@@ -7,6 +7,7 @@ import (
 	_ "github.com/APIParkLab/APIPark/plugins/core"
 	_ "github.com/APIParkLab/APIPark/plugins/permit"
 	_ "github.com/APIParkLab/APIPark/plugins/publish_flow"
+	_ "github.com/APIParkLab/APIPark/resources/locale"
 	_ "github.com/eolinker/ap-account/plugin"
 	_ "github.com/eolinker/go-common/cache/cache_redis"
 	_ "github.com/eolinker/go-common/log-init"

module/catalogue/iml.go

@@ -320,6 +320,7 @@ func (i *imlCatalogueModule) Services(ctx context.Context, keyword string) ([]*c
 	if err != nil {
 		return nil, err
 	}
+
 	serviceIds := utils.SliceToSlice(items, func(i *service.Service) string {
 		return i.Id
 	}, func(s *service.Service) bool {
@@ -330,6 +331,7 @@ func (i *imlCatalogueModule) Services(ctx context.Context, keyword string) ([]*c
 	if len(serviceIds) < 1 {
 		return nil, nil
 	}
+
 	commits, err := i.releaseService.GetRunningApiDocCommits(ctx, serviceIds...)
 	if err != nil {
 		return nil, err

module/service/dto/output.go

@@ -75,11 +75,14 @@ type App struct {
 }
 
 func ToService(model *service.Service) *Service {
-
+	prefix := "/"
+	if model.Prefix != "" {
+		prefix = model.Prefix
+	}
 	s := &Service{
 		Id:           model.Id,
 		Name:         model.Name,
-		Prefix:       model.Prefix,
+		Prefix:       prefix,
 		Description:  model.Description,
 		Team:         auto.UUID(model.Team),
 		ServiceType:  model.ServiceType.String(),

module/service/iml.go

@@ -6,6 +6,13 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+	"time"
+
+	"github.com/eolinker/eosc/log"
+
+	"github.com/APIParkLab/APIPark/resources/access"
+
+	"github.com/eolinker/ap-account/service/role"
 
 	application_authorization "github.com/APIParkLab/APIPark/service/application-authorization"
 
@@ -227,6 +234,7 @@ func (i *imlServiceModule) SearchMyServices(ctx context.Context, teamId string,
 //}
 
 func (i *imlServiceModule) Get(ctx context.Context, id string) (*service_dto.Service, error) {
+	now := time.Now()
 	serviceInfo, err := i.serviceService.Get(ctx, id)
 	if err != nil {
 		return nil, err
@@ -240,6 +248,7 @@ func (i *imlServiceModule) Get(ctx context.Context, id string) (*service_dto.Ser
 	s.Tags = auto.List(utils.SliceToSlice(tags, func(p *service_tag.Tag) string {
 		return p.Tid
 	}))
+	log.Infof("get service cost %d ms", time.Since(now).Milliseconds())
 	return s, nil
 }
 
@@ -539,9 +548,72 @@ type imlAppModule struct {
 	teamMemberService team_member.ITeamMemberService                  `autowired:""`
 	subscribeService  subscribe.ISubscribeService                     `autowired:""`
 	authService       application_authorization.IAuthorizationService `autowired:""`
+	roleService       role.IRoleService                               `autowired:""`
+	roleMemberService role.IRoleMemberService                         `autowired:""`
 	transaction       store.ITransaction                              `autowired:""`
 }
 
+func (i *imlAppModule) SearchCanSubscribe(ctx context.Context, serviceId string) ([]*service_dto.SimpleAppItem, error) {
+	apps, err := i.searchMyApps(ctx, "", "")
+	if err != nil {
+		return nil, err
+	}
+	list, err := i.roleService.ListByPermit(ctx, access.SystemWorkspaceApplicationManagerAll)
+	if err == nil && len(list) > 0 {
+		return utils.SliceToSlice(apps, func(p *service.Service) *service_dto.SimpleAppItem {
+			return &service_dto.SimpleAppItem{
+				Id:          p.Id,
+				Name:        p.Name,
+				Description: p.Description,
+				Team:        auto.UUID(p.Team),
+			}
+		}), nil
+	}
+	list, err = i.roleService.ListByPermit(ctx, access.TeamConsumerSubscriptionSubscribe)
+	if err != nil {
+		return nil, nil
+	}
+	roleIds := utils.SliceToSlice(list, func(p *role.RoleByPermit) string {
+		return p.Id
+	})
+	members, err := i.roleMemberService.ListByRoleIds(ctx, utils.UserId(ctx), roleIds...)
+	if err != nil {
+		return nil, err
+	}
+	if len(members) == 0 {
+		return nil, nil
+	}
+	subscribes, err := i.subscribeService.ListByServices(ctx, serviceId)
+	if err != nil {
+		return nil, err
+	}
+	subscribeMap := utils.SliceToMapO(subscribes, func(p *subscribe.Subscribe) (string, struct{}) {
+		return p.Application, struct{}{}
+	}, func(s *subscribe.Subscribe) bool {
+		return s.ApplyStatus == subscribe.ApplyStatusSubscribe
+	})
+	teamMap := utils.SliceToMapO(members, func(p *role.Member) (string, struct{}) {
+		return role.TrimTeamTarget(p.Target), struct{}{}
+	})
+	result := make([]*service_dto.SimpleAppItem, 0, len(apps))
+	for _, app := range apps {
+		if _, ok := teamMap[app.Team]; !ok {
+			continue
+		}
+		if _, ok := subscribeMap[app.Id]; ok {
+			continue
+		}
+		result = append(result, &service_dto.SimpleAppItem{
+			Id:          app.Id,
+			Name:        app.Name,
+			Description: app.Description,
+			Team:        auto.UUID(app.Team),
+		})
+	}
+
+	return result, nil
+}
+
 func (i *imlAppModule) ExportAll(ctx context.Context) ([]*service_dto.ExportApp, error) {
 	apps, err := i.serviceService.AppList(ctx)
 	if err != nil {

module/service/module.go

@@ -47,6 +47,7 @@ type IAppModule interface {
 	UpdateApp(ctx context.Context, appId string, input *service_dto.UpdateApp) (*service_dto.App, error)
 	Search(ctx context.Context, teamId string, keyword string) ([]*service_dto.AppItem, error)
 	SearchMyApps(ctx context.Context, teamId string, keyword string) ([]*service_dto.AppItem, error)
+	SearchCanSubscribe(ctx context.Context, serviceId string) ([]*service_dto.SimpleAppItem, error)
 	// SimpleApps 获取简易项目列表
 	SimpleApps(ctx context.Context, keyword string) ([]*service_dto.SimpleAppItem, error)
 	MySimpleApps(ctx context.Context, keyword string) ([]*service_dto.SimpleAppItem, error)

plugins/core/access.go

@@ -1 +0,0 @@
-package core

plugins/core/ai.go

@@ -1,19 +1,22 @@
 package core
 
 import (
-	"github.com/eolinker/go-common/pm3"
 	"net/http"
+
+	"github.com/APIParkLab/APIPark/resources/access"
+
+	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) aiAPIs() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai/providers", []string{"context"}, []string{"providers"}, p.aiProviderController.Providers),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai/providers", []string{"context"}, []string{"providers"}, p.aiProviderController.Providers, access.SystemSettingsAiProviderView),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/ai/providers", []string{"context"}, []string{"providers"}, p.aiProviderController.SimpleProviders),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai/provider/config", []string{"context", "query:provider"}, []string{"provider"}, p.aiProviderController.Provider),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai/provider/config", []string{"context", "query:provider"}, []string{"provider"}, p.aiProviderController.Provider, access.SystemSettingsAiProviderView),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai/provider/llms", []string{"context", "query:provider"}, []string{"llms", "provider"}, p.aiProviderController.LLMs),
 		//pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai/provider/enable", []string{"context", "query:provider"}, nil, p.aiProviderController.Enable),
 		//pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai/provider/disable", []string{"context", "query:provider"}, nil, p.aiProviderController.Disable),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai/provider/config", []string{"context", "query:provider", "body"}, nil, p.aiProviderController.UpdateProviderConfig),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai/provider/config", []string{"context", "query:provider", "body"}, nil, p.aiProviderController.UpdateProviderConfig, access.SystemSettingsAiProviderManager),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai/provider/default-llm", []string{"context", "query:provider", "body"}, nil, p.aiProviderController.UpdateProviderDefaultLLM),
+		//pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai/provider/default-llm", []string{"context", "query:provider", "body"}, nil, p.aiProviderController.UpdateProviderDefaultLLM),
 	}
 }

plugins/core/api.go

@@ -3,27 +3,28 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) apiApis() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/routers", []string{"context", "query:keyword", "query:service"}, []string{"routers"}, p.routerController.Search),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/routers", []string{"context", "query:keyword", "query:service"}, []string{"routers"}, p.routerController.Search, access.SystemWorkspaceServiceViewAll, access.TeamServiceApiView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/router/detail", []string{"context", "query:service", "query:router"}, []string{"router"}, p.routerController.Detail),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/router/detail", []string{"context", "query:service", "query:router"}, []string{"router"}, p.routerController.Detail, access.SystemWorkspaceServiceViewAll, access.TeamServiceApiView),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/router", []string{"context", "query:service", "body"}, []string{"router"}, p.routerController.Create),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/router", []string{"context", "query:service", "body"}, []string{"router"}, p.routerController.Create, access.SystemWorkspaceServiceManagerAll, access.TeamServiceApiManager),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/router", []string{"context", "query:service", "query:router", "body"}, []string{"router"}, p.routerController.Edit),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/router", []string{"context", "query:service", "query:router", "body"}, []string{"router"}, p.routerController.Edit, access.SystemWorkspaceServiceManagerAll, access.TeamServiceApiManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/router", []string{"context", "query:service", "query:router"}, nil, p.routerController.Delete),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/router", []string{"context", "query:service", "query:router"}, nil, p.routerController.Delete, access.SystemWorkspaceServiceManagerAll, access.TeamServiceApiManager),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/router/define", []string{"context", "query:service"}, []string{"prefix", "force"}, p.routerController.Prefix),
 
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/api_doc", []string{"context", "query:service", "body"}, []string{"doc"}, p.apiDocController.UpdateDoc),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/api_doc", []string{"context", "query:service", "body"}, []string{"doc"}, p.apiDocController.UpdateDoc, access.SystemWorkspaceServiceManagerAll, access.TeamServiceApiDocManager),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/api_doc", []string{"context", "query:service"}, []string{"doc"}, p.apiDocController.GetDoc),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/api_doc", []string{"context", "query:service"}, []string{"doc"}, p.apiDocController.GetDoc, access.SystemWorkspaceServiceViewAll, access.TeamServiceApiDocView),
 
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/api_doc/upload", []string{"context", "query:service"}, []string{"doc"}, p.apiDocController.UploadDoc),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/api_doc/upload", []string{"context", "query:service"}, []string{"doc"}, p.apiDocController.UploadDoc, access.SystemWorkspaceServiceManagerAll, access.TeamServiceApiDocManager),
 
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/ai-router", []string{"context", "query:service", "query:router"}, []string{"api"}, p.aiAPIController.Get),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/ai-router", []string{"context", "query:service", "query:router"}, []string{"api"}, p.aiAPIController.Get, access.SystemWorkspaceServiceViewAll, access.TeamServiceApiView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/ai-routers", []string{"context", "query:keyword", "query:service"}, []string{"apis"}, p.aiAPIController.List),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/ai-routers", []string{"context", "query:keyword", "query:service"}, []string{"apis"}, p.aiAPIController.List, access.SystemWorkspaceServiceViewAll, access.TeamServiceApiView),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/ai-router", []string{"context", "query:service", "query:router", "body"}, []string{"api"}, p.aiAPIController.Edit),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/ai-router", []string{"context", "query:service", "query:router", "body"}, []string{"api"}, p.aiAPIController.Edit, access.SystemWorkspaceServiceManagerAll, access.TeamServiceApiManager),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/ai-router", []string{"context", "query:service", "body"}, []string{"api"}, p.aiAPIController.Create),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/ai-router", []string{"context", "query:service", "body"}, []string{"api"}, p.aiAPIController.Create, access.SystemWorkspaceServiceManagerAll, access.TeamServiceApiManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/ai-router", []string{"context", "query:service", "query:router"}, nil, p.aiAPIController.Delete),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/ai-router", []string{"context", "query:service", "query:router"}, nil, p.aiAPIController.Delete, access.SystemWorkspaceServiceManagerAll, access.TeamServiceApiManager),
 	}
 }

plugins/core/authorization.go

@@ -3,16 +3,17 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
-func (p *plugin) projectAuthorizationApis() []pm3.Api {
+func (p *plugin) appAuthorizationApis() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/app/authorization", []string{"context", "query:app", "body"}, []string{"authorization"}, p.appAuthorizationController.AddAuthorization),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/app/authorization", []string{"context", "query:app", "body"}, []string{"authorization"}, p.appAuthorizationController.AddAuthorization, access.SystemWorkspaceApplicationManagerAll, access.TeamConsumerAuthorizationManager),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/app/authorization", []string{"context", "query:app", "query:authorization", "body"}, []string{"authorization"}, p.appAuthorizationController.EditAuthorization),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/app/authorization", []string{"context", "query:app", "query:authorization", "body"}, []string{"authorization"}, p.appAuthorizationController.EditAuthorization, access.SystemWorkspaceApplicationManagerAll, access.TeamConsumerAuthorizationManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/app/authorization", []string{"context", "query:app", "query:authorization"}, nil, p.appAuthorizationController.DeleteAuthorization),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/app/authorization", []string{"context", "query:app", "query:authorization"}, nil, p.appAuthorizationController.DeleteAuthorization, access.SystemWorkspaceApplicationManagerAll, access.TeamConsumerAuthorizationManager),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/authorization", []string{"context", "query:app", "query:authorization"}, []string{"authorization"}, p.appAuthorizationController.Info),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/authorization", []string{"context", "query:app", "query:authorization"}, []string{"authorization"}, p.appAuthorizationController.Info, access.SystemWorkspaceApplicationViewAll, access.TeamConsumerAuthorizationView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/authorizations", []string{"context", "query:app"}, []string{"authorizations"}, p.appAuthorizationController.Authorizations),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/authorizations", []string{"context", "query:app"}, []string{"authorizations"}, p.appAuthorizationController.Authorizations, access.SystemWorkspaceApplicationViewAll, access.TeamConsumerAuthorizationView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/authorization/details", []string{"context", "query:app", "query:authorization"}, []string{"details"}, p.appAuthorizationController.Detail),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/authorization/details", []string{"context", "query:app", "query:authorization"}, []string{"details"}, p.appAuthorizationController.Detail, access.SystemWorkspaceApplicationViewAll, access.TeamConsumerAuthorizationView),
 	}
 }

plugins/core/certificate.go

@@ -3,15 +3,16 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) certificateApi() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/certificates", []string{"context"}, []string{"certificates"}, p.certificateController.ListForPartition),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/certificates", []string{"context"}, []string{"certificates"}, p.certificateController.ListForPartition, access.SystemSettingsSslCertificateView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/certificate", []string{"context", "query:id"}, []string{"certificate", "cert"}, p.certificateController.Detail),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/certificate", []string{"context", "query:id"}, []string{"certificate", "cert"}, p.certificateController.Detail, access.SystemSettingsSslCertificateView),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/certificate", []string{"context", "body"}, nil, p.certificateController.Create),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/certificate", []string{"context", "body"}, nil, p.certificateController.Create, access.SystemSettingsSslCertificateManager),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/certificate", []string{"context", "query:id", "body"}, nil, p.certificateController.Update),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/certificate", []string{"context", "query:id", "body"}, nil, p.certificateController.Update, access.SystemSettingsSslCertificateManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/certificate", []string{"context", "query:id"}, []string{"id"}, p.certificateController.Delete),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/certificate", []string{"context", "query:id"}, []string{"id"}, p.certificateController.Delete, access.SystemSettingsSslCertificateManager),
 	}
 }

plugins/core/cluster.go

@@ -3,13 +3,14 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) clusterApi() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/cluster/nodes", []string{"context", "query:partition"}, []string{"nodes"}, p.clusterController.Nodes),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/cluster/nodes", []string{"context", "query:partition"}, []string{"nodes"}, p.clusterController.Nodes, access.SystemSettingsApiGatewayView),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/cluster/reset", []string{"context", "query:partition", "body"}, []string{"nodes"}, p.clusterController.ResetCluster),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/cluster/reset", []string{"context", "query:partition", "body"}, []string{"nodes"}, p.clusterController.ResetCluster, access.SystemSettingsApiGatewayManager),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/cluster/check", []string{"context", "body"}, []string{"nodes"}, p.clusterController.Check),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/cluster/check", []string{"context", "body"}, []string{"nodes"}, p.clusterController.Check, access.SystemSettingsApiGatewayManager),
 	}
 }

plugins/core/core.go

@@ -97,7 +97,7 @@ func (p *plugin) OnComplete() {
 	p.apis = append(p.apis, p.upstreamApis()...)
 	p.apis = append(p.apis, p.apiApis()...)
 	p.apis = append(p.apis, p.subscribeApis()...)
-	p.apis = append(p.apis, p.projectAuthorizationApis()...)
+	p.apis = append(p.apis, p.appAuthorizationApis()...)
 	p.apis = append(p.apis, p.releaseApis()...)
 	p.apis = append(p.apis, p.DynamicModuleApis()...)
 	p.apis = append(p.apis, p.monitorStatisticApis()...)

plugins/core/monitor.go

@@ -3,18 +3,19 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) monitorStatisticApis() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/overview/top10", []string{"context", "body"}, []string{"top10"}, p.monitorStatisticController.Top10),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/overview/top10", []string{"context", "body"}, []string{"top10"}, p.monitorStatisticController.Top10, access.SystemAnalysisRunViewView),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/overview/summary", []string{"context", "body"}, []string{"request_summary", "proxy_summary"}, p.monitorStatisticController.Summary),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/overview/summary", []string{"context", "body"}, []string{"request_summary", "proxy_summary"}, p.monitorStatisticController.Summary, access.SystemAnalysisRunViewView),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/overview/invoke", []string{"context", "body"}, []string{"date", "request_total", "proxy_total", "status_4xx", "status_5xx", "request_rate", "proxy_rate", "time_interval"}, p.monitorStatisticController.OverviewInvokeTrend),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/overview/invoke", []string{"context", "body"}, []string{"date", "request_total", "proxy_total", "status_4xx", "status_5xx", "request_rate", "proxy_rate", "time_interval"}, p.monitorStatisticController.OverviewInvokeTrend, access.SystemAnalysisRunViewView),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/overview/message", []string{"context", "body"}, []string{"date", "request_message", "response_message", "time_interval"}, p.monitorStatisticController.OverviewMessageTrend),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/overview/message", []string{"context", "body"}, []string{"date", "request_message", "response_message", "time_interval"}, p.monitorStatisticController.OverviewMessageTrend, access.SystemAnalysisRunViewView),
 
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/config", []string{"context", "body"}, []string{"info"}, p.monitorConfigController.SaveMonitorConfig),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/monitor/config", []string{"context", "body"}, []string{"info"}, p.monitorConfigController.SaveMonitorConfig, access.SystemSettingsDataSourceManager),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/monitor/config", []string{"context"}, []string{"info"}, p.monitorConfigController.GetMonitorConfig),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/monitor/config", []string{"context"}, []string{"info"}, p.monitorConfigController.GetMonitorConfig, access.SystemSettingsDataSourceView),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/monitor/clusters", []string{"context"}, []string{"clusters"}, p.monitorConfigController.GetMonitorCluster),
 	}
 }

plugins/core/my-team.go

@@ -3,27 +3,28 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) MyTeamApi() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/team", []string{"context", "query:team"}, []string{"team"}, p.myTeamController.GetTeam),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/team", []string{"context", "query:team"}, []string{"team"}, p.myTeamController.GetTeam, access.SystemWorkspaceTeamViewAll, access.TeamTeamTeamView),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/teams", []string{"context", "query:keyword"}, []string{"teams"}, p.myTeamController.Search),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/teams/mine", []string{"context", "query:keyword"}, []string{"teams"}, p.myTeamController.MySimpleTeams),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/teams", []string{"context", "query:keyword"}, []string{"teams"}, p.myTeamController.SimpleTeams),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/team/members/simple", []string{"context", "query:team", "query:keyword"}, []string{"teams"}, p.myTeamController.SimpleMembers),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/team", []string{"context", "query:team", "body"}, []string{"team"}, p.myTeamController.EditTeam),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/team", []string{"context", "query:team", "body"}, []string{"team"}, p.myTeamController.EditTeam, access.SystemWorkspaceTeamManager, access.TeamTeamTeamManager),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/member", []string{"context", "query:team", "body"}, nil, p.myTeamController.AddMember),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/member", []string{"context", "query:team", "body"}, nil, p.myTeamController.AddMember, access.SystemWorkspaceTeamManager, access.TeamTeamMemberManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/team/member", []string{"context", "query:team", "query:user"}, nil, p.myTeamController.RemoveMember),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/team/member", []string{"context", "query:team", "query:user"}, nil, p.myTeamController.RemoveMember, access.SystemWorkspaceTeamManager, access.TeamTeamMemberManager),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/team/members", []string{"context", "query:team", "query:keyword"}, []string{"members"}, p.myTeamController.Members),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/team/members", []string{"context", "query:team", "query:keyword"}, []string{"members"}, p.myTeamController.Members, access.SystemWorkspaceTeamViewAll, access.TeamTeamMemberView),
 
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/team/member/role", []string{"context", "query:team", "body"}, nil, p.myTeamController.UpdateMemberRole),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/team/member/role", []string{"context", "query:team", "body"}, nil, p.myTeamController.UpdateMemberRole, access.SystemWorkspaceTeamManager, access.TeamTeamMemberManager),
 
 		// 团队项目操作
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/team/services", []string{"context", "query:team", "query:keyword"}, []string{"services"}, p.serviceController.Search),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/team/services", []string{"context", "query:team", "query:keyword"}, []string{"services"}, p.serviceController.Search, access.SystemWorkspaceServiceViewAll, access.TeamTeamServiceView),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/service", []string{"context", "query:team", "body"}, []string{"service"}, p.serviceController.Create),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/service", []string{"context", "query:team", "body"}, []string{"service"}, p.serviceController.Create, access.SystemWorkspaceServiceManagerAll, access.TeamTeamServiceManager),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/app", []string{"context", "query:team", "body"}, []string{"app"}, p.appController.CreateApp),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/app", []string{"context", "query:team", "body"}, []string{"app"}, p.appController.CreateApp, access.SystemWorkspaceApplicationManagerAll, access.TeamTeamConsumerManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/team/service", []string{"context", "query:service"}, nil, p.serviceController.Delete),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/team/service", []string{"context", "query:service"}, nil, p.serviceController.Delete, access.SystemWorkspaceServiceManagerAll, access.TeamTeamServiceManager),
 	}
 }

plugins/core/release.go

@@ -3,16 +3,17 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) releaseApis() []pm3.Api {
 	return []pm3.Api{
 
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/release", []string{"context", "query:service", "body"}, []string{}, p.releaseController.Create),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/release", []string{"context", "query:service", "body"}, []string{}, p.releaseController.Create, access.SystemWorkspaceServiceManagerAll, access.TeamServiceReleaseManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/release", []string{"context", "query:service", "query:id"}, []string{}, p.releaseController.Delete),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/release", []string{"context", "query:service", "query:id"}, []string{}, p.releaseController.Delete, access.SystemWorkspaceServiceManagerAll, access.TeamServiceReleaseManager),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/release", []string{"context", "query:service", "query:id"}, []string{"release"}, p.releaseController.Detail),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/release", []string{"context", "query:service", "query:id"}, []string{"release"}, p.releaseController.Detail, access.SystemWorkspaceServiceViewAll, access.TeamServiceReleaseView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/releases", []string{"context", "query:service"}, []string{"releases"}, p.releaseController.List),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/releases", []string{"context", "query:service"}, []string{"releases"}, p.releaseController.List, access.SystemWorkspaceServiceViewAll, access.TeamServiceReleaseView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/release/preview", []string{"context", "query:service"}, []string{"running", "diff", "complete"}, p.releaseController.Preview),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/release/preview", []string{"context", "query:service"}, []string{"running", "diff", "complete"}, p.releaseController.Preview, access.SystemWorkspaceServiceViewAll, access.TeamServiceReleaseView),
 	}
 }

plugins/core/service.go

@@ -3,40 +3,29 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) ServiceApis() []pm3.Api {
 	return []pm3.Api{
 		// 项目
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/info", []string{"context", "query:service"}, []string{"service"}, p.serviceController.Get),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/info", []string{"context", "query:service"}, []string{"service"}, p.serviceController.Get, access.SystemWorkspaceServiceViewAll, access.TeamTeamServiceView),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/info", []string{"context", "query:service", "body"}, []string{"service"}, p.serviceController.Edit),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/info", []string{"context", "query:service", "body"}, []string{"service"}, p.serviceController.Edit, access.SystemWorkspaceServiceManagerAll, access.TeamTeamServiceManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/info", []string{"context", "query:service"}, nil, p.serviceController.Delete),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/info", []string{"context", "query:service"}, nil, p.serviceController.Delete, access.SystemWorkspaceServiceManagerAll, access.TeamTeamServiceManager),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/my_services", []string{"context", "query:team", "query:keyword"}, []string{"services"}, p.serviceController.SearchMyServices),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/services", []string{"context", "query:team", "query:keyword"}, []string{"services"}, p.serviceController.Search),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/services", []string{"context", "query:team", "query:keyword"}, []string{"services"}, p.serviceController.Search, access.SystemWorkspaceServiceViewAll, access.TeamTeamServiceView),
-
-		//pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/services/mine", []string{"context", "query:keyword"}, []string{"services"}, p.serviceController.MySimple),
-		//
-		//pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/services", []string{"context", "query:keyword"}, []string{"services"}, p.serviceController.Simple),
-
-		// AI服务
-		//pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai-services", []string{"context", "query:service", "query:keyword"}, []string{"services"}, p.serviceController.SearchAIServices),
-		//pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/ai-service", []string{"context", "query:team", "body"}, []string{"service"}, p.serviceController.CreateAIService),
-		//pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai-service/info", []string{"context", "query:service", "body"}, []string{"service"}, p.serviceController.EditAIService),
-		//pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/team/ai-service", []string{"context", "query:service"}, nil, p.serviceController.DeleteAIService),
-		//pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/my_ai_services", []string{"context", "query:team", "query:keyword"}, []string{"services"}, p.serviceController.SearchMyAIServices),
-		//pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai-service/info", []string{"context", "query:service"}, []string{"service"}, p.serviceController.Get),
-
 		// 应用相关
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/info", []string{"context", "query:app"}, []string{"app"}, p.appController.GetApp),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/info", []string{"context", "query:app"}, []string{"app"}, p.appController.GetApp, access.SystemWorkspaceApplicationViewAll, access.TeamTeamConsumerView),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/app", []string{"context", "query:app"}, nil, p.appController.DeleteApp),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/app", []string{"context", "query:app"}, nil, p.appController.DeleteApp, access.SystemWorkspaceApplicationManagerAll, access.TeamTeamConsumerManager),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/apps", []string{"context", "query:keyword"}, []string{"apps"}, p.appController.SimpleApps),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/apps/mine", []string{"context", "query:keyword"}, []string{"apps"}, p.appController.MySimpleApps),
 		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/my_apps", []string{"context", "query:team", "query:keyword"}, []string{"apps"}, p.appController.SearchMyApps),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/apps", []string{"context", "query:team", "query:keyword"}, []string{"apps"}, p.appController.Search),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/apps", []string{"context", "query:team", "query:keyword"}, []string{"apps"}, p.appController.Search, access.SystemWorkspaceApplicationViewAll),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/app/info", []string{"context", "query:app", "body"}, []string{"app"}, p.appController.UpdateApp),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/apps/can_subscribe", []string{"context", "query:service"}, []string{"app"}, p.appController.SearchCanSubscribe),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/app/info", []string{"context", "query:app", "body"}, []string{"app"}, p.appController.UpdateApp, access.SystemWorkspaceApplicationManagerAll, access.TeamTeamConsumerManager),
 
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/doc", []string{"context", "query:service"}, []string{"doc"}, p.serviceController.ServiceDoc),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/doc", []string{"context", "query:service"}, []string{"doc"}, p.serviceController.ServiceDoc, access.SystemWorkspaceServiceViewAll, access.TeamServiceServiceIntroView),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/doc", []string{"context", "query:service", "body"}, nil, p.serviceController.SaveServiceDoc),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/doc", []string{"context", "query:service", "body"}, nil, p.serviceController.SaveServiceDoc, access.SystemWorkspaceServiceManagerAll, access.TeamServiceServiceIntroManager),
 	}
 }

plugins/core/square.go

@@ -3,18 +3,19 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) catalogueApi() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/catalogues", []string{"context", "query:keyword"}, []string{"catalogues", "tags"}, p.catalogueController.Search),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/catalogues", []string{"context", "query:keyword"}, []string{"catalogues", "tags"}, p.catalogueController.Search, access.SystemSettingsGeneralView, access.SystemApiPortalApiPortalView),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/catalogue", []string{"context", "body"}, nil, p.catalogueController.Create),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/catalogue", []string{"context", "body"}, nil, p.catalogueController.Create, access.SystemSettingsGeneralManager),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/catalogue", []string{"context", "query:catalogue", "body"}, nil, p.catalogueController.Edit),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/catalogue", []string{"context", "query:catalogue", "body"}, nil, p.catalogueController.Edit, access.SystemSettingsGeneralManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/catalogue", []string{"context", "query:catalogue"}, nil, p.catalogueController.Delete),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/catalogue", []string{"context", "query:catalogue"}, nil, p.catalogueController.Delete, access.SystemSettingsGeneralManager),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/catalogue/sort", []string{"context", "body"}, nil, p.catalogueController.Sort),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/catalogue/sort", []string{"context", "body"}, nil, p.catalogueController.Sort, access.SystemSettingsGeneralManager),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/catalogue/services", []string{"context", "query:keyword"}, []string{"services"}, p.catalogueController.Services),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/catalogue/services", []string{"context", "query:keyword"}, []string{"services"}, p.catalogueController.Services, access.SystemApiPortalApiPortalView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/catalogue/service", []string{"context", "query:service"}, []string{"service"}, p.catalogueController.ServiceDetail),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/catalogue/service", []string{"context", "query:service"}, []string{"service"}, p.catalogueController.ServiceDetail, access.SystemApiPortalApiPortalView),
 		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/catalogue/service/subscribe", []string{"context", "body"}, nil, p.catalogueController.Subscribe),
 	}
 }

plugins/core/subscribe.go

@@ -3,23 +3,25 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
+
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) subscribeApis() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/subscribers", []string{"context", "query:service", "query:keyword"}, []string{"subscribers"}, p.subscribeController.Search),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/subscribers", []string{"context", "query:service", "query:keyword"}, []string{"subscribers"}, p.subscribeController.Search, access.SystemWorkspaceServiceViewAll, access.TeamServiceSubscriptionView),
 
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/subscriber", []string{"context", "query:service", "body"}, nil, p.subscribeController.AddSubscriber),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/subscriber", []string{"context", "query:service", "body"}, nil, p.subscribeController.AddSubscriber, access.SystemWorkspaceServiceManagerAll, access.TeamServiceSubscriptionManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/subscriber", []string{"context", "query:service", "query:service", "query:application"}, nil, p.subscribeController.DeleteSubscriber),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/service/subscriber", []string{"context", "query:service", "query:service", "query:application"}, nil, p.subscribeController.DeleteSubscriber, access.SystemWorkspaceServiceManagerAll, access.TeamServiceSubscriptionManager),
 
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/application/subscriptions", []string{"context", "query:application", "query:keyword"}, []string{"subscriptions"}, p.subscribeController.SearchSubscriptions),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/application/subscriptions", []string{"context", "query:application", "query:keyword"}, []string{"subscriptions"}, p.subscribeController.SearchSubscriptions, access.SystemWorkspaceApplicationViewAll, access.TeamConsumerSubscriptionViewSubscribed),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/application/subscription/cancel", []string{"context", "query:application", "query:subscription"}, nil, p.subscribeController.RevokeSubscription),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/application/subscription/cancel", []string{"context", "query:application", "query:subscription"}, nil, p.subscribeController.RevokeSubscription, access.SystemWorkspaceApplicationManagerAll, access.TeamConsumerSubscriptionSubscribe, access.TeamConsumerSubscriptionManagerSubscribed),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/application/subscription/cancel_apply", []string{"context", "query:application", "query:subscription"}, nil, p.subscribeController.RevokeApply),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/application/subscription/cancel_apply", []string{"context", "query:application", "query:subscription"}, nil, p.subscribeController.RevokeApply, access.SystemWorkspaceApplicationManagerAll, access.TeamConsumerSubscriptionSubscribe, access.TeamConsumerSubscriptionManagerSubscribed),
 
 		// 审核相关
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/approval/subscribes", []string{"context", "query:service", "query:status"}, []string{"approvals"}, p.subscribeApprovalController.GetApprovalList),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/approval/subscribes", []string{"context", "query:service", "query:status"}, []string{"approvals"}, p.subscribeApprovalController.GetApprovalList, access.SystemWorkspaceServiceViewAll, access.TeamServiceSubscriptionView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/approval/subscribe", []string{"context", "query:service", "query:apply"}, []string{"approval"}, p.subscribeApprovalController.GetApprovalDetail),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/approval/subscribe", []string{"context", "query:service", "query:apply"}, []string{"approval"}, p.subscribeApprovalController.GetApprovalDetail, access.SystemWorkspaceServiceViewAll, access.TeamServiceSubscriptionView),
 		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/service/approval/subscribe", []string{"context", "query:service", "query:apply", "body"}, nil, p.subscribeApprovalController.Approval),
 	}
 }

plugins/core/team-manager.go

@@ -1,16 +1,19 @@
 package core
 
 import (
-	"github.com/eolinker/go-common/pm3"
 	"net/http"
+
+	"github.com/APIParkLab/APIPark/resources/access"
+
+	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) TeamManagerApi() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/manager/team", []string{"context", "query:id"}, []string{"team"}, p.teamManagerController.GetTeam),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/manager/team", []string{"context", "query:id"}, []string{"team"}, p.teamManagerController.GetTeam, access.SystemWorkspaceTeamViewAll, access.TeamTeamTeamView),
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/manager/teams", []string{"context", "query:keyword"}, []string{"teams"}, p.teamManagerController.Search),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/manager/teams", []string{"context", "query:keyword"}, []string{"teams"}, p.teamManagerController.Search, access.SystemWorkspaceTeamViewAll, access.TeamTeamTeamView),
-		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/manager/team", []string{"context", "body"}, []string{"team"}, p.teamManagerController.CreateTeam),
+		pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/manager/team", []string{"context", "body"}, []string{"team"}, p.teamManagerController.CreateTeam, access.SystemWorkspaceTeamCreate, access.TeamTeamTeamManager),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/manager/team", []string{"context", "query:id", "body"}, []string{"team"}, p.teamManagerController.EditTeam),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/manager/team", []string{"context", "query:id", "body"}, []string{"team"}, p.teamManagerController.EditTeam, access.SystemWorkspaceTeamManager, access.TeamTeamTeamManager),
-		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/manager/team", []string{"context", "query:id"}, []string{"id"}, p.teamManagerController.DeleteTeam),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/manager/team", []string{"context", "query:id"}, []string{"id"}, p.teamManagerController.DeleteTeam, access.SystemWorkspaceTeamManager, access.TeamTeamTeamManager),
 	}
 }

plugins/core/upstream.go

@@ -3,12 +3,13 @@ package core
 import (
 	"net/http"
 
+	"github.com/APIParkLab/APIPark/resources/access"
 	"github.com/eolinker/go-common/pm3"
 )
 
 func (p *plugin) upstreamApis() []pm3.Api {
 	return []pm3.Api{
-		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/upstream", []string{"context", "query:service"}, []string{"upstream"}, p.upstreamController.Get),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/service/upstream", []string{"context", "query:service"}, []string{"upstream"}, p.upstreamController.Get, access.SystemWorkspaceServiceViewAll, access.TeamServiceUpstreamView),
-		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/upstream", []string{"context", "query:service", "body"}, []string{"upstream"}, p.upstreamController.Save),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/service/upstream", []string{"context", "query:service", "body"}, []string{"upstream"}, p.upstreamController.Save, access.SystemWorkspaceServiceManagerAll, access.TeamServiceUpstreamManager),
 	}
 }

readme/readme-jp.md

@@ -198,7 +198,7 @@ curl -sSO https://download.apipark.com/install/quick-start.sh; bash quick-start.
 <br>
 
 # 📕ドキュメント
-詳細なインストールガイド、APIリファレンス、使用説明書については、[APIParkドキュメント](https://docs.apipark.com/docs/install) をご覧ください。
+詳細なインストールガイド、APIリファレンス、使用説明書については、[APIParkドキュメント](https://docs.apipark.com/docs/deploy) をご覧ください。
 
 <br>
 

readme/readme-zh-cn.md

@@ -201,7 +201,7 @@ curl -sSO https://download.apipark.com/install/quick-start.sh; bash quick-start.
 <br>
 
 # 📕文档
-访问 [APIPark文档](https://docs.apipark.com/docs/install) 获取详细的安装指南、API 参考和使用说明。
+访问 [APIPark文档](https://docs.apipark.com/docs/deploy) 获取详细的安装指南、API 参考和使用说明。
 
 <br>
 

readme/readme-zh-tw.md

@@ -199,7 +199,7 @@ curl -sSO https://download.apipark.com/install/quick-start.sh; bash quick-start.
 <br>
 
 # 📕指南
-訪問 [APIPark指南](https://docs.apipark.com/docs/install) 以獲取詳細的安裝指南、API 參考與使用說明。
+訪問 [APIPark指南](https://docs.apipark.com/docs/deploy) 以獲取詳細的安裝指南、API 參考與使用說明。
 
 <br>
 

resources/access/access.go

@@ -3,8 +3,9 @@ package access
 import (
 	_ "embed"
 
+	yaml "gopkg.in/yaml.v3"
+
 	"github.com/eolinker/go-common/access"
-	"gopkg.in/yaml.v3"
 )
 
 type Access = access.Access
@@ -24,22 +25,61 @@ func init() {
 		access.Add(group, asl)
 
 	}
-	//defaultRoles := access.Roles()
-	//for group, rs := range defaultRoles {
-	//	p, has := access.GetPermit(group)
-	//	if !has {
-	//		continue
-	//	}
-	//
-	//	for _, r := range rs {
-	//		for _, pm := range r.Permits {
-	//			apis, err := p.GetPermits(pm)
-	//			if err != nil {
-	//				continue
-	//			}
-	//			permit.AddPermitRule(pm, apis...)
-	//		}
-	//	}
-	//
-	//}
 }
+
+const (
+	SystemAnalysisRunViewView             = "system.analysis.run_view.view"
+	SystemApiPortalApiPortalView          = "system.api_portal.api_portal.view"
+	SystemSettingsAccountManager          = "system.settings.account.manager"
+	SystemSettingsAccountView             = "system.settings.account.view"
+	SystemSettingsAiProviderManager       = "system.settings.ai_provider.manager"
+	SystemSettingsAiProviderView          = "system.settings.ai_provider.view"
+	SystemSettingsApiGatewayManager       = "system.settings.api_gateway.manager"
+	SystemSettingsApiGatewayView          = "system.settings.api_gateway.view"
+	SystemSettingsDataSourceManager       = "system.settings.data_source.manager"
+	SystemSettingsDataSourceView          = "system.settings.data_source.view"
+	SystemSettingsGeneralManager          = "system.settings.general.manager"
+	SystemSettingsGeneralView             = "system.settings.general.view"
+	SystemSettingsLogConfigurationManager = "system.settings.log_configuration.manager"
+	SystemSettingsLogConfigurationView    = "system.settings.log_configuration.view"
+	SystemSettingsRoleView                = "system.settings.role.view"
+	SystemSettingsSslCertificateManager   = "system.settings.ssl_certificate.manager"
+	SystemSettingsSslCertificateView      = "system.settings.ssl_certificate.view"
+	SystemWorkspaceApplicationManagerAll  = "system.workspace.application.manager_all"
+	SystemWorkspaceApplicationViewAll     = "system.workspace.application.view_all"
+	SystemWorkspaceServiceManagerAll      = "system.workspace.service.manager_all"
+	SystemWorkspaceServiceViewAll         = "system.workspace.service.view_all"
+	SystemWorkspaceTeamCreate             = "system.workspace.team.create"
+	SystemWorkspaceTeamManager            = "system.workspace.team.manager"
+	SystemWorkspaceTeamViewAll            = "system.workspace.team.view_all"
+)
+
+const (
+	TeamConsumerApplicationManager            = "team.consumer.application.manager"
+	TeamConsumerAuthorizationManager          = "team.consumer.authorization.manager"
+	TeamConsumerAuthorizationView             = "team.consumer.authorization.view"
+	TeamConsumerSubscriptionManagerSubscribed = "team.consumer.subscription.manager_subscribed_services"
+	TeamConsumerSubscriptionSubscribe         = "team.consumer.subscription.subscribe"
+	TeamConsumerSubscriptionViewSubscribed    = "team.consumer.subscription.view_subscribed_service"
+	TeamServiceApiManager                     = "team.service.api.manager"
+	TeamServiceApiView                        = "team.service.api.view"
+	TeamServiceApiDocManager                  = "team.service.api_doc.manager"
+	TeamServiceApiDocView                     = "team.service.api_doc.view"
+	TeamServiceReleaseManager                 = "team.service.release.manager"
+	TeamServiceReleaseView                    = "team.service.release.view"
+	TeamServiceServiceManager                 = "team.service.service.manager"
+	TeamServiceServiceIntroManager            = "team.service.service_intro.manager"
+	TeamServiceServiceIntroView               = "team.service.service_intro.view"
+	TeamServiceSubscriptionManager            = "team.service.subscription.manager"
+	TeamServiceSubscriptionView               = "team.service.subscription.view"
+	TeamServiceUpstreamManager                = "team.service.upstream.manager"
+	TeamServiceUpstreamView                   = "team.service.upstream.view"
+	TeamTeamConsumerManager                   = "team.team.consumer.manager"
+	TeamTeamConsumerView                      = "team.team.consumer.view"
+	TeamTeamMemberManager                     = "team.team.member.manager"
+	TeamTeamMemberView                        = "team.team.member.view"
+	TeamTeamServiceManager                    = "team.team.service.manager"
+	TeamTeamServiceView                       = "team.team.service.view"
+	TeamTeamTeamManager                       = "team.team.team.manager"
+	TeamTeamTeamView                          = "team.team.team.view"
+)

resources/access/access.yaml

@@ -71,19 +71,6 @@ system:
             guest_allow: true
           - name: manager
             value: 'manager'
-            apis:
-              - "POST:/api/v1/user/account"
-              - "PUT:/api/v1/user/account"
-              - "DELETE:/api/v1/user/account"
-              - "POST:/api/v1/user/account/enable"
-              - "POST:/api/v1/user/account/disable"
-              - "POST:/api/v1/user/department"
-              - "PUT:/api/v1/user/department"
-              - "DELETE:/api/v1/user/department"
-              - "POST:/api/v1/user/department/member"
-              - "DELETE:/api/v1/user/department/member"
-              - "POST:/api/v1/user/department/member/remove"
-              - "POST:/api/v1/account/role"
             dependents:
               - system.settings.account.view
       - name: role
@@ -92,11 +79,6 @@ system:
           - name: view
             guest_allow: true
             value: 'view'
-            apis:
-              - "GET:/api/v1/system/roles"
-              - "GET:/api/v1/system/role"
-              - "GET:/api/v1/team/roles"
-              - "GET:/api/v1/team/role"
       - name: api gateway
         value: 'api_gateway'
         children:
@@ -104,27 +86,18 @@ system:
             cname: 查看
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/cluster/nodes"
           - name: manager
             value: 'manager'
-            apis:
+            dependents:
-              - "PUT:/api/v1/cluster/reset"
+              - system.settings.api_gateway.view
-              - "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
@@ -134,15 +107,8 @@ system:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/certificates"
-              - "GET:/api/v1/certificate"
           - name: manager
             value: 'manager'
-            apis:
-              - "POST:/api/v1/certificate"
-              - "PUT:/api/v1/certificate"
-              - "DELETE:/api/v1/certificate"
             dependents:
               - system.settings.ssl_certificate.view
       - name: data source
@@ -151,13 +117,8 @@ system:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/monitor/config"
           - name: manager
             value: 'manager'
-            apis:
-              - "POST:/api/v1/monitor/config"
-              - "PUT:/api/v1/monitor/config"
             dependents:
               - system.settings.data_source.view
       - name: log configuration
@@ -166,18 +127,8 @@ system:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/dynamic/{name}/info"
-              - "GET:/api/v1/dynamic/{name}/list"
-              - "GET:/api/v1/dynamic/{name}/render"
           - name: manager
             value: 'manager'
-            apis:
-              - "POST:/api/v1/dynamic/{name}"
-              - "PUT:/api/v1/dynamic/{name}/config"
-              - "DELETE:/api/v1/dynamic/{name}/batch"
-              - "PUT:/api/v1/dynamic/{name}/online"
-              - "PUT:/api/v1/dynamic/{name}/offline"
             dependents:
               - system.settings.log_configuration.view
 team:
@@ -190,17 +141,8 @@ team:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/service/routers"
-              - "GET:/api/v1/service/router/detail"
-              - "GET:/api/v1/service/router/detail/simple"
-              - "GET:/api/v1/service/router/define"
           - name: manager
             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
@@ -210,13 +152,8 @@ team:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/service/api_doc"
           - name: manager
             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
@@ -236,12 +173,8 @@ team:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/service/upstream"
           - name: manager
             value: 'manager'
-            apis:
-              - "PUT:/api/v1/service/upstream"
             dependents:
                 - team.service.upstream.view
       - name: release
@@ -250,18 +183,8 @@ team:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/service/releases"
-              - "GET:/api/v1/service/release"
-              - "GET:/api/v1/service/publishs"
-              - "GET:/api/v1/service/publish/check"
-              - "GET:/api/v1/service/release/preview"
-              - "GET:/api/v1/service/publish/status"
           - name: manager
             value: 'manager'
-            apis:
-              - "POST:/api/v1/service/publish/release/do"
-              - "DELETE:/api/v1/service/release"
             dependents:
               - team.service.release.view
       - name: subscription review
@@ -270,29 +193,10 @@ team:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/service/approval/subscribes"
-              - "GET:/api/v1/service/approval/subscribe"
-              - "GET:/api/v1/service/subscribers"
           - name: manager
             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
-        value: 'service'
-        children:
-          - name: manager
-            value: 'manager'
-            apis:
-              - "PUT:/api/v1/service/info"
-              - "POST:/api/v1/team/service"
-              - "DELETE:/api/v1/team/service"
-            dependents:
-              - team.service.service.manager
   - name: consumer
     value: 'consumer'
     children:
@@ -305,38 +209,20 @@ team:
           - name: view subscribed services
             value: 'view_subscribed_service'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/application/subscription"
           - name: manager subscribed services
             value: 'manager_subscribed_services'
-            apis:
+            dependents:
-              - "POST:/api/v1/catalogue/service/subscribe"
+              - team.consumer.subscription.manager_subscribed_services
-              - "POST:/api/v1/application/subscription/cancel"
-              - "POST:/api/v1/application/subscription/cancel_apply"
       - name: authorization
         value: 'authorization'
         children:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
-              - "GET:/api/v1/app/authorization"
-              - "GET:/api/v1/app/authorizations"
-              - "GET:/api/v1/app/authorization/details"
           - name: manager
             value: 'manager'
-            apis:
+            dependents:
-              - "POST:/api/v1/app/authorization"
+              - team.consumer.authorization.view
-              - "PUT:/api/v1/app/authorization"
-              - "DELETE:/api/v1/app/authorization"
-      - name: consumer
-        value: 'application'
-        children:
-          - name: manager
-            value: 'manager'
-            apis:
-              - "PUT:/api/v1/app/info"
-              - "POST:/api/v1/team/app"
   - name: team
     value: 'team'
     children:
@@ -376,7 +262,6 @@ team:
           - name: view
             value: 'view'
             guest_allow: true
-            apis:
           - name: manager
             value: 'manager'
             apis:

resources/access/role.yaml

@@ -62,7 +62,6 @@ team:
   - name: team admin
     value: team_admin
     permits:
-      - team.consumer.application.manager
       - team.consumer.authorization.manager
       - team.consumer.authorization.view
       - team.consumer.subscription.manager_subscribed_services
@@ -74,7 +73,6 @@ team:
       - 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
@@ -99,7 +97,6 @@ team:
       - 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
@@ -134,7 +131,6 @@ team:
   - 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

resources/locale/i18n/en-US.json

@@ -1,44 +1,46 @@
 {
+  "account": "Account",
   "ai provider": "AI Provider",
-  "api market": "API Portal",
+  "analysis": "Analysis Report",
+  "api": "API",
   "api doc": "API Documentation",
-  "application": "Application",
+  "api gateway": "API Gateway",
-  "application admin": "Application Administrator",
+  "api portal": "API Portal",
-  "application developer": "Application Developer",
+  "authorization": "Access Authorization",
-  "authorization": "Authorization",
+  "consumer": "Consumer",
-  "cluster": "Cluster",
+  "consumer admin": "Consumer Admin",
-  "dashboard": "Dashboard",
+  "consumer developer": "Consumer Developer",
+  "create": "Create",
   "data source": "Data Source",
-  "devops": "DevOps",
+  "devops admin": "DevOps Admin",
-  "devops admin": "DevOps Administrator",
   "general": "General Settings",
   "general member": "General Member",
-  "guest": "Guest",
   "log configuration": "Log Configuration",
   "manager": "Manager",
+  "manager all consumer": "Manage All Consumers",
+  "manager subscribed services": "Manage Subscribed Services",
   "member": "Member",
-  "organization": "Organization Management",
   "release": "Release",
   "role": "Role",
-  "router": "Router",
   "run view": "Run View",
   "service": "Service",
-  "service admin": "Service Administrator",
+  "service admin": "Service Admin",
-  "service classification": "Service Directory",
   "service developer": "Service Developer",
+  "service intro": "Service Documentation",
   "ssl certificate": "SSL Certificate",
-  "subscription management": "Subscription Management",
+  "allow subscribe service": "Allow Subscribe Service",
+  "subscription review": "Subscription Review",
   "subscription service": "Subscription Service",
-  "super admin": "Super Administrator",
+  "super admin": "Super Admin",
   "system settings": "System Settings",
   "team": "Team",
-  "team admin": "Team Administrator",
+  "team settings": "Team Settings",
+  "team admin": "Team Admin",
   "upstream": "Upstream",
   "view": "View",
-  "view all application": "View All Applications",
+  "view all consumer": "View All Consumers",
   "view all service": "View All Services",
   "view all team": "View All Teams",
-  "view system role": "View System Roles",
+  "view subscribed services": "View Subscribed Services",
-  "view team role": "View Team Roles",
   "workspace": "Workspace"
 }

resources/locale/i18n/ja-JP.json

@@ -1,44 +1,46 @@
 {
+  "account": "アカウント",
   "ai provider": "AIプロバイダー",
-  "api market": "APIマーケット",
+  "analysis": "分析レポート",
+  "api": "API",
   "api doc": "APIドキュメント",
-  "application": "アプリケーション",
+  "api gateway": "APIゲートウェイ",
-  "application admin": "アプリケーション管理者",
+  "api portal": "APIポータル",
-  "application developer": "アプリケーション開発者",
+  "authorization": "アクセス許可",
-  "authorization": "認証",
+  "consumer": "消費者",
-  "cluster": "クラスター",
+  "consumer admin": "消費者管理者",
-  "dashboard": "ダッシュボード",
+  "consumer developer": "消費者開発者",
+  "create": "作成",
   "data source": "データソース",
-  "devops": "DevOps",
   "devops admin": "DevOps管理者",
   "general": "一般設定",
   "general member": "一般メンバー",
-  "guest": "ゲスト",
   "log configuration": "ログ設定",
   "manager": "管理者",
+  "manager all consumer": "すべての消費者を管理",
+  "manager subscribed services": "購読したサービスを管理",
   "member": "メンバー",
-  "organization": "組織管理",
   "release": "リリース",
   "role": "役割",
-  "router": "ルーター",
   "run view": "実行ビュー",
   "service": "サービス",
   "service admin": "サービス管理者",
-  "service classification": "サービスディレクトリ",
   "service developer": "サービス開発者",
+  "service intro": "サービスドキュメント",
   "ssl certificate": "SSL証明書",
-  "subscription management": "サブスクリプション管理",
+  "allow subscribe service": "サービスの購読を許可",
-  "subscription service": "サブスクリプションサービス",
+  "subscription review": "購読レビュー",
+  "subscription service": "購読サービス",
   "super admin": "スーパ管理者",
   "system settings": "システム設定",
   "team": "チーム",
+  "team settings": "チーム設定",
   "team admin": "チーム管理者",
   "upstream": "アップストリーム",
   "view": "表示",
-  "view all application": "すべてのアプリケーションを表示",
+  "view all consumer": "すべての消費者を表示",
   "view all service": "すべてのサービスを表示",
   "view all team": "すべてのチームを表示",
-  "view system role": "システム役割を表示",
+  "view subscribed services": "購読したサービスを表示",
-  "view team role": "チーム役割を表示",
   "workspace": "ワークスペース"
 }

resources/locale/i18n/zh-TW.json

@@ -1,44 +1,46 @@
 {
-  "ai provider": "AI供應商",
+  "account": "帳號",
-  "api market": "API市場",
+  "ai provider": "AI模型供應商",
+  "analysis": "分析報告",
+  "api": "API",
   "api doc": "API文檔",
-  "application": "應用",
+  "api gateway": "API網關",
-  "application admin": "應用管理員",
+  "api portal": "API門戶",
-  "application developer": "應用開發者",
+  "authorization": "訪問授權",
-  "authorization": "授權",
+  "consumer": "消費者",
-  "cluster": "集群",
+  "consumer admin": "消費者管理員",
-  "dashboard": "儀表盤",
+  "consumer developer": "消費者開發者",
+  "create": "創建",
   "data source": "數據源",
-  "devops": "運維",
   "devops admin": "運維管理員",
   "general": "常規設置",
   "general member": "普通成員",
-  "guest": "訪客",
   "log configuration": "日誌配置",
   "manager": "管理",
+  "manager all consumer": "管理所有消費者",
+  "manager subscribed services": "管理已訂閱的服務",
   "member": "成員",
-  "organization": "組織管理",
   "release": "發布",
   "role": "角色",
-  "router": "路由",
   "run view": "運行視圖",
   "service": "服務",
   "service admin": "服務管理員",
-  "service classification": "服務目錄",
   "service developer": "服務開發者",
+  "service intro": "服務文檔",
   "ssl certificate": "SSL證書",
-  "subscription management": "訂閱方管理",
+  "allow subscribe service": "允許訂閱服務",
+  "subscription review": "訂閱審核",
   "subscription service": "訂閱服務",
   "super admin": "超級管理員",
   "system settings": "系統設置",
   "team": "團隊",
+  "team settings": "團隊設置",
   "team admin": "團隊管理員",
   "upstream": "上游",
   "view": "查看",
-  "view all application": "查看所有應用",
+  "view all consumer": "查看所有消費者",
   "view all service": "查看所有服務",
   "view all team": "查看所有團隊",
-  "view system role": "查看系統角色",
+  "view subscribed services": "查看已訂閱的服務",
-  "view team role": "查看團隊角色",
   "workspace": "工作空間"
 }

resources/locale/locale.go

@@ -5,18 +5,15 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/eolinker/eosc"
+	"github.com/eolinker/go-common/pm3"
 )
 
 var (
 	//go:embed i18n/*
-	i18nDirs    embed.FS
+	i18nDirs embed.FS
-	i18nData    eosc.Untyped[string, map[string]string]
-	defaultI18n = "zh-CN"
 )
 
 func init() {
-	i18nData = eosc.BuildUntyped[string, map[string]string]()
 	files, err := i18nDirs.ReadDir("i18n")
 	if err != nil {
 		panic(err)
@@ -34,19 +31,6 @@ func init() {
 			panic(err)
 		}
 		key := strings.TrimSuffix(f.Name(), ".json")
-		i18nData.Set(key, tmp)
+		pm3.I18nRegister(key, tmp)
 	}
 }
-
-func Get(i18n string) map[string]string {
-	result, has := i18nData.Get(i18n)
-	if has {
-		return result
-	}
-
-	result, has = i18nData.Get(defaultI18n)
-	if !has {
-		return make(map[string]string)
-	}
-	return result
-}

scripts/docker-compose.yml

@@ -0,0 +1,95 @@
+version: '3'
+services:
+  apipark-mysql:
+    image: mysql:8.0.37
+    privileged: true
+    restart: always
+    container_name: apipark-mysql
+    hostname: apipark-mysql
+    command:
+      - "--character-set-server=utf8mb4"
+      - "--collation-server=utf8mb4_unicode_ci"
+    ports:
+      - "33306:3306"
+    environment:
+      - MYSQL_ROOT_PASSWORD=123456
+      - MYSQL_DATABASE=apipark
+    volumes:
+      - /var/lib/apipark/mysql:/var/lib/mysql
+    networks:
+      - apipark
+  apipark:
+    image: apipark/apipark:v1.2.0-beta
+    container_name: apipark
+    privileged: true
+    restart: always
+    networks:
+      - apipark
+    ports:
+      - "18288:8288"
+    depends_on:
+      - apipark-mysql
+    environment:
+      - MYSQL_USER_NAME=root
+      - MYSQL_PWD=123456
+      - MYSQL_IP=apipark-mysql
+      - MYSQL_PORT=3306                 #mysql端口
+      - MYSQL_DB="apipark"
+      - ERROR_DIR=work/logs  # 日志放置目录
+      - ERROR_FILE_NAME=error.log          # 错误日志文件名
+      - ERROR_LOG_LEVEL=info               # 错误日志等级,可选:panic,fatal,error,warning,info,debug,trace 不填或者非法则为info
+      - ERROR_EXPIRE=7d                    # 错误日志过期时间，默认单位为天，d|天，h|小时, 不合法配置默认为7d
+      - ERROR_PERIOD=day                  # 错误日志切割周期，仅支持day、hour
+      - REDIS_ADDR=apipark-redis:6379           #Redis集群地址 多个用,隔开
+      - REDIS_PWD=123456                         # Redis密码
+      - ADMIN_PASSWORD=12345678
+  influxdb2:
+    image: influxdb:2.6
+    privileged: true
+    restart: always
+    container_name: influxdb2
+    hostname: influxdb2
+    ports:
+      - "8086:8086"
+    volumes:
+      - /var/lib/apipark/influxdb2:/var/lib/influxdb2
+    networks:
+      - apipark
+  apipark-redis:
+    container_name: apipark-redis
+    image: redis:7.2.4
+    hostname: apipark-redis
+    privileged: true
+    restart: always
+    ports:
+      - "6379:6379"
+    command:
+      - bash
+      - -c
+      - "redis-server --protected-mode yes --logfile redis.log --appendonly no --port 6379 --requirepass 123456"
+    networks:
+      - apipark
+  apipark-apinto:
+    image: eolinker/apinto-gateway
+    container_name: apipark-apinto
+    privileged: true
+    restart: always
+    command: 
+      - ./start.sh
+    ports:
+      - "8099:8099"
+      - "9400:9400"
+      - "9401:9401"
+    volumes:
+      - /var/lib/apipark/apinto/data:/var/lib/apinto
+      - /var/lib/apipark/apinto/log:/var/log/apinto
+      - ${PWD}/config.yml:/etc/apinto/config.yml
+    networks:
+      - apipark
+networks:
+  apipark:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.100.0.0/24

scripts/prefix.sh

@@ -31,3 +31,10 @@ if [ ! -d "./aoaccount" ]; then
 fi
 cd "./aoaccount" && git pull
 
+echo "更新go-common"
+cd "${BASEPATH}/"
+if [ ! -d "./go-common" ]; then
+   git clone http://gitlab.eolink.com/apinto/go-common.git
+fi
+cd "./go-common" && git pull
+

service/service/iml.go

@@ -32,6 +32,7 @@ func (i *imlServiceService) ServiceList(ctx context.Context, serviceIds ...strin
 		w["uuid"] = serviceIds
 	}
 	w["as_server"] = true
+	w["is_delete"] = false
 	list, err := i.store.List(ctx, w)
 	if err != nil {
 		return nil, err
@@ -46,6 +47,7 @@ func (i *imlServiceService) ServiceListByKind(ctx context.Context, kind Kind, se
 	}
 	w["as_server"] = true
 	w["kind"] = kind
+	w["is_delete"] = false
 	list, err := i.store.List(ctx, w)
 	if err != nil {
 		return nil, err
@@ -57,6 +59,7 @@ func (i *imlServiceService) SearchPublicServices(ctx context.Context, keyword st
 	w := map[string]interface{}{
 		"as_server":    true,
 		"service_type": PublicService.Int(),
+		"is_delete":    false,
 	}
 	list, err := i.store.Search(ctx, keyword, w)
 	if err != nil {
@@ -93,6 +96,7 @@ func (i *imlServiceService) AppList(ctx context.Context, appIds ...string) ([]*S
 		w["uuid"] = appIds
 	}
 	w["as_app"] = true
+	w["is_delete"] = false
 	list, err := i.store.List(ctx, w)
 	if err != nil {
 		return nil, err