From 49819156ab770b8fda9828dc054c41f369054afd Mon Sep 17 00:00:00 2001
From: ReaJason <reajason1225@gmail.com>
Date: Fri, 28 Feb 2025 23:25:28 +0800
Subject: [PATCH] fix(ui): generate fail

---
 .../javaweb/boot/dto/GenerateRequest.java     |   5 +
 web/src/components/copyable-field.tsx         |   2 +-
 web/src/components/main-config-card.tsx       |   2 +-
 web/src/components/results/agent.tsx          |   2 +-
 web/src/components/results/basic-info.tsx     | 170 +++++++++---------
 web/src/components/results/feedback-alert.tsx |   2 +-
 web/src/components/results/multi-packer.tsx   |   2 +-
 web/src/components/tools/antsword-tab.tsx     |   2 +-
 web/src/components/tools/behinder-tab.tsx     |   2 +-
 web/src/components/tools/command-tab.tsx      |   2 +-
 web/src/components/tools/godzilla-tab.tsx     |   2 +-
 web/src/components/tools/neoreg-tab.tsx       |   2 +-
 web/src/components/tools/suo5-tab.tsx         |   2 +-
 web/src/i18n/en.json                          |   2 +
 web/src/i18n/zh-CN.json                       |   2 +
 web/src/types/shell.ts                        |   6 +
 16 files changed, 113 insertions(+), 94 deletions(-)

diff --git a/boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java b/boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java
index d9bd53de..887a930b 100644
--- a/boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java
+++ b/boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java
@@ -57,6 +57,11 @@ public class GenerateRequest {
                     .headerName(shellToolConfig.getHeaderName())
                     .headerValue(shellToolConfig.getHeaderValue())
                     .build();
+            case NeoreGeorg -> NeoreGeorgConfig.builder()
+                    .shellClassName(shellToolConfig.getShellClassName())
+                    .headerName(shellToolConfig.getHeaderName())
+                    .headerValue(shellToolConfig.getHeaderValue())
+                    .build();
             default -> throw new UnsupportedOperationException("unknown shell tool " + shellConfig.getShellTool());
         };
     }
