From 27c7a7fd2b659666c082948a83997899834df96b Mon Sep 17 00:00:00 2001
From: qiwentaidi <104491549+qiwentaidi@users.noreply.github.com>
Date: Thu, 2 Jan 2025 00:28:10 +0800
Subject: [PATCH] update 2.0.0

---
 core/isic/bing.go                             |  22 +--
 core/portscan/socket.go                       |  82 --------
 core/webscan/infoscan.go                      |   3 +
 frontend/src/App.vue                          |   2 +-
 frontend/src/components/About.vue             |   7 +-
 frontend/src/components/Exp/Hikvision.vue     |   3 +-
 frontend/src/components/Sidebar.vue           |   2 +-
 frontend/src/components/Titlebar.vue          |   2 +-
 frontend/src/components/Update.vue            |   2 +-
 frontend/src/config.ts                        |   5 +-
 frontend/src/i18n/zh_CN.ts                    |   2 +-
 frontend/src/linkage/index.ts                 |   2 +-
 frontend/src/main.ts                          |   2 +-
 frontend/src/{global => stores}/index.ts      |   2 +-
 frontend/src/stores/interface.ts              |  12 --
 frontend/src/stores/style.ts                  |   2 +-
 frontend/src/style/dark.css                   |   4 +
 frontend/src/util.ts                          |   8 +-
 frontend/src/views/AppStarter.vue             |   2 +-
 frontend/src/views/Asset/Company.vue          |   2 +-
 frontend/src/views/Asset/ISICollection.vue    |   2 +-
 frontend/src/views/Asset/Subdomain.vue        |   4 +-
 frontend/src/views/Permeation/Dirsearch.vue   |   2 +-
 frontend/src/views/Permeation/Jsfinder.vue    |   6 +-
 frontend/src/views/Permeation/Webscan.vue     |  66 +++----
 frontend/src/views/PocManagement.vue          |   2 +-
 frontend/src/views/Settings.vue               |   5 +-
 frontend/src/views/SpaceEngine/AgentPool.vue  |   2 +-
 frontend/src/views/SpaceEngine/FOFA.vue       |   6 +-
 frontend/src/views/SpaceEngine/Hunter.vue     |   6 +-
 .../src/views/SpaceEngine/Polymerization.vue  |   2 +-
 frontend/src/views/SpaceEngine/Quake.vue      |   6 +-
 frontend/src/views/Tools/DataHanding.vue      | 176 +++++++++++++-----
 frontend/src/views/Tools/ExtractDbInfo.vue    |   2 +-
 frontend/src/views/Tools/Memo.vue             |   2 +-
 frontend/wailsjs/go/services/Database.d.ts    |   2 +
 frontend/wailsjs/go/services/Database.js      |   4 +
 services/database.go                          |  36 ++++
 38 files changed, 263 insertions(+), 236 deletions(-)
 delete mode 100644 core/portscan/socket.go
 rename frontend/src/{global => stores}/index.ts (98%)

diff --git a/core/isic/bing.go b/core/isic/bing.go
index af55fdb7..d8aaaf21 100644
--- a/core/isic/bing.go
+++ b/core/isic/bing.go
@@ -2,36 +2,20 @@ package isic
 
 import (
 	"bytes"
-	"net/http"
+	"fmt"
 	"slack-wails/lib/clients"
 	"strings"
 
 	"github.com/PuerkitoBio/goquery"
 )
 
-// 根据网络环境，选择www.bing.com 还是cn.bing.com
-
-func chooseBingEnvironment() (string, error) {
-	resp, _, err := clients.NewSimpleGetRequest("https://www.bing.com", clients.NotFollowClient())
-	if err != nil || resp == nil {
-		return "", err
-	}
-	if resp.StatusCode == http.StatusFound {
-		return "https://cn.bing.com", nil
-	}
-	return "https://www.bing.com", nil
-}
-
 func BingSearch(query string) (string, error) {
-	bingUrl, err := chooseBingEnvironment()
-	if err != nil {
-		return "", err
-	}
-	link := bingUrl + "/search?q=site%3a+" + strings.TrimSpace(query)
+	link := "https://www.bing.com/search?q=site%3a+" + strings.TrimSpace(query)
 	_, body, err := clients.NewSimpleGetRequest(link, clients.DefaultClient())
 	if err != nil {
 		return "请求失败", err
 	}
+	fmt.Printf("string(body): %v\n", string(body))
 	doc, err := goquery.NewDocumentFromReader(bytes.NewReader(body))
 	if err != nil {
 		return "解析网站失败", err
diff --git a/core/portscan/socket.go b/core/portscan/socket.go
deleted file mode 100644
index c5863c60..00000000
--- a/core/portscan/socket.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// https://github.com/chainreactors/gogo/blob/master/v2/pkg/socket.go
-package portscan
-
-import (
-	"net"
-	"time"
-)
-
-func NewSocket(network, target string, delay int) (*Socket, error) {
-	s := &Socket{
-		Timeout: time.Duration(delay) * time.Second,
-	}
-	var conn net.Conn
-	var err error
-	if ProxyDialTimeout != nil {
-		conn, err = ProxyDialTimeout(network, target, s.Timeout)
-	} else {
-		conn, err = net.DialTimeout(network, target, s.Timeout)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	s.Conn = conn
-	return s, nil
-}
-
-type Socket struct {
-	Conn    net.Conn
-	Count   int
-	Timeout time.Duration
-}
-
-func (s *Socket) Read(timeout int) ([]byte, error) {
-	buf := make([]byte, 16384)
-	s.Conn.SetReadDeadline(time.Now().Add(time.Duration(timeout) * time.Second))
-	n, err := s.Conn.Read(buf)
-	if err != nil {
-		return nil, err
-	}
-	return buf[:n], nil
-}
-
-func (s *Socket) Request(data []byte, max int) ([]byte, error) {
-	_ = s.Conn.SetDeadline(time.Now().Add(s.Timeout))
-	var err error
-	_, err = s.Conn.Write(data)
-	if err != nil {
-		return []byte{}, err
-	}
-	s.Count++
-	buf := make([]byte, max)
-	time.Sleep(time.Duration(500) * time.Millisecond)
-	n, err := s.Conn.Read(buf)
-	if err != nil {
-		return []byte{}, err
-	}
-	return buf[:n], err
-}
-
-func (s *Socket) QuickRequest(data []byte, max int) ([]byte, error) {
-	// read small data, without wait for 500ms
-	_ = s.Conn.SetDeadline(time.Now().Add(s.Timeout))
-	var err error
-	_, err = s.Conn.Write(data)
-	if err != nil {
-		return []byte{}, err
-	}
-	s.Count++
-	buf := make([]byte, max)
-	n, err := s.Conn.Read(buf)
-	if err != nil {
-		return []byte{}, err
-	}
-	return buf[:n], err
-}
-
-func (s *Socket) Close() error {
-	return s.Conn.Close()
-}
-
-var ProxyDialTimeout func(network, address string, timeout time.Duration) (net.Conn, error)
diff --git a/core/webscan/infoscan.go b/core/webscan/infoscan.go
index 9d5c7ece..a6f29641 100644
--- a/core/webscan/infoscan.go
+++ b/core/webscan/infoscan.go
@@ -320,6 +320,9 @@ func (s *FingerScanner) NewActiveFingerScan(rootPath bool) {
 				Title:        ti.Title,
 				Fingerprints: []string{fp.Fpe[0].ProductName},
 				Detect:       "Active",
+				Port:         ti.StatusCode,
+				Scheme:       fp.URL.Scheme,
+				Host:         fp.URL.Host,
 			}
 		}
 	})
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 423b7b07..20a8144e 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { onMounted, computed } from "vue";
-import global from "./global";
+import global from "./stores";
 import Sidebar from "./components/Sidebar.vue";
 import Titlebar from "./components/Titlebar.vue";
 import { EventsOn } from "wailsjs/runtime/runtime";
