From 53850621a533bb9ce742ab819c1028c3a9ecfc13 Mon Sep 17 00:00:00 2001
From: Feng_Qi <freedomkk_qfeng@qq.com>
Date: Fri, 11 Feb 2022 15:50:19 +0800
Subject: [PATCH] README VERSION 0.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新 readme 和 example
---
 README.MD        | 80 ++++++++++++++++++++++++++----------------------
 ssh.json.example | 40 +++++++++++++-----------
 2 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/README.MD b/README.MD
index 0d96985..5cfb03f 100644
--- a/README.MD
+++ b/README.MD
@@ -29,40 +29,42 @@ https://github.com/shanghai-edu/multissh/releases/
 # ./multissh -h
 Usage of ./multissh:
   -c string
-        cfg File Path
+    	cfg File Path
   -ciphers string
-        ciphers
+    	ciphers
   -cmdfile string
-        cmdfile path
+    	cmdfile path
   -cmds string
-        cmds
+    	cmds
   -f string
-        write file locate
+    	write file locate
   -hostfile string
-        hostfile path
+    	hostfile path
   -hosts string
-        host address list
+    	host address list
   -ipfile string
-        ipfile path
+    	ipfile path
   -ips string
-        ip address list
-  -j    print output in json format
+    	ip address list
+  -j	print output in json format
   -k string
-        ssh private key
-  -l    In linux mode,multi command combine with && ,such as date&&cd /opt&&ls
+    	ssh private key
+  -keyexchanges string
+    	keyexchanges
+  -l	In linux mode,multi command combine with && ,such as date&&cd /opt&&ls
   -n int
-        max execute number (default 20)
+    	max execute number (default 20)
   -outTxt
-        write result into txt
+    	write result into txt
   -p string
-        password
+    	password
   -port int
-        ssh port (default 22)
+    	ssh port (default 22)
   -t int
-        max timeout (default 30)
+    	max timeout (default 30)
   -u string
-        username
-  -v    show version
+    	username
+  -v	show version
 ```
 **cmdfile 示例**
 ```
@@ -82,24 +84,28 @@ show clock
 **ssh.json 示例**
 ```
 {
-    "SshHosts": [
-        {
-            "Host": "192.168.31.51",
-            "Port": 22,
-            "Username": "admin",
-            "Password": "admin",
-			"cmds":"show clock;show clock"
-        },
-        {
-            "Host": "192.168.80.131",
-            "Port": 22,
-            "Username": "root",
-            "Password": "",
-            "key": "./server.key",
-            "linuxMode": true,
-            "CmdFile": "cmd2.txt.example"
-        }
-    ]
+	"SshHosts": [{
+			"Host": "192.168.31.51",
+			"Port": 22,
+			"Username": "admin",
+			"Password": "admin",
+			"cmds": "show clock;show clock"
+		},
+		{
+			"Host": "192.168.80.131",
+			"Port": 22,
+			"Username": "root",
+			"Password": "",
+			"key": "./server.key",
+			"linuxMode": true,
+			"CmdFile": "cmd2.txt.example"
+		}
+	],
+	"Global": {
+		"Ciphers": "aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc",
+		"KeyExchanges": "diffie-hellman-group1-sha1,curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha1"
+	}
+
 }
 ```
 
diff --git a/ssh.json.example b/ssh.json.example
index bede1a5..01fa5ee 100644
--- a/ssh.json.example
+++ b/ssh.json.example
@@ -1,20 +1,24 @@
 {
-    "SshHosts": [
-        {
-            "Host": "192.168.31.51",
-            "Port": 22,
-            "Username": "admin",
-            "Password": "admin",
-			"cmds":"show clock;show clock"
-        },
-        {
-            "Host": "192.168.80.131",
-            "Port": 22,
-            "Username": "root",
-            "Password": "",
-            "key": "./server.key",
-            "linuxMode": true,
-            "CmdFile": "cmd2.txt.example"
-        }
-    ]
+	"SshHosts": [{
+			"Host": "192.168.31.51",
+			"Port": 22,
+			"Username": "admin",
+			"Password": "admin",
+			"cmds": "show clock;show clock"
+		},
+		{
+			"Host": "192.168.80.131",
+			"Port": 22,
+			"Username": "root",
+			"Password": "",
+			"key": "./server.key",
+			"linuxMode": true,
+			"CmdFile": "cmd2.txt.example"
+		}
+	],
+	"Global": {
+		"Ciphers": "aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc",
+		"KeyExchanges": "diffie-hellman-group1-sha1,curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha1"
+	}
+
 }
\ No newline at end of file