Merge pull request hacklcx#78 from hacklcx/dev

Dev
S3c0nd · Apr 15, 2020 · 7f112d1 · 7f112d1
2 parents fedb772 + c46c93b
commit 7f112d1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 29 deletions.
diff --git a/admin/footer.html b/admin/footer.html
@@ -25,6 +25,12 @@
         <div class="tab-content">
             <div class="tab-pane fade in active" id="home-2">
                 <div class="timeline-2">
+                    <div class="time-item">
+                        <div class="item-info">
+                            <small class="text-muted">2020-04-15</small>
+                            <p>发布 v0.6.1 版本</p>
+                        </div>
+                    </div>
                     <div class="time-item">
                         <div class="item-info">
                             <small class="text-muted">2020-04-13</small>

diff --git a/core/rpc/server/server.go b/core/rpc/server/server.go
@@ -139,7 +139,7 @@ func Start(addr string) {
 		log.Pr("RPC", "127.0.0.1", "RPC Server 监听地址失败", err)
 	}
 
-	wg, poolX := pool.New(10)
+	wg, poolX := pool.New(500)
 	defer poolX.Release()
 
 	for {

diff --git a/logs/hfish.log b/logs/hfish.log
@@ -1,26 +0,0 @@
-[HFish] ::1 - [2020-04-12 21:08:58] "GET /fish HTTP/1.1 200 2.732661ms "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:08:58 | 200 |    2.802894ms |             ::1 | GET      /fish
-[HFish] ::1 - [2020-04-12 21:08:58] "GET /get/fish/list?page=1&pageSize=10&type=all&colony=all&so_text= HTTP/1.1 200 717.647µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:08:58 | 200 |     761.957µs |             ::1 | GET      /get/fish/list?page=1&pageSize=10&type=all&colony=all&so_text=
-[HFish] ::1 - [2020-04-12 21:08:58] "GET /get/fish/typeList HTTP/1.1 200 398.674µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:08:58 | 200 |     425.748µs |             ::1 | GET      /get/fish/typeList
-[HFish] ::1 - [2020-04-12 21:08:58] "GET /static/favicon.ico HTTP/1.1 200 5.761358ms "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:08:58 | 200 |    5.797331ms |             ::1 | GET      /static/favicon.ico
-[HFish] ::1 - [2020-04-12 21:09:01] "GET /get/fish/info?id=345420 HTTP/1.1 200 503.042µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:01 | 200 |     580.277µs |             ::1 | GET      /get/fish/info?id=345420
-[HFish] ::1 - [2020-04-12 21:09:10] "GET /fish HTTP/1.1 200 3.724968ms "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:10 | 200 |    3.833232ms |             ::1 | GET      /fish
-[HFish] ::1 - [2020-04-12 21:09:10] "GET /get/fish/list?page=1&pageSize=10&type=all&colony=all&so_text= HTTP/1.1 200 1.281898ms "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:10 | 200 |    1.356016ms |             ::1 | GET      /get/fish/list?page=1&pageSize=10&type=all&colony=all&so_text=
-[HFish] ::1 - [2020-04-12 21:09:10] "GET /get/fish/typeList HTTP/1.1 200 717.999µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:10 | 200 |     755.677µs |             ::1 | GET      /get/fish/typeList
-[HFish] ::1 - [2020-04-12 21:09:10] "GET /static/favicon.ico HTTP/1.1 200 196.15µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:10 | 200 |     258.079µs |             ::1 | GET      /static/favicon.ico
-[HFish] ::1 - [2020-04-12 21:09:13] "GET /get/fish/info?id=345421 HTTP/1.1 200 380.149µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:13 | 200 |     448.807µs |             ::1 | GET      /get/fish/info?id=345421
-[HFish] ::1 - [2020-04-12 21:09:14] "GET /get/fish/info?id=345422 HTTP/1.1 200 660.812µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:14 | 200 |     706.055µs |             ::1 | GET      /get/fish/info?id=345422
-[HFish] ::1 - [2020-04-12 21:09:15] "GET /get/fish/info?id=345423 HTTP/1.1 200 500.405µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:15 | 200 |     599.709µs |             ::1 | GET      /get/fish/info?id=345423
-[HFish] ::1 - [2020-04-12 21:09:24] "GET /get/fish/info?id=345423 HTTP/1.1 200 432.039µs "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" "
-[GIN] 2020/04/12 - 21:09:24 | 200 |     495.844µs |             ::1 | GET      /get/fish/info?id=345423

diff --git a/main.go b/main.go
@@ -17,7 +17,7 @@ func main() {
 		} else if args[1] == "init" || args[1] == "--init" {
 			setting.Init()
 		} else if args[1] == "version" || args[1] == "--version" {
-			fmt.Println("v0.6")
+			fmt.Println("v0.6.1")
 		} else if args[1] == "run" || args[1] == "--run" {
 			setting.Run()
 		} else {

diff --git a/utils/setting/setting.go b/utils/setting/setting.go
@@ -422,7 +422,7 @@ func Help() {
  {K ||       __ _______     __
   | PP      / // / __(_)__ / /
   | ||     / _  / _// (_-</ _ \
-  (__\\   /_//_/_/ /_/___/_//_/ v0.6
+  (__\\   /_//_/_/ /_/___/_//_/ v0.6.1
 `
 	fmt.Println(color.Yellow(logo))
 	fmt.Println(color.White(" A Safe and Active Attack Honeypot Fishing Framework System for Enterprises."))