diff --git a/web/src/components/copyable-field.tsx b/web/src/components/copyable-field.tsx
index e9afc8fa..416e696e 100644
--- a/web/src/components/copyable-field.tsx
+++ b/web/src/components/copyable-field.tsx
@@ -36,7 +36,7 @@ export function CopyableField({ label, value, text }: CopyableFieldProps) {
 
   return (
     <div className="flex flex-col gap-1 py-1">
-      <div className="flex items-center justify-between gap-2">
+      <div className="flex items-center justify-between gap-2 h-8">
         <Label className="text-sm text-muted-foreground">{label}：</Label>
         {value && (
           <CopyToClipboard text={value as string} onCopy={handleCopy}>
diff --git a/web/src/components/main-config-card.tsx b/web/src/components/main-config-card.tsx
index be0559d8..72d7403a 100644
--- a/web/src/components/main-config-card.tsx
+++ b/web/src/components/main-config-card.tsx
@@ -282,7 +282,7 @@ export function MainConfigCard({
         }}
         className="w-full"
       >
-        <div className="relative bg-muted rounded-lg mb-4">
+        <div className="relative bg-muted rounded-lg">
           <TabsList className="flex flex-wrap gap-1 w-full bg-transparent tabs-list">
             {shellTools.map((shellTool) => (
               <TabsTrigger
diff --git a/web/src/components/results/agent.tsx b/web/src/components/results/agent.tsx
index 9cce853a..c014bd0e 100644
--- a/web/src/components/results/agent.tsx
+++ b/web/src/components/results/agent.tsx
@@ -1,6 +1,6 @@
 import { downloadBytes } from "@/lib/utils";
 import { GenerateResult } from "@/types/shell";
-import { Separator } from "@radix-ui/react-dropdown-menu";
+import { Separator } from "../ui/separator";
 import { ScrollTextIcon } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { Button } from "../ui/button";
diff --git a/web/src/components/results/basic-info.tsx b/web/src/components/results/basic-info.tsx
index e3ea4e02..b100ceed 100644
--- a/web/src/components/results/basic-info.tsx
+++ b/web/src/components/results/basic-info.tsx
@@ -4,15 +4,17 @@ import {
   CommandShellToolConfig,
   GenerateResult,
   GodzillaShellToolConfig,
+  NeoreGeorgShellToolConfig,
+  ShellToolType,
   Suo5ShellToolConfig,
 } from "@/types/shell";
-import { Separator } from "@radix-ui/react-dropdown-menu";
 import { FileTextIcon } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { Fragment } from "react/jsx-runtime";
 import { CopyableField } from "../copyable-field";
 import { Card, CardContent, CardHeader, CardTitle } from "../ui/card";
 import { FeedbackAlert } from "./feedback-alert";
+import { Separator } from "../ui/separator";
 
 export function BasicInfo({ generateResult }: { generateResult?: GenerateResult }) {
   const { t } = useTranslation();
@@ -39,88 +41,90 @@ export function BasicInfo({ generateResult }: { generateResult?: GenerateResult
           />
         </div>
         <Separator className="my-2" />
-
-        {(generateResult?.shellConfig.shellTool === "Behinder" ||
-          generateResult?.shellConfig.shellTool === "Godzilla" ||
-          generateResult?.shellConfig.shellTool === "Command" ||
-          generateResult?.shellConfig.shellTool === "AntSword" ||
-          generateResult?.shellConfig.shellTool === "Suo5") && (
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
-            {/* Tool-specific fields */}
-            {generateResult?.shellConfig.shellTool === "Behinder" && (
-              <>
-                <CopyableField label={t("shellToolConfig.behinderScriptType")} text="jsp" />
-                <CopyableField
-                  label={t("shellToolConfig.behinderEncryptType")}
-                  text={t("shellToolConfig.behinderDefaultEncryptType")}
-                />
-                <CopyableField
-                  label={t("shellToolConfig.behinderPass")}
-                  text={(generateResult?.shellToolConfig as BehinderShellToolConfig).pass}
-                  value={(generateResult?.shellToolConfig as BehinderShellToolConfig).pass}
-                />
-                <CopyableField
-                  label={t("shellToolConfig.customHeader")}
-                  text={`${(generateResult?.shellToolConfig as BehinderShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as BehinderShellToolConfig).headerValue}`}
-                  value={`${(generateResult?.shellToolConfig as BehinderShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as BehinderShellToolConfig).headerValue}`}
-                />
-              </>
-            )}
-            {generateResult?.shellConfig.shellTool === "Godzilla" && (
-              <Fragment>
-                <CopyableField
-                  label={t("shellToolConfig.pass")}
-                  text={(generateResult?.shellToolConfig as GodzillaShellToolConfig).pass}
-                  value={(generateResult?.shellToolConfig as GodzillaShellToolConfig).pass}
-                />
-                <CopyableField
-                  label={t("shellToolConfig.key")}
-                  text={(generateResult?.shellToolConfig as GodzillaShellToolConfig).key}
-                  value={(generateResult?.shellToolConfig as GodzillaShellToolConfig).key}
-                />
-                <CopyableField label={t("shellToolConfig.godzillaPayload")} text="JavaDynamicPayload" />
-                <CopyableField label={t("shellToolConfig.godzillaEncryptor")} text="JAVA_AES_BASE64" />
-                <CopyableField
-                  label={t("shellToolConfig.godzillaHeader")}
-                  text={`${(generateResult?.shellToolConfig as GodzillaShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as GodzillaShellToolConfig).headerValue}`}
-                  value={`${(generateResult?.shellToolConfig as GodzillaShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as GodzillaShellToolConfig).headerValue}`}
-                />
-              </Fragment>
-            )}
-            {generateResult?.shellConfig.shellTool === "Command" && (
-              <Fragment>
-                <CopyableField
-                  label={t("shellToolConfig.paramName")}
-                  text={(generateResult?.shellToolConfig as CommandShellToolConfig).paramName}
-                  value={(generateResult?.shellToolConfig as CommandShellToolConfig).paramName}
-                />
-              </Fragment>
-            )}
-            {generateResult?.shellConfig.shellTool === "Suo5" && (
-              <Fragment>
-                <CopyableField
-                  label={t("shellToolConfig.suo5Header")}
-                  text={`${(generateResult?.shellToolConfig as Suo5ShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as Suo5ShellToolConfig).headerValue}`}
-                  value={`${(generateResult?.shellToolConfig as Suo5ShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as Suo5ShellToolConfig).headerValue}`}
-                />
-              </Fragment>
-            )}
-            {generateResult?.shellConfig.shellTool === "AntSword" && (
-              <Fragment>
-                <CopyableField
-                  label={t("shellToolConfig.antSwordPass")}
-                  text={(generateResult?.shellToolConfig as AntSwordShellToolConfig).pass}
-                  value={(generateResult?.shellToolConfig as AntSwordShellToolConfig).pass}
-                />
-                <CopyableField
-                  label={t("shellToolConfig.httpHeader")}
-                  text={`${(generateResult?.shellToolConfig as AntSwordShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as AntSwordShellToolConfig).headerValue}`}
-                  value={`${(generateResult?.shellToolConfig as AntSwordShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as AntSwordShellToolConfig).headerValue}`}
-                />
-              </Fragment>
-            )}
-          </div>
-        )}
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
+          {generateResult?.shellConfig.shellTool === ShellToolType.Behinder && (
+            <>
+              <CopyableField label={t("shellToolConfig.behinderScriptType")} text="jsp" />
+              <CopyableField
+                label={t("shellToolConfig.behinderEncryptType")}
+                text={t("shellToolConfig.behinderDefaultEncryptType")}
+              />
+              <CopyableField
+                label={t("shellToolConfig.behinderPass")}
+                text={(generateResult?.shellToolConfig as BehinderShellToolConfig).pass}
+                value={(generateResult?.shellToolConfig as BehinderShellToolConfig).pass}
+              />
+              <CopyableField
+                label={t("shellToolConfig.customHeader")}
+                text={`${(generateResult?.shellToolConfig as BehinderShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as BehinderShellToolConfig).headerValue}`}
+                value={`${(generateResult?.shellToolConfig as BehinderShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as BehinderShellToolConfig).headerValue}`}
+              />
+            </>
+          )}
+          {generateResult?.shellConfig.shellTool === ShellToolType.Godzilla && (
+            <Fragment>
+              <CopyableField
+                label={t("shellToolConfig.pass")}
+                text={(generateResult?.shellToolConfig as GodzillaShellToolConfig).pass}
+                value={(generateResult?.shellToolConfig as GodzillaShellToolConfig).pass}
+              />
+              <CopyableField
+                label={t("shellToolConfig.key")}
+                text={(generateResult?.shellToolConfig as GodzillaShellToolConfig).key}
+                value={(generateResult?.shellToolConfig as GodzillaShellToolConfig).key}
+              />
+              <CopyableField label={t("shellToolConfig.godzillaPayload")} text="JavaDynamicPayload" />
+              <CopyableField label={t("shellToolConfig.godzillaEncryptor")} text="JAVA_AES_BASE64" />
+              <CopyableField
+                label={t("shellToolConfig.godzillaHeader")}
+                text={`${(generateResult?.shellToolConfig as GodzillaShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as GodzillaShellToolConfig).headerValue}`}
+                value={`${(generateResult?.shellToolConfig as GodzillaShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as GodzillaShellToolConfig).headerValue}`}
+              />
+            </Fragment>
+          )}
+          {generateResult?.shellConfig.shellTool === ShellToolType.Command && (
+            <Fragment>
+              <CopyableField
+                label={t("shellToolConfig.paramName")}
+                text={(generateResult?.shellToolConfig as CommandShellToolConfig).paramName}
+                value={(generateResult?.shellToolConfig as CommandShellToolConfig).paramName}
+              />
+            </Fragment>
+          )}
+          {generateResult?.shellConfig.shellTool === ShellToolType.Suo5 && (
+            <Fragment>
+              <CopyableField
+                label={t("shellToolConfig.suo5Header")}
+                text={`${(generateResult?.shellToolConfig as Suo5ShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as Suo5ShellToolConfig).headerValue}`}
+                value={`${(generateResult?.shellToolConfig as Suo5ShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as Suo5ShellToolConfig).headerValue}`}
+              />
+            </Fragment>
+          )}
+          {generateResult?.shellConfig.shellTool === ShellToolType.AntSword && (
+            <Fragment>
+              <CopyableField
+                label={t("shellToolConfig.antSwordPass")}
+                text={(generateResult?.shellToolConfig as AntSwordShellToolConfig).pass}
+                value={(generateResult?.shellToolConfig as AntSwordShellToolConfig).pass}
+              />
+              <CopyableField
+                label={t("shellToolConfig.httpHeader")}
+                text={`${(generateResult?.shellToolConfig as AntSwordShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as AntSwordShellToolConfig).headerValue}`}
+                value={`${(generateResult?.shellToolConfig as AntSwordShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as AntSwordShellToolConfig).headerValue}`}
+              />
+            </Fragment>
+          )}
+          {generateResult?.shellConfig.shellTool === ShellToolType.NeoreGeorg && (
+            <Fragment>
+              <CopyableField label={t("shellToolConfig.neoreGeorgKey")} text="key" value="key" />
+              <CopyableField
+                label={t("shellToolConfig.neoreGeorgHeader")}
+                text={`${(generateResult?.shellToolConfig as NeoreGeorgShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as NeoreGeorgShellToolConfig).headerValue}`}
+                value={`${(generateResult?.shellToolConfig as NeoreGeorgShellToolConfig).headerName}: ${(generateResult?.shellToolConfig as NeoreGeorgShellToolConfig).headerValue}`}
+              />
+            </Fragment>
+          )}
+        </div>
         <Separator className="my-2" />
         <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
           <CopyableField
diff --git a/web/src/components/results/feedback-alert.tsx b/web/src/components/results/feedback-alert.tsx
index e9d2900a..e70a14af 100644
--- a/web/src/components/results/feedback-alert.tsx
+++ b/web/src/components/results/feedback-alert.tsx
@@ -6,7 +6,7 @@ import {
   AlertDialogDescription,
   AlertDialogTitle,
   AlertDialogTrigger,
-} from "@radix-ui/react-alert-dialog";
+} from "../ui/alert-dialog";
 import { CircleHelpIcon } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { AlertDialogFooter, AlertDialogHeader } from "../ui/alert-dialog";
diff --git a/web/src/components/results/multi-packer.tsx b/web/src/components/results/multi-packer.tsx
index 7d14642e..49bf7774 100644
--- a/web/src/components/results/multi-packer.tsx
+++ b/web/src/components/results/multi-packer.tsx
@@ -1,4 +1,4 @@
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@radix-ui/react-select";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select";
 import { TFunction } from "i18next";
 import { useEffect, useState } from "react";
 import { Fragment } from "react/jsx-runtime";
diff --git a/web/src/components/tools/antsword-tab.tsx b/web/src/components/tools/antsword-tab.tsx
index 03ea2d61..89e477f0 100644
--- a/web/src/components/tools/antsword-tab.tsx
+++ b/web/src/components/tools/antsword-tab.tsx
@@ -1,5 +1,5 @@
 import { FormSchema } from "@/types/schema";
-import { TabsContent } from "@radix-ui/react-tabs";
+import { TabsContent } from "../ui/tabs";
 import { FormProvider, UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { Card, CardContent } from "../ui/card";
diff --git a/web/src/components/tools/behinder-tab.tsx b/web/src/components/tools/behinder-tab.tsx
index 0c207d6d..8d58cddf 100644
--- a/web/src/components/tools/behinder-tab.tsx
+++ b/web/src/components/tools/behinder-tab.tsx
@@ -1,5 +1,5 @@
 import { FormSchema } from "@/types/schema";
-import { TabsContent } from "@radix-ui/react-tabs";
+import { TabsContent } from "../ui/tabs";
 import { FormProvider, UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { Card, CardContent } from "../ui/card";
diff --git a/web/src/components/tools/command-tab.tsx b/web/src/components/tools/command-tab.tsx
index c03cb9e5..9835ddf8 100644
--- a/web/src/components/tools/command-tab.tsx
+++ b/web/src/components/tools/command-tab.tsx
@@ -1,5 +1,5 @@
 import { FormSchema } from "@/types/schema";
-import { TabsContent } from "@radix-ui/react-tabs";
+import { TabsContent } from "../ui/tabs";
 import { FormProvider, UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { Card, CardContent } from "../ui/card";
diff --git a/web/src/components/tools/godzilla-tab.tsx b/web/src/components/tools/godzilla-tab.tsx
index a9ecad5b..a6bd670c 100644
--- a/web/src/components/tools/godzilla-tab.tsx
+++ b/web/src/components/tools/godzilla-tab.tsx
@@ -1,5 +1,5 @@
 import { FormSchema } from "@/types/schema";
-import { TabsContent } from "@radix-ui/react-tabs";
+import { TabsContent } from "../ui/tabs";
 import { FormProvider, UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { Card, CardContent } from "../ui/card";
diff --git a/web/src/components/tools/neoreg-tab.tsx b/web/src/components/tools/neoreg-tab.tsx
index 99308f04..29a2c2a2 100644
--- a/web/src/components/tools/neoreg-tab.tsx
+++ b/web/src/components/tools/neoreg-tab.tsx
@@ -1,5 +1,5 @@
 import { FormSchema } from "@/types/schema";
-import { TabsContent } from "@radix-ui/react-tabs";
+import { TabsContent } from "../ui/tabs";
 import { FormProvider, UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { Card, CardContent } from "../ui/card";
diff --git a/web/src/components/tools/suo5-tab.tsx b/web/src/components/tools/suo5-tab.tsx
index ba07f27c..5cb7a202 100644
--- a/web/src/components/tools/suo5-tab.tsx
+++ b/web/src/components/tools/suo5-tab.tsx
@@ -1,5 +1,5 @@
 import { FormSchema } from "@/types/schema";
-import { TabsContent } from "@radix-ui/react-tabs";
+import { TabsContent } from "../ui/tabs";
 import { FormProvider, UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { Card, CardContent } from "../ui/card";
diff --git a/web/src/i18n/en.json b/web/src/i18n/en.json
index ad0309b0..0919bea2 100644
--- a/web/src/i18n/en.json
+++ b/web/src/i18n/en.json
@@ -103,6 +103,8 @@
     "headerValue": "Header Value",
     "httpHeader": "HTTP -> HTTP HEADERS",
     "key": "Key",
+    "neoreGeorgHeader": "Custom Header",
+    "neoreGeorgKey": "Connection Key",
     "paramName": "Param Name",
     "pass": "Pass",
     "suo5Header": "AdvanceConfiguration -> Request Header"
diff --git a/web/src/i18n/zh-CN.json b/web/src/i18n/zh-CN.json
index 29101de9..aae688c8 100644
--- a/web/src/i18n/zh-CN.json
+++ b/web/src/i18n/zh-CN.json
@@ -103,6 +103,8 @@
     "headerValue": "请求头值",
     "httpHeader": "请求信息 -> HTTP HEADERS",
     "key": "密钥",
+    "neoreGeorgHeader": "自定义请求头",
+    "neoreGeorgKey": "连接密钥",
     "paramName": "请求参数",
     "pass": "密码",
     "suo5Header": "高级配置 -> 请求头"
diff --git a/web/src/types/shell.ts b/web/src/types/shell.ts
index eb489563..c7ec15f6 100644
--- a/web/src/types/shell.ts
+++ b/web/src/types/shell.ts
@@ -53,6 +53,12 @@ export interface AntSwordShellToolConfig {
   headerValue?: string;
 }
 
+export interface NeoreGeorgShellToolConfig {
+  shellClassName?: string;
+  headerName?: string;
+  headerValue?: string;
+}
+
 export interface InjectorConfig {
   injectorClassName?: string;
   classInheritance?: string;