diff --git a/frontend/src/components/About.vue b/frontend/src/components/About.vue
index 566413ad..832100ae 100644
--- a/frontend/src/components/About.vue
+++ b/frontend/src/components/About.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { BrowserOpenURL } from "wailsjs/runtime/runtime";
-import global from "@/global"
+import global from "@/stores"
 const wikiAddress = "https://github.com/qiwentaidi/Slack/wiki/%E6%9B%B4%E6%96%B0%E6%97%A5%E5%BF%97"
 const projectAddress = "https://github.com/qiwentaidi/Slack/"
 const issueAddress = "https://github.com/qiwentaidi/Slack/issues/new"
@@ -24,6 +24,11 @@ const issueAddress = "https://github.com/qiwentaidi/Slack/issues/new"
         $t('aside.update_log') }}</el-link>
         </div>
         <div></div>
+        <span>相关工具</span>
+        <el-descriptions direction="vertical" :column="1" border>
+            <el-descriptions-item label="Slack webscan cli">https://github.com/qiwentaidi/initial</el-descriptions-item>
+            <el-descriptions-item label="A chrome-extension for website fingerprint extraction">https://github.com/qiwentaidi/LuckyCat</el-descriptions-item>
+        </el-descriptions>
         <div></div>
         <span>联系我们</span>
         <img src="@/assets/icon/wechat.png" style="height: 208px;">
diff --git a/frontend/src/components/Exp/Hikvision.vue b/frontend/src/components/Exp/Hikvision.vue
index 852db20a..7a9ff464 100644
--- a/frontend/src/components/Exp/Hikvision.vue
+++ b/frontend/src/components/Exp/Hikvision.vue
@@ -56,7 +56,6 @@ import { Close, Picture, Upload } from '@element-plus/icons-vue';
 import { HikvsionCamera } from 'wailsjs/go/services/App';
 import { FormatWebURL, getProxy } from '@/util';
 import { FileDialog, ReadFile } from 'wailsjs/go/services/File';
-import { File } from '@/stores/interface';
 import { ElMessage } from 'element-plus';
 import async from 'async';
 
@@ -127,7 +126,7 @@ async function uploadFile() {
     if (!path) {
         return
     }
-    let file: File = await ReadFile(path)
+    let file = await ReadFile(path)
     if (file.Error) {
         ElMessage.warning(file.Message)
         return
diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index 50e8772d..8d90b1ff 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Refresh, Setting } from "@element-plus/icons-vue";
 import updateUI from "./Update.vue";
-import global from "@/global/index";
+import global from "@/stores";
 import menus from "@/router/menu";
 import pocIcon from '@/assets/icon/pocmanagement.svg'
 
diff --git a/frontend/src/components/Titlebar.vue b/frontend/src/components/Titlebar.vue
index adfd0e5e..a72b631e 100644
--- a/frontend/src/components/Titlebar.vue
+++ b/frontend/src/components/Titlebar.vue
@@ -2,7 +2,7 @@
 import { Close, Minus, Back, Right, RefreshRight } from '@element-plus/icons-vue';
 import { Quit, WindowMinimise, WindowReload, WindowToggleMaximise } from "wailsjs/runtime/runtime";
 import { IsMacOS } from "wailsjs/go/services/File";
-import global from "@/global";
+import global from "@/stores";
 import { useRoute } from "vue-router";
 import { ref, computed, onMounted } from "vue";
 import updateUI from "./Update.vue";
diff --git a/frontend/src/components/Update.vue b/frontend/src/components/Update.vue
index 0f71b19d..52daeba0 100644
--- a/frontend/src/components/Update.vue
+++ b/frontend/src/components/Update.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Download } from "@element-plus/icons-vue";
-import global from "@/global"
+import global from "@/stores"
 import { UpdatePocFile, DownloadLastestClient, Restart, IsMacOS } from "wailsjs/go/services/File";
 import { ElMessageBox, ElNotification } from "element-plus";
 import { onMounted, h } from "vue";
diff --git a/frontend/src/config.ts b/frontend/src/config.ts
index 5f16bca3..55114e55 100644
--- a/frontend/src/config.ts
+++ b/frontend/src/config.ts
@@ -1,9 +1,8 @@
 import { CheckFileStat, InitConfig, ReadFile, RemoveOldConfig, SaveDataToFile, ReadLocalStore } from 'wailsjs/go/services/File';
 import { ElLoading, ElNotification } from 'element-plus';
-import global from "./global";
+import global from "./stores";
 import { compareVersion, ReadLine, sleep } from './util';
 import router from "./router";
-import { File } from "./stores/interface";
 import { CreateTable } from 'wailsjs/go/services/Database';
 import { crackDict } from './stores/options';
 
