diff --git a/api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/pom.xml b/api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/pom.xml index 086d9fe..e89b2ec 100644 --- a/api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/pom.xml +++ b/api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/pom.xml @@ -75,6 +75,7 @@ org.minbox.framework ssh-agent + ${ssh-agent.version} true diff --git a/api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/src/main/java/org/minbox/framework/api/boot/maven/plugin/mybatis/enhance/codegen/ApiBootMybatisEnhanceCodegen.java b/api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/src/main/java/org/minbox/framework/api/boot/maven/plugin/mybatis/enhance/codegen/ApiBootMybatisEnhanceCodegen.java index 32fae6b..4278560 100644 --- a/api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/src/main/java/org/minbox/framework/api/boot/maven/plugin/mybatis/enhance/codegen/ApiBootMybatisEnhanceCodegen.java +++ b/api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/src/main/java/org/minbox/framework/api/boot/maven/plugin/mybatis/enhance/codegen/ApiBootMybatisEnhanceCodegen.java @@ -43,7 +43,9 @@ import org.minbox.framework.api.boot.maven.plugin.mybatis.enhance.codegen.tools.CamelTools; import org.minbox.framework.api.boot.maven.plugin.mybatis.enhance.codegen.writer.JavaClassWriter; import org.minbox.framework.ssh.agent.AgentConnection; -import org.minbox.framework.ssh.agent.DefaultAgentConnection; +import org.minbox.framework.ssh.agent.AgentSupport; +import org.minbox.framework.ssh.agent.apache.ApacheMinaSshdAgentConnection; +import org.minbox.framework.ssh.agent.config.AgentConfig; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; @@ -171,6 +173,11 @@ public class ApiBootMybatisEnhanceCodegen extends AbstractMojo { */ @Parameter private boolean enableSshProxy = false; + /** + * ssh代理连接方式,默认为Apache Mina + */ + @Parameter + private AgentSupport sshProxySupport = AgentSupport.mina; /** * Ssh Proxy代理参数设置 */ @@ -211,7 +218,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { getLog().info("The entity class corresponding to the " + tableNames.size() + " tables will be generated,and the table name list: " + JSON.toJSONString(tableNames)); } - tableNames.stream().forEach(tableName -> { + tableNames.forEach(tableName -> { LocalDateTime startGetInfoTime = LocalDateTime.now(); // get table Table table = dataBase.getTable(tableName); @@ -297,7 +304,8 @@ public void execute() throws MojoExecutionException, MojoFailureException { private AgentConnection startingSshProxy(SshProxySetting setting) { AgentConnection connection = null; try { - connection = new DefaultAgentConnection(setting); + this.sshProxySupport = this.sshProxySupport == null ? AgentSupport.mina : this.sshProxySupport; + connection = (AgentConnection) Class.forName(this.sshProxySupport.getClassName()).getDeclaredConstructor(AgentConfig.class).newInstance(setting); connection.connect(); } catch (Exception e) { getLog().error("SSH Connection:" + setting.getServerIp() + ":" + setting.getForwardTargetPort() + ",try agent failure.", e); diff --git a/api-boot-project/api-boot-starters/api-boot-starter-ssh-agent/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-ssh-agent/pom.xml index a4d4715..db42439 100644 --- a/api-boot-project/api-boot-starters/api-boot-starter-ssh-agent/pom.xml +++ b/api-boot-project/api-boot-starters/api-boot-starter-ssh-agent/pom.xml @@ -34,6 +34,7 @@ org.minbox.framework ssh-agent + ${ssh-agent.version}