diff --git a/configs/banner.go b/configs/banner.go
index f7e6a89..ea7a2b3 100644
--- a/configs/banner.go
+++ b/configs/banner.go
@@ -13,7 +13,7 @@ func Banner() {
 		"/ /_/ / _  / _(__  )_  / / / / / /_/ /__  /_/ /\n" +
 		"\\__,_/  /_/  /____/ /_/ /_/ /_/\\__,_/ _  .___/\n" +
 		"                                        /_/"
-	s := "  dismap version: 0.3 release\n" +
+	s := "  dismap version: 0.4 release\n" +
 		"  author: zhzyker && Nemophllist\n" +
 		"  from: https://github.com/zhzyker/dismap\n"
 	fmt.Println(logger.Purple(b))
diff --git a/configs/config.go b/configs/config.go
index 267e81a..824c66e 100644
--- a/configs/config.go
+++ b/configs/config.go
@@ -1,11 +1,9 @@
 package configs
 
-
-
-var DefaultPorts = []int{21,22,25,53,69,79,80,81,82,83,84,85,86,87,88,89,110,135,137,138,139,143,389,443,445,554,587,631,800,801,808,880,888,1000,1024,1025,1080,1099,1389,1433,1521,2000,2001,2222,2601,3306,3307,3388,3389,3443,5800,5900,6379,7000,7001,7007,7010,7788,8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8030,8060,8070,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8161,8175,8188,8189,8443,8445,8448,8554,8800,8848,8880,8881,8888,8899,8983,8989,9000,9001,9002,9008,9010,9043,9060,9080,9081,9082,9083,9084,9085,9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9099,9443,9448,9600,9628,9800,9899,9981,9986,9988,9998,9999,11001,13443,15000,20000,33890,45554,49155,49156,50050,61616}
+var DefaultPorts = []int{21, 22, 23, 25, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 110, 135, 137, 138, 139, 143, 389, 443, 445, 587, 631, 800, 801, 808, 880, 888, 1000, 1024, 1025, 1080, 1099, 1389, 1433, 1521, 2383, 3306, 3307, 3388, 3389, 3443, 5000, 5357, 5560, 5800, 5900, 6379, 7000, 7001, 7007, 7010, 7788, 8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007, 8008, 8009, 8010, 8011, 8030, 8060, 8070, 8080, 8081, 8082, 8083, 8084, 8085, 8086, 8087, 8088, 8089, 8090, 8091, 8092, 8093, 8094, 8095, 8096, 8097, 8098, 8099, 8161, 8175, 8188, 8189, 8200, 8443, 8445, 8448, 8554, 8800, 8848, 8880, 8881, 8888, 8899, 8983, 8989, 9000, 9001, 9002, 9008, 9010, 9043, 9060, 9080, 9081, 9082, 9083, 9084, 9085, 9086, 9087, 9088, 9089, 9090, 9091, 9092, 9093, 9094, 9095, 9096, 9097, 9099, 9443, 9600, 9628, 9800, 9999, 11001, 13443, 49155, 50050, 61616}
 
 var DefaultHeader = map[string]string{
 	"Accept-Language": "zh,zh-TW;q=0.9,en-US;q=0.8,en;q=0.7,zh-CN;q=0.6",
-	"User-agent": "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36",
-	"Cookie": "rememberMe=int",
-}
\ No newline at end of file
+	"User-agent":      "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36",
+	"Cookie":          "rememberMe=int",
+}
diff --git a/configs/rule.go b/configs/rule.go
index 867105f..29ea3c1 100644
--- a/configs/rule.go
+++ b/configs/rule.go
@@ -2,13 +2,13 @@ package configs
 
 type ReqHttp struct {
 	ReqMethod string
-	ReqPath string
+	ReqPath   string
 	ReqHeader []string
-	ReqBody string
+	ReqBody   string
 }
 
 type InStr struct {
-	InBody string
+	InBody   string
 	InHeader string
 	InIcoMd5 string
 }