@@ -33,7 +32,7 @@ export async function InitConfigFile(timeout: number) {
     let result = await InitConfig();
     catchError(result, loading)
   } else {
-    let result: File = await ReadFile(global.PATH.homedir + global.PATH.LocalPocVersionFile)
+    let result = await ReadFile(global.PATH.homedir + global.PATH.LocalPocVersionFile)
     global.UPDATE.LocalPocVersion = result.Content!
     if (!global.UPDATE.LocalPocVersion || compareVersion(global.UPDATE.LocalPocVersion, "0.0.4") != 1) {
       await RemoveOldConfig();
diff --git a/frontend/src/i18n/zh_CN.ts b/frontend/src/i18n/zh_CN.ts
index a5109d3d..90b4fc03 100644
--- a/frontend/src/i18n/zh_CN.ts
+++ b/frontend/src/i18n/zh_CN.ts
@@ -3,7 +3,7 @@ export default {
         'slogan': "安服集成化工具平台，希望能让你少开几个应用测试",
         'home': '首页',
         'penetration': '渗透测试',
-        'webscan': '网站扫描',
+        'webscan': '漏洞扫描',
         'portscan': '端口扫描',
         'dirscan': '目录扫描',
         'pocdetail': '漏洞详情',
diff --git a/frontend/src/linkage/index.ts b/frontend/src/linkage/index.ts
index fb5062e2..be4646e3 100644
--- a/frontend/src/linkage/index.ts
+++ b/frontend/src/linkage/index.ts
@@ -1,5 +1,5 @@
 import { Callgologger, LoadDirsearchDict, DirScan, HunterSearch, Subdomain, FofaSearch } from 'wailsjs/go/services/App'
-import global from '@/global'
+import global from '@/stores'
 import { ElMessage, ElNotification } from 'element-plus';
 import { dirsearch, structs } from 'wailsjs/go/models';
 import { getRootDomain } from '@/util';
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index ca5c3f48..8b538404 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -10,7 +10,7 @@ import "element-plus/theme-chalk/el-message-box.css";
 import "element-plus/theme-chalk/el-notification.css";
 import 'element-plus/theme-chalk/el-loading.css'
 import * as ElementPlusIconsVue from "@element-plus/icons-vue";
-import global from "./global";
+import global from "./stores";
 import "./style/dark.css"
 import "./style/light.css"
 //引入依赖和语言
diff --git a/frontend/src/global/index.ts b/frontend/src/stores/index.ts
similarity index 98%
rename from frontend/src/global/index.ts
rename to frontend/src/stores/index.ts
index 0bfac16e..aece6dce 100644
--- a/frontend/src/global/index.ts
+++ b/frontend/src/stores/index.ts
@@ -59,7 +59,7 @@ const Logger = reactive({
     length: 100, // 日志显示条数
 })
 
-const LOCAL_VERSION = "1.7.7"
+const LOCAL_VERSION = "2.0.0"
 
 const Language = ref("zh")
 const Theme = ref(false)
diff --git a/frontend/src/stores/interface.ts b/frontend/src/stores/interface.ts
index a6ca8bc8..92fb4364 100644
--- a/frontend/src/stores/interface.ts
+++ b/frontend/src/stores/interface.ts
@@ -22,13 +22,6 @@ export interface QuakeTableTabs {
     message: string;
 }
 
-export interface PortScanData {
-    IP: string;
-    Port: number;
-    Server: string;
-    Link: string;
-}
-
 export interface Dir {
     Status: number;
     URL: string;
@@ -59,11 +52,6 @@ export interface Results {
     ICP: string;
 }
 
-export interface File {
-    Error?: boolean;
-    Message?: string;
-    Content?: string;
-}
 
 export interface HunterEntryTips {
     value: string;
diff --git a/frontend/src/stores/style.ts b/frontend/src/stores/style.ts
index 91be4118..0f518adf 100644
--- a/frontend/src/stores/style.ts
+++ b/frontend/src/stores/style.ts
@@ -1,5 +1,5 @@
 import { computed } from 'vue'
-import global from '@/global';
+import global from '@/stores';
 
 export const titlebarStyle = computed(() => {
     return global.Theme.value ? {
diff --git a/frontend/src/style/dark.css b/frontend/src/style/dark.css
index b92c8665..7822ab72 100644
--- a/frontend/src/style/dark.css
+++ b/frontend/src/style/dark.css
@@ -12,6 +12,10 @@ html.dark {
         color: #CF364C;
     }
 
+    .el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
+        border-bottom-color: #1D1E1F;
+    }
+
     .el-result:hover {
         cursor: pointer;
         background-color: #3c3c3c;
diff --git a/frontend/src/util.ts b/frontend/src/util.ts
index 5fb8ff09..b3ec41f6 100644
--- a/frontend/src/util.ts
+++ b/frontend/src/util.ts
@@ -1,5 +1,5 @@
 import { ElMessage, ElNotification } from "element-plus";
-import global from "./global";
+import global from "./stores";
 import { Callgologger, CheckTarget, GoFetch, NetDial, Socks5Conn } from "wailsjs/go/services/App";
 import { CheckFileStat, FileDialog, ReadFile, RemoveOldClient } from "wailsjs/go/services/File";
 import Loading from "./components/Loading.vue";
@@ -56,11 +56,7 @@ function isEmpty(obj: string) {
     return true;
   }
   return false;
-}
-
-export function CopyALL(filed: string[]) {
-  Copy(filed.join("\n"));
-}
+} 
 
 // Function to process the input target in the text area
 // 处理文本域的目标输入
diff --git a/frontend/src/views/AppStarter.vue b/frontend/src/views/AppStarter.vue
index eb645ba1..11a23637 100644
--- a/frontend/src/views/AppStarter.vue
+++ b/frontend/src/views/AppStarter.vue
@@ -16,7 +16,7 @@ import itermIcon from '@/assets/icon/iterm.svg'
 import chromeIcon from '@/assets/icon/chrome.svg'
 import buttonIcon from '@/assets/icon/button.svg'
 import gridIcon from '@/assets/icon/grid.svg'
-import global from "@/global";
+import global from "@/stores";
 import { structs } from "wailsjs/go/models";
 
 
diff --git a/frontend/src/views/Asset/Company.vue b/frontend/src/views/Asset/Company.vue
index b8700941..160fb7a0 100644
--- a/frontend/src/views/Asset/Company.vue
+++ b/frontend/src/views/Asset/Company.vue
@@ -7,7 +7,7 @@ import { ExportAssetToXlsx } from '@/export'
 import usePagination from "@/usePagination";
 import { Copy, getRootDomain, transformArrayFields } from "@/util";
 import exportIcon from '@/assets/icon/doucment-export.svg'
-import global from "@/global";
+import global from "@/stores";
 import { LinkSubdomain } from "@/linkage";
 import throttle from 'lodash/throttle';
 import CustomTabs from "@/components/CustomTabs.vue";
diff --git a/frontend/src/views/Asset/ISICollection.vue b/frontend/src/views/Asset/ISICollection.vue
index e1eefff3..c09cd079 100644
--- a/frontend/src/views/Asset/ISICollection.vue
+++ b/frontend/src/views/Asset/ISICollection.vue
@@ -83,7 +83,7 @@
 </template>
 
 <script lang="ts" setup>
-import global from '@/global';
+import global from '@/stores';
 import { ISICResult } from '@/stores/interface';
 import usePagination from '@/usePagination';
 import { sleep, ProcessTextAreaInput } from '@/util';
diff --git a/frontend/src/views/Asset/Subdomain.vue b/frontend/src/views/Asset/Subdomain.vue
index d6810f85..decfaf9a 100644
--- a/frontend/src/views/Asset/Subdomain.vue
+++ b/frontend/src/views/Asset/Subdomain.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import global from "@/global";
+import global from "@/stores";
 import { Copy, ReadLine, transformArrayFields } from '@/util'
 import { ExportToXlsx } from '@/export'
 import { reactive, ref, onMounted } from "vue";
@@ -340,7 +340,7 @@ const handleCheckAllChange = (val: boolean) => {
         </el-form>
     </el-drawer>
     <el-dialog v-model="usefulDialog" title="使用须知">
-        <el-descriptions title="" direction="vertical" :column="4" border>
+        <el-descriptions direction="vertical" :column="4" border>
             <template #title>
                 <span>下面为各API查询页码及积分获取情况，优先推荐配置Chaos，注册链接可在设置中查看</span>
                 <el-tag style="margin-block: 5px;">FOFA、Quake、Hunter默认不参与测绘，需要在设置中手动开启</el-tag>
diff --git a/frontend/src/views/Permeation/Dirsearch.vue b/frontend/src/views/Permeation/Dirsearch.vue
index e857983e..fc5abf7b 100644
--- a/frontend/src/views/Permeation/Dirsearch.vue
+++ b/frontend/src/views/Permeation/Dirsearch.vue
@@ -6,7 +6,7 @@ import { ElMessage, ElNotification } from 'element-plus'
 import { BrowserOpenURL, EventsOn, EventsOff } from 'wailsjs/runtime'
 import { QuestionFilled, RefreshRight, Document, FolderOpened, DocumentCopy, ChromeFilled, Reading, Setting } from '@element-plus/icons-vue';
 import { onMounted } from 'vue';
-import global from '@/global';
+import global from '@/stores';
 import { CheckFileStat, FileDialog, List, OpenFolder } from 'wailsjs/go/services/File';
 import { Dir } from '@/stores/interface';
 import usePagination from '@/usePagination';
diff --git a/frontend/src/views/Permeation/Jsfinder.vue b/frontend/src/views/Permeation/Jsfinder.vue
index e2b643a1..1a3433ce 100644
--- a/frontend/src/views/Permeation/Jsfinder.vue
+++ b/frontend/src/views/Permeation/Jsfinder.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
 import { reactive, ref, h } from 'vue';
-import { Copy, CopyALL, FormatWebURL } from '@/util';
+import { Copy, FormatWebURL } from '@/util';
 import { JSFind } from 'wailsjs/go/services/App';
 import { QuestionFilled, Search, DocumentCopy, ChromeFilled } from '@element-plus/icons-vue';
 import async from 'async';
-import global from "@/global";
+import global from "@/stores";
 import { ElNotification, ElMessage } from 'element-plus';
 import { BrowserOpenURL } from 'wailsjs/runtime/runtime';
 import ContextMenu from '@imengyu/vue3-context-menu'
@@ -234,7 +234,7 @@ function onContextMenu(e: MouseEvent, data: any) {
             <span style="font-weight: bold; margin-right: 5px;">{{ item.title }}: {{ getLength(item.data.value)
               }}</span>
           </div>
-          <el-button round type="primary" size="small" @click="CopyALL(item.data.value.map(item => item.Filed))">Copy
+          <el-button round type="primary" size="small" @click="Copy((item.data.value.map(item => item.Filed).join('\n')))">Copy
             ALL</el-button>
         </div>
         <!-- CONTENT -->
diff --git a/frontend/src/views/Permeation/Webscan.vue b/frontend/src/views/Permeation/Webscan.vue
index ebe29e18..6f4a9be1 100644
--- a/frontend/src/views/Permeation/Webscan.vue
+++ b/frontend/src/views/Permeation/Webscan.vue
@@ -8,7 +8,7 @@ import {
 import { InitRule, FingerprintList, NewWebScanner, GetFingerPocMap, ExitScanner, ViewPictrue, Callgologger, IPParse, SpaceGetPort, IsRoot, PortParse, HostAlive, NewSynScanner, NewTcpScanner, PortBrute } from 'wailsjs/go/services/App'
 import { ElMessage, ElMessageBox, ElNotification } from 'element-plus';
 import { TestProxy, Copy, UploadFileAndRead, generateRandomString, ProcessTextAreaInput, getProxy, ReadLine } from '@/util'
-import global from "@/global"
+import global from "@/stores"
 import { BrowserOpenURL, EventsOn, EventsOff } from 'wailsjs/runtime/runtime';
 import usePagination from '@/usePagination';
 import { LinkFOFA, LinkHunter } from '@/linkage';
@@ -23,7 +23,8 @@ import {
     RemovePocscanResult, RemoveScanTask, ExportWebReportWithHtml,
     ExportWebReportWithJson, RetrieveAllScanTasks, AddFingerscanResult,
     AddPocscanResult, AddScanTask, ReadWebReportWithJson, RenameScanTask,
-    RetrieveFingerscanResults, RetrievePocscanResults, UpdateScanTaskWithResults
+    RetrieveFingerscanResults, RetrievePocscanResults, UpdateScanTaskWithResults,
+    RemoveFingerprintResult
 } from 'wailsjs/go/services/Database';
 import saveIcon from '@/assets/icon/save.svg'
 import githubIcon from '@/assets/icon/github.svg'
@@ -76,10 +77,6 @@ const param = reactive({
     hostFilter: '',
 })
 
-function handleInputTypeChange(val: any) {
-    if (param.inputType != 'URL') config.webscanOption = 0
-}
-
 function updatePorts(index: number) {
     if (index >= 0 && index < portGroupOptions.length) {
         form.portlist = portGroupOptions[index].value;
@@ -387,15 +384,23 @@ class Engine {
             this.inputLines = fp.table.result.filter(
                 (line) => line.Scheme === "http" || line.Scheme === "https"
             ).map(item => item.URL);
+
             // 对web服务先去提取再去除，之后扫描
-            updateActivities({
-                content: "Extracting and removing webpage activity detection information, totaling: " + this.inputLines.length.toString() + ", followed by fingerprint detection",
-                timestamp: (new Date()).toTimeString()
-            })
-            fp.table.result = fp.table.result.filter(
-                (line) => line.Scheme !== "http" && line.Scheme !== "https"
-            );
-            fp.ctrl.watchResultChange(fp.table)
+            if (this.inputLines.length != 0) {
+                updateActivities({
+                    content: "Extracting and removing webpage activity detection information, totaling: " + this.inputLines.length.toString() + ", followed by fingerprint detection",
+                    timestamp: (new Date()).toTimeString()
+                })
+                fp.table.result = fp.table.result.filter(
+                    (line) => line.Scheme !== "http" && line.Scheme !== "https"
+                );
+                fp.ctrl.watchResultChange(fp.table)
+                if (config.writeDB) {
+                    RemoveFingerprintResult(form.taskId, this.inputLines)
+                }
+            }
+            // 设置后续的扫描类型
+            config.webscanOption = 2
         }
         // 每个阶段任务前检查是否为退出状态
         if (!form.runnningStatus) {
@@ -433,7 +438,7 @@ class Engine {
             AppendTemplateFolder: global.webscan.append_pocfile,
         }
         updateActivities({
-            content: "Loading webscan engine",
+            content: "Loading webscan engine, current mode: " + config.webscanOption.toString(),
             timestamp: (new Date()).toTimeString()
         })
         await NewWebScanner(options, {
@@ -452,8 +457,8 @@ class Engine {
             form.runnningStatus = false
             return
         }
-         // 每个阶段任务前检查是否为退出状态
-         if (!form.runnningStatus) {
+        // 每个阶段任务前检查是否为退出状态
+        if (!form.runnningStatus) {
             return
         }
         let crackLinks = fp.table.result.filter(
@@ -497,10 +502,10 @@ class Engine {
             }
             let protocol = target.split("://")[0]
             userDict = crackDict.usernames.find(item => item.name.toLocaleLowerCase() === protocol)?.dic!
-            Callgologger("info", target + " is start brute")
+            Callgologger("info", target + " is start weak password cracking")
             await PortBrute(target, userDict, passDict)
         }, (err: any) => {
-            Callgologger("info", "PortBrute Finished")
+            Callgologger("info", "Crack Finished")
             updateActivities({
                 content: "All task completed",
                 timestamp: (new Date()).toTimeString(),
@@ -508,7 +513,6 @@ class Engine {
             form.runnningStatus = false
         });
     }
-
 }
 
 // 联动空间引擎
@@ -651,6 +655,8 @@ const taskManager = {
                 ElMessage.success("删除成功")
                 rp.table.result = rp.table.result.filter(item => item.TaskId != taskId)
                 rp.ctrl.watchResultChange(rp.table)
+                fp.initTable()
+                vp.initTable()
             })
             .catch(() => {
                 Callgologger("error", "[webscan] delete task failed")
@@ -956,15 +962,14 @@ function checkDictInput() {
         <el-tabs type="border-card">
             <el-tab-pane label="信息">
                 <el-table :data="fp.table.pageContent" stripe height="100vh"
-                    @selection-change="fp.ctrl.handleSelectChange" :cell-style="{ textAlign: 'center' }"
-                    :header-cell-style="{ 'text-align': 'center' }" @row-contextmenu="handleWebscanContextMenu"
-                    @sort-change="fp.ctrl.sortChange">
-                    <el-table-column fixed type="selection" width="55px" />
+                    :cell-style="{ textAlign: 'center' }" :header-cell-style="{ 'text-align': 'center' }" 
+                    @row-contextmenu="handleWebscanContextMenu" @sort-change="fp.ctrl.sortChange">
                     <el-table-column fixed prop="URL" label="Link" width="300px" />
                     <el-table-column width="150px" label="Port/Protocol" :show-overflow-tooltip="true">
                         <template #default="scope">
                             <el-tag type="primary" round effect="plain">{{ scope.row.Port }}</el-tag>
-                            <el-tag type="primary" round effect="plain" style="margin-left: 5px;">{{ scope.row.Scheme }}</el-tag>
+                            <el-tag type="primary" round effect="plain" style="margin-left: 5px;">{{ scope.row.Scheme
+                                }}</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column prop="StatusCode" width="100px" label="Code" sortable="custom"
@@ -1038,9 +1043,6 @@ function checkDictInput() {
                                 <el-button :icon="Reading" type="primary" link
                                     @click="detailDialog = true; selectedRow = scope.row" />
                             </el-tooltip>
-                            <el-tooltip content="打开漏洞链接">
-                                <el-button :icon="ChromeFilled" link @click="BrowserOpenURL(scope.row.URL)" />
-                            </el-tooltip>
                             <el-tooltip content="删除">
                                 <el-button :icon="Delete" link @click="deleteVuln(scope.row)" />
                             </el-tooltip>
@@ -1124,7 +1126,8 @@ function checkDictInput() {
                     </el-tooltip>
                 </template>
                 <el-segmented v-model="param.inputType" :options="webscanInputOptions" block
-                    @change="handleInputTypeChange" style="width: 100%; margin-bottom: 2px;" />
+                    @change="param.inputType != 'URL' ? config.webscanOption = 0 : config.crack = false"
+                     style="width: 100%; margin-bottom: 2px;" />
                 <div class="textarea-container" style="margin-block: 10px;">
                     <el-input v-model="form.input" type="textarea" :rows="6"></el-input>
                     <el-space class="action-area">
@@ -1205,9 +1208,7 @@ function checkDictInput() {
                 <el-tooltip content="启用后主动指纹只拼接根路径，否则会拼接输入的完整URL">
                     <el-checkbox label="根路径扫描" v-model="config.rootPathScan" />
                 </el-tooltip>
-                <el-tooltip content="关闭状态无指纹目标会扫全漏洞">
-                    <el-checkbox label="跳过无指纹目标漏扫" v-model="config.skipNucleiWithoutTags" />
-                </el-tooltip>
+                <el-checkbox label="无指纹目标跳过漏扫" v-model="config.skipNucleiWithoutTags" />
                 <el-checkbox label="网站截图" v-model="config.screenhost" />
             </el-form-item>
             <el-form-item label="口令暴破:" v-show="param.inputType != 'URL'">
@@ -1271,6 +1272,7 @@ function checkDictInput() {
                             <el-button :icon="form.hideResponse ? DArrowLeft : DArrowRight" link
                                 @click="form.hideResponse = !form.hideResponse" />
                             <el-button :icon="DocumentCopy" link @click="Copy(selectedRow.Request)" />
+                            <el-button :icon="ChromeFilled" link @click="BrowserOpenURL(selectedRow.URL)" />
                         </el-button-group>
                     </div>
                     <highlightjs language="http" :code="selectedRow.Request" style="font-size: small;"></highlightjs>
diff --git a/frontend/src/views/PocManagement.vue b/frontend/src/views/PocManagement.vue
index fb3033e2..bfa01af1 100644
--- a/frontend/src/views/PocManagement.vue
+++ b/frontend/src/views/PocManagement.vue
@@ -2,7 +2,7 @@
 import { watch, onMounted, onUnmounted, ref, nextTick, toRaw } from 'vue';
 import { Search, CirclePlusFilled, Delete, DocumentCopy, Reading, Edit } from "@element-plus/icons-vue";
 import { CheckFileStat, ReadFile, RemoveFile, WriteFile } from 'wailsjs/go/services/File';
-import global from '@/global';
+import global from '@/stores';
 import { FingerprintList, GetFingerPocMap } from 'wailsjs/go/services/App';
 import { Copy } from '@/util';
 import { PocDetail } from '@/stores/interface';
diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue
index 43fe4dbc..f5be01ca 100644
--- a/frontend/src/views/Settings.vue
+++ b/frontend/src/views/Settings.vue
@@ -162,13 +162,12 @@
 </template>
 
 <script lang="ts" setup>
-import global from "@/global"
+import global from "@/stores"
 import { ElMessage, MenuItemRegistered } from 'element-plus';
 import { TestProxy } from "@/util";
 import { Edit, Sunny, Moon, UserFilled } from '@element-plus/icons-vue';
 import { reactive, ref } from "vue";
 import { ReadFile, WriteFile } from "wailsjs/go/services/File";
-import { File } from '@/stores/interface';
 import { useI18n } from "vue-i18n";
 import { useDark, useToggle } from '@vueuse/core'
 import { BrowserOpenURL } from "wailsjs/runtime/runtime";
@@ -202,7 +201,7 @@ const ctrl = reactive({
 })
 
 async function ReadDict(path: string) {
-  let file: File = await ReadFile(global.PATH.homedir + global.PATH.PortBurstPath + path)
+  let file = await ReadFile(global.PATH.homedir + global.PATH.PortBurstPath + path)
   ctrl.currentDic = file.Content
 }
 
diff --git a/frontend/src/views/SpaceEngine/AgentPool.vue b/frontend/src/views/SpaceEngine/AgentPool.vue
index 6d6cfd1b..1ed3ddd0 100644
--- a/frontend/src/views/SpaceEngine/AgentPool.vue
+++ b/frontend/src/views/SpaceEngine/AgentPool.vue
@@ -5,7 +5,7 @@ import { splitInt } from '@/util'
 import { ExportTXT } from '@/export'
 import { reactive, onMounted } from 'vue';
 import { Socks5Conn, FofaSearch } from 'wailsjs/go/services/App'
-import global from "@/global"
+import global from "@/stores"
 import { SearchAgentPool, ExecSqlStatement } from 'wailsjs/go/services/Database';
 import { ElMessage } from 'element-plus';
 import CustomTabs from '@/components/CustomTabs.vue';
diff --git a/frontend/src/views/SpaceEngine/FOFA.vue b/frontend/src/views/SpaceEngine/FOFA.vue
index a34155be..e8d52547 100644
--- a/frontend/src/views/SpaceEngine/FOFA.vue
+++ b/frontend/src/views/SpaceEngine/FOFA.vue
@@ -7,7 +7,7 @@ import { ExportToXlsx } from '@/export'
 import { FofaTips, FofaSearch, IconHash, Callgologger } from 'wailsjs/go/services/App'
 import { BrowserOpenURL } from 'wailsjs/runtime'
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
-import global from "@/global"
+import global from "@/stores"
 import { InsertFavGrammarFiled, RemoveFavGrammarFiled, SelectAllSyntax } from 'wailsjs/go/services/Database';
 import exportIcon from '@/assets/icon/doucment-export.svg'
 import csegmentIcon from '@/assets/icon/csegment.svg'
@@ -404,9 +404,9 @@ function searchCsegmentIpv4(ip: string) {
                                 class="keyword-search">
                                 <el-table-column width="150" prop="Name" label="语法名称" />
                                 <el-table-column prop="Content" label="语法内容" />
-                                <el-table-column label="操作" width="100">
+                                <el-table-column label="操作" width="100" align="center">
                                     <template #default="scope">
-                                        <el-button link
+                                        <el-button type="danger" plain size="small" :icon="Delete"
                                             @click="syntax.deleteStar(scope.row.Name, scope.row.Content)">删除
                                         </el-button>
                                     </template>
diff --git a/frontend/src/views/SpaceEngine/Hunter.vue b/frontend/src/views/SpaceEngine/Hunter.vue
index d9cc5ac7..65aa6c64 100644
--- a/frontend/src/views/SpaceEngine/Hunter.vue
+++ b/frontend/src/views/SpaceEngine/Hunter.vue
@@ -5,7 +5,7 @@ import { ElNotification, ElMessage, ElMessageBox, FormInstance, FormRules } from
 import { Search, ChromeFilled, DocumentCopy, PictureRounded, Delete, Star, Collection, CollectionTag } from '@element-plus/icons-vue';
 import { splitInt, Copy, CsegmentIpv4 } from '@/util'
 import { TableTabs, HunterEntryTips } from "@/stores/interface"
-import global from "@/global"
+import global from "@/stores"
 import { FaviconMd5, HunterSearch, HunterTips } from 'wailsjs/go/services/App'
 import { InsertFavGrammarFiled, SelectAllSyntax, RemoveFavGrammarFiled } from 'wailsjs/go/services/Database'
 import { BrowserOpenURL } from 'wailsjs/runtime'
@@ -433,9 +433,9 @@ function searchCsegmentIpv4(ip: string) {
                             <el-table :data="form.syntaxData" @row-click="entry.rowClick2" class="keyword-search">
                                 <el-table-column width="150" prop="Name" label="语法名称" />
                                 <el-table-column prop="Content" label="语法内容" />
-                                <el-table-column label="操作" width="100">
+                                <el-table-column label="操作" width="100" align="center">
                                     <template #default="scope">
-                                        <el-button link type="primary"
+                                        <el-button type="danger" plain size="small" :icon="Delete"
                                             @click="syntax.deleteStar(scope.row.Name, scope.row.Content)">删除
                                         </el-button>
                                     </template>
diff --git a/frontend/src/views/SpaceEngine/Polymerization.vue b/frontend/src/views/SpaceEngine/Polymerization.vue
index a73dc017..c1ec77e7 100644
--- a/frontend/src/views/SpaceEngine/Polymerization.vue
+++ b/frontend/src/views/SpaceEngine/Polymerization.vue
@@ -90,7 +90,7 @@ import { reactive } from 'vue';
 import { Search, WarningFilled, ChromeFilled, Grid } from '@element-plus/icons-vue';
 import { Uncover } from '@/stores/interface';
 import { UncoverSearch } from 'wailsjs/go/services/App';
-import global from '@/global';
+import global from '@/stores';
 import { BrowserOpenURL } from 'wailsjs/runtime/runtime';
 import { CsegmentIpv4 } from '@/util';
 import { ExportToXlsx } from '@/export';
diff --git a/frontend/src/views/SpaceEngine/Quake.vue b/frontend/src/views/SpaceEngine/Quake.vue
index a49105aa..303ff3f1 100644
--- a/frontend/src/views/SpaceEngine/Quake.vue
+++ b/frontend/src/views/SpaceEngine/Quake.vue
@@ -84,9 +84,9 @@
                             <el-table :data="quake.syntaxData" @row-click="syntax.rowClick2" class="keyword-search">
                                 <el-table-column width="150" prop="Name" label="语法名称" />
                                 <el-table-column prop="Content" label="语法内容" />
-                                <el-table-column label="操作" width="100">
+                                <el-table-column label="操作" width="100" align="center">
                                     <template #default="scope">
-                                        <el-button link style="color: #4CA87D"
+                                        <el-button type="danger" plain size="small" :icon="Delete"
                                             @click="syntax.deleteStar(scope.row.Name, scope.row.Content)">删除
                                         </el-button>
                                     </template>
@@ -267,7 +267,7 @@ import { ExportToXlsx } from '@/export';
 import { QuakeTableTabs, QuakeTipsData } from '@/stores/interface';
 import { BrowserOpenURL } from 'wailsjs/runtime/runtime';
 import { Callgologger, FaviconMd5, QuakeSearch, QuakeTips } from 'wailsjs/go/services/App';
-import global from '@/global';
+import global from '@/stores';
 import { ElMessage, ElMessageBox, ElNotification, FormInstance } from 'element-plus';
 import { FileDialog } from 'wailsjs/go/services/File';
 import { InsertFavGrammarFiled, RemoveFavGrammarFiled, SelectAllSyntax } from 'wailsjs/go/services/Database';
diff --git a/frontend/src/views/Tools/DataHanding.vue b/frontend/src/views/Tools/DataHanding.vue
index 67e75967..894abde0 100644
--- a/frontend/src/views/Tools/DataHanding.vue
+++ b/frontend/src/views/Tools/DataHanding.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { h, reactive } from "vue";
 import { ExtractIP, IpLocation } from "wailsjs/go/services/App";
-import { UserFilled, Filter, Location, Cellphone, Postcard, Upload, DeleteFilled, Unlock, DocumentCopy } from "@element-plus/icons-vue";
+import { UserFilled, Location, Cellphone, Postcard, Upload, CloseBold, Unlock, DocumentCopy } from "@element-plus/icons-vue";
 import alibabaIcon from "@/assets/icon/alibaba.svg";
 import onlineIcon from "@/assets/icon/online.svg";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -36,7 +36,7 @@ async function processInput() {
         return false
     }
     if (form.input.startsWith("{{file://") && form.input.endsWith("}}")) {
-        let filepath = form.input.substring(8, form.input.length - 2);        
+        let filepath = form.input.substring(8, form.input.length - 2);
         let isStat = await CheckFileStat(filepath)
         if (!isStat) {
             ElMessage.warning('文件不存在!')
@@ -66,13 +66,13 @@ function handlePaste(event: any) {
     }
 }
 
-function deduplication() {
+function deduplication(input: string) {
     processInput().then(isSuccess => {
         if (!isSuccess) {
             return
         }
         let lines = [] as string[];
-        if (form.dedupSplit == "\\n") {
+        if (input == "") {
             lines = content.split(/[(\r\n)\r\n]+/); // 根据换行或者回车进行识别
         } else {
             lines = content.split(form.dedupSplit);
@@ -86,10 +86,7 @@ function deduplication() {
             });
             return;
         }
-        ElMessage.success({
-            message: `已去重数据${lines.length - uniqueArray.length}条`,
-            grouping: true,
-        });
+        form.tips = `已去重数据${lines.length - uniqueArray.length}条`,
         form.result = uniqueArray.join("\n");
     })
 }
@@ -102,18 +99,18 @@ function getDomains() {
         const urls = await ExtractURLs(content);
         const uniqueArray = Array.from(new Set(urls))
         const domains = uniqueArray
-        .map((url: string) => {
-            try {
-                const parsedUrl = new URL(url);
-                return parsedUrl.hostname;
-            } catch (e) {
+            .map((url: string) => {
+                try {
+                    const parsedUrl = new URL(url);
+                    return parsedUrl.hostname;
+                } catch (e) {
 
-            }
-        })
-        .filter((domain) => domain); // 过滤掉空字符串
+                }
+            })
+            .filter((domain) => domain); // 过滤掉空字符串
         form.result = domains.join("\n");
         form.tips = `共提取 ${domains.length} 个结果`
-    })    
+    })
 }
 
 function getURLs() {
@@ -125,7 +122,7 @@ function getURLs() {
         const uniqueArray = Array.from(new Set(urls))
         form.result = uniqueArray.join("\n");
         form.tips = `共提取 ${uniqueArray.length} 个结果`
-    })    
+    })
 }
 
 function getPhoneNumbers() {
@@ -137,7 +134,7 @@ function getPhoneNumbers() {
         const uniqueArray = Array.from(new Set(phoneNumbers))
         form.result = uniqueArray.join("\n");
         form.tips = `共提取 ${uniqueArray.length} 个结果`
-    })  
+    })
 }
 
 function getIdCards() {
@@ -149,7 +146,7 @@ function getIdCards() {
         const uniqueArray = Array.from(new Set(idcards))
         form.result = uniqueArray.join("\n");
         form.tips = `共提取 ${uniqueArray.length} 个结果`
-    }) 
+    })
 }
 
 function getAlibabaDruidWebURI() {
@@ -160,7 +157,7 @@ function getAlibabaDruidWebURI() {
         const uris = await ExtractAlibabaDruidWebURI(content);
         form.result = uris.join("\n");
         form.tips = `共提取 ${uris.length} 个结果`
-    }) 
+    })
 }
 
 function getAlibabaDruidWebSession() {
@@ -262,6 +259,87 @@ function decryptWinSCPIniContent(iniContent: string) {
     return decodedSessions;
 }
 
+/**
+ * 将包含整数列表和有效字节数信息的字典数据转换为字符串，用于处理在断点调试时无法找到字符串密钥，只有字典数据时使用
+ */
+function dataDictConvertToString(dataDict: { words: number[]; sigBytes: number }): string {
+    const { words, sigBytes } = dataDict;
+    // 验证有效字节数是否合理
+    if (sigBytes < 0) {
+        return "有效字节数不能为负数，转换操作无法进行。";
+    }
+
+    let byteSequence: Uint8Array;
+    try {
+        // 将 "words" 数组转化为字节序列
+        const buffer = new ArrayBuffer(words.length * 4);
+        const dataView = new DataView(buffer);
+
+        words.forEach((num, index) => {
+            dataView.setUint32(index * 4, num, false); // Big-endian (network byte order)
+        });
+
+        byteSequence = new Uint8Array(buffer);
+
+        // 截取实际有效字节数
+        if (sigBytes > byteSequence.length) {
+            form.tips = "指定的有效字节数超过了实际生成字节序列的长度，将按实际长度截取。"
+            byteSequence = byteSequence.slice(0, byteSequence.length);
+        } else {
+            byteSequence = byteSequence.slice(0, sigBytes);
+        }
+        // 将字节序列转化为字符串
+        return new TextDecoder("utf-8").decode(byteSequence);
+    } catch (error) {
+        if (error instanceof RangeError) {
+            return `在将整数转换为字节序列时出现错误: ${error.message}`
+        } else if (error instanceof TypeError) {
+
+            return "字节序列无法按照UTF-8编码进行解码，请检查数据来源和编码格式！"
+        } else {
+            return "发生了未知错误：" + error
+        }
+    }
+}
+
+function parseDataDict(input: string): { words: number[]; sigBytes: number } | string {
+    /**
+     * 解析前端传入的字符串形式的 dataDict
+     * 并验证其格式是否符合要求
+     */
+    try {
+        // 尝试解析 JSON 字符串
+        const parsed = JSON.parse(input);
+
+        // 检查是否包含所需的 "words" 和 "sigBytes" 字段
+        if (
+            !Array.isArray(parsed.words) ||
+            typeof parsed.sigBytes !== "number"
+        ) {
+            return "输入数据的结构不正确，应包含 'words' 数组和 'sigBytes' 数字。"
+        }
+
+        // 验证 "words" 的每个值是否为有效整数
+        for (const num of parsed.words) {
+            if (!Number.isInteger(num)) {
+                return "'words' 数组中包含无效的整数值。"
+            }
+        }
+
+        // 验证 "sigBytes" 是否为非负整数
+        if (parsed.sigBytes < 0) {
+            return "'sigBytes' 必须是非负整数。"
+        }
+
+        return {
+            words: parsed.words,
+            sigBytes: parsed.sigBytes,
+        };
+    } catch (error) {
+        return "解析失败：" + error.message
+    }
+}
+
 function handleContextMenu(e: MouseEvent) {
     //prevent the browser's default menu
     e.preventDefault();
@@ -290,7 +368,6 @@ function handleContextMenu(e: MouseEvent) {
             },
             {
                 label: "网络信息",
-                divided: true,
                 icon: h(onlineIcon, defaultIconSize),
                 children: [
                     {
@@ -304,7 +381,7 @@ function handleContextMenu(e: MouseEvent) {
                                     form.result = result;
                                 });
                             })
-                            
+
                         }
                     },
                     {
@@ -340,7 +417,6 @@ function handleContextMenu(e: MouseEvent) {
             {
                 label: "个人敏感信息",
                 icon: h(UserFilled, defaultIconSize),
-                divided: true,
                 children: [
                     {
                         label: "提取手机号",
@@ -382,7 +458,7 @@ function handleContextMenu(e: MouseEvent) {
                     },
                     {
                         label: "Finereport v8 - privilege.xml",
-                        onClick: async() => {
+                        onClick: async () => {
                             if (! await processInput()) {
                                 return
                             }
@@ -403,7 +479,8 @@ function handleContextMenu(e: MouseEvent) {
                     },
                     {
                         label: "Seeyon OA - datasourceCtp.properties",
-                        onClick: async() => {
+                        divided: true,
+                        onClick: async () => {
                             if (! await processInput()) {
                                 return
                             }
@@ -424,16 +501,35 @@ function handleContextMenu(e: MouseEvent) {
                             form.tips = `解密成功`
                         }
                     },
+                    {
+                        label: "AES | DES json key to string",
+                        onClick: async () => {
+                            if (! await processInput()) {
+                                return
+                            }
+                            let result = parseDataDict(content)
+                            if (typeof result === "string") {
+                                form.result = result
+                                form.result += "\n\n" + `示例数据(是否换行无所谓是JSON就行):\n {"words": [1161312566,808858179,892351288,1145124405], "sigBytes": 16}`
+                                return
+                            }
+                            form.result = dataDictConvertToString(result)
+                        }
+                    }
                 ]
             },
             {
-                label: "清空文本框",
-                icon: h(DeleteFilled, defaultIconSize),
+                label: "数据去重",
                 onClick: () => {
-                    form.input = ""
+                    ElMessageBox.prompt('在此处输入分隔字符后会将数据转换成数组然后去重，不输入默认按换行去重', '数据去重', {
+                        confirmButtonText: '去重',
+                    })
+                        .then(({ value }) => {
+                            deduplication(value)
+                        })
                 }
             }
-        ]
+        ],
     });
 }
 
@@ -444,24 +540,16 @@ druid数据提取需要输出响应包内容
 </script>
 
 <template>
-    <el-input v-model.lazy="form.dedupSplit" placeholder="在此处输入分隔字符后会将数据转换成数组然后去重，换行输入\n">
-        <template #prepend>
-            数据去重
-        </template>
-        <template #suffix>
-            <el-divider direction="vertical" />
-            <el-button type="primary" :icon="Filter" link @click="deduplication">去重</el-button>
-        </template>
-    </el-input>
-    <div class="textarea-container" style="margin-block: 10px;">
-        <el-input v-model="form.input" type="textarea" :rows="10" :placeholder="code"
+    <div class="textarea-container" style="margin-bottom: 10px;">
+        <el-input v-model="form.input" type="textarea" :rows="12" :placeholder="code"
             @contextmenu.stop.prevent="handleContextMenu" @paste="handlePaste"></el-input>
-        <div class="action-area">
+        <el-space class="action-area">
             <el-button :icon="Upload" size="small" @click="uploadFile">Upload</el-button>
-        </div>
+            <el-button :icon="CloseBold" size="small" @click="form.input = ''"></el-button>
+        </el-space>
     </div>
     <div class="textarea-container">
-        <el-input v-model="form.result" type="textarea" :rows="19" readonly />
+        <el-input v-model="form.result" type="textarea" :rows="20" readonly />
         <div class="action-area">
             <el-button :icon="DocumentCopy" size="small" @click="Copy(form.result)">Copy</el-button>
         </div>
diff --git a/frontend/src/views/Tools/ExtractDbInfo.vue b/frontend/src/views/Tools/ExtractDbInfo.vue
index e748bfb1..4ff948e3 100644
--- a/frontend/src/views/Tools/ExtractDbInfo.vue
+++ b/frontend/src/views/Tools/ExtractDbInfo.vue
@@ -192,7 +192,7 @@ import disconnectedIcon from '@/assets/icon/disconnect.svg'
 import CustomTabs from '@/components/CustomTabs.vue'
 import { nanoid as nano } from 'nanoid'
 import { regexpAKSK, regexpIdCard, regexpPhone } from '@/stores/validate'
-import global from '@/global'
+import global from '@/stores'
 import { SaveConfig } from '@/config'
 import { databaseOptions } from '@/stores/options'
 import { DatabaseConnection } from '@/stores/interface'
diff --git a/frontend/src/views/Tools/Memo.vue b/frontend/src/views/Tools/Memo.vue
index 3cce6f36..ed91adcf 100644
--- a/frontend/src/views/Tools/Memo.vue
+++ b/frontend/src/views/Tools/Memo.vue
@@ -54,7 +54,7 @@ import { CheckFileStat, InitMemo, ReadMemo } from 'wailsjs/go/services/File';
 import { DocumentCopy, Plus } from '@element-plus/icons-vue';
 import saveIcon from '@/assets/icon/save.svg'
 import { Copy } from '@/util';
-import global from '@/global';
+import global from '@/stores';
 onMounted(async () => {
     handleChange(data.memo[0])
     let fp = global.PATH.homedir + "/slack/memo.txt"
diff --git a/frontend/wailsjs/go/services/Database.d.ts b/frontend/wailsjs/go/services/Database.d.ts
index d65f1499..13da263f 100755
--- a/frontend/wailsjs/go/services/Database.d.ts
+++ b/frontend/wailsjs/go/services/Database.d.ts
@@ -56,6 +56,8 @@ export function RemoveConnection(arg1:string):Promise<boolean>;
 
 export function RemoveFavGrammarFiled(arg1:string,arg2:string,arg3:string):Promise<boolean>;
 
+export function RemoveFingerprintResult(arg1:string,arg2:Array<string>):Promise<boolean>;
+
 export function RemovePocscanResult(arg1:string,arg2:string,arg3:string):Promise<boolean>;
 
 export function RemoveScanTask(arg1:string):Promise<boolean>;
diff --git a/frontend/wailsjs/go/services/Database.js b/frontend/wailsjs/go/services/Database.js
index fa284255..aa2ca926 100755
--- a/frontend/wailsjs/go/services/Database.js
+++ b/frontend/wailsjs/go/services/Database.js
@@ -106,6 +106,10 @@ export function RemoveFavGrammarFiled(arg1, arg2, arg3) {
   return window['go']['services']['Database']['RemoveFavGrammarFiled'](arg1, arg2, arg3);
 }
 
+export function RemoveFingerprintResult(arg1, arg2) {
+  return window['go']['services']['Database']['RemoveFingerprintResult'](arg1, arg2);
+}
+
 export function RemovePocscanResult(arg1, arg2, arg3) {
   return window['go']['services']['Database']['RemovePocscanResult'](arg1, arg2, arg3);
 }
diff --git a/services/database.go b/services/database.go
index 1f3883c2..6f27a63e 100644
--- a/services/database.go
+++ b/services/database.go
@@ -959,6 +959,15 @@ func (d *Database) RetrieveFingerscanResults(taskid string) []structs.InfoResult
 		} else {
 			result.Fingerprints = []string{}
 		}
+		if port != nil {
+			result.Port = *port
+		}
+		if host != nil {
+			result.Host = *host
+		}
+		if scheme != nil {
+			result.Scheme = *scheme
+		}
 		results = append(results, result)
 	}
 	return results
@@ -1007,6 +1016,33 @@ func (d *Database) RemovePocscanResult(taskid, template_id, vuln_url string) boo
 	return d.ExecSqlStatement(deleteStmt, taskid, template_id, vuln_url)
 }
 
+// 移除某组指纹信息，用于删除探测http的基本状态，后续会由指纹探测重新写入
+func (d *Database) RemoveFingerprintResult(taskid string, link []string) bool {
+	// 如果链接列表为空，直接返回 false 表示操作未执行
+	if len(link) == 0 {
+		gologger.Info(d.ctx, "No link provided to remove fingerprint result")
+		return true
+	}
+
+	// 构造占位符和参数列表
+	placeholders := make([]string, len(link))
+	params := make([]interface{}, len(link)+1)
+	params[0] = taskid
+	for i, l := range link {
+		placeholders[i] = "?"
+		params[i+1] = l
+	}
+
+	// 构造 SQL 语句
+	deleteStmt := fmt.Sprintf(
+		"DELETE FROM FingerprintInfo WHERE task_id = ? AND url IN (%s)",
+		strings.Join(placeholders, ","),
+	)
+
+	// 执行 SQL 语句
+	return d.ExecSqlStatement(deleteStmt, params...)
+}
+
 // 导出JSON报告
 func (d *Database) ExportWebReportWithJson(reportpath string, tasks []structs.TaskResult) bool {
 	var fingerprintsResults []structs.InfoResult