GZTimeWalker · Jul 27, 2023
diff --git a/‎src/GZCTF/ClientApp/package.json
+1-1 b/‎src/GZCTF/ClientApp/package.json
+1-1
diff --git a/‎src/GZCTF/ClientApp/pnpm-lock.yaml
+44-44 b/‎src/GZCTF/ClientApp/pnpm-lock.yaml
+44-44
diff --git a/‎src/GZCTF/ClientApp/src/Api.ts
+4-4 b/‎src/GZCTF/ClientApp/src/Api.ts
+4-4
diff --git a/‎src/GZCTF/ClientApp/src/pages/admin/Instances.tsx
+34-6 b/‎src/GZCTF/ClientApp/src/pages/admin/Instances.tsx
+34-6
diff --git a/‎src/GZCTF/Models/Request/Admin/ContainerInstanceModel.cs
+7-6 b/‎src/GZCTF/Models/Request/Admin/ContainerInstanceModel.cs
+7-6
@@ -51,7 +51,7 @@
     "@types/marked": "^5.0.1",
     "@types/node": "20.4.5",
     "@types/prismjs": "^1.26.0",
-    "@types/react": "^18.2.16",
+    "@types/react": "^18.2.17",
     "@types/react-dom": "^18.2.7",
     "@typescript-eslint/eslint-plugin": "^6.2.0",
     "@typescript-eslint/parser": "^6.2.0",
 
@@ -546,13 +546,13 @@ export interface ContainerInstanceModel {
    * @format date-time
    */
   expectStopAt?: string
-  /** 公开 IP */
-  publicIP?: string | null
+  /** 访问 IP */
+  publicIP?: string
   /**
-   * 公开端口
+   * 访问端口
    * @format int32
    */
-  publicPort?: number | null
+  publicPort?: number
 }
 
 /** 队伍信息 */
 
@@ -12,7 +12,9 @@ import {
   Badge,
   Box,
   Code,
+  Tooltip,
 } from '@mantine/core'
+import { useClipboard } from '@mantine/hooks'
 import { showNotification } from '@mantine/notifications'
 import {
   mdiAccountGroupOutline,
@@ -26,7 +28,7 @@ import { ActionIconWithConfirm } from '@Components/ActionIconWithConfirm'
 import AdminPage from '@Components/admin/AdminPage'
 import { showErrorNotification } from '@Utils/ApiErrorHandler'
 import { ChallengeTagLabelMap } from '@Utils/Shared'
-import { useTableStyles } from '@Utils/ThemeOverride'
+import { useTableStyles, useTooltipStyles } from '@Utils/ThemeOverride'
 import api, { ChallengeModel, ChallengeTag, TeamModel } from '@Api'
 
 type SelectTeamItemProps = TeamModel & React.ComponentPropsWithoutRef<'div'>
@@ -76,6 +78,8 @@ const Instances: FC = () => {
   const [challenge, setChallenge] = useState<ChallengeModel[]>()
   const [disabled, setDisabled] = useState(false)
   const { classes, theme } = useTableStyles()
+  const clipBoard = useClipboard()
+  const { classes: tooltipClasses } = useTooltipStyles()
 
   useEffect(() => {
     if (instances) {
@@ -246,12 +250,36 @@ const Instances: FC = () => {
                         </Group>
                       </td>
                       <td>
-                        <Text size="sm" ff={theme.fontFamilyMonospace} color="dimmed">
-                          {`${inst.publicIP}:`}
-                          <Text span weight="bold" color="white">
-                            {inst.publicPort}
+                        <Tooltip
+                          label="点击复制"
+                          withArrow
+                          position="left"
+                          classNames={tooltipClasses}
+                        >
+                          <Text
+                            size="sm"
+                            color="dimmed"
+                            ff={theme.fontFamilyMonospace}
+                            style={{
+                              backgroundColor: 'transparent',
+                              fontSize: theme.fontSizes.sm,
+                              cursor: 'pointer',
+                            }}
+                            onClick={() => {
+                              clipBoard.copy(`${inst.publicIP ?? ''}:${inst.publicPort ?? ''}`)
+                              showNotification({
+                                color: 'teal',
+                                message: '实例入口已复制到剪贴板',
+                                icon: <Icon path={mdiCheck} size={1} />,
+                              })
+                            }}
+                          >
+                            {`${inst.publicIP}:`}
+                            <Text span weight="bold" color="white">
+                              {inst.publicPort}
+                            </Text>
                           </Text>
-                        </Text>
+                        </Tooltip>
                       </td>
                       <td align="right">
                         <Group noWrap spacing="sm" position="right">
 
@@ -43,14 +43,14 @@ public class ContainerInstanceModel
     public DateTimeOffset ExpectStopAt { get; set; } = DateTimeOffset.UtcNow + TimeSpan.FromHours(2);
 
     /// <summary>
-    /// 公开 IP
+    /// 访问 IP
     /// </summary>
-    public string? PublicIP { get; set; }
+    public string PublicIP { get; set; } = string.Empty;
 
     /// <summary>
-    /// 公开端口
+    /// 访问端口
     /// </summary>
-    public int? PublicPort { get; set; }
+    public int PublicPort { get; set; }
 
     internal static ContainerInstanceModel FromContainer(Container container)
     {
@@ -64,8 +64,9 @@ internal static ContainerInstanceModel FromContainer(Container container)
             ContainerId = container.ContainerId,
             StartedAt = container.StartedAt,
             ExpectStopAt = container.ExpectStopAt,
-            PublicIP = container.PublicIP,
-            PublicPort = container.PublicPort
+            // fallback to host if public is null
+            PublicIP = container.PublicIP ?? container.IP,
+            PublicPort = container.PublicPort ?? container.Port
         };
 
         if (team is not null && chal is not null)