update 0.6.2

forestbird · May 11, 2020 · 69e8b2d · 69e8b2d
1 parent b9d9b1c
commit 69e8b2d
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@
 ### Situational awareness
 
 
-![](./images/data.jpg)
+![](./images/data.png)
 
 
 ### Upper hook page

diff --git a/README_CN.md b/README_CN.md
@@ -93,7 +93,7 @@
 ### 态势感知
 
 
-![](./images/data.jpg)
+![](./images/data.png)
 
 
 ### 上钩页

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-05-12</small>
+                            <p>发布 v0.6.2 版本</p>
+                        </div>
+                    </div>
                     <div class="time-item">
                         <div class="item-info">
                             <small class="text-muted">2020-04-15</small>

diff --git a/images/data.jpg b/images/data.jpg
diff --git a/images/data.png b/images/data.png
diff --git a/logs/hfish.log b/logs/hfish.log
diff --git a/main.go b/main.go
@@ -7,7 +7,7 @@ import (
 )
 
 func main() {
-	setting.Run()
+	//setting.Run()
 	args := os.Args
 	if args == nil || len(args) < 2 {
 		setting.Help()
@@ -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.1")
+			fmt.Println("v0.6.2")
 		} else if args[1] == "run" || args[1] == "--run" {
 			setting.Run()
 		} else {

diff --git a/utils/conf/conf.go b/utils/conf/conf.go
@@ -38,29 +38,55 @@ func Contains(l *list.List, value string) (bool, *list.Element) {
 
 func GetCustomName() []string {
 	names := cfg.SectionStrings()
+	var existConfig []string
 
-	existConfig := []string{
-		"DEFAULT",
-		"rpc",
-		"admin",
-		"api",
-		"plug",
-		"web",
-		"deep",
-		"ssh",
-		"redis",
-		"mysql",
-		"telnet",
-		"ftp",
-		"mem_cache",
-		"http",
-		"tftp",
-		"elasticsearch",
-		"vnc",
+	rpcStatus := Get("rpc", "status")
+
+	// 判断 RPC 是否开启 1 RPC 服务端 2 RPC 客户端
+	if rpcStatus == "1" || rpcStatus == "0" {
+		existConfig = []string{
+			"DEFAULT",
+			"rpc",
+			"admin",
+			"api",
+			"plug",
+			"web",
+			"deep",
+			"ssh",
+			"redis",
+			"mysql",
+			"telnet",
+			"ftp",
+			"mem_cache",
+			"http",
+			"tftp",
+			"elasticsearch",
+			"vnc",
+		}
+	} else if rpcStatus == "2" {
+		existConfig = []string{
+			"DEFAULT",
+			"rpc",
+			"api",
+			"plug",
+			"web",
+			"deep",
+			"ssh",
+			"redis",
+			"mysql",
+			"telnet",
+			"ftp",
+			"mem_cache",
+			"http",
+			"tftp",
+			"elasticsearch",
+			"vnc",
+		}
 	}
 
 	for i := 0; i < len(names); i++ {
 		for j := 0; j < len(existConfig); j++ {
+
 			if names[i] == existConfig[j] {
 				names = append(names[:i], names[i+1:]...)
 			}