From ddff866cb7151bea021567173557c90e8f54d9da Mon Sep 17 00:00:00 2001
From: token <239573049@qq.com>
Date: Sat, 27 Jan 2024 01:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=20=E5=A2=9E=E5=8A=A0=E9=9B=86=E7=BE=A4Health?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Gateway/Entities/ClusterEntity.cs  |  6 ++++++
 src/Gateway/Services/GatewayService.cs | 13 ++++++------
 web/src/components/Cluster-Gateway.tsx | 20 ++++++++++++------
 web/src/components/Create-Cluster.tsx  |  9 ++++++++-
 web/src/components/Create-Router.tsx   |  6 +++++-
 web/src/components/Router-Gateway.tsx  | 28 +++++++++++++++++++++++++-
 web/src/components/Update-Cluster.tsx  |  8 ++++++++
 web/src/components/Update-Route.tsx    |  6 +++++-
 web/src/index.d.ts                     |  4 ++++
 9 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/src/Gateway/Entities/ClusterEntity.cs b/src/Gateway/Entities/ClusterEntity.cs
index 1e139fb..3cdabde 100644
--- a/src/Gateway/Entities/ClusterEntity.cs
+++ b/src/Gateway/Entities/ClusterEntity.cs
@@ -14,6 +14,7 @@ public sealed class ClusterEntity : Entity
     /// 集群描述
     /// </summary>
     public string? Description { get; set; }
+
     
     [Column(MapType = typeof(string), StringLength = -1)]
     public List<DestinationsEntity> DestinationsEntities { get; set; } = new();
@@ -26,4 +27,9 @@ public sealed class DestinationsEntity
     public string Address { get; set; }
     
     public string? Host { get; set; }
+    
+    /// <summary>
+    /// 接受活动运行状况检查探测的端点。例如<c> http://127.0.0.1:1234 </c>。
+    /// </summary>
+    public string? Health { get; set; }
 }
