diff --git a/src/utils/constants.js b/src/utils/constants.js
index ed900ca6..7f1c067f 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -2467,16 +2467,7 @@ export const entityDetailTags = {
 }
 export const entityDefaultColor = 'rgb(119,131,145)'
 // 赛风3IP的type字段字典
-export const psiphon3IpType = [
-  {
-    name: 'Psiphon3 server',
-    value: 0
-  },
-  {
-    name: 'Psiphon3 cdn',
-    value: 1
-  }
-]
+export const tagValueLabelMapping = [{"name":"Psiphon3 Server","value":"psiphon3_server"},{"name":"I2P","value":"i2p"},{"name":"MTProxy","value":"mtproxy"},{"name":"Obfs4","value":"obfs4"},{"name":"Snowflake","value":"snowflake"},{"name":"Tor","value":"tor"},{"name":"Loki Password Stealer","value":"Loki Password Stealer (PWS)"},{"name":"IcedID","value":"IcedID"},{"name":"QakBot","value":"QakBot"},{"name":"Mirai","value":"Mirai"},{"name":"BazarBackdoor","value":"BazarBackdoor"},{"name":"NjRAT","value":"NjRAT"},{"name":"CryptBot","value":"CryptBot"},{"name":"BitRAT","value":"BitRAT"},{"name":"RedLine Stealer","value":"RedLine Stealer"},{"name":"Nanocore RAT","value":"Nanocore RAT"},{"name":"DCRat","value":"DCRat"},{"name":"Cobalt Strike","value":"Cobalt Strike"},{"name":"AsyncRAT","value":"AsyncRAT"},{"name":"ostap","value":"ostap"},{"name":"Vidar","value":"Vidar"},{"name":"magecart","value":"magecart"},{"name":"Hancitor","value":"Hancitor"},{"name":"SystemBC","value":"SystemBC"},{"name":"SmokeLoader","value":"SmokeLoader"},{"name":"Remcos","value":"Remcos"},{"name":"Amadey","value":"Amadey"},{"name":"Ficker Stealer","value":"Ficker Stealer"},{"name":"Get2","value":"Get2"},{"name":"ISFB","value":"ISFB"},{"name":"Dridex","value":"Dridex"},{"name":"Pony","value":"Pony"},{"name":"Azorult","value":"Azorult"},{"name":"NetWire RC","value":"NetWire RC"},{"name":"Mozi","value":"Mozi"},{"name":"Raccoon","value":"Raccoon"},{"name":"Quasar RAT","value":"Quasar RAT"},{"name":"Emotet","value":"Emotet"},{"name":"Numando","value":"Numando"},{"name":"Oski Stealer","value":"Oski Stealer"},{"name":"Ave Maria","value":"Ave Maria"},{"name":"NetSupportManager RAT","value":"NetSupportManager RAT"},{"name":"STRRAT","value":"STRRAT"},{"name":"Orcus RAT","value":"Orcus RAT"},{"name":"Vjw0rm","value":"Vjw0rm"},{"name":"Ghost RAT","value":"Ghost RAT"},{"name":"LimeRAT","value":"LimeRAT"},{"name":"Astaroth","value":"Astaroth"},{"name":"Unknown malware","value":"Unknown malware"},{"name":"TrickBot","value":"TrickBot"},{"name":"IcedID Downloader","value":"IcedID Downloader"},{"name":"BetaBot","value":"BetaBot"},{"name":"Agent Tesla","value":"Agent Tesla"},{"name":"Bashlite","value":"Bashlite"},{"name":"DanaBot","value":"DanaBot"},{"name":"Snake","value":"Snake"},{"name":"Gozi","value":"Gozi"},{"name":"PoshC2","value":"PoshC2"},{"name":"Houdini","value":"Houdini"},{"name":"BlackNET RAT","value":"BlackNET RAT"},{"name":"Revenge RAT","value":"Revenge RAT"},{"name":"ServHelper","value":"ServHelper"},{"name":"Alien","value":"Alien"},{"name":"N-W0rm","value":"N-W0rm"},{"name":"LokiBot","value":"LokiBot"},{"name":"Zloader","value":"Zloader"},{"name":"Crimson RAT","value":"Crimson RAT"},{"name":"Grandoreiro","value":"Grandoreiro"},{"name":"Buer","value":"Buer"},{"name":"Qealler","value":"Qealler"},{"name":"FastCash","value":"FastCash"},{"name":"CyberGate","value":"CyberGate"},{"name":"Formbook","value":"Formbook"},{"name":"Hydra","value":"Hydra"},{"name":"Arkei Stealer","value":"Arkei Stealer"},{"name":"Tsunami","value":"Tsunami"},{"name":"AdWind","value":"AdWind"},{"name":"Dofloo","value":"Dofloo"},{"name":"MrBlack","value":"MrBlack"},{"name":"XLoader","value":"XLoader"},{"name":"Anatsa","value":"Anatsa"},{"name":"TeamBot","value":"TeamBot"},{"name":"DiamondFox","value":"DiamondFox"},{"name":"BillGates","value":"BillGates"},{"name":"Kinsing","value":"Kinsing"},{"name":"CCleaner Backdoor","value":"CCleaner Backdoor"},{"name":"JSOutProx","value":"JSOutProx"},{"name":"SharkBot","value":"SharkBot"},{"name":"Empire Downloader","value":"Empire Downloader"},{"name":"solarmarker","value":"solarmarker"},{"name":"FireBird RAT","value":"FireBird RAT"},{"name":"XpertRAT","value":"XpertRAT"},{"name":"RMS","value":"RMS"},{"name":"GCleaner","value":"GCleaner"},{"name":"Unidentified Linux 001","value":"Unidentified Linux 001"},{"name":"Ousaban","value":"Ousaban"},{"name":"sLoad","value":"sLoad"},{"name":"PerlBot","value":"PerlBot"},{"name":"SectopRAT","value":"SectopRAT"},{"name":"Loda","value":"Loda"},{"name":"Coinminer","value":"Coinminer"},{"name":"DarkSide","value":"DarkSide"},{"name":"404 Keylogger","value":"404 Keylogger"},{"name":"Cpuminer","value":"Cpuminer"},{"name":"MooBot","value":"MooBot"},{"name":"Parallax RAT","value":"Parallax RAT"},{"name":"XOR DDoS","value":"XOR DDoS"},{"name":"Vulturi","value":"Vulturi"},{"name":"Taurus Stealer","value":"Taurus Stealer"},{"name":"Cutwail","value":"Cutwail"},{"name":"Metamorfo","value":"Metamorfo"},{"name":"GootLoader","value":"GootLoader"},{"name":"Meterpreter","value":"Meterpreter"},{"name":"BumbleBee","value":"BumbleBee"},{"name":"Tofsee","value":"Tofsee"},{"name":"Socelars","value":"Socelars"},{"name":"Squirrelwaffle","value":"Squirrelwaffle"},{"name":"Roaming Mantis","value":"Roaming Mantis"},{"name":"Alfonso Stealer","value":"Alfonso Stealer"},{"name":"DarkComet","value":"DarkComet"},{"name":"STOP","value":"STOP"},{"name":"MoqHao","value":"MoqHao"},{"name":"CollectorGoomba","value":"CollectorGoomba"},{"name":"Prometei","value":"Prometei"},{"name":"Cerberus","value":"Cerberus"},{"name":"Spectre Rat","value":"Spectre Rat"},{"name":"Unidentified 001","value":"Unidentified 001"},{"name":"FluBot","value":"FluBot"},{"name":"BlackRock","value":"BlackRock"},{"name":"CryptoNight","value":"CryptoNight"},{"name":"Kronos","value":"Kronos"},{"name":"Winnti","value":"Winnti"},{"name":"Korlia","value":"Korlia"},{"name":"Monero Miner","value":"Monero Miner"},{"name":"Anubis","value":"Anubis"},{"name":"MirrorBlast","value":"MirrorBlast"},{"name":"Banload","value":"Banload"},{"name":"FlawedGrace","value":"FlawedGrace"},{"name":"DoppelDridex","value":"DoppelDridex"},{"name":"Mispadu","value":"Mispadu"},{"name":"Mekotio","value":"Mekotio"},{"name":"Ozone RAT","value":"Ozone RAT"},{"name":"StealthWorker Go","value":"StealthWorker Go"},{"name":"SilverFish","value":"SilverFish"},{"name":"NodeJS Ransomware","value":"NodeJS Ransomware"},{"name":"Ryuk","value":"Ryuk"},{"name":"QNAPCrypt","value":"QNAPCrypt"},{"name":"Venom RAT","value":"Venom RAT"},{"name":"BlackMatter","value":"BlackMatter"},{"name":"Janeleiro","value":"Janeleiro"},{"name":"Chrysaor","value":"Chrysaor"},{"name":"PurpleFox","value":"PurpleFox"},{"name":"Mars Stealer","value":"Mars Stealer"},{"name":"Matanbuchus","value":"Matanbuchus"},{"name":"FFDroider","value":"FFDroider"},{"name":"BlackGuard","value":"BlackGuard"},{"name":"SMSspy","value":"SMSspy"},{"name":"TitanStealer","value":"TitanStealer"},{"name":"BianLian","value":"BianLian"},{"name":"Deimos","value":"Deimos"},{"name":"Sliver","value":"Sliver"},{"name":"Aurora Stealer","value":"Aurora Stealer"},{"name":"Stealc","value":"Stealc"},{"name":"Gomorrah stealer","value":"Gomorrah stealer"},{"name":"RecordBreaker","value":"RecordBreaker"},{"name":"Brute Ratel C4","value":"Brute Ratel C4"},{"name":"LaplasClipper","value":"LaplasClipper"},{"name":"XWorm","value":"XWorm"},{"name":"PhotoLoader","value":"PhotoLoader"},{"name":"Kimsuky","value":"Kimsuky"},{"name":"Rhadamanthys","value":"Rhadamanthys"},{"name":"Nighthawk","value":"Nighthawk"},{"name":"Fabookie","value":"Fabookie"},{"name":"Lumma Stealer","value":"Lumma Stealer"},{"name":"Kaiji","value":"Kaiji"},{"name":"ClipBanker","value":"ClipBanker"},{"name":"PrivateLoader","value":"PrivateLoader"},{"name":"ViperSoftX","value":"ViperSoftX"},{"name":"Phonk","value":"Phonk"},{"name":"PlugX","value":"PlugX"},{"name":"HyperBro","value":"HyperBro"},{"name":"SideWinder","value":"SideWinder"},{"name":"Coper","value":"Coper"},{"name":"Specter","value":"Specter"},{"name":"Kaiten","value":"Kaiten"},{"name":"Bitter RAT","value":"Bitter RAT"},{"name":"BATLOADER","value":"BATLOADER"},{"name":"ACBackdoor","value":"ACBackdoor"},{"name":"BKA Trojaner","value":"BKA Trojaner"},{"name":"JSSLoader","value":"JSSLoader"},{"name":"PureCrypter","value":"PureCrypter"},{"name":"SpyNote","value":"SpyNote"},{"name":"S.O.V.A.","value":"S.O.V.A."},{"name":"Ginzo Stealer","value":"Ginzo Stealer"},{"name":"PennyWise Stealer","value":"PennyWise Stealer"},{"name":"DOUBLEBACK","value":"DOUBLEBACK"},{"name":"OPRDNS","value":"OPRDNS"},{"name":"TLDNS","value":"TLDNS"},{"name":"RTDNS","value":"RTDNS"},{"name":"ADNS","value":"ADNS"},{"name":"FWDNS","value":"FWDNS"}]
 // detection新增页的第一步，选择mode
 export const detectionRuleType = {
   indicator: 'indicator_match',
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue b/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
index 24a5371a..6b49350d 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
@@ -60,7 +60,7 @@ import {
   drillDownPanelTypeMapping,
   entityType,
   entityDetailTags,
-  psiphon3IpType,
+  tagValueLabelMapping,
   riskLevelMapping,
   entityDefaultColor
 } from '@/utils/constants'
@@ -92,16 +92,9 @@ export default {
   },
   methods: {
     getTagColor,
-    tagValueHandler (k, k2, value) {
-      if (k === 'psiphon3Ip') {
-        if (k2 === 'type') {
-          const find = psiphon3IpType.find(t => t.value === value)
-          if (find) {
-            return find.name
-          }
-        }
-      }
-      return value
+    tagValueHandler (value) {
+      const find = tagValueLabelMapping.find(t => t.value === value)
+      return find ? find.name : value
     },
     getData () {
       this.toggleLoading(true)
@@ -122,7 +115,7 @@ export default {
                 Object.keys(res.data[k]).forEach(k2 => {
                   const find = entityDetailTags[this.entity.entityType].find(t => t.name === k2)
                   if (find) {
-                    this.levelTwoTags.push({ key: k2, value: this.tagValueHandler(k, k2, res.data[k][k2]), type: find.type })
+                    this.levelTwoTags.push({ key: k2, value: this.tagValueHandler(res.data[k][k2]), type: find.type })
                   }
                 })
               }
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
index 6761b0eb..bcb9fec9 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
@@ -40,6 +40,7 @@ import { overwriteUrl, urlParamsHandler } from '@/utils/tools'
 import { useRoute } from 'vue-router'
 import axios from 'axios'
 import { api } from '@/utils/api'
+import {tagValueLabelMapping} from '../../../../utils/constants'
 
 export default {
   name: 'EntityDetailTabs',
@@ -136,7 +137,7 @@ export default {
                 Object.keys(r[k]).forEach(k2 => {
                   const find = entityDetailTags[this.entity.entityType].find(t => t.name === k2)
                   if (find) {
-                    aggregation.intelligenceContent.push({ key: k2, value: this.tagValueHandler(k, k2, r[k][k2]), type: find.type })
+                    aggregation.intelligenceContent.push({ key: k2, value: this.tagValueHandler(r[k][k2]), type: find.type })
                   }
                 })
               }
@@ -251,16 +252,9 @@ export default {
         case 'app': return api.entity.openPortOfApp
       }
     },
-    tagValueHandler (k, k2, value) {
-      if (k === 'psiphon3Ip') {
-        if (k2 === 'type') {
-          const find = psiphon3IpType.find(t => t.value === value)
-          if (find) {
-            return find.name
-          }
-        }
-      }
-      return value
+    tagValueHandler (value) {
+      const find = tagValueLabelMapping.find(t => t.value === value)
+      return find ? find.name : value
     }
   },
   beforeUnmount () {
diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue
index 5e78cac0..b7924915 100644
--- a/src/views/entityExplorer/entityList/Row.vue
+++ b/src/views/entityExplorer/entityList/Row.vue
@@ -187,7 +187,7 @@ import relatedServer from '@/mixins/relatedServer'
 import Loading from '@/components/common/Loading'
 import axios from 'axios'
 import { api } from '@/utils/api'
-import { entityDefaultColor, entityDetailTags, psiphon3IpType } from '@/utils/constants'
+import { entityDefaultColor, entityDetailTags, tagValueLabelMapping } from '@/utils/constants'
 import _ from 'lodash'
 import { getTagColor } from '@/utils/tools'
 
@@ -292,7 +292,7 @@ export default {
               Object.keys(res.data[k]).forEach(k2 => {
                 const find = entityDetailTags[this.entity.entityType].find(t => t.name === k2)
                 if (find) {
-                  this.levelTwoTags.push({ key: k2, value: this.tagValueHandler(k, k2, res.data[k][k2]), type: find.type })
+                  this.levelTwoTags.push({ key: k2, value: this.tagValueHandler(res.data[k][k2]), type: find.type })
                 }
               })
             }
@@ -304,16 +304,9 @@ export default {
         }
       })
     },
-    tagValueHandler (k, k2, value) {
-      if (k === 'psiphon3Ip') {
-        if (k2 === 'type') {
-          const find = psiphon3IpType.find(t => t.value === value)
-          if (find) {
-            return find.name
-          }
-        }
-      }
-      return value
+    tagValueHandler (value) {
+      const find = tagValueLabelMapping.find(t => t.value === value)
+      return find ? find.name : value
     },
     /* 切换折叠状态 */
     switchCollapse () {