@@ -26,7 +26,7 @@ var RuleData = []RuleLab{
 	{1, "EnterCRM", "body", "", InStr{"(Ent.base.js)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "MeterSphere", "body", "", InStr{"(<title>MeterSphere</title>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Apache Druid", "body", "", InStr{"(<title>Apache Druid</title>|content=\"Apache Druid console\")", "", ""}, ReqHttp{"", "", nil, ""}},
-	{2, "Alibaba Druid", "body", "", InStr{"(<meta http-equiv=\"refresh\" content=\"0;url=faq.html\">\n(.*)<title>Welcome</title>|click(druid.login.login)|<title>druid monitor</title>|druid.common.buildHead|druid.index.init())", "", ""}, ReqHttp{"", "", nil, ""}},
+	{2, "Alibaba Druid", "body", "", InStr{"(click(druid.login.login)|<title>druid monitor</title>|druid.common.buildHead|druid.index.init())", "", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Sunlogin", "body|header", "and", InStr{"(\"msg\":\"Verification failure\")", "(application/json|text/html)", ""}, ReqHttp{"", "", nil, ""}},
 
 	{1, "08CMS", "body", "", InStr{"(content=\"08cms|typeof(_08cms))", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -231,7 +231,7 @@ var RuleData = []RuleLab{
 	{1, "Apahce-Guacamole", "body", "", InStr{"(images/guacamole-logo|guacamole - clientless remote desktop|scripts/guac-ui.js)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Apahce-hadoop-YARN", "body", "", InStr{"(yarn.dt.plugins.js)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Apache-Haus", "body", "", InStr{"(href=\"/apachehaus.ico|copyright &copy; 2008-2017 <a href=\"http://www.apachehaus.com\">the apache haus</a>)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Apache", "header", "", InStr{"", "(Server: Apache(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Apache", "header", "", InStr{"", "(Server: Apache)", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Apahce-Kylin", "body", "", InStr{"(href=\"/kylin/\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Apache-Mesos", "body", "", InStr{"(href=\"/static/css/mesos.css|<img src=\"/static/img/mesos_logo.png\" alt=\"apache mesos\">)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Apache-OFBiz", "body|header", "", InStr{"(Apache OFBiz|apache.ofbiz)", "(Set-Cookie: OFBiz.Visitor=)", ""}, ReqHttp{"GET", "/myportal/control/main", nil, ""}},
@@ -239,10 +239,10 @@ var RuleData = []RuleLab{
 	{1, "Apache-on-Mac_OS_X", "ico", "", InStr{"", "", "(73778a17b0d22ffbb7d6c445a7947b92)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Apache-on-Red-Hat/Fedora", "ico", "", InStr{"", "", "(d99217782f41e71bcaa8e663e6302473)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Apahce-Oozie-Web-Console", "body", "", InStr{"(oozie-console|href=\"/oozie\">oozie console)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "Apache-RocketMQ", "body|header", "or", InStr{"(title>RocketMq(.*)</title>)", "(X-Application-Context: rocketmq-console(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{3, "Apache-RocketMQ", "body|header", "or", InStr{"(title>RocketMq)", "(X-Application-Context: rocketmq-console)", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Apache-Shiro", "header|body", "or", InStr{"(</i> shiro</li>)", "(rememberMe=|=deleteMe|shiro-cas)", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Apache-Solr", "body|ico", "or", InStr{"(SolrCore Initialization Failures|ng-app=\"solrAdminApp\")", "", "(69acfcb2659952bc37c54108d52fca70|ffc05799dee87a4f8901c458f7291d73)"}, ReqHttp{"", "", nil, ""}},
-	{1, "Apache-Spark ", "body|ico", "or", InStr{"(src=\"/static/spark-logo(.*)\\.png\"|spark://)", "", "\""}, ReqHttp{"", "", nil, ""}},
+	{1, "Apache-Spark", "body", "", InStr{"(src=\"/static/spark-logo(.*)\\.png\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Apache-Struts2", "body|header", "and", InStr{"(struts problem report|there is no action mapped for namespace|no result defined for action and result input|<a href=(.*)\\.action(.*)</a>|<form id=(.*)\\.action(.*)|<a href=(.*)\\.do(.*)</a>|(.*)\\.action|(.*)\\.do)", "(jsessionid)", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Apache-Tomcat", "body|ico", "or", InStr{"(href=\"tomcat.css|tomcat.apache.org|this is the default tomcat home page|<h3>apache tomcat|<a href=\"/docs/setup.html\">Tomcat Setup</a>|If you're seeing this, you've successfully installed Tomcat. Congratulations!|this is the default tomcat home page|tomcat.apache.org|href=\\\"tomcat.css)", "", "(d80e364c0d3138c7ecd75bf9896f2cad|4644f2d45601037b8423d45e13194c93)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Apache-Traffic-Server", "header", "", InStr{"", "(apachetrafficserver)", ""}, ReqHttp{"", "", nil, ""}},
@@ -544,7 +544,7 @@ var RuleData = []RuleLab{
 	{1, "brother-8510DN", "body", "", InStr{"(id=\"modelname\"><h1>mfc-8510dn)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Brother-Printer", "body", "", InStr{"(<frame src=\"/printer/inc_head.html|<img src=\"/common/image/hl4040cn)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "BrowserCMS", "body", "", InStr{"(powered by browsercms|content=\"browsercms)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "BT-Linux-Control-Pane", "body|header|ico", "or", InStr{"(<img src=\"https://app.bt.cn/static/app.png\">|href=\"http://www.bt.cn/bbs/thread-1172-1-1.html|宝塔linux面板|src=\"/static/js/validform_v5.3.2_min.js|请使用正确的入口登录面板|rm -f /www/server/panel/data/admin_path.pl|宝塔(.*)面板)", "(set-cookie: bt_panel=|Set-Cookie: BT_COLL=)", "(9637ebd168435de51fea8193d2d89e39)"}, ReqHttp{"", "", nil, ""}},
+	{1, "BT-Linux-Control-Pane", "body|header|ico", "or", InStr{"(<img src=\"https://app.bt.cn/static/app.png\">|href=\"http://www.bt.cn/bbs/thread-1172-1-1.html|宝塔linux面板|src=\"/static/js/validform_v5.3.2_min.js|请使用正确的入口登录面板|rm -f /www/server/panel/data/admin_path.pl)", "(set-cookie: bt_panel=|Set-Cookie: BT_COLL=)", "(9637ebd168435de51fea8193d2d89e39)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Buffalo-TeraStation", "body", "", InStr{"(value=\"view terastation manual|value=\"terastation handbuch lesen)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "BugFree", "body", "", InStr{"(id=\"logo\" alt=bugfree|class=\"loginbgimage\" alt=\"bugfree|name=\"buguserpwd)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "BugScan", "body", "", InStr{"(<title>bugscan memos</title>|powered by bugscan)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -1076,6 +1076,7 @@ var RuleData = []RuleLab{
 	{1, "Destoon", "body", "", InStr{"(content=\"destoon|destoon_moduleid)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Devaldi-FlexPaper", "body", "", InStr{"(login to the flexpaper console|href=\"http://flexpaper.devaldi.com/plugins.htm\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "devolo-dLAN-WIFI", "body", "", InStr{"(href=\"customization.css\")", "", ""}, ReqHttp{"", "", nil, ""}},
+	{3, "Dreamer-CMS", "header", "", InStr{"", "(dreamer-cms-(.*)=)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "DFE-SCADA", "body", "", InStr{"(scada|536870912)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "DHC-OA", "body", "", InStr{"(src=\"/extcomponent/security/image/dhc.png\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Diagrams", "body", "", InStr{"(<link rel=\"canonical\" href=\"https://app.diagrams.net\">)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -1221,7 +1222,7 @@ var RuleData = []RuleLab{
 	{1, "Dreambox WebControl", "ico", "", InStr{"", "", "(d9aa63661d742d5f7c7300d02ac18d69)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Dr.Rui-Cloud-office-system", "body", "", InStr{"(/studentsign/tologin.di|/user/toupdatepasswordpage.di)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "DrugPak", "body", "", InStr{"(powered by drugpak|/dplimg/dpstyle.css)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "Drupal", "header|body|ico", "or", InStr{"(href=\"https://www.drupal.org\"|data-drupal-link-system-path=\"(.*)\")", "(x-generator: drupal)", "(f0ee98b4394dfdab17c16245dd799204|b6341dfc213100c61db4fb8775878cec|a4819787db1dabe1a6b669d5d6df3bfd|e6a9dc66179d8c9f34288b16a02f987e|a4819787db1dabe1a6b669d5d6df3bfd|b6341dfc213100c61db4fb8775878cec|f0ee98b4394dfdab17c16245dd799204)"}, ReqHttp{"", "", nil, ""}},
+	{3, "Drupal", "header|body|ico", "or", InStr{"(href=\"https://www.drupal.org\"|data-drupal-link-system-path=)", "(x-generator: drupal)", "(f0ee98b4394dfdab17c16245dd799204|b6341dfc213100c61db4fb8775878cec|a4819787db1dabe1a6b669d5d6df3bfd|e6a9dc66179d8c9f34288b16a02f987e|a4819787db1dabe1a6b669d5d6df3bfd|b6341dfc213100c61db4fb8775878cec|f0ee98b4394dfdab17c16245dd799204)"}, ReqHttp{"", "", nil, ""}},
 	{3, "Drupal CMS", "ico", "", InStr{"", "", "(e6a9dc66179d8c9f34288b16a02f987e)"}, ReqHttp{"", "", nil, ""}},
 	{1, "DrWebAntiVirus", "body", "", InStr{"(/avdesk/includes/system/templates/images/logo_en.png)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "DrWebAntiVirus", "header", "", InStr{"", "(server: drwebserver|drweb_personal_office=)", ""}, ReqHttp{"", "", nil, ""}},
@@ -1266,7 +1267,7 @@ var RuleData = []RuleLab{
 	{1, "ebrigade-ERP", "body", "", InStr{"(class='btn btn-ebrigade btn-lg')", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "ebug-http", "ico", "", InStr{"", "", "(171429057ae2d6ad68e2cd6dcfd4adc1)"}, ReqHttp{"", "", nil, ""}},
 	{1, "ECash-System", "body", "", InStr{"(<br>欢迎使用e-cash系统)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "E-cology-OA", "body|header|ico", "or", InStr{"(<script type=\"text/javascript\" src=\"/js/ecology)", "(Set-Cookie: ecology(.*))", "(41eca7a9245394106a09b2534d8030df)"}, ReqHttp{"", "", nil, ""}},
+	{3, "E-cology-OA", "body|header|ico", "or", InStr{"(<script type=\"text/javascript\" src=\"/js/ecology)", "(Set-Cookie: ecology)", "(41eca7a9245394106a09b2534d8030df)"}, ReqHttp{"", "", nil, ""}},
 	{1, "ECOR", "header", "", InStr{"", "(ecor264)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "ECShop", "body|header", "or", InStr{"(content=\"ecshop|id=\"ecs_cartinfo\")", "(ecs_id)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "EDAS-Setting-Management", "body", "", InStr{"(lcccommoncontroller)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -1361,8 +1362,8 @@ var RuleData = []RuleLab{
 	{1, "Eisoo-AnyShare", "body", "", InStr{"(res/libs/webuploader/webuploader.css|src=\"/res/libs/base64.min.js\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "ekmpowershop web store", "ico", "", InStr{"", "", "(BC96CB8D0841380F3504BB5584F78198)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Ektron-CMS", "header", "", InStr{"", "(ektguid=)", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "Elasticsearch", "body|header", "or", InStr{"(you know, for search|<title>elasticsearch(.*)</title>)", "(server: ecstatic(.*))", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "ElasticHD", "body", "or", InStr{"(<title>Elastic HD(.*)</title>|<meta content=ElasticHD name=keywords>)", "", ""}, ReqHttp{"", "", nil, ""}},
+	{3, "Elasticsearch", "body|header", "or", InStr{"(you know, for search|<title>elasticsearch)", "(server: ecstatic)", ""}, ReqHttp{"", "", nil, ""}},
+	{3, "ElasticHD", "body", "or", InStr{"(<title>Elastic HD|<meta content=ElasticHD name=keywords>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "e-Learning", "body", "", InStr{"(method=\"post\" action=\"/eln3_asp/login.do)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Elecom-Thecus-NAS", "body", "", InStr{"(if(mod_ui=='thecus')|msg:\"您无任何 raid 系统。\"|msg:\"you don`t have any raid system.\",)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Electro-Industries-GaugeTech", "header", "", InStr{"", "(server: eig embedded web server)", ""}, ReqHttp{"", "", nil, ""}},
@@ -1596,9 +1597,9 @@ var RuleData = []RuleLab{
 	{1, "Gitblit", "body", "", InStr{"(<a title=\"gitblit homepage\" href=\"http://gitblit.com/\">)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "GitBucket", "body", "", InStr{"(/assets/common/images/gitbucket.png)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "GitBucket", "header", "", InStr{"", "(gitbucket)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Gitea", "body|header", "or", InStr{"(href=\"https://docs.gitea.io\">Help</a>)", "(Set-Cookie: i_like_gitea=(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Gitea", "body|header", "or", InStr{"(href=\"https://docs.gitea.io\">Help</a>)", "(Set-Cookie: i_like_gitea=)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Github-Enterprise", "header", "", InStr{"", "(_gh_manage)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Gitlab", "body|header", "or", InStr{"(gon.default_issues_tracker|content=\"gitlab community edition\"|content=\"gitlab |<a href=\"https://about.gitlab.com/\">about gitlab|class=\"col-sm-7 brand-holder pull-left\"|<a href=\"https://about.gitlab.com/\">About GitLab</a>)", "(Set-Cookie: _gitlab_session=(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Gitlab", "body|header", "or", InStr{"(gon.default_issues_tracker|content=\"gitlab community edition\"|content=\"gitlab |<a href=\"https://about.gitlab.com/\">about gitlab|class=\"col-sm-7 brand-holder pull-left\"|<a href=\"https://about.gitlab.com/\">About GitLab</a>)", "(Set-Cookie: _gitlab_session=)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Gitorious", "body", "", InStr{"(powered by gitorious)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Gitorious", "header", "", InStr{"", "(_gitorious_sess)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "GitStack-Code", "body", "", InStr{"(gitstack/)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -1654,7 +1655,7 @@ var RuleData = []RuleLab{
 	{1, "Gree-Logistics", "body", "", InStr{"(/images/gree/gree.gif)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "greencms", "header", "", InStr{"", "(x-powered-by: greencms)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "GridSite", "body", "", InStr{"(<a href=\"http://www.gridsite.org/\">gridsite|gridsite-admin.cgi?cmd)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Grizzly NIO", "body", "", InStr{"(<div class=\"footer\">Grizzly(.*)</div>)", "", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Grizzly NIO", "body", "", InStr{"(<div class=\"footer\">Grizzly)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Group-Office", "body", "", InStr{"(powered by group-office|\"theme\":\"group-office\",)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Group-Office", "header", "", InStr{"", "(groupoffice=)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "GROWFORCE-Email", "body", "", InStr{"(href=\"http://webmail.zmail300.cn|href=\"/page/help/mailconfig/configs/index.html)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -1887,7 +1888,7 @@ var RuleData = []RuleLab{
 	{1, "HP-J4110A", "header", "", InStr{"", "(realm=\"hp j4110a)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "HP-J4812A", "header", "", InStr{"", "(realm=\"hp j4812a)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "HP-J4813A", "header", "", InStr{"", "(realm=\"hp j4813a)", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "HP-LaserJet-Printer", "body|header", "or", InStr{"(<FORM method=\"post\" ACTION=\"/hp/device/supplies_status.html\">|<h1>HP LaserJet(.*)</h1></td>)", "(hp-chaisoe)", ""}, ReqHttp{"", "", nil, ""}},
+	{3, "HP-LaserJet-Printer", "body|header", "or", InStr{"(<FORM method=\"post\" ACTION=\"/hp/device/supplies_status.html\">|<h1>HP LaserJet)", "(hp-chaisoe)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "HP-ML310e-Gen8", "header", "", InStr{"", "(ml310e-gen8)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "HP-ML330-G6", "body", "", InStr{"(servername=\"proliant ml330 g6)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "HP-OfficeJet-Printer", "body", "", InStr{"(align=\"center\">hp officejet)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2039,7 +2040,7 @@ var RuleData = []RuleLab{
 	{1, "IBM-WebSphere-DataPower", "header", "", InStr{"", "(x-backside-transport|360 web server)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "IBM-Web-Traffic-Express-Caching-Proxy", "body", "", InStr{"(/admin-bin/webexec/wte.html)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "IBM-Web-Traffic-Express-Caching-Proxy", "header", "", InStr{"", "(ibm-proxy-wte)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "IBOS-OA", "body|header", "or", InStr{"(<meta name=\"author\" content=\"IBOS Team\" />)", "(Set-Cookie: 8uxd_saltkey=(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "IBOS-OA", "body|header", "or", InStr{"(<meta name=\"author\" content=\"IBOS Team\" />)", "(Set-Cookie: 8uxd_saltkey=)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "iBot Cloud", "body", "", InStr{"(author:lvzhaohua)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "iB-WRA150N", "header", "", InStr{"", "(realm=\"ib-wra150n)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "ICALL-CMS", "body", "", InStr{"(var img_obj = document.getelementbyid('showing');)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2065,7 +2066,7 @@ var RuleData = []RuleLab{
 	{1, "iHOUSE real estate web hosting", "ico", "", InStr{"", "", "(0AD3A7E2C3A7B144C04E73050A63DF0B)"}, ReqHttp{"", "", nil, ""}},
 	{1, "iHTML", "header", "", InStr{"", "(using ihtml)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Iisexport", "header", "", InStr{"", "(iisexport)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "IIS", "header|body", "or", InStr{"(<img src=\"welcome.png\" alt=\"IIS)", "(Server: Microsoft-IIS(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "IIS", "header|body", "or", InStr{"(<img src=\"welcome.png\" alt=\"IIS)", "(Server: Microsoft-IIS)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "ikiwiki", "ico", "", InStr{"", "", "(32bf63ac2d3cfe82425ce8836c9ce87c)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Ikonboard", "body", "", InStr{"(content=\"ikonboard|powered by <a href=\"http://www.ikonboard.com)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "ikuai8-Cloud", "body", "", InStr{"(<strong>we're sorry but ikuai cloud platform doesn't )", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2109,7 +2110,6 @@ var RuleData = []RuleLab{
 	{1, "Inspur-as5600", "body", "", InStr{"(id=\"loginbtnarea\"|class=\"logininputlabel\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Inspur-EC-Government-Approval-Platform", "body", "", InStr{"(onlinequery/querylist.aspx|langchao.ecgap.outportal)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Inspur-InCloud-Sphere", "body", "", InStr{"(class=\"easyui-layout)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "Inspur-OA", "body", "", InStr{"(浪潮OA(.*) V(.*))", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Inspur-Server", "body", "", InStr{"(img/inspur_logo.png|<!-- add by zhchhong|<frame src=\"./page/blank.html\" name=\"mainframe\" id=\"mainframe\" scrolling=\"no\" noresize=\"false\"></frame>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Inspur-Storage-", "body", "", InStr{"(<td align=\"left\">浪潮存储 您身边的存储专家</td>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Instalcompact-EmSyDia-1.6", "body", "", InStr{"(urz/ic/)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2218,7 +2218,7 @@ var RuleData = []RuleLab{
 	{1, "JEECMS", "body", "", InStr{"(http://www.jeecms.com)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "JeeSite", "body|header", "or", InStr{"(jeesite.css|jeesite.js|jeesite.com)", "(set-cookie: jeesite.session.id=)", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Jenkins", "body|header|ico", "or", InStr{"(jenkins-agent-protocols|Error 403 No valid crumb was included in the request)", "X-Jenkins", "(23e8c7bd78e8cd826c5a6073b15068b1)"}, ReqHttp{"", "", nil, ""}},
-	{1, "Jetty", "header|ico", "or", InStr{"", "(Server: Jetty(.*))", "(ed7d5c39c69262f4ba95418d4f909b10)"}, ReqHttp{"", "", nil, ""}},
+	{1, "Jetty", "header|ico", "or", InStr{"", "(Server: Jetty)", "(ed7d5c39c69262f4ba95418d4f909b10)"}, ReqHttp{"", "", nil, ""}},
 	{1, "JFrog", "body|header", "or", InStr{"(src=/ui/img/jfrog|<meta http-equiv=\"refresh\" content=\"0;URL=/artifactory\">|Artifactory is a binaries repository manager)", "(Location: /artifactory/)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "JianHengXinAn-JH-LAS", "body", "", InStr{"(jh-la3600|建恒信安日志审计系统)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "jianzhengzhe-BodyWornCamera", "body", "", InStr{"(/user/getdefaultpage|/record/index|href=\"/html/download.html\">工具下载</a></li>)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2226,7 +2226,7 @@ var RuleData = []RuleLab{
 	{1, "jidiAudit", "body", "", InStr{"(jddba 1.0)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "JieNoHan-Journal", "body", "", InStr{"(tougao/misc.js)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Jigsaw", "header", "", InStr{"", "(server: jigsaw)", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "Jinher-OA", "body", "", InStr{"(Jinher Software|<title>金和(.*)</title>|js/passwordcommon.js|js/passwordnew.js|jinher network|c6/jhsoft.web.login|closewindownoask)", "", ""}, ReqHttp{"", "", nil, ""}},
+	{3, "Jinher-OA", "body", "", InStr{"(Jinher Software|<title>金和|js/passwordcommon.js|js/passwordnew.js|jinher network|c6/jhsoft.web.login|closewindownoask)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "jinqing", "body", "", InStr{"(action=\"/j_spring_security_check)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Jira", "body|header|ico", "or", InStr{"(jira.webresources|ams-build-number|com.atlassian.plugins|content=\"jira|href=\"/secure/AboutPage.jspa\">About JIRA</a>|<meta name=\"stp-license-product-name\" content=\"JIRA\"/>)", "(atlassian.xsrf.token)", "(88717398db158e3330ce94fc1784e4a7)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Jit-Authentication-gateway", "body", "", InStr{"(/jit_pnx_portal/)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2381,7 +2381,7 @@ var RuleData = []RuleLab{
 	{1, "LanyEye", "body", "", InStr{"(<font>兰眼下一代威胁感知系统</font>|/skin/admin/img/login/laneye.png)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "laobanmail-VisualHost", "body", "", InStr{"(/public/js/util/xg_oyang.js)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "laravel-admin", "body", "", InStr{"(vendor/laravel-admin/|欢迎登录laravel-admin</p>)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "Laravel", "body|header", "or", InStr{"(<title>Laravel</title>|PhpDebugBar.Widgets.LaravelSQLQueriesWidget|<a href=\"https://laravel.com/docs\">Documentation</a>|<a href=\"https://laravel.com/docs\">Docs</a>|<a href=\"https://github.com/laravel/laravel\">GitHub</a>)", "(set-Cookie: laravel_session=(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{3, "Laravel", "body|header", "or", InStr{"(<title>Laravel</title>|PhpDebugBar.Widgets.LaravelSQLQueriesWidget|<a href=\"https://laravel.com/docs\">Documentation</a>|<a href=\"https://laravel.com/docs\">Docs</a>|<a href=\"https://github.com/laravel/laravel\">GitHub</a>)", "(set-Cookie: laravel_session=)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Lasso-Web-Data-Engine", "header", "", InStr{"", "(server: lasso)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "lastfmproxy", "ico", "", InStr{"", "", "(fa21ab1b1e1b4c9516afbd63e91275a9)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Launch-Cameras-and-Surveillance", "body", "", InStr{"(action=\"webs/loginhandle)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2509,7 +2509,7 @@ var RuleData = []RuleLab{
 	{1, "M2M-Server", "header", "", InStr{"", "(realm=\"m2m server|server: idvhttpd)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "M2Soft-RDServer", "header", "", InStr{"", "(server: rdserver)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "MacbookAIR", "header", "", InStr{"", "(macbook-air)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Maccms", "body", "", InStr{"(src=\"/template/paody/images/(.*)\\.png\")", "", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Maccms", "body", "", InStr{"(src=\"/template/paody/images/)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "MacHTTP", "header", "", InStr{"", "(server: machttp)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Mac-OSX-Server", "header", "", InStr{"", "(realm=\"mac os x server)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Macromedia Breeze", "ico", "", InStr{"", "", "(80656aabfafe0f3559f71bb0524c4bb3)"}, ReqHttp{"", "", nil, ""}},
@@ -2630,7 +2630,7 @@ var RuleData = []RuleLab{
 	{1, "Miniature-JWS", "header", "", InStr{"", "(rogatkin's)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "MiniBB", "body", "", InStr{"(<!--minibb copyright link|powered by <a href=\"http://www.minibb.)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "mini_httpd", "header", "", InStr{"", "(mini_httpd)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "MinIO", "body|header|ico", "or", InStr{"(<img src=\"/minio/logo.svg\" alt=\"\">|<title>Minio Browser</title>)", "(Server: MinIO(.*))", "(613d1c501e586902bd510ab8b8de7cfa)"}, ReqHttp{"", "", nil, ""}},
+	{1, "MinIO", "body|header|ico", "or", InStr{"(<img src=\"/minio/logo.svg\" alt=\"\">|<title>Minio Browser</title>)", "(Server: MinIO)", "(613d1c501e586902bd510ab8b8de7cfa)"}, ReqHttp{"", "", nil, ""}},
 	{1, "MINIO-Browser", "body", "", InStr{"(href=\"/minio/loader.css\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Mirapoint", "body", "", InStr{"(/wm/mail/login.html)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Mi-Router", "body", "", InStr{"(url=/cgi-bin/luci/web|mirouter-router-2</a>)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2857,12 +2857,12 @@ var RuleData = []RuleLab{
 	{1, "NexG-VForce", "body", "", InStr{"(var lurl = \"vos.shtml\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "NeXpose-Security-Console", "body", "", InStr{"(/nexpose-dark.min.css|nexposeccpassword|/nexpose-features.js)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Nextcloud-Product", "body", "", InStr{"(nextcloud</a> – 给您所有数据一个安全的家)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{3, "Nexus-Repository-Manager", "header|body|ico", "or", InStr{"(nexus repository manager|progressmessage('initializing ...')|Sonatype Nexus Repository Manager|Nexus Repository Manager)", "(Server: Nexus(.*))", "(79a95f4f1c2cc36eea51fe66450acfa2)"}, ReqHttp{"", "", nil, ""}},
+	{3, "Nexus-Repository-Manager", "header|body|ico", "or", InStr{"(nexus repository manager|progressmessage('initializing ...')|Sonatype Nexus Repository Manager|Nexus Repository Manager)", "(Server: Nexus)", "(79a95f4f1c2cc36eea51fe66450acfa2)"}, ReqHttp{"", "", nil, ""}},
 	{3, "Nexus-Router", "body", "", InStr{"(http://nexuswifi.com/)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "NGI-DIAM4", "body", "", InStr{"(src=\"/diam4/inc/lang/fr/lang.min.js\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "NGI-GXD5-Pacs", "body", "", InStr{"(<div id=\"passwordwrapper\" class=\"fieldwrapper\">)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Nginx-admin", "header", "", InStr{"", "(nginx admin)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Nginx", "header|body", "or", InStr{"(Welcome to nginx)", "(Server: nginx(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Nginx", "header|body", "or", InStr{"(Welcome to nginx)", "(Server: nginx)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Niagara-Web-Server", "header", "", InStr{"", "(niagara-release)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "nington-CAS", "body", "", InStr{"(id=\"dynamicpasswordwithmobile\">)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "NITC-CMS", "body", "", InStr{"(nitc web marketing service|/images/nitc1.png)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2938,7 +2938,7 @@ var RuleData = []RuleLab{
 	{1, "Octeth Technologies oemPro", "ico", "", InStr{"", "", "(48c02490ba335a159b99343b00decd87)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Octopress", "ico", "", InStr{"", "", "(eec3051d5c356d1798bea1d8a3617c51)"}, ReqHttp{"", "", nil, ""}},
 	{1, "octoprint", "body", "", InStr{"(/octoprint/wiki/plugin:-discovery)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "OctopusPro", "body", "", InStr{"((.*)rel=\"home\">OctopusPro</a></h2>)", "", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "OctopusPro", "body", "", InStr{"(rel=\"home\">OctopusPro</a></h2>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Octopussy", "body", "", InStr{"(value=\"connect to octopussy|align=\"center\" >octopussy)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Odoo", "body", "", InStr{"(You should be redirected automatically to target URL: <a href=\"/web\">/web</a>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "oExam", "body", "", InStr{"(}else if(type===\"examcard\"){)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2948,7 +2948,7 @@ var RuleData = []RuleLab{
 	{1, "OLAT", "body", "", InStr{"(title=\"homepage of open source lms olat|content=\"olat|content=\"olat 是一个学习内容管理系统 (lcms).|content=\"olat - online learning and training|o_info.uriprefix=\"/olat/dmz/\";|href=\"/olat/raw/)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "OMAudit", "body", "", InStr{"(omaudit v3版)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "OMD-Monitoring", "header", "", InStr{"", "(realm=\"omd monitoring)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "OneinStack", "body", "", InStr{"(<a class=\"nav-link\" href=\"https://oneinstack.com\" target=\"_blank\">OneinStack(.*))", "", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "OneinStack", "body", "", InStr{"(<a class=\"nav-link\" href=\"https://oneinstack.com\" target=\"_blank\">OneinStack)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Onethink", "body", "", InStr{"(<a href=\"http://www.onethink.cn\" target=\"_blank\">onethink</a>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Online-Grades", "body", "", InStr{"(content=\"online grades)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Online Judge", "body", "", InStr{"(<title>OnlineJudge</title>)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -2976,7 +2976,7 @@ var RuleData = []RuleLab{
 	{1, "opennms", "body", "", InStr{"(/css/gwt-asset.css|opennms® is a registered trademark of|/opennms/index.jsp)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "opennms", "header", "", InStr{"", "(/opennms/login.jsp)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Open-Realty", "body", "", InStr{"(content=\"open-realty|href=\"http://www.open-realty.org\" title=\"powered by open-realty)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "OpenResty", "body|header", "or", InStr{"(Thank you for flying OpenResty)", "(Server: openresty(.*))", "(88717398db158e3330ce94fc1784e4a7)"}, ReqHttp{"", "", nil, ""}},
+	{1, "OpenResty", "body|header", "or", InStr{"(Thank you for flying OpenResty)", "(Server: openresty)", "(88717398db158e3330ce94fc1784e4a7)"}, ReqHttp{"", "", nil, ""}},
 	{1, "OpenResty", "body", "", InStr{"(<center>openresty/)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "OpenResty", "header", "", InStr{"", "(ngx_openresty)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "OpenSNS", "body", "", InStr{"(powered by opensns|content=\"opensns|os-icon-home app-icon )", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -3307,7 +3307,7 @@ var RuleData = []RuleLab{
 	{1, "ralph", "body", "", InStr{"(ralph <strong>3</strong>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "ramaze-ruby", "ico", "", InStr{"", "", "(6be5ebd07e37d0b415ec83396a077312|12225e325909cee70c31f5a7ab2ee194)"}, ReqHttp{"", "", nil, ""}},
 	{1, "ramptel-SansCord-Router", "body", "", InStr{"(name=username value=\"ywrtaw4=\"|href=\"http://www.ramptel.com/\")", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Rancher", "body|header", "or", InStr{"(Welcome to Rancher|<meta name=\"ui/configs/asset-manifest\" content=\"(.*))", "(Set-Cookie: PL=rancher(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Rancher", "body|header", "or", InStr{"(Welcome to Rancher|<meta name=\"ui/configs/asset-manifest\" content=)", "(Set-Cookie: PL=rancher)", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Ranzhi-OA", "body", "", InStr{"(/sys/index.php?m=user&f=login&referer=)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Rapid7 (NeXpose)", "ico", "", InStr{"", "", "(e19ffb2bc890f5bdca20f10bfddb288d)"}, ReqHttp{"", "", nil, ""}},
 	{1, "RAPID-Browser", "body", "", InStr{"(<!-- ### bullet table ### -->|images/login_button.gif\" alt=\"login to rapid browser)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -3347,7 +3347,7 @@ var RuleData = []RuleLab{
 	{1, "Reremouse-Exam-System", "body", "", InStr{"(蝙蝠在线考试系统|博库医学在线考试系统，技术支持：杭州博库科技有限公司|src=\"/resources/js/upscroll.js\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Residential-Gateway", "body", "", InStr{"( sagemcom corporation.)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Residential-Gateway", "header", "", InStr{"", "(residential gateway)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Resin", "body|header", "or", InStr{"(<script type=\"text/javascript\" src=\"/resin-doc/js/default.js\">)", "(Server: Resin(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Resin", "body|header", "or", InStr{"(<script type=\"text/javascript\" src=\"/resin-doc/js/default.js\">)", "(Server: Resin)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "ResourceManager", "body", "", InStr{"(this is standby rm. redirecting to the current active rm)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Restlet-Framework", "header", "", InStr{"", "(restlet-framework)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "reviewboard", "body", "", InStr{"(/static/rb/images/delete)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -3497,7 +3497,7 @@ var RuleData = []RuleLab{
 	{1, "Secworld-VPN", "body", "", InStr{"(admin/js/virtual_keyboard.js|src=\"images/login_logo.gif\"|/images/sslvpnportallogo.jpg|证书认证|secworld)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Secworld-VPN", "header", "", InStr{"", "(host_for_cookie)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Seehealth-Health-Management-System", "body", "", InStr{"(href=\"upvalidatefile.aspx)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Seeyon", "header|body", "or", InStr{"(href=\"/seeyon/common/images/)", "(Server: Seeyon-Server(.*))", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Seeyon", "header|body", "or", InStr{"(href=\"/seeyon/common/images/)", "(Server: Seeyon-Server)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "SEH-KYOCERA-PrintServer", "body", "", InStr{"(<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"> <title>print server homepage</title></head> <frameset cols=\"200)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "selfhtml", "ico", "", InStr{"", "", "(7f57bbd0956976e797b4e8eebdc6d733)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Semaphore", "body", "", InStr{"(www.smartlogic.com|alt=\"powered by semaphore\")", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -3837,7 +3837,7 @@ var RuleData = []RuleLab{
 	{1, "Tenda-W20E", "body", "", InStr{"(var sys_target = \"w20e\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Tenda-W30E", "body", "", InStr{"(var sys_target = \"w30e\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Tenda-WiFi", "body", "", InStr{"(src=\"img/logo-inverse.png\" alt=\"tenda logo\")", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Tengine", "body|header", "or", InStr{"(If you see this page, the tengine web server is successfully installed and)", "(Server: Tengine(.*))", "(88717398db158e3330ce94fc1784e4a7)"}, ReqHttp{"", "", nil, ""}},
+	{1, "Tengine", "body|header", "or", InStr{"(If you see this page, the tengine web server is successfully installed and)", "(Server: Tengine)", "(88717398db158e3330ce94fc1784e4a7)"}, ReqHttp{"", "", nil, ""}},
 	{1, "TengWeiOA", "body", "", InStr{"(/_common/scripts/global.js|/valcode.aspx)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Tenon-iTools", "header", "", InStr{"", "(itools|mac os x)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "teradata-Aster", "body", "", InStr{"(images/teradata_aster_logo.png)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -3978,7 +3978,7 @@ var RuleData = []RuleLab{
 	{1, "TP_LINK-TL-PS110U", "header", "", InStr{"", "(tl-ps110u)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "TP_LINK-TL-WA801ND", "header", "", InStr{"", "(tp-link wireless wa801nd|realm=\"tp-link wireless n access point wa801nd)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "TP_LINK-TL-WDR7500", "header", "", InStr{"", "(realm=\"tp-link wireless wdr7500|realm=\"tp-link wireless dual band gigabit router wdr7500)", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "TP_LINK-TL-WDR7661", "body", "", InStr{"(<title>TL-WDR7661(.*)</title>|var proName=\"TL-WDR7661)", "", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "TP_LINK-TL-WDR7661", "body", "", InStr{"(var proName=\"TL-WDR7661)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "TP-LINK-Wireless-N-Router-WR941N", "header", "", InStr{"", "(realm=\"tp-link wireless n router wr941n|tp-link wireless wr941n)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "TP-LINK-Wireless-Router", "body", "", InStr{"(javascript:gourl('http://www.tp-link.com.cn');)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "TP-LINK-Wireless-Router", "header", "", InStr{"", "(tp-link|wireless)", ""}, ReqHttp{"", "", nil, ""}},
@@ -4323,7 +4323,7 @@ var RuleData = []RuleLab{
 	{1, "Whir-ezOFFICE", "body", "", InStr{"(ezofficeusername|whirrootpath|/defaultroot/js/cookie.js)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Whir-ezOFFICE", "header", "", InStr{"", "(loclan)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "whir-flexoffice", "body", "", InStr{"(var flexofficepath=\"\\/flexoffice\")", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Whir-OA", "body|header|ico", "or", InStr{"(return ajaxForSync[(]whirRootPath)", "(Set-Cookie: OASESSIONID=(.*))", "(fa1f01d0392d60663d8ce936fe06096a)"}, ReqHttp{"", "", nil, ""}},
+	{1, "Whir-OA", "body|header|ico", "or", InStr{"(return ajaxForSync[(]whirRootPath)", "(Set-Cookie: OASESSIONID=)", "(fa1f01d0392d60663d8ce936fe06096a)"}, ReqHttp{"", "", nil, ""}},
 	{1, "WHMCS", "body", "", InStr{"(powered by <a href=\"http://www.whmcs.com|<div id=\"welcome_box\">please <a href=\"clientarea.php\" title=\"login\"><strong>login</strong></a> or <a href=\"register.php\" title=\"register\"><strong>register</strong></a></div>)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "WHOLETON-Employee-Internet-Management", "body", "", InStr{"(updateloginpswd.php|passroedele|下一代防火墙|classid=\"clsid:81be1f16-9d88-48cc-8d3e-cb8e37b71fee)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "WHOLETON-NGFW", "body", "", InStr{"(/base/img/login_logo_ngaf.jpg)", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -4358,7 +4358,7 @@ var RuleData = []RuleLab{
 	{1, "Wiwide-Commercial-Wi-Fi-Device", "body", "", InStr{"(http-equiv=\"refresh\" content=\"0; url=/cgi-bin/luci\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Wiwide-Commercial-Wi-Fi-Device", "header", "", InStr{"", "(tx-server: mixr)", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "WoltLab Burning Board", "ico", "", InStr{"", "", "(1bf954ba2d568ec9771d35c94a6eb2dc)"}, ReqHttp{"", "", nil, ""}},
-	{3, "Wordpress Admin", "body|header|ico", "or", InStr{"(<a href=\"https://cn.wordpress.org/\" title=)", "(Set-Cookie: wordpress_test_cookie=(.*))", "(e1e8bdc3ce87340ab6ebe467519cf245|b231ad66a2a9b0eb06f72c4c88973039|D5FE5CBCC31CFF5F8AC010DB72EB000C|28a122aa74f6929b0994fc544555c0b1|3ead5afa19537170bb980924397b70d6|e44d22b74f7ee4435e22062d5adf4a6a|6cec5a9c106d45e458fc680f70df91b0|fa54dbf2f61bd2e0188e47f5f578f736)"}, ReqHttp{"GET", "/wp-login.php", nil, ""}},
+	{3, "Wordpress Admin", "body|header|ico", "or", InStr{"(<a href=\"https://cn.wordpress.org/\" title=)", "(Set-Cookie: wordpress_test_cookie=)", "(e1e8bdc3ce87340ab6ebe467519cf245|b231ad66a2a9b0eb06f72c4c88973039|D5FE5CBCC31CFF5F8AC010DB72EB000C|28a122aa74f6929b0994fc544555c0b1|3ead5afa19537170bb980924397b70d6|e44d22b74f7ee4435e22062d5adf4a6a|6cec5a9c106d45e458fc680f70df91b0|fa54dbf2f61bd2e0188e47f5f578f736)"}, ReqHttp{"GET", "/wp-login.php", nil, ""}},
 	{3, "WordPress", "body|header", "or", InStr{"(name=\"generator\" content=\"wordpress |/wp-includes/)", "(x-pingback|wordpress_test_cookie)", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "WordPress Multi-User (MU)", "ico", "", InStr{"", "", "(95103d0eabcd541527a86f23b636e794)"}, ReqHttp{"", "", nil, ""}},
 	{1, "Worldsoft CMS", "ico", "", InStr{"", "", "(E9E6C56F63122FB05E6899E1DEDD0734)"}, ReqHttp{"", "", nil, ""}},
@@ -4441,6 +4441,7 @@ var RuleData = []RuleLab{
 	{1, "YMail-Optical-Content-Reading", "body", "", InStr{"(/ymail/default/js/menu.js)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Ymhome-OA", "body", "", InStr{"(/yimioa.apk)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Yongyou-ism", "body", "", InStr{"(sheight*window.screen.deviceydpi)", "", ""}, ReqHttp{"", "", nil, ""}},
+	{3, "Yonyou-NC", "body", "", InStr{"(url=nccloud)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Yonyou-ERP", "body", "", InStr{"(login_main_bg|login_owner)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Yonyou-ERP-NC", "body", "", InStr{"(/nc/servlet/nc.ui.iufo.login.index)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{3, "Yonyou-GRP-U8", "body", "", InStr{"(window.location.replace(\"login.jsp?up=1\"))", "", ""}, ReqHttp{"", "", nil, ""}},
@@ -4455,7 +4456,7 @@ var RuleData = []RuleLab{
 	{3, "Yonyou-U8-cloud", "body", "", InStr{"(开启u8 cloud云端之旅)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Yonyou-Uclient", "body", "", InStr{"(http-equiv=refresh content=0;url=index.jsp)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Yonyou-UFIDA", "body", "", InStr{"(/system/login/login.asp?appid=)", "", ""}, ReqHttp{"", "", nil, ""}},
-	{1, "Yonyou-UFIDA-NC", "body", "", InStr{"(ufida|logo/images/|logo/images/ufida_nc.png|<div id=\"nc_text\">|<div id=\"nc_img\" onmouseover=\"overimage('nc');|产品登录界面|ufida nc)", "", ""}, ReqHttp{"", "", nil, ""}},
+	{1, "Yonyou-UFIDA-NC", "body", "", InStr{"(ufida|logo/images/|logo/images/ufida_nc.png|<div id=\"nc_text\">|<div id=\"nc_img\" onmouseover=\"overimage('nc');|ufida nc)", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Yottabyte-Company's-product", "body", "", InStr{"(class=\"btn btn-primary form-btn form-btn-login pull-right\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "Yottabyte-Rizhiyi", "body", "", InStr{"(href=\"/static/assets/yottaweb-elements/index.css\")", "", ""}, ReqHttp{"", "", nil, ""}},
 	{1, "YouHua-iEMOS_CW", "body", "", InStr{"(var id = document.getelementbyid(\"txtyhmm\").value)", "", ""}, ReqHttp{"", "", nil, ""}},
diff --git a/internal/operate/flag_network.go b/internal/operate/flag_network.go
index 0d86682..c8ebcdc 100644
--- a/internal/operate/flag_network.go
+++ b/internal/operate/flag_network.go
@@ -32,15 +32,41 @@ func FlagNetwork(op *os.File, wg *sync.WaitGroup, lock *sync.Mutex, address stri
 	intIde := 0
 	for _, host := range actualHosts {
 		for _, port := range ports {
-			wg.Add(1)
+			wg.Add(3)
 			intSyncThread++
 			go func(host string, port int, Args map[string]interface{}) {
-				res := protocol.Discover(host, port, Args)
-				if res["status"].(string) == "open" {
+				resTls := protocol.DiscoverTls(host, port, Args)
+				if resTls["status"].(string) == "open" {
 					intAll++
-					parse.VerboseParse(res)
-					output.Write(res, op)
-					if strings.Contains(res["uri"].(string), "://") {
+					parse.VerboseParse(resTls)
+					output.Write(resTls, op)
+					if strings.Contains(resTls["uri"].(string), "://") {
+						intIde++
+					}
+				}
+				wg.Done()
+			}(host, port, Args)
+
+			go func(host string, port int, Args map[string]interface{}) {
+				resTcp := protocol.DiscoverTcp(host, port, Args)
+				if resTcp["status"].(string) == "open" {
+					intAll++
+					parse.VerboseParse(resTcp)
+					output.Write(resTcp, op)
+					if strings.Contains(resTcp["uri"].(string), "://") {
+						intIde++
+					}
+				}
+				wg.Done()
+			}(host, port, Args)
+
+			go func(host string, port int, Args map[string]interface{}) {
+				resUdp := protocol.DiscoverUdp(host, port, Args)
+				if resUdp["status"].(string) == "open" {
+					intAll++
+					parse.VerboseParse(resUdp)
+					output.Write(resUdp, op)
+					if strings.Contains(resUdp["uri"].(string), "://") {
 						intIde++
 					}
 				}
diff --git a/internal/operate/flag_url.go b/internal/operate/flag_url.go
index 89ae63a..39ff801 100644
--- a/internal/operate/flag_url.go
+++ b/internal/operate/flag_url.go
@@ -13,20 +13,15 @@ func FlagUrl(op *os.File, uri string, Args map[string]interface{}) {
 	if logger.DebugError(err) {
 		return
 	}
-	if Args["FlagMode"] == Args["FlagType"] {
-		if scheme == "https" {
-			Args["FlagType"] = "tls"
-			Args["FlagMode"] = scheme
-		} else {
-			Args["FlagType"] = "tcp"
-			Args["FlagMode"] = scheme
-		}
-	}
-	res := protocol.Discover(host, port, Args)
-	if Args["FlagMode"] == Args["FlagType"] {
-		Args["FlagType"] = ""
-		Args["FlagMode"] = ""
+	var res map[string]interface{}
+	//Args["FlagMode"] = scheme
+	switch scheme {
+	case "http":
+		res = protocol.DiscoverTcp(host, port, Args)
+	case "https":
+		res = protocol.DiscoverTls(host, port, Args)
 	}
+	//Args["FlagMode"] = ""
 	parse.VerboseParse(res)
 	output.Write(res, op)
 }
diff --git a/internal/output/output.go b/internal/output/output.go
index 67eb2e4..ed9940b 100644
--- a/internal/output/output.go
+++ b/internal/output/output.go
@@ -1,41 +1,45 @@
 package output
 
 import (
+	"encoding/hex"
+	"encoding/json"
 	"fmt"
+	"github.com/zhzyker/dismap/internal/flag"
 	"github.com/zhzyker/dismap/pkg/logger"
 	"os"
+	"time"
 )
 
-func Open(Args map[string]interface{}) *os.File  {
-	o := Args["FlagOutput"].(string)
-	op, err :=  os.OpenFile(o, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
-	if logger.DebugError(err) {
-		logger.Error(fmt.Sprintf("Failed to open file %s", logger.Red(o)))
+func Open(Args map[string]interface{}) *os.File {
+	if len(Args["FlagOutJson"].(string)) != 0 {
+		return openFile(Args["FlagOutJson"].(string))
+	} else {
+		return openFile(Args["FlagOutput"].(string))
 	}
-	return op
 }
 
 func Write(result map[string]interface{}, output *os.File) {
 	if result["status"].(string) == "close" {
 		return
 	}
-	JsonOutput(result, "save")
-	content := fmt.Sprintf("%s, %s, %s, %s, %s, %s",
-		logger.GetTime(),
-		result["type"],
-		result["protocol"],
-		logger.Clean(result["identify.string"].(string)),
-		result["uri"],
-		result["banner.string"])
-	var text = []byte(content + "\n")
-	_, err := output.Write(text)
-	if logger.DebugError(err) {
-		logger.Error(fmt.Sprintf("Target %s write failed", logger.Red(result["uri"])))
+	if len(flag.OutJson) != 0 {
+		result["banner.byte"] = hex.EncodeToString(result["banner.byte"].([]byte))
+		result["date"] = time.Now().Unix()
+		byteR, _ := json.Marshal(result)
+		writeContent(output, string(byteR))
+	} else {
+		content := fmt.Sprintf("%s, %s, %s, %s, %s, %s",
+			logger.GetTime(),
+			result["type"],
+			result["protocol"],
+			logger.Clean(result["identify.string"].(string)),
+			result["uri"],
+			result["banner.string"])
+		writeContent(output, content)
 	}
 }
 
 func Close(file *os.File) {
-	JsonOutput(nil, "write")
 	err := file.Close()
 	if logger.DebugError(err) {
 		logger.Error(fmt.Sprintf("Close file %s exception", logger.Red(file.Name())))
@@ -43,3 +47,18 @@ func Close(file *os.File) {
 		logger.Info("The identification results are saved in " + logger.Yellow(file.Name()))
 	}
 }
+
+func openFile(name string) *os.File {
+	osFile, err := os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if logger.DebugError(err) {
+		logger.Error(fmt.Sprintf("Failed to open file %s", logger.Red(name)))
+	}
+	return osFile
+}
+
+func writeContent(file *os.File, content string) {
+	_, err := file.Write([]byte(content + "\n"))
+	if logger.DebugError(err) {
+		logger.Error(fmt.Sprintf("Write failed: %s", logger.Red(content)))
+	}
+}
diff --git a/internal/output/output_json.go b/internal/output/output_json.go
deleted file mode 100644
index 35eb4ee..0000000
--- a/internal/output/output_json.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package output
-
-import (
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"github.com/zhzyker/dismap/internal/flag"
-	"github.com/zhzyker/dismap/pkg/logger"
-	"os"
-	"strings"
-)
-
-var JsonData []string
-
-func JsonOutput(result map[string]interface{}, operate string) {
-	if flag.OutJson == "" {
-		return
-	}
-	if operate == "save" {
-		result["banner.byte"] = hex.EncodeToString(result["banner.byte"].([]byte))
-		byteR, err := json.Marshal(result)
-		if logger.DebugError(err) {
-			logger.Error("json.Marshal failed to " + logger.Red("flag.OutJson"))
-		}
-		strR := string(byteR)
-		JsonData = append(JsonData, strR)
-	}
-	if operate == "write" {
-		_, err := os.Stat(flag.OutJson)
-		if err == nil {
-			logger.Error(logger.LightRed(fmt.Sprintf("json file %s already exists", flag.OutJson)))
-		}
-		jsonFile, err :=  os.OpenFile(flag.OutJson, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
-		if logger.DebugError(err) {
-			logger.Error(fmt.Sprintf("Failed to open file %s", logger.Red(flag.OutJson)))
-		}
-		byteContent := strings.Join(JsonData, ", ")
-		_, err = jsonFile.Write([]byte(fmt.Sprintf("[%s]\r\n", byteContent)))
-		if logger.DebugError(err) {
-			logger.Error(fmt.Sprintf("Target %s write failed", logger.Red(result["uri"])))
-		}
-		err = jsonFile.Close()
-		if logger.DebugError(err) {
-			logger.Error(fmt.Sprintf("Close file %s exception", logger.Red(flag.OutJson)))
-		} else {
-			logger.Info("The identification json results are saved in " + logger.Yellow(flag.OutJson))
-		}
-	}
-}
diff --git a/internal/protocol/discover.go b/internal/protocol/discover.go
index 7ef81bf..7ce518d 100644
--- a/internal/protocol/discover.go
+++ b/internal/protocol/discover.go
@@ -3,6 +3,8 @@ package protocol
 import (
 	"github.com/zhzyker/dismap/internal/parse"
 	"github.com/zhzyker/dismap/internal/protocol/get"
+	"github.com/zhzyker/dismap/pkg/logger"
+	"time"
 )
 
 func isContainInt(items []int, item int) bool {
@@ -14,117 +16,74 @@ func isContainInt(items []int, item int) bool {
 	return false
 }
 
-func getTls(result map[string]interface{}, host string, port int, timeout int) bool {
-	b, err := get.TlsProtocol(host, port, timeout)
-	if err == nil {
-		result["type"] = "tls"
-		result["status"] = "open"
-		result["banner.byte"] = b
-		return true
+func setResult(host string, port int, Args map[string]interface{}) map[string]interface{} {
+	var banner []byte
+	result := map[string]interface{}{
+		"date":            time.Now().Unix(),
+		"status":          "None",
+		"banner.byte":     banner,
+		"banner.string":   "None",
+		"protocol":        Args["FlagMode"].(string),
+		"type":            Args["FlagType"].(string),
+		"host":            host,
+		"port":            port,
+		"uri":             "None",
+		"note":            "None",
+		"path":            "",
+		"identify.bool":   false,
+		"identify.string": "None",
 	}
-	return false
+	return result
 }
 
-func getTcp(result map[string]interface{}, host string, port int, timeout int) bool {
-	b, err := get.TcpProtocol(host, port, timeout)
-	if err == nil {
-		result["type"] = "tcp"
-		result["status"] = "open"
-		result["banner.byte"] = b
-		return true
+func DiscoverTls(host string, port int, Args map[string]interface{}) map[string]interface{} {
+	result := setResult(host, port, Args)
+	b, err := get.TlsProtocol(host, port, Args["FlagTimeout"].(int))
+	if logger.DebugError(err) {
+		return result
 	}
-	return false
-}
-
-func getUdp(result map[string]interface{}, host string, port int, timeout int) bool {
-	b, err := get.UdpProtocol(host, port, timeout)
-	if err == nil {
-		result["type"] = "udp"
-		result["status"] = "open"
-		result["banner.byte"] = b
-		return true
+	result["type"] = "tls"
+	result["status"] = "open"
+	result["banner.byte"] = b
+	result["banner.string"] = parse.ByteToStringParse1(b)
+	if JudgeTls(result, Args) {
+		return result
 	}
-	return false
+	return result
 }
 
-func getInfo(result map[string]interface{}, host string, port int, timeout int, pt string) {
-	var udpPort = []int{53,111,123,137,138,139,12345}
-	switch pt {
-	case "" :
-		if getTls(result, host, port, timeout) {
-			return
-		}
-		if getTcp(result, host, port, timeout) {
-			return
-		}
-		if isContainInt(udpPort, port) == true {
-			if getUdp(result, host, port, timeout) {
-				return
-			}
-		}
-	case "tls" :
-		if getTls(result, host, port, timeout) {
-			return
-		}
-	case "tcp" :
-		if getTcp(result, host, port, timeout) {
-			return
-		}
-	case "udp" :
-		if getUdp(result, host, port, timeout) {
-			return
-		}
+func DiscoverTcp(host string, port int, Args map[string]interface{}) map[string]interface{} {
+	result := setResult(host, port, Args)
+	b, err := get.TcpProtocol(host, port, Args["FlagTimeout"].(int))
+	if logger.DebugError(err) {
+		return result
 	}
-	result["type"] = pt
-	result["status"] = "close"
-	result["banner.byte"] = make([]byte, 256)
-	return
-}
-
-func setResult(host string, port int, Args map[string]interface{}) map[string]interface{} {
-	timeout := Args["FlagTimeout"].(int)
-	scheme := Args["FlagMode"].(string)
-	pt := Args["FlagType"].(string)
-	var banner []byte
-	result := map[string]interface{}{
-		"status": "None",
-		"banner.byte": banner,
-		"banner.string": "None",
-		"protocol": scheme,
-		"type": pt,
-		"host": host,
-		"port": port,
-		"uri": "None",
-		"note": "None",
-		"path": "",
-		"identify.bool": false,
-		"identify.string": "None",
+	result["type"] = "tcp"
+	result["status"] = "open"
+	result["banner.byte"] = b
+	result["banner.string"] = parse.ByteToStringParse1(b)
+	if JudgeTcp(result, Args) {
+		return result
 	}
-	getInfo(result, host, port, timeout, pt)
 	return result
 }
 
-func Discover(host string, port int, Args map[string]interface{}) map[string]interface{} {
+func DiscoverUdp(host string, port int, Args map[string]interface{}) map[string]interface{} {
 	result := setResult(host, port, Args)
-	if result["status"] != "open" {
+	var udpPort = []int{53, 111, 123, 137, 138, 139, 12345}
+	if isContainInt(udpPort, port) {
 		return result
 	}
-	result["banner.string"] = parse.ByteToStringParse1(result["banner.byte"].([]byte))
-
-	if result["type"] == "tls" {
-		if JudgeTls(result, Args) {
-			return result
-		}
-	}
-	if result["type"] == "tcp" {
-		if JudgeTcp(result, Args) {
-			return result
-		}
+	b, err := get.UdpProtocol(host, port, Args["FlagTimeout"].(int))
+	if logger.DebugError(err) {
+		return result
 	}
-	if result["type"] == "udp" {
-		if JudgeUdp(result, Args) {
-			return result
-		}
+	result["type"] = "tcp"
+	result["status"] = "open"
+	result["banner.byte"] = b
+	result["banner.string"] = parse.ByteToStringParse1(b)
+	if JudgeUdp(result, Args) {
+		return result
 	}
 	return result
-}
\ No newline at end of file
+}
diff --git a/internal/protocol/identify.go b/internal/protocol/identify.go
index 011284e..68a2cc3 100644
--- a/internal/protocol/identify.go
+++ b/internal/protocol/identify.go
@@ -147,11 +147,17 @@ func JudgeTcp(result map[string]interface{}, Args map[string]interface{}) bool {
 			return true
 		}
 	}
+	if protocol == "giop" || runAll {
+		if judge.TcpGIOP(result, Args) {
+			printSuccess("TCP/GIOP", result)
+			return true
+		}
+	}
 
 	status := result["status"].(string)
 	if status == "open" && runAll {
 		printFailed("TCP/unknown", result)
-		}
+	}
 	return false
 }
 
@@ -183,7 +189,6 @@ func JudgeTls(result map[string]interface{}, Args map[string]interface{}) bool {
 	status := result["status"].(string)
 	if status == "open" && runAll {
 		printFailed("TLS/unknown", result)
-		//logger.Failed(fmt.Sprintf("[%s] %s [%s]", logger.Cyan("TLS/unknown"), parse.SchemeParse(result), logger.Blue(banner)))
 	}
 	return false
 }
@@ -254,8 +259,8 @@ func printFailed(p string, result map[string]interface{}) {
 			logger.Cyan(p),
 			parse.SchemeParse(result),
 			logger.Blue(result["banner.string"].(string))),
-			)
+		)
 		result["identify.string"] = logger.Clean(result["identify.string"].(string))
 		result["note"] = logger.Clean(result["note"].(string))
 	}
-}
\ No newline at end of file
+}
diff --git a/internal/protocol/judge/tcp_giop.go b/internal/protocol/judge/tcp_giop.go
new file mode 100644
index 0000000..45f77f1
--- /dev/null
+++ b/internal/protocol/judge/tcp_giop.go
@@ -0,0 +1,41 @@
+package judge
+
+import (
+	"encoding/hex"
+	"github.com/zhzyker/dismap/internal/parse"
+	"github.com/zhzyker/dismap/internal/proxy"
+	"github.com/zhzyker/dismap/pkg/logger"
+	"strings"
+)
+
+func TcpGIOP(result map[string]interface{}, Args map[string]interface{}) bool {
+	timeout := Args["FlagTimeout"].(int)
+	host := result["host"].(string)
+	port := result["port"].(int)
+
+	conn, err := proxy.ConnProxyTcp(host, port, timeout)
+	if logger.DebugError(err) {
+		return false
+	}
+
+	msg := "\x47\x49\x4f\x50\x01\x02\x00\x03\x00\x00\x00\x17\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x0b\x4e\x61\x6d\x65\x53\x65\x72\x76\x69\x63\x65"
+	_, err = conn.Write([]byte(msg))
+	if logger.DebugError(err) {
+		return false
+	}
+
+	reply := make([]byte, 256)
+	_, _ = conn.Read(reply)
+	if conn != nil {
+		_ = conn.Close()
+	}
+
+	if strings.Contains(hex.EncodeToString(reply[0:4]), "47494f50") == false {
+		return false
+	}
+
+	result["protocol"] = "giop"
+	result["banner.string"] = parse.ByteToStringParse2(reply[0:4])
+	result["banner.byte"] = reply
+	return true
+}
diff --git a/internal/protocol/judge/tcp_telnet.go b/internal/protocol/judge/tcp_telnet.go
index 2fdb1eb..291cb70 100644
--- a/internal/protocol/judge/tcp_telnet.go
+++ b/internal/protocol/judge/tcp_telnet.go
@@ -1,8 +1,10 @@
 package judge
 
 import (
+	"encoding/hex"
 	"github.com/zhzyker/dismap/pkg/logger"
 	"regexp"
+	"strings"
 )
 
 func TcpTelnet(result map[string]interface{}) bool {
@@ -15,6 +17,9 @@ func TcpTelnet(result map[string]interface{}) bool {
 	if ok {
 		result["protocol"] = "telnet"
 		return true
+	} else if strings.Contains(hex.EncodeToString(buff[0:2]), "fffb") {
+		result["protocol"] = "telnet"
+		return true
 	}
 	return false
-}
\ No newline at end of file
+}