From d8cd4665026464720d8be47bf533a082b08e9bd8 Mon Sep 17 00:00:00 2001
From: tingfuyeh <tingfuyeh@tencent.com>
Date: Thu, 2 Jan 2025 11:31:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=9E=E9=80=80=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=9E=E7=8E=B0=E7=9A=84=E6=94=B9=E5=8A=A8=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../polaris/auth/common/UseableResource.tsx   |   8 -
 web/src/polaris/auth/policy/Page.tsx          | 108 +---
 .../polaris/auth/policy/operation/Create.tsx  | 472 +-----------------
 .../auth/policy/operation/CreateDuck.ts       | 458 +----------------
 .../fileGroup/detail/file/Page.tsx            |   4 +-
 .../fileGroup/detail/version/PageDuck.tsx     |   2 +-
 .../fileGroup/detail/version/model.ts         |   1 +
 7 files changed, 52 insertions(+), 1001 deletions(-)

diff --git a/web/src/polaris/auth/common/UseableResource.tsx b/web/src/polaris/auth/common/UseableResource.tsx
index 2755d04d..de740b55 100644
--- a/web/src/polaris/auth/common/UseableResource.tsx
+++ b/web/src/polaris/auth/common/UseableResource.tsx
@@ -16,14 +16,6 @@ interface Props {
     namespaces: StrategyResourceEntry[]
     services: StrategyResourceEntry[]
     config_groups: StrategyResourceEntry[]
-    router_rules: StrategyResourceEntry[]
-    // lane_rules: StrategyResourceEntry[]
-    circuitbreaker_rules: StrategyResourceEntry[]
-    faultdetect_rules: StrategyResourceEntry[]
-    ratelimit_rules: StrategyResourceEntry[]
-    users: StrategyResourceEntry[]
-    user_groups: StrategyResourceEntry[]
-    auth_policies: StrategyResourceEntry[]
   }
 }
 export default purify(function(props: Props) {
diff --git a/web/src/polaris/auth/policy/Page.tsx b/web/src/polaris/auth/policy/Page.tsx
index 0e7a311c..d2d2dc9b 100644
--- a/web/src/polaris/auth/policy/Page.tsx
+++ b/web/src/polaris/auth/policy/Page.tsx
@@ -34,25 +34,14 @@ import UseableResource from '../common/UseableResource'
 export enum AuthSubjectType {
   USER = 'user',
   USERGROUP = 'group',
-  ROLE = 'role',
 }
 export enum AuthResourceType {
   NAMESPACE = 'namespaces',
   SERVICE = 'services',
   CONFIGURATION = 'config_groups',
-  ROUTER_RULE = 'route_rules',
-  RATELIMIT_RULE = 'ratelimit_rules',
-  CIRCUIT_BREAKER_RULE = 'circuitbreaker_rules',
-  FAULTDETECT_RULE = 'faultdetect_rules',
-  LANE_RULE = 'lane_rules',
-  AUTH_USERS = 'users',
-  AUTH_USER_GROUP = 'user_groups',
-  AUTH_ROLE = 'roles',
-  AUTH_POLICY = 'auth_policies',
 }
 export const AUTH_SUBJECT_TYPE_MAP = {
   [AuthSubjectType.USER]: { text: '用户', urlKey: 'user' },
-  // [AuthSubjectType.ROLE]: { text: '角色', urlKey: 'role' },
   [AuthSubjectType.USERGROUP]: { text: '用户组', urlKey: 'usergroup' },
 }
 export const AUTH_RESOURCE_TYPE_MAP = {
@@ -68,34 +57,6 @@ export const AUTH_RESOURCE_TYPE_MAP = {
     text: '配置分组',
     columnsRender: x => x.name,
   },
-  [AuthResourceType.ROUTER_RULE]: {
-    text: '路由规则',
-    columnsRender: x => x.name,
-  },
-  [AuthResourceType.RATELIMIT_RULE]: {
-    text: '限流规则',
-    columnsRender: x => x.name,
-  },
-  [AuthResourceType.CIRCUIT_BREAKER_RULE]: {
-    text: '熔断规则',
-    columnsRender: x => x.name,
-  },
-  [AuthResourceType.FAULTDETECT_RULE]: {
-    text: '探测规则',
-    columnsRender: x => x.name,
-  },
-  [AuthResourceType.AUTH_USERS]: {
-    text: '用户',
-    columnsRender: x => x.name,
-  },
-  [AuthResourceType.AUTH_USER_GROUP]: {
-    text: '用户组',
-    columnsRender: x => x.name,
-  },
-  [AuthResourceType.AUTH_POLICY]: {
-    text: '鉴权策略',
-    columnsRender: x => x.name,
-  },
 }
 export const AuthSubjectTabs = Object.keys(AUTH_SUBJECT_TYPE_MAP).map(id => ({
   id,
@@ -178,8 +139,7 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
     ...item,
     label: `${item.label}(${currentAuthItem?.principals?.[`${item.id}s`]?.length ?? 0})`,
   }))
-  const defaultList = authList.filter(item => item.default_strategy && item.name.indexOf('默认策略') > -1)
-  const globalList = authList.filter(item => item.default_strategy && item.name.indexOf('默认策略') === -1)
+  const defaultList = authList.filter(item => item.default_strategy)
   const customList = authList.filter(item => !item.default_strategy)
   const isCurrAuthItemOwnerDefaultPrinciple =
     currentAuthItem?.default_strategy &&
@@ -258,7 +218,7 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
       </Table.ActionPanel>
       <Row>
         <Col span={6}>
-          <div style={{ padding: '10px', backgroundColor: '#f9f9f9', height: '100%', maxHeight: '1200px' }}>
+          <div style={{ padding: '10px', backgroundColor: '#f9f9f9', height: '100%', maxHeight: '1000px' }}>
             <SearchBox
               value={searchword}
               onSearch={handlers.search}
@@ -278,18 +238,6 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
                 默认策略（{defaultList.length}）
               </ListItem>
               {defaultList.filter(() => collapseDefault).map(renderListItem)}
-              <ListItem
-                key={'collapse-button'}
-                onClick={() => {
-                  setCollapseDefault(!collapseDefault)
-                }}
-                className={'auth-item'}
-                current={false}
-              >
-                <Icon type={collapseDefault ? 'arrowdown' : 'arrowup'} />
-                全局策略（{globalList.length}）
-              </ListItem>
-              {globalList.filter(() => collapseDefault).map(renderListItem)}
               <ListItem
                 key={'collapse-button'}
                 onClick={() => {
@@ -306,7 +254,7 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
           </div>
         </Col>
         <Col span={18}>
-          <Card bordered style={{ height: '100%', maxHeight: '1200px' }}>
+          <Card bordered style={{ height: '100%', maxHeight: '1000px' }}>
             {currentAuthItem.id ? (
               <Card.Body
                 title={formatPolicyName(currentAuthItem.name)}
@@ -337,9 +285,6 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
                     <FormItem label={'备注'}>
                       <FormText>{currentAuthItem.comment || '无备注'}</FormText>
                     </FormItem>
-                    <FormItem label={'效果'}>
-                      <FormText>{currentAuthItem.action}</FormText>
-                    </FormItem>
                   </Form>
                 </Card>
                 <section style={{ borderTop: '1px solid #cfd5de', margin: '20px 0' }}></section>
@@ -351,14 +296,6 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
                           namespaces: currentAuthItem?.resources?.['namespaces'],
                           services: currentAuthItem?.resources?.['services'],
                           config_groups: currentAuthItem?.resources?.config_groups,
-                          router_rules: currentAuthItem?.resources?.route_rules,
-                          ratelimit_rules: currentAuthItem?.resources?.ratelimit_rules,
-                          circuitbreaker_rules: currentAuthItem?.resources?.circuitbreaker_rules,
-                          faultdetect_rules: currentAuthItem?.resources?.faultdetect_rules,
-                          users: currentAuthItem?.resources?.users,
-                          user_groups: currentAuthItem?.resources?.user_groups,
-                          auth_policies: currentAuthItem?.resources?.auth_policies,
-                          // lane_rules: currentAuthItem?.resources?.lane_rules,
                         }}
                       />
                     </Card.Body>
@@ -402,35 +339,14 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
                       </Card.Body>
                     </Card>
                     <Card bordered>
-                      <Card.Body title={'可访问接口'}>
-                        {currentAuthItem.functions.length === 1 && currentAuthItem.functions[0] === '*' ? (
-                          <section style={{ margin: '20px 10px' }}>{`全部（含后续新增）`}</section>
-                        ) : (
-                          <Table
-                            bordered
-                            records={currentAuthItem.functions}
-                            columns={[
-                              {
-                                key: 'name',
-                                header: '名称',
-                                render: x => x,
-                              },
-                            ]}
-                            addons={[scrollable({ maxHeight: '300px' }), autotip({})]}
-                            style={{ marginTop: '20px' }}
-                          />
-                        )}
-                      </Card.Body>
-                    </Card>
-                    <Card bordered>
-                      <Card.Body title={'可操作资源'}>
+                      <Card.Body title={'资源'}>
                         <Tabs
                           tabs={AuthResourceTabs}
                           activeId={showAuthResourceType}
                           onActive={tab => setShowAuthResourceType(tab.id as AuthResourceType)}
                           style={{ marginBottom: '20px' }}
                         >
-                          {currentAuthItem.resources[showAuthResourceType]?.length === 1 &&
+                          {currentAuthItem.resources[showAuthResourceType].length === 1 &&
                           currentAuthItem.resources[showAuthResourceType][0].id === '*' ? (
                             <section style={{ margin: '20px 10px' }}>
                               {`全部${AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].text}（含后续新增）`}
@@ -445,6 +361,7 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
                                   header: '名称',
                                   render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
                                 },
+                                { key: 'auth', header: '权限', render: () => '读｜写' },
                               ]}
                               addons={[scrollable({ maxHeight: '300px' }), autotip({})]}
                               style={{ marginTop: '20px' }}
@@ -464,13 +381,24 @@ export default function AuthPage(props: DuckCmpProps<Duck>) {
       </Row>
     </>
   )
+  const [alertVisible, setAlertVisible] = React.useState(true)
   return isInDetailpage ? (
     contentElement
   ) : (
     <BasicLayout title={'策略'} store={store} selectors={duck.selectors} header={<></>}>
       <Card>
         <Card.Body>
-          <Alert>{authStatusMsg}</Alert>
+          <Alert
+            visible={alertVisible}
+            onClose={() => setAlertVisible(false)}
+            extra={
+              <Button type='link' onClick={() => setAlertVisible(false)}>
+                关闭
+              </Button>
+            }
+          >
+            {authStatusMsg}
+          </Alert>
           {contentElement}
         </Card.Body>
       </Card>
diff --git a/web/src/polaris/auth/policy/operation/Create.tsx b/web/src/polaris/auth/policy/operation/Create.tsx
index 16338e39..07f370d0 100644
--- a/web/src/polaris/auth/policy/operation/Create.tsx
+++ b/web/src/polaris/auth/policy/operation/Create.tsx
@@ -13,12 +13,11 @@ import {
   Table,
   Button,
   FormText,
-  Segment,
 } from 'tea-component'
 
 import Duck from './CreateDuck'
 import { AuthResourceType, AuthSubjectType, AuthSubjectTabs, AuthResourceTabs, AUTH_RESOURCE_TYPE_MAP } from '../Page'
-import { AuthStrategy, getServerFunctionDesc, ServerFunction, ServerFunctionZhDesc, User, UserGroup } from '../../model'
+import { User, UserGroup } from '../../model'
 import { autotip } from 'tea-component/lib/table/addons'
 import FormField from '@src/polaris/common/duckComponents/form/Field'
 import SearchableTransfer from '@src/polaris/common/duckComponents/SearchableTransfer'
@@ -26,83 +25,34 @@ import Input from '@src/polaris/common/duckComponents/form/Input'
 import DetailPage from '@src/polaris/common/duckComponents/DetailPage'
 import { Namespace, Service } from '@src/polaris/service/types'
 import router from '@src/polaris/common/util/router'
-import { CircuitBreakerRule } from '@src/polaris/administration/breaker/types'
-import { RateLimit } from '@src/polaris/administration/accessLimiting/model'
-import { CustomRoute } from '@src/polaris/administration/dynamicRoute/customRoute/model'
-import { FaultDetectRule } from '@src/polaris/administration/breaker/faultDetect/types'
+import { ConfigFileGroup } from '@src/polaris/configuration/fileGroup/types'
 const steps = [
   { id: '1', label: '选择用户' },
-  { id: '2', label: '选择接口' },
-  { id: '3', label: '选择资源' },
-  { id: '4', label: '执行效果' },
-  { id: '5', label: '预览' },
+  { id: '2', label: '授权' },
+  { id: '3', label: '预览' },
 ]
 
-export default purify(function (props: DuckCmpProps<Duck>) {
+export default purify(function(props: DuckCmpProps<Duck>) {
   const { duck, store, dispatch } = props
   const { selectors, ducks, selector, creators } = duck
   const composedId = selectors.composedId(store)
   const { id } = composedId
   const [step, setStep] = React.useState('1')
-  const { name,
-    useAllNamespace, useAllService, useAllConfigGroup,
-    useAllRouterRule, useAllRatelimitRule, useAllCircuitBreakerRule, useAllFaultDetectRule,
-    useAllUsers, useAllUserGroups, useAllAuthPoliy,
-    useAllFunctions, comment, effect } = ducks.form
-      .getAPI(store, dispatch)
-      .getFields(['name',
-        'useAllNamespace', 'useAllService', 'useAllConfigGroup',
-        'useAllRouterRule', 'useAllRatelimitRule', 'useAllCircuitBreakerRule', 'useAllFaultDetectRule',
-        'useAllUsers', 'useAllUserGroups', 'useAllAuthPoliy',
-        'useAllFunctions', 'comment', 'effect'])
+  const { name, useAllNamespace, useAllService, useAllConfigGroup, comment } = ducks.form
+    .getAPI(store, dispatch)
+    .getFields(['name', 'useAllNamespace', 'useAllService', 'useAllConfigGroup', 'comment'])
   const isModify = !!id
 
   const [showAuthSubjectType, setShowAuthSubjectType] = React.useState(AuthSubjectType.USER)
   const [showAuthResourceType, setShowAuthResourceType] = React.useState(AuthResourceType.NAMESPACE)
-  const [showFunctionGroup, setFunctionGroup] = React.useState("Namespace")
-
-  const serverFunctionGroups = {
-    namespaceView: "命名空间",
-    clientView: "客户端",
-    discoverView: "注册发现",
-    governanceView: "治理规则",
-    configView: "配置中心",
-    authView: "鉴权",
-  };
-
-  const serverFunctionOptions = [
-    { groupKey: "namespaceView", text: "命名空间", value: "Namespace" },
-    { groupKey: "clientView", text: "客户端", value: "Client" },
-    { groupKey: "discoverView", text: "服务", value: "Service|ServiceContract" },
-    { groupKey: "discoverView", text: "实例", value: "Instance" },
-    { groupKey: "governanceView", text: "路由规则", value: "RouteRule" },
-    { groupKey: "governanceView", text: "限流规则", value: "RateLimitRule" },
-    { groupKey: "governanceView", text: "熔断规则", value: "CircuitBreakerRule" },
-    { groupKey: "governanceView", text: "探测规则", value: "FaultDetectRule" },
-    { groupKey: "configView", text: "配置分组", value: "ConfigGroup" },
-    { groupKey: "configView", text: "配置文件", value: "ConfigFile|ConfigRelease" },
-    { groupKey: "authView", text: "用户", value: "User" },
-    { groupKey: "authView", text: "用户组", value: "UserGroup" },
-    { groupKey: "authView", text: "鉴权策略", value: "AuthPolicy" },
-  ];
 
   const {
     user: { selection: userSelection },
     userGroup: { selection: userGroupSelection },
-
-    opuser: { selection: opuserSelection },
-    opuserGroup: { selection: opuserGroupSelection },
-    authPolicy: { selection: authPolicySelection },
     namespace: { selection: namespaceSelection },
     service: { selection: serviceSelection },
     configGroup: { selection: configGroupSelection },
-    routerRules: { selection: routerRuleSelection },
-    ratelimitRules: { selection: rateLimitRuleSelection },
-    circuitbreakerRules: { selection: circuitbreakerRuleSelection },
-    faultdetectRules: { selection: faultdetectRuleSelection },
-    functions: { selection: functionSelection },
     originPolicy,
-    functionGroup,
   } = selector(store)
   return (
     <DetailPage
@@ -114,7 +64,7 @@ export default purify(function (props: DuckCmpProps<Duck>) {
     >
       {/* 内容区域一般使用 Card 组件显示内容 */}
       <Card>
-        <Card.Body title={<Stepper steps={steps} current={step} style={{ width: '800px' }}></Stepper>}>
+        <Card.Body title={<Stepper steps={steps} current={step} style={{ width: '500px' }}></Stepper>}>
           {step === '1' && (
             <Form>
               <FormField field={name} label={'名称'} required>
@@ -161,47 +111,7 @@ export default purify(function (props: DuckCmpProps<Duck>) {
           )}
           {step === '2' && (
             <Form>
-              <FormItem label={'可访问接口'}>
-                <RadioGroup
-                  value={useAllFunctions.getValue() ? 'all' : 'partial'}
-                  onChange={value => {
-                    useAllFunctions.setValue(value === 'all')
-                  }}
-                  style={{ marginTop: '10px' }}
-                >
-                  <Radio name={'all'}>{'全部（含后续新增）'}</Radio>
-                  <Radio name={'partial'}>{'指定接口'}</Radio>
-                </RadioGroup>
-                {!useAllFunctions.getValue() && (
-                  <>
-                    <Segment
-                      defaultValue='Namespace'
-                      value={functionGroup}
-                      onChange={val => {
-                        setFunctionGroup(val)
-                        dispatch(creators.setFunctionGroup(val))
-                      }}
-                      options={serverFunctionOptions}
-                      groups={serverFunctionGroups}
-                      style={{ marginTop: '10px' }}
-                    />
-                    <SearchableTransfer
-                      title={'请选择接口'}
-                      duck={ducks.functions}
-                      store={store}
-                      dispatch={dispatch}
-                      itemRenderer={(record: ServerFunction) => (
-                        <Text overflow>{record.id}（{record.desc}）</Text>
-                      )}
-                    />
-                  </>
-                )}
-              </FormItem>
-            </Form>
-          )}
-          {step === '3' && (
-            <Form>
-              <FormItem label={'可操作资源'}>
+              <FormItem label={'资源'}>
                 <Tabs
                   tabs={AuthResourceTabs}
                   activeId={showAuthResourceType}
@@ -273,218 +183,18 @@ export default purify(function (props: DuckCmpProps<Duck>) {
                         duck={ducks.configGroup}
                         store={store}
                         dispatch={dispatch}
-                        itemRenderer={(record: Service) => (
-                          <Text overflow>
-                            {record.name}（{record.namespace}）
-                          </Text>
-                        )}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.ROUTER_RULE}>
-                    <RadioGroup
-                      value={useAllRouterRule.getValue() ? 'all' : 'partial'}
-                      onChange={value => {
-                        useAllRouterRule.setValue(value === 'all')
-                      }}
-                      style={{ marginTop: '10px' }}
-                    >
-                      <Radio name={'all'}>{'全部路由规则（含后续新增）'}</Radio>
-                      <Radio name={'partial'}>{'指定路由规则'}</Radio>
-                    </RadioGroup>
-                    {!useAllRouterRule.getValue() && (
-                      <SearchableTransfer
-                        style={{ marginTop: '10px' }}
-                        title={'请选择路由规则'}
-                        duck={ducks.routerRules}
-                        store={store}
-                        dispatch={dispatch}
-                        itemRenderer={(record: CustomRoute) => (
-                          <Text overflow>
-                            {record.name}（{record.id}）
-                          </Text>
-                        )}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.RATELIMIT_RULE}>
-                    <RadioGroup
-                      value={useAllRatelimitRule.getValue() ? 'all' : 'partial'}
-                      onChange={value => {
-                        useAllRatelimitRule.setValue(value === 'all')
-                      }}
-                      style={{ marginTop: '10px' }}
-                    >
-                      <Radio name={'all'}>{'全部限流规则（含后续新增）'}</Radio>
-                      <Radio name={'partial'}>{'指定限流规则'}</Radio>
-                    </RadioGroup>
-                    {!useAllRatelimitRule.getValue() && (
-                      <SearchableTransfer
-                        style={{ marginTop: '10px' }}
-                        title={'请选限流规则'}
-                        duck={ducks.ratelimitRules}
-                        store={store}
-                        dispatch={dispatch}
-                        itemRenderer={(record: RateLimit) => (
-                          <Text overflow>
-                            {record.name}（{record.id}）
-                          </Text>
-                        )}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.CIRCUIT_BREAKER_RULE}>
-                    <RadioGroup
-                      value={useAllCircuitBreakerRule.getValue() ? 'all' : 'partial'}
-                      onChange={value => {
-                        useAllCircuitBreakerRule.setValue(value === 'all')
-                      }}
-                      style={{ marginTop: '10px' }}
-                    >
-                      <Radio name={'all'}>{'全部熔断规则（含后续新增）'}</Radio>
-                      <Radio name={'partial'}>{'指定熔断规则'}</Radio>
-                    </RadioGroup>
-                    {!useAllCircuitBreakerRule.getValue() && (
-                      <SearchableTransfer
-                        style={{ marginTop: '10px' }}
-                        title={'请选熔断规则'}
-                        duck={ducks.circuitbreakerRules}
-                        store={store}
-                        dispatch={dispatch}
-                        itemRenderer={(record: CircuitBreakerRule) => (
-                          <Text overflow>
-                            {record.name}（{record.id}）
-                          </Text>
-                        )}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.FAULTDETECT_RULE}>
-                    <RadioGroup
-                      value={useAllFaultDetectRule.getValue() ? 'all' : 'partial'}
-                      onChange={value => {
-                        useAllFaultDetectRule.setValue(value === 'all')
-                      }}
-                      style={{ marginTop: '10px' }}
-                    >
-                      <Radio name={'all'}>{'全部探测规则（含后续新增）'}</Radio>
-                      <Radio name={'partial'}>{'指定探测规则'}</Radio>
-                    </RadioGroup>
-                    {!useAllFaultDetectRule.getValue() && (
-                      <SearchableTransfer
-                        style={{ marginTop: '10px' }}
-                        title={'请选探测规则'}
-                        duck={ducks.faultdetectRules}
-                        store={store}
-                        dispatch={dispatch}
-                        itemRenderer={(record: FaultDetectRule) => (
-                          <Text overflow>
-                            {record.name}（{record.id}）
-                          </Text>
-                        )}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.AUTH_USERS}>
-                    <RadioGroup
-                      value={useAllUsers.getValue() ? 'all' : 'partial'}
-                      onChange={value => {
-                        useAllUsers.setValue(value === 'all')
-                      }}
-                      style={{ marginTop: '10px' }}
-                    >
-                      <Radio name={'all'}>{'全部用户（含后续新增）'}</Radio>
-                      <Radio name={'partial'}>{'指定用户'}</Radio>
-                    </RadioGroup>
-                    {!useAllUsers.getValue() && (
-                      <SearchableTransfer
-                        style={{ marginTop: '10px' }}
-                        title={'请选用户'}
-                        duck={ducks.user}
-                        store={store}
-                        dispatch={dispatch}
-                        itemRenderer={(record: User) => (
-                          <Text overflow>
-                            {record.name}（{record.id}）
-                          </Text>
-                        )}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.AUTH_USER_GROUP}>
-                    <RadioGroup
-                      value={useAllUserGroups.getValue() ? 'all' : 'partial'}
-                      onChange={value => {
-                        useAllUserGroups.setValue(value === 'all')
-                      }}
-                      style={{ marginTop: '10px' }}
-                    >
-                      <Radio name={'all'}>{'全部用户组（含后续新增）'}</Radio>
-                      <Radio name={'partial'}>{'指定用户组'}</Radio>
-                    </RadioGroup>
-                    {!useAllUserGroups.getValue() && (
-                      <SearchableTransfer
-                        style={{ marginTop: '10px' }}
-                        title={'请选用户组'}
-                        duck={ducks.userGroup}
-                        store={store}
-                        dispatch={dispatch}
-                        itemRenderer={(record: UserGroup) => (
-                          <Text overflow>
-                            {record.name}（{record.id}）
-                          </Text>
-                        )}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.AUTH_POLICY}>
-                    <RadioGroup
-                      value={useAllAuthPoliy.getValue() ? 'all' : 'partial'}
-                      onChange={value => {
-                        useAllAuthPoliy.setValue(value === 'all')
-                      }}
-                      style={{ marginTop: '10px' }}
-                    >
-                      <Radio name={'all'}>{'全部鉴权策略（含后续新增）'}</Radio>
-                      <Radio name={'partial'}>{'指定鉴权策略'}</Radio>
-                    </RadioGroup>
-                    {!useAllAuthPoliy.getValue() && (
-                      <SearchableTransfer
-                        style={{ marginTop: '10px' }}
-                        title={'请选鉴权策略'}
-                        duck={ducks.authPolicy}
-                        store={store}
-                        dispatch={dispatch}
-                        itemRenderer={(record: AuthStrategy) => (
-                          <Text overflow>
-                            {record.name}（{record.id}）
-                          </Text>
-                        )}
+                        itemRenderer={(record: ConfigFileGroup) => <Text overflow>{record.name}</Text>}
                       />
                     )}
                   </TabPanel>
                 </Tabs>
               </FormItem>
-            </Form>
-          )}
-          {step === '4' && (
-            <Form>
-              <FormItem label="执行效果" required>
-                <RadioGroup
-                  value={effect.getValue()}
-                  defaultValue='ALLOW'
-                  onChange={value => {
-                    effect.setValue(value)
-                  }}
-                  style={{ marginTop: '10px' }}
-                >
-                  <Radio name={'ALLOW'}>{'允许'}</Radio>
-                  <Radio name={'DENY'}>{'禁止'}</Radio>
-                </RadioGroup>
+              <FormItem label={'操作'}>
+                <FormText>{'读操作｜写操作'}</FormText>
               </FormItem>
             </Form>
           )}
-          {step === '5' && (
+          {step === '3' && (
             <Form>
               <FormItem label={'策略名称'}>
                 <FormText>{name.getValue()}</FormText>
@@ -497,29 +207,7 @@ export default purify(function (props: DuckCmpProps<Duck>) {
                   {userGroupSelection.map(item => `${item.name}(${item.id})`).join(',' || '无选中用户组')}
                 </FormText>
               </FormItem>
-              <FormItem label={'执行效果'}>
-                <FormText>
-                  {effect.getValue() === 'ALLOW' ? '允许' : '禁止'}
-                </FormText>
-              </FormItem>
-              <FormItem label={'可访问接口'}>
-                {useAllFunctions.getValue() ? (
-                  <FormText>{'全部接口（含后续新增）'}</FormText>
-                ) : (
-                  <Table
-                    records={functionSelection}
-                    columns={[
-                      {
-                        key: 'name',
-                        header: '名称',
-                        render: x => x.id,
-                      },
-                    ]}
-                    addons={[autotip({})]}
-                  />
-                )}
-              </FormItem>
-              <FormItem label={'可操作资源'}>
+              <FormItem label={'资源'}>
                 <Tabs
                   tabs={AuthResourceTabs}
                   activeId={showAuthResourceType}
@@ -537,6 +225,7 @@ export default purify(function (props: DuckCmpProps<Duck>) {
                             header: '名称',
                             render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
                           },
+                          { key: 'auth', header: '权限', render: () => '读｜写' },
                         ]}
                         addons={[autotip({})]}
                       />
@@ -554,14 +243,15 @@ export default purify(function (props: DuckCmpProps<Duck>) {
                             header: '名称',
                             render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
                           },
+                          { key: 'auth', header: '权限', render: () => '读｜写' },
                         ]}
                         addons={[autotip({})]}
                       />
                     )}
                   </TabPanel>
                   <TabPanel id={AuthResourceType.CONFIGURATION}>
-                    {useAllConfigGroup.getValue() ? (
-                      <FormText>{'全部配置分组（含后续新增）'}</FormText>
+                    {useAllService.getValue() ? (
+                      <FormText>{'全部服务（含后续新增）'}</FormText>
                     ) : (
                       <Table
                         records={configGroupSelection}
@@ -571,125 +261,7 @@ export default purify(function (props: DuckCmpProps<Duck>) {
                             header: '名称',
                             render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
                           },
-                        ]}
-                        addons={[autotip({})]}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.ROUTER_RULE}>
-                    {useAllRouterRule.getValue() ? (
-                      <FormText>{'全部路由规则（含后续新增）'}</FormText>
-                    ) : (
-                      <Table
-                        records={routerRuleSelection}
-                        columns={[
-                          {
-                            key: 'name',
-                            header: '名称',
-                            render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
-                          },
-                        ]}
-                        addons={[autotip({})]}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.RATELIMIT_RULE}>
-                    {useAllRatelimitRule.getValue() ? (
-                      <FormText>{'全部限流规则（含后续新增）'}</FormText>
-                    ) : (
-                      <Table
-                        records={rateLimitRuleSelection}
-                        columns={[
-                          {
-                            key: 'name',
-                            header: '名称',
-                            render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
-                          },
-                        ]}
-                        addons={[autotip({})]}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.CIRCUIT_BREAKER_RULE}>
-                    {useAllCircuitBreakerRule.getValue() ? (
-                      <FormText>{'全部熔断规则（含后续新增）'}</FormText>
-                    ) : (
-                      <Table
-                        records={circuitbreakerRuleSelection}
-                        columns={[
-                          {
-                            key: 'name',
-                            header: '名称',
-                            render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
-                          },
-                        ]}
-                        addons={[autotip({})]}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.FAULTDETECT_RULE}>
-                    {useAllFaultDetectRule.getValue() ? (
-                      <FormText>{'全部探测规则（含后续新增）'}</FormText>
-                    ) : (
-                      <Table
-                        records={faultdetectRuleSelection}
-                        columns={[
-                          {
-                            key: 'name',
-                            header: '名称',
-                            render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
-                          },
-                        ]}
-                        addons={[autotip({})]}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.AUTH_USERS}>
-                    {useAllUsers.getValue() ? (
-                      <FormText>{'全部用户（含后续新增）'}</FormText>
-                    ) : (
-                      <Table
-                        records={opuserSelection}
-                        columns={[
-                          {
-                            key: 'name',
-                            header: '名称',
-                            render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
-                          },
-                        ]}
-                        addons={[autotip({})]}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.AUTH_USER_GROUP}>
-                    {useAllUserGroups.getValue() ? (
-                      <FormText>{'全部用户组（含后续新增）'}</FormText>
-                    ) : (
-                      <Table
-                        records={opuserGroupSelection}
-                        columns={[
-                          {
-                            key: 'name',
-                            header: '名称',
-                            render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
-                          },
-                        ]}
-                        addons={[autotip({})]}
-                      />
-                    )}
-                  </TabPanel>
-                  <TabPanel id={AuthResourceType.AUTH_POLICY}>
-                    {useAllAuthPoliy.getValue() ? (
-                      <FormText>{'全部鉴权策略（含后续新增）'}</FormText>
-                    ) : (
-                      <Table
-                        records={authPolicySelection}
-                        columns={[
-                          {
-                            key: 'name',
-                            header: '名称',
-                            render: AUTH_RESOURCE_TYPE_MAP[showAuthResourceType].columnsRender,
-                          },
+                          { key: 'auth', header: '权限', render: () => '读｜写' },
                         ]}
                         addons={[autotip({})]}
                       />
@@ -701,7 +273,7 @@ export default purify(function (props: DuckCmpProps<Duck>) {
           )}
         </Card.Body>
         <Card.Footer style={{ padding: '15px' }}>
-          {step === '5' && (
+          {step === '3' && (
             <Button
               type={'primary'}
               onClick={() => {
@@ -712,7 +284,7 @@ export default purify(function (props: DuckCmpProps<Duck>) {
               {'完成'}
             </Button>
           )}
-          {Number(step) < 5 && (
+          {Number(step) < 3 && (
             <Button
               type={'primary'}
               onClick={() => {
diff --git a/web/src/polaris/auth/policy/operation/CreateDuck.ts b/web/src/polaris/auth/policy/operation/CreateDuck.ts
index 04d2d9f7..714debe4 100644
--- a/web/src/polaris/auth/policy/operation/CreateDuck.ts
+++ b/web/src/polaris/auth/policy/operation/CreateDuck.ts
@@ -3,17 +3,12 @@ import { takeLatest } from 'redux-saga-catch'
 import { reduceFromPayload, createToPayload } from 'saga-duck'
 import DetailPage from '@src/polaris/common/ducks/DetailPage'
 import { UserSelectDuck } from '../../userGroup/operation/CreateDuck'
-import { AuthPolicySelectDuck, UserGroupSelectDuck } from '../../user/operation/AttachUserGroupDuck'
+import { UserGroupSelectDuck } from '../../user/operation/AttachUserGroupDuck'
 import {
   AuthStrategy,
   describeGovernanceStrategyDetail,
   createGovernanceStrategy,
   modifyGovernanceStrategy,
-  ServerFunctionGroup,
-  describeServerFunctions,
-  ServerFunction,
-  UserGroup,
-  getServerFunctionDesc,
 } from '../../model'
 import { diffAddRemoveArray } from '@src/polaris/common/util/common'
 import { Namespace, Service } from '@src/polaris/service/types'
@@ -26,15 +21,6 @@ import { notification } from 'tea-component'
 import router from '@src/polaris/common/util/router'
 import { ConfigFileGroup } from '@src/polaris/configuration/fileGroup/types'
 import { describeConfigFileGroups } from '@src/polaris/configuration/fileGroup/model'
-import { DescribeFaultDetects } from '@src/polaris/administration/breaker/faultDetect/model'
-import { DescribeCircuitBreakers } from '@src/polaris/administration/breaker/model'
-import { describeLimitRules, RateLimit } from '@src/polaris/administration/accessLimiting/model'
-import { describeRoutes } from '@src/polaris/service/detail/route/model'
-import { CustomRoute, describeCustomRoute } from '@src/polaris/administration/dynamicRoute/customRoute/model'
-import { CircuitBreakerRule, FaultDetectConfig } from '@src/polaris/administration/breaker/types'
-import { FaultDetectRule } from '@src/polaris/administration/breaker/faultDetect/types'
-import Dialog from '@src/polaris/common/duckComponents/Dialog'
-import { UserItem } from '../../user/PageDuck'
 
 interface ComposedId {
   id: string
@@ -52,7 +38,6 @@ export default abstract class CreateDuck extends DetailPage {
       SET_INSTANCE_ID,
       SUBMIT,
       SET_ORIGIN_POLICY,
-      SET_FUNCTION_GROUP,
     }
     return {
       ...super.quickTypes,
@@ -79,19 +64,11 @@ export default abstract class CreateDuck extends DetailPage {
     return {
       ...super.quickDucks,
       form: CreateFormDuck,
-      functions: FunctionSelectDuck,
       user: UserSelectDuck,
       userGroup: UserGroupSelectDuck,
-      opuser: UserSelectDuck,
-      opuserGroup: UserGroupSelectDuck,
-      authPolicy: AuthPolicySelectDuck,
       namespace: NamespaceSelectDuck,
       service: ServiceSelectDuck,
       configGroup: ConfigurationSelectDuck,
-      routerRules: RouterRulesSelectDuck,
-      ratelimitRules: RatelimitRulesSelectDuck,
-      circuitbreakerRules: CircuitbreakerRulesSelectDuck,
-      faultdetectRules: FaultdetectRulesSelectDuck,
     }
   }
   get reducers() {
@@ -100,7 +77,6 @@ export default abstract class CreateDuck extends DetailPage {
       ...super.reducers,
       instanceId: reduceFromPayload(types.SET_INSTANCE_ID, ''),
       originPolicy: reduceFromPayload(types.SET_ORIGIN_POLICY, {} as AuthStrategy),
-      functionGroup: reduceFromPayload(types.SET_FUNCTION_GROUP, "Namespace"),
     }
   }
 
@@ -118,14 +94,13 @@ export default abstract class CreateDuck extends DetailPage {
     return {
       ...super.creators,
       submit: createToPayload<void>(types.SUBMIT),
-      setFunctionGroup: createToPayload<string>(types.SET_FUNCTION_GROUP),
     }
   }
   *saga() {
     yield* super.saga()
     const duck = this
     const { types, ducks, selectors, selector } = duck
-    yield takeLatest(types.SUBMIT, function* () {
+    yield takeLatest(types.SUBMIT, function*() {
       try {
         yield* ducks.form.submit()
       } catch (e) {
@@ -134,18 +109,9 @@ export default abstract class CreateDuck extends DetailPage {
       const {
         user: { selection: userSelection },
         userGroup: { selection: userGroupSelection },
-
-        opuser: { selection: opuserSelection },
-        opuserGroup: { selection: opuserGroupSelection },
-        authPolicy: { selection: authPolicySelection },
         namespace: { selection: namespaceSelection },
         service: { selection: serviceSelection },
         configGroup: { selection: configGroupSelection },
-        routerRules: { selection: routerRuleSelection },
-        ratelimitRules: { selection: rateLimitRuleSelection },
-        circuitbreakerRules: { selection: circuitbreakerRuleSelection },
-        faultdetectRules: { selection: faultdetectRuleSelection },
-        functions: { selection: functionSelection },
         originPolicy,
       } = selector(yield select())
       const values = ducks.form.selectors.values(yield select())
@@ -153,30 +119,11 @@ export default abstract class CreateDuck extends DetailPage {
       if (id) {
         const {
           principals: { users: originUsers, groups: originUserGroups },
-          resources: {
-            namespaces: originNamespaces,
-            services: originServices,
-            config_groups: originConfigGroup,
-            route_rules: originRouterRules,
-            ratelimit_rules: originRateLimitRules,
-            circuitbreaker_rules: originCircuitBreakerRules,
-            faultdetect_rules: originFaultDetectRules,
-            users: originOpUsers,
-            user_groups: originOpUserGroups,
-            auth_policies: originAuthPolicies,
-          },
+          resources: { namespaces: originNamespaces, services: originServices, config_groups: originConfigGroup },
         } = originPolicy
         const isOriginAllNamespace = !!originNamespaces.find(item => item.id === '*')
         const isOriginAllService = !!originServices.find(item => item.id === '*')
         const isOriginAllConfigGroup = !!originConfigGroup.find(item => item.id === '*')
-        const isOriginAllRouterRule = !!originRouterRules.find(item => item.id === '*')
-        const isOriginAllRateLimitRule = !!originRateLimitRules.find(item => item.id === '*')
-        const isOriginAllCircuitBreakerRule = !!originCircuitBreakerRules.find(item => item.id === '*')
-        const isOriginAllFaultDetectRule = !!originFaultDetectRules.find(item => item.id === '*')
-        const isOriginAllOpUser = !!originOpUsers.find(item => item.id === '*')
-        const isOriginAllOpUserGroup = !!originOpUserGroups.find(item => item.id === '*')
-        const isOriginAllAuthPolicy = !!originAuthPolicies.find(item => item.id === '*')
-
         const { addArray: addUsers, removeArray: removeUsers } = diffAddRemoveArray(
           originUsers.map(item => item.id),
           userSelection.map(item => item.id),
@@ -197,35 +144,6 @@ export default abstract class CreateDuck extends DetailPage {
           originConfigGroup.map(item => item.id),
           configGroupSelection.map(item => item.id),
         )
-        let { addArray: addRouterRules, removeArray: removeRouterRules } = diffAddRemoveArray(
-          originRouterRules.map(item => item.id),
-          routerRuleSelection.map(item => item.id),
-        )
-        let { addArray: addRateLimitRules, removeArray: removeRateLimitRules } = diffAddRemoveArray(
-          originRateLimitRules.map(item => item.id),
-          rateLimitRuleSelection.map(item => item.id),
-        )
-        let { addArray: addCircuitBreakerRules, removeArray: removeCircuitBreakerRules } = diffAddRemoveArray(
-          originCircuitBreakerRules.map(item => item.id),
-          circuitbreakerRuleSelection.map(item => item.id),
-        )
-        let { addArray: addFaultDetectRules, removeArray: removeFaultDetectRules } = diffAddRemoveArray(
-          originFaultDetectRules.map(item => item.id),
-          faultdetectRuleSelection.map(item => item.id),
-        )
-        let { addArray: addOpUsers, removeArray: removeOpUsers } = diffAddRemoveArray(
-          originOpUsers.map(item => item.id),
-          opuserSelection.map(item => item.id),
-        )
-        let { addArray: addOpUserGroups, removeArray: removeOpUserGroups } = diffAddRemoveArray(
-          originOpUserGroups.map(item => item.id),
-          opuserGroupSelection.map(item => item.id),
-        )
-        let { addArray: addAuthPolicies, removeArray: removeAuthPolicies } = diffAddRemoveArray(
-          originAuthPolicies.map(item => item.id),
-          authPolicySelection.map(item => item.id),
-        )
-
         if (values.useAllNamespace && !isOriginAllNamespace) {
           addNamespaces = ['*']
           removeNamespaces = originNamespaces.map(item => item.id)
@@ -245,9 +163,6 @@ export default abstract class CreateDuck extends DetailPage {
           addServices = serviceSelection.filter(item => item.id !== '*').map(item => item.id)
           removeServices = ['*']
         }
-        if (isOriginAllService && values.useAllService) {
-          removeServices = []
-        }
         if (!isOriginAllConfigGroup && values.useAllConfigGroup) {
           addConfigGroup = ['*']
           removeConfigGroup = originConfigGroup.map(item => item.id)
@@ -256,85 +171,8 @@ export default abstract class CreateDuck extends DetailPage {
           addConfigGroup = configGroupSelection.filter(item => item.id !== '*').map(item => item.id)
           removeConfigGroup = ['*']
         }
-        if (isOriginAllConfigGroup && values.useAllConfigGroup) {
-          removeConfigGroup = []
-        }
-        if (!isOriginAllRouterRule && values.useAllRouterRule) {
-          addRouterRules = ['*']
-          removeRouterRules = originRouterRules.map(item => item.id)
-        }
-        if (isOriginAllRouterRule && !values.useAllRouterRule) {
-          addRouterRules = routerRuleSelection.filter(item => item.id !== '*').map(item => item.id)
-          removeRouterRules = ['*']
-        }
-        if (isOriginAllRouterRule && values.useAllRouterRule) {
-          removeRouterRules = []
-        }
-        if (!isOriginAllRateLimitRule && values.useAllRatelimitRule) {
-          addRateLimitRules = ['*']
-          removeRateLimitRules = originRateLimitRules.map(item => item.id)
-        }
-        if (isOriginAllRateLimitRule && !values.useAllRatelimitRule) {
-          addRateLimitRules = rateLimitRuleSelection.filter(item => item.id !== '*').map(item => item.id)
-          removeRateLimitRules = ['*']
-        }
-        if (isOriginAllRateLimitRule && values.useAllRatelimitRule) {
-          removeRateLimitRules = []
-        }
-        if (!isOriginAllCircuitBreakerRule && values.useAllCircuitBreakerRule) {
-          addCircuitBreakerRules = ['*']
-          removeCircuitBreakerRules = originCircuitBreakerRules.map(item => item.id)
-        }
-        if (isOriginAllCircuitBreakerRule && !values.useAllCircuitBreakerRule) {
-          addCircuitBreakerRules = circuitbreakerRuleSelection.filter(item => item.id !== '*').map(item => item.id)
-          removeCircuitBreakerRules = ['*']
-        }
-        if (isOriginAllCircuitBreakerRule && values.useAllCircuitBreakerRule) {
-          removeCircuitBreakerRules = []
-        }
-        if (!isOriginAllFaultDetectRule && values.useAllFaultDetectRule) {
-          addFaultDetectRules = ['*']
-          removeFaultDetectRules = originFaultDetectRules.map(item => item.id)
-        }
-        if (isOriginAllFaultDetectRule && !values.useAllFaultDetectRule) {
-          addFaultDetectRules = faultdetectRuleSelection.filter(item => item.id !== '*').map(item => item.id)
-          removeFaultDetectRules = ['*']
-        }
-        if (isOriginAllFaultDetectRule && values.useAllFaultDetectRule) {
-          removeFaultDetectRules = []
-        }
-        if (!isOriginAllOpUser && values.useAllUsers) {
-          addOpUsers = ['*']
-          removeOpUsers = originOpUsers.map(item => item.id)
-        }
-        if (isOriginAllOpUser && !values.useAllUsers) {
-          addOpUsers = opuserSelection.filter(item => item.id !== '*').map(item => item.id)
-          removeOpUsers = ['*']
-        }
-        if (isOriginAllOpUser && values.useAllUsers) {
-          removeOpUsers = []
-        }
-        if (!isOriginAllOpUserGroup && values.useAllUserGroups) {
-          addOpUserGroups = ['*']
-          removeOpUserGroups = originOpUserGroups.map(item => item.id)
-        }
-        if (isOriginAllOpUserGroup && !values.useAllUserGroups) {
-          addOpUserGroups = opuserGroupSelection.filter(item => item.id !== '*').map(item => item.id)
-          removeOpUserGroups = ['*']
-        }
-        if (isOriginAllOpUserGroup && values.useAllUserGroups) {
-          removeOpUserGroups = []
-        }
-        if (!isOriginAllAuthPolicy && values.useAllAuthPoliy) {
-          addAuthPolicies = ['*']
-          removeAuthPolicies = originAuthPolicies.map(item => item.id)
-        }
-        if (isOriginAllAuthPolicy && !values.useAllAuthPoliy) {
-          addAuthPolicies = authPolicySelection.filter(item => item.id !== '*').map(item => item.id)
-          removeAuthPolicies = ['*']
-        }
-        if (isOriginAllAuthPolicy && values.useAllAuthPoliy) {
-          removeAuthPolicies = []
+        if (isOriginAllService && values.useAllService) {
+          removeServices = []
         }
         const result = yield modifyGovernanceStrategy([
           {
@@ -347,13 +185,6 @@ export default abstract class CreateDuck extends DetailPage {
               namespaces: addNamespaces.map(item => ({ id: item })),
               services: addServices.map(item => ({ id: item })),
               config_groups: addConfigGroup.map(id => ({ id })),
-              route_rules: addRouterRules.map(item => ({ id: item })),
-              ratelimit_rules: addRateLimitRules.map(item => ({ id: item })),
-              circuitbreaker_rules: addCircuitBreakerRules.map(item => ({ id: item })),
-              faultdetect_rules: addFaultDetectRules.map(item => ({ id: item })),
-              users: addOpUsers.map(item => ({ id: item })),
-              user_groups: addOpUserGroups.map(item => ({ id: item })),
-              auth_policies: addAuthPolicies.map(item => ({ id: item })),
             },
             remove_principals: {
               users: removeUsers.map(item => ({ id: item })),
@@ -363,22 +194,8 @@ export default abstract class CreateDuck extends DetailPage {
               namespaces: removeNamespaces.map(item => ({ id: item })),
               services: removeServices.map(item => ({ id: item })),
               config_groups: removeConfigGroup.map(id => ({ id })),
-              route_rules: removeRouterRules.map(item => ({ id: item })),
-              ratelimit_rules: removeRateLimitRules.map(item => ({ id: item })),
-              circuitbreaker_rules: removeCircuitBreakerRules.map(item => ({ id: item })),
-              faultdetect_rules: removeFaultDetectRules.map(item => ({ id: item })),
-              users: removeOpUsers.map(item => ({ id: item })),
-              user_groups: removeOpUserGroups.map(item => ({ id: item })),
-              auth_policies: removeAuthPolicies.map(item => ({ id: item })),
             },
-            action: values.effect,
             comment: values.comment,
-            functions: () => {
-              if (values.useAllFunctions) {
-                return ["*"]
-              }
-              return functionSelection.map(item => item.id)
-            },
           },
         ] as any)
         if (result) {
@@ -394,39 +211,14 @@ export default abstract class CreateDuck extends DetailPage {
             users: userSelection.map(item => ({ id: item.id })),
             groups: userGroupSelection.map(item => ({ id: item.id })),
           },
-          action: values.effect,
-          functions: values.useAllFunctions ? ["*"] : functionSelection.map(item => item.id),
           resources: {
             namespaces: values.useAllNamespace
               ? [{ id: '*' }]
               : namespaceSelection.map(item => ({ id: item.name, namespace: item.name })),
-            services: values.useAllService
-              ? [{ id: '*' }]
-              : serviceSelection.map(item => ({ id: item.id })),
+            services: values.useAllService ? [{ id: '*' }] : serviceSelection.map(item => ({ id: item.id })),
             config_groups: values.useAllConfigGroup
               ? [{ id: '*' }]
               : configGroupSelection.map(item => ({ id: item.id })),
-            route_rules: values.useAllRouterRule
-              ? [{ id: '*' }]
-              : routerRuleSelection.map(item => ({ id: item.id })),
-            ratelimit_rules: values.useAllRatelimitRule
-              ? [{ id: '*' }]
-              : rateLimitRuleSelection.map(item => ({ id: item.id })),
-            circuitbreaker_rules: values.useAllCircuitBreakerRule
-              ? [{ id: '*' }]
-              : circuitbreakerRuleSelection.map(item => ({ id: item.id })),
-            faultdetect_rules: values.useAllFaultDetectRule
-              ? [{ id: '*' }]
-              : faultdetectRuleSelection.map(item => ({ id: item.id })),
-            users: values.useAllUsers
-              ? [{ id: '*' }]
-              : opuserSelection.map(item => ({ id: item.id })),
-            user_groups: values.useAllUserGroups
-              ? [{ id: '*' }]
-              : opuserGroupSelection.map(item => ({ id: item.id })),
-            auth_policies: values.useAllAuthPoliy
-              ? [{ id: '*' }]
-              : authPolicySelection.map(item => ({ id: item.id })),
           },
           comment: values.comment,
         })
@@ -438,31 +230,13 @@ export default abstract class CreateDuck extends DetailPage {
         }
       }
     })
-    yield takeLatest(types.FETCH_DONE, function* (action) {
-      const { form,
-        user, userGroup, authPolicy,
-        opuser, opuserGroup,
-        namespace,
-        service,
-        configGroup,
-        functions,
-        routerRules, ratelimitRules, circuitbreakerRules, faultdetectRules,
-      } = ducks
-      // 查询资源的 duck 这里需要进行一次 load 加载
+    yield takeLatest(types.FETCH_DONE, function*(action) {
+      const { form, user, userGroup, namespace, service, configGroup } = ducks
       yield put(user.creators.load({}))
       yield put(userGroup.creators.load({}))
-      yield put(opuser.creators.load({}))
-      yield put(opuserGroup.creators.load({}))
-      yield put(authPolicy.creators.load({}))
       yield put(namespace.creators.load({}))
       yield put(service.creators.load({}))
       yield put(configGroup.creators.load({}))
-      yield put(functions.creators.load({ "name": "Namespace" }))
-      // 治理规则
-      yield put(routerRules.creators.load({}))
-      yield put(ratelimitRules.creators.load({}))
-      yield put(circuitbreakerRules.creators.load({}))
-      yield put(faultdetectRules.creators.load({}))
       if (!action.payload.id) return
       const policy = action.payload as AuthStrategy
       yield put({ type: types.SET_ORIGIN_POLICY, payload: policy })
@@ -474,42 +248,8 @@ export default abstract class CreateDuck extends DetailPage {
       yield put(
         form.creators.setValue('useAllConfigGroup', !!policy.resources.config_groups.find(item => item.id === '*')),
       )
-      yield put(
-        form.creators.setValue('useAllFunctions', !!policy.functions.find(item => item === '*')),
-      )
-      yield put(
-        form.creators.setValue('useAllRouterRule', !!policy.resources.route_rules.find(item => item.id === '*')),
-      )
-      yield put(
-        form.creators.setValue('useAllRatelimitRule', !!policy.resources.ratelimit_rules.find(item => item.id === '*')),
-      )
-      yield put(
-        form.creators.setValue('useAllCircuitBreakerRule', !!policy.resources.circuitbreaker_rules.find(item => item.id === '*')),
-      )
-      yield put(
-        form.creators.setValue('useAllFaultDetectRule', !!policy.resources.faultdetect_rules.find(item => item.id === '*')),
-      )
-      yield put(
-        form.creators.setValue('useAllUsers', !!policy.resources.users.find(item => item.id === '*')),
-      )
-      yield put(
-        form.creators.setValue('useAllUserGroups', !!policy.resources.user_groups.find(item => item.id === '*')),
-      )
-      yield put(
-        form.creators.setValue('useAllAuthPoliy', !!policy.resources.auth_policies.find(item => item.id === '*')),
-      )
       yield put(user.creators.select(policy.principals.users))
       yield put(userGroup.creators.select(policy.principals.groups))
-
-      yield put(form.creators.setValue('effect', policy.action))
-
-      // functions
-      yield put(functions.creators.select(policy.functions.map(item => ({ id: item, name: item, desc: getServerFunctionDesc("", item) })).filter(item => item.id !== '*') as ServerFunction[]))
-
-      // 资源
-      yield put(opuser.creators.select(policy.resources.users.filter(item => item.id !== '*') as UserItem[]))
-      yield put(opuserGroup.creators.select(policy.resources.user_groups.filter(item => item.id !== '*') as UserGroup[]))
-      yield put(authPolicy.creators.select(policy.resources.auth_policies.filter(item => item.id !== '*') as AuthStrategy[]))
       yield put(
         namespace.creators.select(policy.resources.namespaces.filter(item => item.id !== '*') as NamespaceItem[]),
       )
@@ -519,22 +259,6 @@ export default abstract class CreateDuck extends DetailPage {
           policy.resources.config_groups.filter(item => item.id !== '*') as ConfigFileGroup[],
         ),
       )
-      yield put(routerRules.creators.select(policy.resources.route_rules.filter(item => item.id !== '*') as CustomRoute[]))
-      yield put(ratelimitRules.creators.select(policy.resources.ratelimit_rules.filter(item => item.id !== '*') as RateLimit[]))
-      yield put(circuitbreakerRules.creators.select(policy.resources.circuitbreaker_rules.filter(item => item.id !== '*') as CircuitBreakerRule[]))
-      yield put(faultdetectRules.creators.select(policy.resources.faultdetect_rules.filter(item => item.id !== '*') as FaultDetectRule[]))
-    })
-    yield takeLatest(types.SET_FUNCTION_GROUP, function* (action) {
-      const { form,
-        functions,
-      } = ducks
-      yield put(functions.creators.load({ "name": action.payload }))
-    })
-    yield takeLatest(types.SET_FUNCTION_GROUP, function* (action) {
-      const { form,
-        functions,
-      } = ducks
-      yield put(functions.creators.load({ "name": action.payload }))
     })
   }
   async getData(composedId) {
@@ -549,17 +273,8 @@ export interface Fvalues {
   useAllNamespace: boolean
   useAllService: boolean
   useAllConfigGroup: boolean
-  useAllFunctions: boolean
-  useAllRouterRule: boolean
-  useAllCircuitBreakerRule: boolean
-  useAllRatelimitRule: boolean
-  useAllFaultDetectRule: boolean
-  useAllUsers: boolean
-  useAllUserGroups: boolean
-  useAllAuthPoliy: boolean
   comment: string
   id: string
-  effect: string
 }
 
 export class CreateFormDuck extends Form {
@@ -702,160 +417,3 @@ export class ConfigurationSelectDuck extends SearchableMultiSelect {
     return result
   }
 }
-
-export class RouterRulesSelectDuck extends SearchableMultiSelect {
-  Item: CustomRoute
-
-  getId(item: this['Item']) {
-    return item.id
-  }
-
-  get autoSearch() {
-    return false
-  }
-
-  get autoClearBeforeLoad() {
-    return false
-  }
-
-  async getData(param) {
-    const { keyword } = param
-
-    const result = await getAllList(describeCustomRoute)(keyword ? { group: keyword } : {})
-    result.list = result.list.map(item => ({ ...item }))
-
-    return result
-  }
-}
-
-export class RatelimitRulesSelectDuck extends SearchableMultiSelect {
-  Item: RateLimit
-
-  getId(item: this['Item']) {
-    return item.id
-  }
-
-  get autoSearch() {
-    return false
-  }
-
-  get autoClearBeforeLoad() {
-    return false
-  }
-
-  async getData(param) {
-    const { keyword } = param
-
-    const result = await getAllList(describeLimitRules)(keyword ? { group: keyword } : {})
-    result.list = result.list.map(item => ({ ...item }))
-
-    return result
-  }
-}
-export class CircuitbreakerRulesSelectDuck extends SearchableMultiSelect {
-  Item: CircuitBreakerRule
-
-  getId(item: this['Item']) {
-    return item.id
-  }
-
-  get autoSearch() {
-    return false
-  }
-
-  get autoClearBeforeLoad() {
-    return false
-  }
-
-  async getData(param) {
-    const { keyword } = param
-
-    const result = await getAllList(DescribeCircuitBreakers)(keyword ? { group: keyword } : {})
-    result.list = result.list.map(item => ({ ...item }))
-
-    return result
-  }
-}
-export class FaultdetectRulesSelectDuck extends SearchableMultiSelect {
-  Item: FaultDetectRule
-
-  getId(item: this['Item']) {
-    return item.id
-  }
-
-  get autoSearch() {
-    return false
-  }
-
-  get autoClearBeforeLoad() {
-    return false
-  }
-
-  async getData(param) {
-    const { keyword } = param
-
-    const result = await getAllList(DescribeFaultDetects)(keyword ? { group: keyword } : {})
-    result.list = result.list.map(item => ({ ...item }))
-
-    return result
-  }
-}
-
-export class FunctionSelectDuck extends SearchableMultiSelect {
-  Item: ServerFunction
-  getId(item: this['Item']) {
-    return item.id
-  }
-
-  get autoSearch() {
-    return false
-  }
-
-  get autoClearBeforeLoad() {
-    return false
-  }
-
-  async getData(filter) {
-    const keyword: string = filter["name"]
-    if (keyword === "" || keyword === undefined) {
-      return {
-        list: [],
-        totalCount: 0,
-      }
-    }
-    const allKeyWord = keyword.split("|")
-    const result = await describeServerFunctions()
-    const targetGroup = result.list.filter(item => {
-      for (const searchKey of allKeyWord) {
-        if (searchKey === "" || searchKey === undefined) {
-          continue
-        }
-        if (searchKey === item.name) {
-          return true
-        }
-      }
-      return false
-    })
-
-    if (targetGroup.length === 0) {
-      return {
-        list: [],
-        totalCount: 0,
-      }
-    }
-
-    const functionList = new Array()
-    for (const group of targetGroup) {
-      functionList.push(...group.functions.map(item => ({
-        id: item,
-        name: item,
-        desc: getServerFunctionDesc(group.name, item)
-      })))
-    }
-
-    return {
-      list: functionList,
-      totalCount: functionList.length,
-    }
-  }
-}
\ No newline at end of file
diff --git a/web/src/polaris/configuration/fileGroup/detail/file/Page.tsx b/web/src/polaris/configuration/fileGroup/detail/file/Page.tsx
index bed826b0..83e3739b 100644
--- a/web/src/polaris/configuration/fileGroup/detail/file/Page.tsx
+++ b/web/src/polaris/configuration/fileGroup/detail/file/Page.tsx
@@ -335,7 +335,7 @@ export default function Page(props: DuckCmpProps<Duck>) {
                             >
                               发布
                             </Button>
-                            {isBetaingRelease(currentNode) ? (
+                            {/* {isBetaingRelease(currentNode) ? (
                               <Button
                                 type={'primary'}
                                 disabled={editing || !data.editable}
@@ -351,7 +351,7 @@ export default function Page(props: DuckCmpProps<Duck>) {
                               >
                                 灰度发布
                               </Button>
-                            )}
+                            )} */}
                             {editing ? (
                               <>
                                 <Button type={'weak'} onClick={() => handlers.getTemplate(currentNode)}>
diff --git a/web/src/polaris/configuration/fileGroup/detail/version/PageDuck.tsx b/web/src/polaris/configuration/fileGroup/detail/version/PageDuck.tsx
index 3baba98d..f770537a 100644
--- a/web/src/polaris/configuration/fileGroup/detail/version/PageDuck.tsx
+++ b/web/src/polaris/configuration/fileGroup/detail/version/PageDuck.tsx
@@ -241,7 +241,7 @@ export default class ConfigFileReleaseHistoryDuck extends GridPageDuck {
       fileName,
     })
     return {
-      totalCount: result.configFileReleases.length,
+      totalCount: result.total,
       list:
         result.configFileReleases?.map(item => ({
           ...item,
diff --git a/web/src/polaris/configuration/fileGroup/detail/version/model.ts b/web/src/polaris/configuration/fileGroup/detail/version/model.ts
index 434aa2ab..119d17a6 100644
--- a/web/src/polaris/configuration/fileGroup/detail/version/model.ts
+++ b/web/src/polaris/configuration/fileGroup/detail/version/model.ts
@@ -83,6 +83,7 @@ export interface DescribeConfigFileReleasesParams {
  */
 export interface DescribeConfigFileReleasesResult {
   configFileReleases: ConfigFileRelease[]
+  total: number
 }
 
 /** 查询某个配置所有版本信息 */