fix: '网关功能优化'

src/assets/images/icons/时间.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1666692888056" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4237" data-spm-anchor-id="a313x.7781069.0.i7" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 85.33C276.36 85.33 85.33 276.36 85.33 512S276.36 938.67 512 938.67 938.67 747.64 938.67 512 747.64 85.33 512 85.33z m0 768c-188.21 0-341.33-153.12-341.33-341.33S323.79 170.67 512 170.67 853.33 323.79 853.33 512 700.21 853.33 512 853.33z" p-id="4238" fill="#1890FF"></path><path d="M512 256h-85.33v341.33h298.66V512H512z" p-id="4239" fill="#1890FF"></path></svg>
\ No newline at end of file

src/pages/platformCenter/hostmanager/gateWay/AddModal.jsx

@@ -18,7 +18,7 @@ import { InfoCircleOutlined } from '@ant-design/icons';
 
 const { Item } = Form;
 const AddModal = props => {
-  const { callBackSubmit = () => {}, type, pickItem, visible, onCancel } = props;
+  const { callBackSubmit = () => {}, type, pickItem, visible, onCancel, keepData } = props;
   const [loading, setLoading] = useState(false);
   const [current, setCurrent] = useState(false);
   const [advanced, setAdvanced] = useState(0);
@@ -26,6 +26,7 @@ const AddModal = props => {
 
   useEffect(() => {
     if (visible) {
+      console.log(keepData);
       if (type === 'edit') {
         let aa = pickItem.methods.replace(/\s/g, '');
         form.setFieldsValue({
@@ -298,6 +299,20 @@ const AddModal = props => {
               required: true,
               message: '请输入关键字',
             },
+            {
+              validator: (rule, value) => {
+                let aa = form.getFieldValue().Key;
+                if (type === 'edit') {
+                  if (keepData.indexOf(aa) !== -1 && pickItem.key !== aa) {
+                    return Promise.reject('关键字已存在');
+                  }
+                } else if (keepData.indexOf(aa) !== -1) {
+                  return Promise.reject('关键字已存在');
+                }
+
+                return Promise.resolve();
+              },
+            },
           ]}
         >
           <Input allowClear />

src/pages/platformCenter/hostmanager/gateWay/CheckModal.jsx

+/* eslint-disable react/jsx-boolean-value */
+import React, { useState, useEffect } from 'react';
+import {
+  Form,
+  Modal,
+  Input,
+  notification,
+  Radio,
+  InputNumber,
+  Checkbox,
+  Switch,
+  Tooltip,
+  Row,
+  Col,
+} from 'antd';
+import { SaveRoutes } from '@/services/hostmanager/hostmanager';
+import { InfoCircleOutlined } from '@ant-design/icons';
+
+const { Item } = Form;
+const AddModal = props => {
+  const { callBackSubmit = () => {}, pickItem, visible, onCancel } = props;
+  const [loading, setLoading] = useState(false);
+  const [current, setCurrent] = useState(false);
+  const [advanced, setAdvanced] = useState(0);
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    if (visible) {
+      let aa = pickItem.methods.replace(/\s/g, '');
+      form.setFieldsValue({
+        UpstreamPathTemplate: pickItem.upstreamPathTemplate,
+        DownstreamPathTemplate: pickItem.downstreamPathTemplate,
+        Methods: aa.split(','),
+        Url: pickItem.url,
+        IsAuthentication: pickItem.isAuthentication,
+        Key: pickItem.key,
+        Priority: pickItem.priority,
+        UpstreamHost: pickItem.upstreamHost,
+        AddHeasersToRequest: pickItem.addHeasersToRequest,
+        UpstreamHeaderTransform: pickItem.upstreamHeaderTransform,
+        DownstreamHeaderTransform: pickItem.downstreamHeaderTransform,
+        Timeout: pickItem.timeout,
+        QoSOptions: pickItem.qoSOptions,
+        RateLimitOptions: pickItem.rateLimitOptions,
+        CacheOptions: pickItem.cacheOptions,
+        LoadBalancerOptions: pickItem.loadBalancerOptions,
+        SecurityOptions: pickItem.securityOptions,
+        RequestIdKey: pickItem.requestIdKey,
+        ServiceName: pickItem.serviceName,
+        ServiceNamespace: pickItem.serviceNamespace,
+        DelegatingHandlers: pickItem.delegatingHandlers,
+        ReRouteIsCaseSensitive: pickItem.reRouteIsCaseSensitive,
+        DownstreamHttpMethod: pickItem.downstreamHttpMethod,
+      });
+      if (
+        pickItem.upstreamHost ||
+        pickItem.addHeasersToRequest ||
+        pickItem.upstreamHeaderTransform ||
+        pickItem.downstreamHeaderTransform ||
+        pickItem.timeout ||
+        pickItem.qoSOptions ||
+        pickItem.rateLimitOptions ||
+        pickItem.cacheOptions ||
+        pickItem.loadBalancerOptions ||
+        pickItem.securityOptions ||
+        pickItem.requestIdKey ||
+        pickItem.serviceName ||
+        pickItem.serviceNamespace ||
+        pickItem.delegatingHandlers ||
+        pickItem.reRouteIsCaseSensitive ||
+        pickItem.downstreamHttpMethod
+      ) {
+        setAdvanced(1);
+        setCurrent(true);
+      }
+    } else {
+      form.resetFields();
+      setAdvanced(0);
+      setCurrent(false);
+    }
+  }, [visible]);
+  // 提交
+  const onSubmit = () => {
+    onCancel();
+  };
+
+  const layout = {
+    layout: 'horizontal',
+    labelCol: { span: 4 },
+    wrapperCol: { span: 18 },
+  };
+
+  const plainOptions = ['GET', 'POST', 'PUT', 'DELETE'];
+
+  const change = (e, event) => {
+    if (e) {
+      setAdvanced(1);
+      setCurrent(true);
+    } else {
+      setAdvanced(0);
+      setCurrent(false);
+    }
+  };
+
+  return (
+    <Modal
+      title="查看网关配置"
+      bodyStyle={{ width: '100%', maxHeight: '600px', overflow: 'scroll', minHeight: '360px' }}
+      width="700px"
+      destroyOnClose
+      maskClosable={false}
+      okText="关闭"
+      {...props}
+      onOk={() => onSubmit()}
+      confirmLoading={loading}
+      forceRender={true}
+      getContainer={false}
+    >
+      <Form form={form} {...layout}>
+        <Item
+          label="上游路由模板"
+          name="UpstreamPathTemplate"
+          rules={[
+            {
+              validator: (rule, value) => {
+                let aa = form.getFieldValue().UpstreamPathTemplate;
+                console.log(aa.startsWith('/'));
+                if (!aa.startsWith('/')) {
+                  return Promise.reject('必须以/开头');
+                }
+                return Promise.resolve();
+              },
+            },
+            {
+              required: true,
+              message: '请输入上游路由模板',
+            },
+          ]}
+        >
+          <Input
+            allowClear
+            style={{ width: '100%' }}
+            placeholder="示例:/PandaOMS/PandaOMS/{url}"
+            disabled
+          />
+        </Item>
+        <Item
+          label="下游路由模板"
+          name="DownstreamPathTemplate"
+          rules={[
+            {
+              validator: (rule, value) => {
+                let aa = form.getFieldValue().DownstreamPathTemplate;
+                console.log(aa.startsWith('/'));
+                if (!aa.startsWith('/')) {
+                  return Promise.reject('必须以/开头');
+                }
+                return Promise.resolve();
+              },
+            },
+            {
+              required: true,
+              message: '请输入下游路由模板',
+            },
+          ]}
+        >
+          <Input allowClear placeholder="示例:/{url}" disabled />
+        </Item>
+        <Item
+          label="上游请求方式"
+          name="Methods"
+          rules={[
+            {
+              required: true,
+              message: '请选择上游请求方式',
+            },
+          ]}
+        >
+          <Checkbox.Group options={plainOptions} style={{ display: 'flex' }} disabled />
+        </Item>
+        <Item
+          label="下游服务地址"
+          name="Url"
+          rules={[
+            {
+              required: true,
+              message: '请输入下游服务地址',
+            },
+          ]}
+        >
+          <Input allowClear placeholder="示例:http://localhost:8050" disabled />
+        </Item>
+        <Item label="身份认证" name="IsAuthentication">
+          <Radio.Group>
+            <Radio value={true} disabled>
+              开启
+            </Radio>
+            <Radio value={false} disabled>
+              关闭
+            </Radio>
+          </Radio.Group>
+        </Item>
+        <Item
+          label="关键字"
+          name="Key"
+          rules={[
+            {
+              required: true,
+              message: '请输入关键字',
+            },
+          ]}
+        >
+          <Input allowClear disabled />
+        </Item>
+        <Row>
+          <Col span={8}>
+            <Item
+              // label={
+              //   <div>
+              //     <Tooltip title="0默认级别最低，10最高，优先级越高越先匹配">
+              //       <InfoCircleOutlined
+              //         style={{
+              //           color: 'rgb(24, 144, 255)',
+              //           marginLeft: '0px',
+              //           marginRight: '5px',
+              //         }}
+              //       />
+              //     </Tooltip>
+              //     <span>优先级</span>
+              //   </div>
+              // }
+              label="优先级"
+              name="Priority"
+              labelCol={{ span: 12 }}
+            >
+              <InputNumber min={0} max={10} defaultValue={0} disabled />
+            </Item>
+          </Col>
+          <Col span={16}>
+            <Item>
+              <span style={{ color: 'red' }}>0默认级别最低，10最高，优先级越高越先匹配</span>
+            </Item>
+          </Col>
+        </Row>
+        {/* <Switch
+          checkedChildren="高级设置"
+          unCheckedChildren="高级设置"
+          onChange={change}
+          checked={current}
+          style={{ marginLeft: '40px', marginBottom: '15px' }}
+        />
+        {advanced === 1 ? (
+          <>
+            <Item label="上游host" name="UpstreamHost">
+              <Input allowClear />
+            </Item>
+            <Item label="头部信息" name="AddHeasersToRequest">
+              <Input allowClear />
+            </Item>
+            <Item label="上游头信息转发" name="UpstreamHeaderTransform">
+              <Input allowClear />
+            </Item>
+            <Item label="下游头信息转发" name="DownstreamHeaderTransform">
+              <Input allowClear />
+            </Item>
+
+            <Item label="超时设置" name="Timeout">
+              <Input allowClear />
+            </Item>
+            <Item label="服务质量与熔断" name="QoSOptions">
+              <Input allowClear />
+            </Item>
+            <Item label="限流配置" name="RateLimitOptions">
+              <Input allowClear />
+            </Item>
+            <Item label="缓存" name="CacheOptions">
+              <Input allowClear />
+            </Item>
+            <Item label="负载均衡" name="LoadBalancerOptions">
+              <Input allowClear />
+            </Item>
+            <Item label="安全配置" name="SecurityOptions">
+              <Input allowClear />
+            </Item>
+            <Item label="请求Id Key" name="RequestIdKey">
+              <Input allowClear />
+            </Item>
+            <Item label="服务名" name="ServiceName">
+              <Input allowClear />
+            </Item>
+            <Item label="服务空间" name="ServiceNamespace">
+              <Input allowClear />
+            </Item>
+            <Item label="委托配置" name="DelegatingHandlers">
+              <Input allowClear />
+            </Item>
+            <Item label="路由大小写敏感" name="ReRouteIsCaseSensitive">
+              <Radio.Group>
+                <Radio value={0}>否</Radio>
+                <Radio value={1}>是</Radio>
+              </Radio.Group>
+            </Item>
+            <Item label="下游请求方式" name="DownstreamHttpMethod">
+              <Checkbox.Group options={plainOptions} />
+            </Item>
+          </>
+        ) : (
+          ''
+        )} */}
+      </Form>
+    </Modal>
+  );
+};
+export default AddModal;

src/services/hostmanager/hostmanager.js

@@ -54,9 +54,9 @@ export const GetGateWay = param => get(`${PUBLISH_SERVICE}/HostManager/GetGateWa
 export const UpdateGeteWay = param => get(`${PUBLISH_SERVICE}/HostManager/UpdateGeteWay`, param);
 // 网关配置
 // export const GetReRoutesFirst = param => get(`/OcelotSettings/GetReRoutes`, param);
-export const GetReRoutes = param => get(`/OcelotSettings/GetReRoutes`, param);
-export const SaveRoutes = param => post(`/OcelotSettings/SaveRoutes`, param);
-export const DelRoutes = param => get(`/OcelotSettings/DelRoutes`, param);
+export const GetReRoutes = param => get(`/PandaCore/GateWay/OcelotSettings/GetReRoutes`, param);
+export const SaveRoutes = param => post(`/PandaCore/GateWay/OcelotSettings/SaveRoutes`, param);
+export const DelRoutes = param => get(`/PandaCore/GateWay/OcelotSettings/DelRoutes`, param);
 
 // 代理服务老接口
 export const GetNginxConfigInfoOLD = param =>