\ No newline at end of file
diff --git a/src/Gateway/Services/GatewayService.cs b/src/Gateway/Services/GatewayService.cs
index a567de9..0fe7853 100644
--- a/src/Gateway/Services/GatewayService.cs
+++ b/src/Gateway/Services/GatewayService.cs
@@ -36,8 +36,9 @@ public class GatewayService(
 
         foreach (var cluster in from item in clusters
                  let items = item.DestinationsEntities.ToDictionary(entity => entity.Id,
-                     entity => new DestinationConfig() { Address = entity.Address, Host = entity.Host, })
-                 select new ClusterConfig()
+                     entity => new DestinationConfig
+                         { Address = entity.Address, Host = entity.Host, Health = entity.Health })
+                 select new ClusterConfig
                  {
                      ClusterId = item.ClusterId,
                      Destinations = items
@@ -137,7 +138,7 @@ public class GatewayService(
         entity.MaxRequestBodySize = routeEntity.MaxRequestBodySize;
         entity.Path = routeEntity.Path;
         entity.Hosts = routeEntity.Hosts;
-        
+
         await freeSql.Update<RouteEntity>().SetSource(entity).ExecuteAffrowsAsync();
 
         return ResultDto.Success();
@@ -224,16 +225,16 @@ public class GatewayService(
     {
         var entity = await freeSql.Select<ClusterEntity>().Where(x => x.ClusterId == clusterEntity.ClusterId)
             .FirstAsync();
-        
+
         if (entity == null)
         {
             return ResultDto.Error("集群Id不存在");
         }
-        
+
         entity.ClusterName = clusterEntity.ClusterName;
         entity.Description = clusterEntity.Description;
         entity.DestinationsEntities = clusterEntity.DestinationsEntities;
-        
+
         await freeSql.Update<ClusterEntity>().SetSource(entity).ExecuteAffrowsAsync();
 
         return ResultDto.Success();
diff --git a/web/src/components/Cluster-Gateway.tsx b/web/src/components/Cluster-Gateway.tsx
index 2b093e8..23ac0c1 100644
--- a/web/src/components/Cluster-Gateway.tsx
+++ b/web/src/components/Cluster-Gateway.tsx
@@ -65,7 +65,6 @@ export default function ClusterGateway({ activeKey }: IProps) {
                             header={item.clusterName}
                             itemKey={item.clusterId}>
                             <>
-
                                 <div style={{
                                     float: 'left',
                                     marginBottom: '20px',
@@ -79,11 +78,20 @@ export default function ClusterGateway({ activeKey }: IProps) {
                                         <span>{item.description}</span>
                                     </div>
                                     <div>
-                                        <span>集群地址：</span>
-                                        <span>{item.destinationsEntities.map((x: DestinationsEntity) => {
-                                            return (<Tag style={{
-                                                marginRight: '5px',
-                                            }} size="small" shape='circle' color='amber'>{x.address}</Tag>)
+                                        <div style={{
+                                            marginTop: '5px',
+                                            fontWeight: 'bold',
+                                            fontSize: '18px',
+                                        }}>集群列表</div>
+                                        <span>{item.destinationsEntities.map((x: DestinationsEntity, i: number) => {
+                                            return (<div key={i}>
+                                                集群地址：<Tag style={{
+                                                    marginRight: '5px',
+                                                }} size="small" shape='circle' color='amber'>{x.address}</Tag>
+                                                集群health：<Tag style={{
+                                                    marginRight: '5px',
+                                                }} size="small" shape='circle' color='amber'>{x.health}</Tag>
+                                            </div>)
                                         })}</span>
                                     </div>
                                 </div>
diff --git a/web/src/components/Create-Cluster.tsx b/web/src/components/Create-Cluster.tsx
index 5d16d4a..af4995c 100644
--- a/web/src/components/Create-Cluster.tsx
+++ b/web/src/components/Create-Cluster.tsx
@@ -38,7 +38,7 @@ export default function CreateCluster({ visible, onCancel, onSusccess }: IProps)
     }
 
     return (
-        <SideSheet width={500} title="创建集群" visible={visible} onCancel={onCancel}>
+        <SideSheet width={650} title="创建集群" visible={visible} onCancel={onCancel}>
             <Form style={{
                 overflowX: 'hidden',
                 overflowY: 'auto',
@@ -76,6 +76,13 @@ export default function CreateCluster({ visible, onCancel, onSusccess }: IProps)
                                                     style={{ width: 170, marginRight: 16 }}
                                                 >
                                                 </Input>
+                                                <Input
+                                                    field={`${field}[health]`}
+                                                    size='large'
+                                                    label={`状况检查探测的端点`}
+                                                    style={{ width: 200, marginRight: 16 }}
+                                                >
+                                                </Input>
                                                 <Button
                                                     type='danger'
                                                     theme='borderless'
diff --git a/web/src/components/Create-Router.tsx b/web/src/components/Create-Router.tsx
index 29c2f17..369c142 100644
--- a/web/src/components/Create-Router.tsx
+++ b/web/src/components/Create-Router.tsx
@@ -11,7 +11,7 @@ interface IProps {
 }
 
 const { Option } = Form.Select;
-const { Select, Input, TagInput } = Form;
+const { Select, Input, TagInput, Checkbox } = Form;
 
 export default function CreateRouter({ visible, onCancel, onSusccess }: IProps) {
     const [clusterIds, setClusterIds] = useState<ClusterEntity[]>([]);
@@ -59,6 +59,10 @@ export default function CreateRouter({ visible, onCancel, onSusccess }: IProps)
                                 { validator: (rule, value) => value.length < 10, message: '路由名称长度不能超过10位' },
                             ]} field='routeName' required={true} size='large' label='路由名称' style={{ width: '100%' }} placeholder='请输入路由名称'></Input>
                         <Input field='description' label='路由描述' size='large' style={{ width: '100%' }} placeholder='请输入路由描述'></Input>
+                        <Input field='authorizationPolicy' label='授权策略' size='large' style={{ width: '100%' }} placeholder='请输入授权策略'></Input>
+                        <Checkbox field='requireHttpsMetadata' label='认证中心是否需要https' style={{ width: '100%' }}></Checkbox>
+                        <Input field='authorizationPolicyAddress' placeholder='请输入授权认证中心地址' size='large' label='授权认证中心地址' style={{ width: '100%' }}></Input>
+                        <Input field='maxRequestBodySize' min={16777216} max={999999999} placeholder='请输入请求Body最大长度' type='number' size='large' label='请求Body最大长度' style={{ width: '100%' }}></Input>
                         <Select field='clusterId' rules={[
                             {
                                 required: true,
diff --git a/web/src/components/Router-Gateway.tsx b/web/src/components/Router-Gateway.tsx
index 1345f18..7bd157f 100644
--- a/web/src/components/Router-Gateway.tsx
+++ b/web/src/components/Router-Gateway.tsx
@@ -35,7 +35,7 @@ export default function RouterGateway({ activeKey }: IProps) {
     }, [
         activeKey
     ]);
-    
+
     return (
         <>
             <List
@@ -105,6 +105,32 @@ export default function RouterGateway({ activeKey }: IProps) {
                                             </Tag>)
                                         })}</span>
                                     </div>
+                                    <div style={{
+                                        marginTop: '5px',
+                                    }}>
+                                        <span>授权策略：</span>
+                                        <span>{item.authorizationPolicy}</span>
+                                    </div>
+                                    <div style={{
+                                        marginTop: '5px',
+                                    }}>
+                                        <span>授权认证中心地址：</span>
+                                        <span>{item.authorizationPolicyAddress}</span>
+                                    </div>
+                                    <div style={{
+                                        marginTop: '5px',
+                                    }}>
+                                        <span>认证中心是否需要https：</span>
+                                        <span>{item.requireHttpsMetadata ? '是' : '否'}</span>
+                                    </div>
+
+                                    <div style={{
+                                        marginTop: '5px',
+                                    }}>
+                                        <span>请求Body最大长度：</span>
+                                        <span>{item.maxRequestBodySize}</span>
+                                    </div>
+
                                 </div>
                                 <div style={{
                                     float: 'right',
diff --git a/web/src/components/Update-Cluster.tsx b/web/src/components/Update-Cluster.tsx
index 3dd4ad5..2b4adf0 100644
--- a/web/src/components/Update-Cluster.tsx
+++ b/web/src/components/Update-Cluster.tsx
@@ -85,6 +85,14 @@ export default function UpdateCluster({ visible, onCancel, onSusccess, cluster }
                                                     style={{ width: 170, marginRight: 16 }}
                                                 >
                                                 </Input>
+                                                <Input
+                                                    field={`${field}[health]`}
+                                                    size='large'
+                                                    initValue={cluster?.destinationsEntities[i]?.health}
+                                                    label={`状况检查探测的端点`}
+                                                    style={{ width: 200, marginRight: 16 }}
+                                                >
+                                                </Input>
                                                 <Button
                                                     type='danger'
                                                     theme='borderless'
diff --git a/web/src/components/Update-Route.tsx b/web/src/components/Update-Route.tsx
index e213f60..cf5a608 100644
--- a/web/src/components/Update-Route.tsx
+++ b/web/src/components/Update-Route.tsx
@@ -11,7 +11,7 @@ interface IProps {
 }
 
 const { Option } = Form.Select;
-const { Select, Input, TagInput } = Form;
+const { Select, Input, TagInput, Checkbox } = Form;
 
 
 export default function UpdateCluster({ visible, onCancel, onSusccess, router }: IProps) {
@@ -63,6 +63,10 @@ export default function UpdateCluster({ visible, onCancel, onSusccess, router }:
                                 { validator: (rule, value) => value.length < 10, message: '路由名称长度不能超过10位' },
                             ]} field='routeName' required={true} size='large' label='路由名称' style={{ width: '100%' }} placeholder='请输入路由名称'></Input>
                         <Input initValue={router?.description} field='description' label='路由描述' size='large' style={{ width: '100%' }} placeholder='请输入路由描述'></Input>
+                        <Input field='authorizationPolicy' initValue={router?.authorizationPolicy} label='授权策略' size='large' style={{ width: '100%' }} placeholder='请输入授权策略'></Input>
+                        <Checkbox field='requireHttpsMetadata' initValue={router?.requireHttpsMetadata} label='认证中心是否需要https' style={{ width: '100%' }}></Checkbox>
+                        <Input field='authorizationPolicyAddress' initValue={router?.authorizationPolicyAddress} placeholder='请输入授权认证中心地址' size='large' label='授权认证中心地址' style={{ width: '100%' }}></Input>
+                        <Input field='maxRequestBodySize' min={16777216} initValue={router?.maxRequestBodySize}  placeholder='请输入请求Body最大长度' type='number' size='large' label='请求Body最大长度' style={{ width: '100%' }}></Input>
                         <Select initValue={router?.clusterId} field='clusterId' rules={[
                             {
                                 required: true,
diff --git a/web/src/index.d.ts b/web/src/index.d.ts
index 592cae6..ef103e5 100644
--- a/web/src/index.d.ts
+++ b/web/src/index.d.ts
@@ -4,6 +4,9 @@ export interface RouteEntity {
     description: string;
     clusterId: string | null;
     maxRequestBodySize: number | null;
+    authorizationPolicy:string | null;
+    requireHttpsMetadata:boolean | null;
+    authorizationPolicyAddress:string | null;
     path: string;
     hosts: string[];
     clusterEntity: ClusterEntity | null;
@@ -19,6 +22,7 @@ export interface ClusterEntity {
 export interface DestinationsEntity {
     id: string;
     address: string;
+    health:string | null;
     host: string | null;
 }