diff --git a/src/main/java/com/cym/config/InitConfig.java b/src/main/java/com/cym/config/InitConfig.java
index f8a2a781208f00458254fcb315537987f86dd303..f0f4a0e2f9e77de8f32b40c3fe48e88786a340b9 100644
--- a/src/main/java/com/cym/config/InitConfig.java
+++ b/src/main/java/com/cym/config/InitConfig.java
@@ -76,7 +76,7 @@ public class InitConfig {
 		// 初始化base值
 		Long count = sqlHelper.findAllCount(Basic.class);
 		if (count == 0) {
-			List<Basic> basics = new ArrayList<Basic>();
+			List<Basic> basics = new ArrayList<>();
 			basics.add(new Basic("worker_processes", "auto", 1l));
 			basics.add(new Basic("events", "{\r\n    worker_connections  1024;\r\n    accept_mutex on;\r\n}", 2l));
 			sqlHelper.insertAll(basics);
@@ -85,7 +85,7 @@ public class InitConfig {
 		// 初始化http值
 		count = sqlHelper.findAllCount(Http.class);
 		if (count == 0) {
-			List<Http> https = new ArrayList<Http>();
+			List<Http> https = new ArrayList<>();
 			https.add(new Http("include", "mime.types", 0l));
 			https.add(new Http("default_type", "application/octet-stream", 1l));
 			sqlHelper.insertAll(https);
diff --git a/src/main/java/com/cym/config/VersionConfig.java b/src/main/java/com/cym/config/VersionConfig.java
index cc7174cb001c3ae7be8f9ae69325546deb59b96c..14fff4858df3951dc4ccdd0c8f51104996e4ccdc 100644
--- a/src/main/java/com/cym/config/VersionConfig.java
+++ b/src/main/java/com/cym/config/VersionConfig.java
@@ -76,7 +76,7 @@ public class VersionConfig  {
 			if (SystemTool.isWindows() && basePath.startsWith("/")) {
 				basePath = basePath.substring(1);
 			}
-			if (basePath.indexOf("/target/") != -1) {
+			if (basePath.contains("/target/")) {
 				basePath = basePath.substring(0, basePath.indexOf("/target/"));
 			}
 			Model model = reader.read(new FileReader(new File(basePath, "pom.xml")));
diff --git a/src/main/java/com/cym/controller/adminPage/AdminController.java b/src/main/java/com/cym/controller/adminPage/AdminController.java
index 38b90480287484763b3ee2326b412afd2d4a85e1..d01ec0aa9dcba17a5ca5155ee9532110f31d3f28 100644
--- a/src/main/java/com/cym/controller/adminPage/AdminController.java
+++ b/src/main/java/com/cym/controller/adminPage/AdminController.java
@@ -163,7 +163,7 @@ public class AdminController extends BaseController {
 				h = 300;
 			}
 			try {
-				Hashtable<EncodeHintType, Object> hints = new Hashtable<EncodeHintType, Object>();
+				Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
 				hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
 				hints.put(EncodeHintType.MARGIN, 0);
 
diff --git a/src/main/java/com/cym/controller/adminPage/CertController.java b/src/main/java/com/cym/controller/adminPage/CertController.java
index dd6d650db196411253046f984ab1fb5b3ea27738..aa7ec71d86f0045580cf524e66c5c40baa21edd4 100644
--- a/src/main/java/com/cym/controller/adminPage/CertController.java
+++ b/src/main/java/com/cym/controller/adminPage/CertController.java
@@ -190,17 +190,23 @@ public class CertController extends BaseController {
 			if (cert.getType() == 0) {
 				// DNS API申请
 				String dnsType = "";
-				if (cert.getDnsType().equals("ali")) {
-					dnsType = "dns_ali";
-				} else if (cert.getDnsType().equals("dp")) {
-					dnsType = "dns_dp";
-				} else if (cert.getDnsType().equals("cf")) {
-					dnsType = "dns_cf";
-				} else if (cert.getDnsType().equals("gd")) {
-					dnsType = "dns_gd";
-				} else if (cert.getDnsType().equals("hw")) {
-					dnsType = "dns_huaweicloud";
-				}
+                switch (cert.getDnsType()) {
+                    case "ali":
+                        dnsType = "dns_ali";
+                        break;
+                    case "dp":
+                        dnsType = "dns_dp";
+                        break;
+                    case "cf":
+                        dnsType = "dns_cf";
+                        break;
+                    case "gd":
+                        dnsType = "dns_gd";
+                        break;
+                    case "hw":
+                        dnsType = "dns_huaweicloud";
+                        break;
+                }
 				cmd = homeConfig.acmeSh + " --issue --dns " + dnsType + domain + keylength + " --server letsencrypt";
 			} else if (cert.getType() == 2) {
 				// DNS TXT申请
diff --git a/src/main/java/com/cym/controller/adminPage/ConfController.java b/src/main/java/com/cym/controller/adminPage/ConfController.java
index 980a8cc64fb70528e6761a4ddd07555312260fec..b00d8589959fe0d4fc4c6a0e648320cc6a0fad83 100644
--- a/src/main/java/com/cym/controller/adminPage/ConfController.java
+++ b/src/main/java/com/cym/controller/adminPage/ConfController.java
@@ -106,10 +106,7 @@ public class ConfController extends BaseController {
 		String nginxContent = Base64.decodeStr(jsonObject.getStr("nginxContent"));
 
 		List<String> subContent = jsonObject.getJSONArray("subContent").toList(String.class);
-		for (int i = 0; i < subContent.size(); i++) {
-			String content = Base64.decodeStr(subContent.get(i));
-			subContent.set(i, content);
-		}
+        subContent.replaceAll(Base64::decodeStr);
 		List<String> subName = jsonObject.getJSONArray("subName").toList(String.class);
 
 		if (nginxPath == null) {
@@ -223,10 +220,7 @@ public class ConfController extends BaseController {
 		String nginxContent = Base64.decodeStr(jsonObject.getStr("nginxContent"), CharsetUtil.CHARSET_UTF_8);
 
 		List<String> subContent = jsonObject.getJSONArray("subContent").toList(String.class);
-		for (int i = 0; i < subContent.size(); i++) {
-			String content = Base64.decodeStr(subContent.get(i), CharsetUtil.CHARSET_UTF_8);
-			subContent.set(i, content);
-		}
+        subContent.replaceAll(source -> Base64.decodeStr(source, CharsetUtil.CHARSET_UTF_8));
 
 		// 替换分解域名include路径中的目标conf.d为temp/conf.d
 		String confDir = ToolUtils.handlePath(new File(nginxPath).getParent()) + "/conf.d/";
diff --git a/src/main/java/com/cym/controller/adminPage/LoginController.java b/src/main/java/com/cym/controller/adminPage/LoginController.java
index c0b3a8129380432997d4dfe552e3126bf8b29566..0f5bccddbee18fcf3e8f8985b42a2dcf752995d0 100644
--- a/src/main/java/com/cym/controller/adminPage/LoginController.java
+++ b/src/main/java/com/cym/controller/adminPage/LoginController.java
@@ -243,7 +243,7 @@ public class LoginController extends BaseController {
 
 		settingService.remove("remoteCode"); // 立刻销毁验证码
 
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("creditKey", creditService.make(admin.getId()));
 		map.put("system", SystemTool.getSystem());
 		return renderSuccess(map);
diff --git a/src/main/java/com/cym/controller/adminPage/RootController.java b/src/main/java/com/cym/controller/adminPage/RootController.java
index bf0a6ab72ee2b9f9d9b0bac23f6a118764ab674a..760f56e455ab6342b9cafefd545c8939bccc661a 100644
--- a/src/main/java/com/cym/controller/adminPage/RootController.java
+++ b/src/main/java/com/cym/controller/adminPage/RootController.java
@@ -27,7 +27,7 @@ public class RootController extends BaseController {
 			id = "/";
 		}
 
-		List<TreeNode> list = new ArrayList<TreeNode>();
+		List<TreeNode> list = new ArrayList<>();
 
 		File[] fileList = null;
 		if (SystemTool.isWindows() && id.equals("/")) {
@@ -61,21 +61,17 @@ public class RootController extends BaseController {
 		}
 
 		// 按文件夹进行排序
-		list.sort(new Comparator<TreeNode>() {
+		list.sort((o1, o2) -> {
 
-			@Override
-			public int compare(TreeNode o1, TreeNode o2) {
+            if (o1.getIsParent().equals("true") && o2.getIsParent().equals("false")) {
+                return -1;
+            }
+            if (o1.getIsParent().equals("false") && o2.getIsParent().equals("true")) {
+                return 1;
+            }
 
-				if (o1.getIsParent().equals("true") && o2.getIsParent().equals("false")) {
-					return -1;
-				}
-				if (o1.getIsParent().equals("false") && o2.getIsParent().equals("true")) {
-					return 1;
-				}
-
-				return o1.getName().compareToIgnoreCase(o2.getName());
-			}
-		});
+            return o1.getName().compareToIgnoreCase(o2.getName());
+        });
 
 		return list;
 	}
diff --git a/src/main/java/com/cym/controller/adminPage/ServerController.java b/src/main/java/com/cym/controller/adminPage/ServerController.java
index 161396995a7e171a8f8b8ec713de9dd92bdba3fc..a10f36c7b5ca1b85fa22d13ba75d4ae6f014bbfa 100644
--- a/src/main/java/com/cym/controller/adminPage/ServerController.java
+++ b/src/main/java/com/cym/controller/adminPage/ServerController.java
@@ -67,7 +67,7 @@ public class ServerController extends BaseController {
 	public ModelAndView index(ModelAndView modelAndView, Page page, String keywords) {
 		page = serverService.search(page, keywords);
 
-		List<ServerExt> exts = new ArrayList<ServerExt>();
+		List<ServerExt> exts = new ArrayList<>();
 		for (Server server : (List<Server>) page.getRecords()) {
 			ServerExt serverExt = new ServerExt();
 			if (server.getEnable() == null) {
@@ -119,7 +119,7 @@ public class ServerController extends BaseController {
 	}
 
 	private String buildLocationStr(String id) {
-		List<String> str = new ArrayList<String>();
+		List<String> str = new ArrayList<>();
 		List<Location> locations = serverService.getLocationByServerId(id);
 
 		for (Location location : locations) {
@@ -266,35 +266,40 @@ public class ServerController extends BaseController {
 	@Mapping("preview")
 	public JsonResult preview(String id, String type) {
 		NgxBlock ngxBlock = null;
-		if (type.equals("server")) {
-			Server server = sqlHelper.findById(id, Server.class);
-			ngxBlock = confService.bulidBlockServer(server);
-		} else if (type.equals("upstream")) {
-			Upstream upstream = sqlHelper.findById(id, Upstream.class);
-			ngxBlock = confService.buildBlockUpstream(upstream);
-		} else if (type.equals("http")) {
-			List<Http> httpList = sqlHelper.findAll(new Sort("seq", Direction.ASC), Http.class);
-			ngxBlock = new NgxBlock();
-			ngxBlock.addValue("http");
-			for (Http http : httpList) {
-				if (http.getEnable() == null || !http.getEnable()) {
-					continue;
-				}
-				
-				NgxParam ngxParam = new NgxParam();
-				ngxParam.addValue(http.getName().trim() + " " + http.getValue().trim());
-				ngxBlock.addEntry(ngxParam);
-			}
-		} else if (type.equals("stream")) {
-			List<Stream> streamList = sqlHelper.findAll(new Sort("seq", Direction.ASC), Stream.class);
-			ngxBlock = new NgxBlock();
-			ngxBlock.addValue("stream");
-			for (Stream stream : streamList) {
-				NgxParam ngxParam = new NgxParam();
-				ngxParam.addValue(stream.getName() + " " + stream.getValue());
-				ngxBlock.addEntry(ngxParam);
-			}
-		}
+        switch (type) {
+            case "server":
+                Server server = sqlHelper.findById(id, Server.class);
+                ngxBlock = confService.bulidBlockServer(server);
+                break;
+            case "upstream":
+                Upstream upstream = sqlHelper.findById(id, Upstream.class);
+                ngxBlock = confService.buildBlockUpstream(upstream);
+                break;
+            case "http":
+                List<Http> httpList = sqlHelper.findAll(new Sort("seq", Direction.ASC), Http.class);
+                ngxBlock = new NgxBlock();
+                ngxBlock.addValue("http");
+                for (Http http : httpList) {
+                    if (http.getEnable() == null || !http.getEnable()) {
+                        continue;
+                    }
+
+                    NgxParam ngxParam = new NgxParam();
+                    ngxParam.addValue(http.getName().trim() + " " + http.getValue().trim());
+                    ngxBlock.addEntry(ngxParam);
+                }
+                break;
+            case "stream":
+                List<Stream> streamList = sqlHelper.findAll(new Sort("seq", Direction.ASC), Stream.class);
+                ngxBlock = new NgxBlock();
+                ngxBlock.addValue("stream");
+                for (Stream stream : streamList) {
+                    NgxParam ngxParam = new NgxParam();
+                    ngxParam.addValue(stream.getName() + " " + stream.getValue());
+                    ngxBlock.addEntry(ngxParam);
+                }
+                break;
+        }
 		NgxConfig ngxConfig = new NgxConfig();
 		ngxConfig.addEntry(ngxBlock);
 
diff --git a/src/main/java/com/cym/service/RemoteService.java b/src/main/java/com/cym/service/RemoteService.java
index 9b43d258f7add37f1854e9e60ef36a004579cea2..9f30999ba3225153dc7a613219bca4a78cea470c 100644
--- a/src/main/java/com/cym/service/RemoteService.java
+++ b/src/main/java/com/cym/service/RemoteService.java
@@ -30,7 +30,7 @@ public class RemoteService {
 	AdminService adminService;
 
 	public void getCreditKey(Remote remote, String code, String auth) {
-		Map<String, Object> paramMap = new HashMap<String, Object>();
+		Map<String, Object> paramMap = new HashMap<>();
 
 		paramMap.put("name", Base64.encode(Base64.encode(remote.getName())));
 		paramMap.put("pass", Base64.encode(Base64.encode(remote.getPass())));
diff --git a/src/main/java/com/cym/service/ServerService.java b/src/main/java/com/cym/service/ServerService.java
index 1cea84f60b6f11cc71ca7f7275b4f02c6baf9e08..81cc402e602312bafc6aa4af6b690a3da33a11b7 100644
--- a/src/main/java/com/cym/service/ServerService.java
+++ b/src/main/java/com/cym/service/ServerService.java
@@ -77,7 +77,7 @@ public class ServerService {
 
 		sqlHelper.insertOrUpdate(server);
 
-		List<Param> paramList = new ArrayList<Param>();
+		List<Param> paramList = new ArrayList<>();
 		if (StrUtil.isNotEmpty(serverParamJson) && JSONUtil.isTypeJSON(serverParamJson)) {
 			paramList = JSONUtil.toList(JSONUtil.parseArray(serverParamJson), Param.class);
 		}
@@ -103,7 +103,7 @@ public class ServerService {
 				location.setDescr(findLocationDescr(locationOlds, location));
 				sqlHelper.insert(location);
 
-				paramList = new ArrayList<Param>();
+				paramList = new ArrayList<>();
 				if (StrUtil.isNotEmpty(location.getLocationParamJson()) && JSONUtil.isJson(location.getLocationParamJson())) {
 					paramList = JSONUtil.toList(JSONUtil.parseArray(location.getLocationParamJson()), Param.class);
 				}
@@ -144,7 +144,7 @@ public class ServerService {
 
 		List<String> locationIds = sqlHelper.findIdsByQuery(new ConditionAndWrapper().eq("serverId", server.getId()), Location.class);
 		sqlHelper.deleteByQuery(new ConditionOrWrapper().eq("serverId", server.getId()).in("locationId", locationIds), Param.class);
-		List<Param> paramList = new ArrayList<Param>();
+		List<Param> paramList = new ArrayList<>();
 		if (StrUtil.isNotEmpty(serverParamJson) && JSONUtil.isTypeJSON(serverParamJson)) {
 			paramList = JSONUtil.toList(JSONUtil.parseArray(serverParamJson), Param.class);
 		}
diff --git a/src/main/java/com/cym/sqlhelper/utils/ConditionWrapper.java b/src/main/java/com/cym/sqlhelper/utils/ConditionWrapper.java
index 0ec1316fd8366924499e0932f15b2bdeaef73c07..a3db148f42698e044b9fa6bd02e60a993cbaa71f 100644
--- a/src/main/java/com/cym/sqlhelper/utils/ConditionWrapper.java
+++ b/src/main/java/com/cym/sqlhelper/utils/ConditionWrapper.java
@@ -15,7 +15,7 @@ import cn.hutool.core.util.StrUtil;
 public abstract class ConditionWrapper {
 	boolean andLink;
 
-	List<Object> list = new ArrayList<Object>();
+	List<Object> list = new ArrayList<>();
 
 	/**
 	 * 将Wrapper转化为Condition
@@ -27,7 +27,7 @@ public abstract class ConditionWrapper {
 	public String build(List<String> values) {
 		String sql = "";
 		if (list.size() > 0) {
-			List<String> blocks = new ArrayList<String>();
+			List<String> blocks = new ArrayList<>();
 			for (Object object : list) {
 				if (object instanceof Condition) {
 					Condition condition = (Condition) object;
@@ -81,7 +81,7 @@ public abstract class ConditionWrapper {
 	}
 
 	public String buildIn(Object value) {
-		List<String> ask = new ArrayList<String>();
+		List<String> ask = new ArrayList<>();
 		for (Object obj : (Collection<?>) value) {
 			ask.add("?");
 		}
diff --git a/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java b/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java
index 0b6188ec1d0e4367cea072cc696480581c107c71..af559ded5a6d07f281ee6ef66de27e635a82c676 100644
--- a/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java
+++ b/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java
@@ -56,7 +56,7 @@ public class ImportOrExportUtil {
 								break;
 							}
 
-							List<String> lines = new ArrayList<String>();
+							List<String> lines = new ArrayList<>();
 							for (Object object : page.getRecords()) {
 								lines.add(JSONUtil.toJsonStr(object));
 							}
@@ -99,7 +99,7 @@ public class ImportOrExportUtil {
 						sqlHelper.deleteByQuery(new ConditionAndWrapper(), clazz);
 
 						reader = FileUtil.getReader(file, Charset.forName("UTF-8"));
-						List<Object> list = new ArrayList<Object>();
+						List<Object> list = new ArrayList<>();
 						while (true) {
 							String json = reader.readLine();
 							if (StrUtil.isEmpty(json)) {
diff --git a/src/main/java/com/cym/utils/BLogFileTailer.java b/src/main/java/com/cym/utils/BLogFileTailer.java
index 09b034528cd63a81c1dc79a2f2d13f6371554c11..369b01c750c0b7c37937ed67da4e09d3faba8592 100644
--- a/src/main/java/com/cym/utils/BLogFileTailer.java
+++ b/src/main/java/com/cym/utils/BLogFileTailer.java
@@ -22,12 +22,8 @@ public class BLogFileTailer {
 			.builder()//
 			.expiration(20, TimeUnit.SECONDS)//
 			.expirationPolicy(ExpirationPolicy.ACCESSED)//
-			.expirationListener(new ExpirationListener<String, Tailer>() {
-				@Override
-				public void expired(String guid, Tailer tailer) {
-					tailer.stop();
-					tailer = null;
-				}
+			.expirationListener((ExpirationListener<String, Tailer>) (guid, tailer) -> {
+                tailer.stop();
 			}).build();//
 
 	public Map<String, Vector<String>> lineMap = ExpiringMap//
@@ -39,17 +35,13 @@ public class BLogFileTailer {
 	public String run(String guid, String path) {
 
 		if (tailerMap.get(guid) == null) {
-			Tailer tailer = new Tailer(new File(path), new LineHandler() {
+			Tailer tailer = new Tailer(new File(path), line -> {
+                if (lineMap.get(guid) == null) {
+                    lineMap.put(guid, new Vector<>());
+                }
 
-				@Override
-				public void handle(String line) {
-					if (lineMap.get(guid) == null) {
-						lineMap.put(guid, new Vector<String>());
-					}
-
-					lineMap.get(guid).add("<div>" + line + "</div>");
-				}
-			}, 50);
+                lineMap.get(guid).add("<div>" + line + "</div>");
+            }, 50);
 			tailer.start(true);
 
 			tailerMap.put(guid, tailer);
diff --git a/src/main/java/com/cym/utils/NetWorkUtil.java b/src/main/java/com/cym/utils/NetWorkUtil.java
index fd18a6387bbefbb2416d71ce052deda69ef25253..3ecf736a4b76318f41aef047f78d217e67107674 100644
--- a/src/main/java/com/cym/utils/NetWorkUtil.java
+++ b/src/main/java/com/cym/utils/NetWorkUtil.java
@@ -61,7 +61,7 @@ public class NetWorkUtil {
 					logger.error(e.getMessage(), e);
 				}
 			}
-			Optional.ofNullable(pro).ifPresent(p -> p.destroy());
+			Optional.ofNullable(pro).ifPresent(Process::destroy);
 		}
 		networkInfo.setTime(DateUtil.format(new Date(), "HH:mm:ss"));
 		return networkInfo;
@@ -83,9 +83,9 @@ public class NetWorkUtil {
 				// TX packets 169848511  bytes 155937621328 (155.9 GB)
 				
 				while ((line = input.readLine()) != null) {
-					if (line.indexOf("RX packets") >= 0) {
+					if (line.contains("RX packets")) {
 						rx += formatLong(line);
-					} else if (line.indexOf("TX packets") >= 0) {
+					} else if (line.contains("TX packets")) {
 						tx += formatLong(line);
 					}
 				}
diff --git a/src/main/java/com/cym/utils/PwdCheckUtil.java b/src/main/java/com/cym/utils/PwdCheckUtil.java
index 3feab7f7f1f5af791b37a8ada32d91e478a9c31d..fb29ae4d4ded68353df8c66037b08a966e70c41f 100644
--- a/src/main/java/com/cym/utils/PwdCheckUtil.java
+++ b/src/main/java/com/cym/utils/PwdCheckUtil.java
@@ -192,23 +192,23 @@ public class PwdCheckUtil {
                 if (isLower) {
                     //考虑 大写键盘匹配的情况
                     String UpperStr = KEYBOARD_HORIZONTAL_ARR[j].toUpperCase();
-                    if((configStr.indexOf(distinguishStr) != -1) || (UpperStr.indexOf(distinguishStr) != -1)) {
+                    if((configStr.contains(distinguishStr)) || (UpperStr.contains(distinguishStr))) {
                         flag = true;
                         return flag;
                     }
                     //考虑逆序输入情况下 连续输入
                     String revUpperStr = new StringBuffer(UpperStr).reverse().toString();
-                    if((revOrderStr.indexOf(distinguishStr) != -1) || (revUpperStr.indexOf(distinguishStr) != -1)) {
+                    if((revOrderStr.contains(distinguishStr)) || (revUpperStr.contains(distinguishStr))) {
                         flag = true;
                         return flag;
                     }
                 }else {
-                    if(configStr.indexOf(str) != -1) {
+                    if(configStr.contains(str)) {
                         flag = true;
                         return flag;
                     }
                     //考虑逆序输入情况下 连续输入
-                    if(revOrderStr.indexOf(str) != -1) {
+                    if(revOrderStr.contains(str)) {
                         flag = true;
                         return flag;
                     }
@@ -252,23 +252,23 @@ public class PwdCheckUtil {
                 if (isLower) {
                     //考虑 大写键盘匹配的情况
                     String UpperStr = KEYBOARD_SLOPE_ARR[j].toUpperCase();
-                    if((configStr.indexOf(distinguishStr) != -1) || (UpperStr.indexOf(distinguishStr) != -1)) {
+                    if((configStr.contains(distinguishStr)) || (UpperStr.contains(distinguishStr))) {
                         flag = true;
                         return flag;
                     }
                     //考虑逆序输入情况下 连续输入
                     String revUpperStr = new StringBuffer(UpperStr).reverse().toString();
-                    if((revOrderStr.indexOf(distinguishStr) != -1) || (revUpperStr.indexOf(distinguishStr) != -1)) {
+                    if((revOrderStr.contains(distinguishStr)) || (revUpperStr.contains(distinguishStr))) {
                         flag = true;
                         return flag;
                     }
                 }else {
-                    if(configStr.indexOf(str) != -1) {
+                    if(configStr.contains(str)) {
                         flag = true;
                         return flag;
                     }
                     //考虑逆序输入情况下 连续输入
-                    if(revOrderStr.indexOf(str) != -1) {
+                    if(revOrderStr.contains(str)) {
                         flag = true;
                         return flag;
                     }
diff --git a/src/main/java/com/cym/utils/TelnetUtils.java b/src/main/java/com/cym/utils/TelnetUtils.java
index bcc9fd77e5ddf53c359372a96050879ff3c3dae6..018a2f67ff5b0b6ecf3e2d4725d970c615d54f72 100644
--- a/src/main/java/com/cym/utils/TelnetUtils.java
+++ b/src/main/java/com/cym/utils/TelnetUtils.java
@@ -14,12 +14,6 @@ public class TelnetUtils {
 			SocketAddress saAdd = new InetSocketAddress(host.trim(), port);
 			sClient = new Socket();
 			sClient.connect(saAdd, 1000); // 设置超时 1s
-		} catch (UnknownHostException e) {
-			return false;
-		} catch (SocketTimeoutException e) {
-			return false;
-		} catch (IOException e) {
-			return false;
 		} catch (Exception e) {
 			return false;
 		} finally {
@@ -27,7 +21,7 @@ public class TelnetUtils {
 				if (sClient != null) {
 					sClient.close();
 				}
-			} catch (Exception e) {
+			} catch (Exception ignored) {
 			}
 		}
 		return true;