From 5c4d0e46d4b897d576420a32583f9417ce6f9a19 Mon Sep 17 00:00:00 2001 From: zhanghouying Date: Fri, 8 May 2020 17:32:38 +0800 Subject: [PATCH] =?UTF-8?q?[Bug=E4=BF=AE=E5=A4=8D](v2.5):=20v2.5=20beta=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E8=83=BD=E5=90=91=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=83=A8=E7=BD=B2=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #347 --- .../zhengjie/modules/mnt/util/ScpClientUtil.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java index 0348790a..7cb83aa1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java @@ -17,8 +17,10 @@ package me.zhengjie.modules.mnt.util; import ch.ethz.ssh2.Connection; import ch.ethz.ssh2.SCPClient; +import com.google.common.collect.Maps; import java.io.IOException; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -29,20 +31,20 @@ import java.util.logging.Logger; */ public class ScpClientUtil { - static private ScpClientUtil instance; + static private Map instance = Maps.newHashMap(); - static synchronized public ScpClientUtil getInstance(String ip, int port, String username, String passward) { - if (instance == null) { - instance = new ScpClientUtil(ip, port, username, passward); + static synchronized public ScpClientUtil getInstance(String ip, int port, String username, String password) { + if (instance.get(ip) == null) { + instance.put(ip, new ScpClientUtil(ip, port, username, password)); } - return instance; + return instance.get(ip); } - public ScpClientUtil(String ip, int port, String username, String passward) { + public ScpClientUtil(String ip, int port, String username, String password) { this.ip = ip; this.port = port; this.username = username; - this.password = passward; + this.password = password; } public void getFile(String remoteFile, String localTargetDirectory) {