|
@@ -2,16 +2,20 @@ package com.alibaba.otter.canal.admin.connector;
|
|
|
|
|
|
import java.util.function.Function;
|
|
|
|
|
|
+import com.alibaba.otter.canal.admin.config.SpringContext;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
+import org.springframework.core.env.Environment;
|
|
|
|
|
|
public class SimpleAdminConnectors {
|
|
|
|
|
|
- private static final Logger logger = LoggerFactory.getLogger(SimpleAdminConnectors.class);
|
|
|
- private static String defaultUser = "admin";
|
|
|
- private static String defaultPasswd = "admin";
|
|
|
+ private static final Logger logger = LoggerFactory.getLogger(SimpleAdminConnectors.class);
|
|
|
|
|
|
public static <R> R execute(String ip, int port, Function<AdminConnector, R> function) {
|
|
|
+ Environment env = (Environment) SpringContext.getBean(Environment.class);
|
|
|
+ String defaultUser = env.getProperty("canal.adminUser", "admin");
|
|
|
+ String defaultPasswd = env.getProperty("canal.adminPasswd", "admin");
|
|
|
+
|
|
|
return execute(ip, port, defaultUser, defaultPasswd, function);
|
|
|
}
|
|
|
|