djb-eapim/bapweb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto-merge: Merge master into jenkins_with_weblogic

Browse Source
This commit is contained in:
Jenkins Automation
2025-11-17 14:06:08 +09:00
parent ff25ecec36 6b5bf02358
commit acabc344a1
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/eactive/eai/batch/ftp/SFTPAdaptor.java
+3 -1
View File
@@ -1237,10 +1237,12 @@ public class SFTPAdaptor {
if (StringUtils.equals(authType, Transfer.AUTH_TYPE_ID)) { if (StringUtils.equals(authType, Transfer.AUTH_TYPE_ID)) {
session = jsch.getSession(username, serverList[inx], port); session = jsch.getSession(username, serverList[inx], port);
session.setPassword(password); session.setPassword(password);
session.setConfig("PreferredAuthentications","password");
// key 방식 인증 // key 방식 인증
} else if (StringUtils.equals(authType, Transfer.AUTH_TYPE_KEY)) { } else if (StringUtils.equals(authType, Transfer.AUTH_TYPE_KEY)) {
jsch.addIdentity(password); jsch.addIdentity(password);
session = jsch.getSession(username, serverList[inx], port); session = jsch.getSession(username, serverList[inx], port);
session.setConfig("PreferredAuthentications", "publickey");
} }
if(proxyServer != null && !proxyServer.isEmpty()) {// 20251112 if(proxyServer != null && !proxyServer.isEmpty()) {// 20251112
@@ -1257,7 +1259,7 @@ public class SFTPAdaptor {
} }
session.setConfig("StrictHostKeyChecking", "no"); session.setConfig("StrictHostKeyChecking", "no");
session.setConfig("PreferredAuthentications","password");
session.setTimeout(300 * 1000); session.setTimeout(300 * 1000);
session.connect(); session.connect();
break; break;
src/com/eactive/eai/common/dao/Keys.java
+5 -5
View File
@@ -25,11 +25,11 @@ public interface Keys
public static final String SERVER_KEY = "inst.Name"; public static final String SERVER_KEY = "inst.Name";
public static final String TABLE_OWNER = System.getProperty(TABLE_OWNER_KEY)+"."; public static final String TABLE_OWNER = System.getProperty(TABLE_OWNER_KEY)+".";
public static final String BAP01_JOB_QUEUE = "qu01Bap11Svr01JobQueue"; // subBap11JmsSvr01 public static final String BAP01_JOB_QUEUE = "jms/qu01Bap11Svr01JobQueue"; // subBap11JmsSvr01
public static final String BAP01_TIMER_QUEUE = "qu01Bap11Svr01TimerQueue"; // subBap11JmsSvr01 public static final String BAP01_TIMER_QUEUE = "jms/qu01Bap11Svr01TimerQueue"; // subBap11JmsSvr01
public static final String BAP02_JOB_QUEUE = "qu01Bap21Svr01JobQueue"; // subBap21JmsSvr01 public static final String BAP02_JOB_QUEUE = "jms/qu01Bap21Svr01JobQueue"; // subBap21JmsSvr01
public static final String BAP02_TIMER_QUEUE = "qu01Bap21Svr01TimerQueue"; // subBap21JmsSvr01 public static final String BAP02_TIMER_QUEUE = "jms/qu01Bap21Svr01TimerQueue"; // subBap21JmsSvr01
public static final String CONNECT_FACTORY = "cft01BapConnectionFactory"; public static final String CONNECT_FACTORY = "jms/cft01BapConnectionFactory";
} }