提交 17e7dd5a 编写于 作者: X xueli.xue

底层优化

上级 650682d2
...@@ -26,7 +26,7 @@ public class ExecutorRegistryThread extends Thread { ...@@ -26,7 +26,7 @@ public class ExecutorRegistryThread extends Thread {
public void start(final int port, final String ip, final String appName){ public void start(final int port, final String ip, final String appName){
// valid // valid
if (AdminApiUtil.allowCallApi && (appName!=null && appName.trim().length()>0) ) { if ( !(AdminApiUtil.allowCallApi() && (appName!=null && appName.trim().length()>0)) ) {
logger.warn(">>>>>>>>>>>> xxl-job, executor registry config fail"); logger.warn(">>>>>>>>>>>> xxl-job, executor registry config fail");
return; return;
} }
......
...@@ -28,30 +28,27 @@ public class AdminApiUtil { ...@@ -28,30 +28,27 @@ public class AdminApiUtil {
public static final String REGISTRY = "/api/registry"; public static final String REGISTRY = "/api/registry";
private static List<String> adminAddressList = null; private static List<String> adminAddressList = null;
public static boolean allowCallApi = true;
public static void init(String adminAddresses){ public static void init(String adminAddresses){
// admin assress list // admin assress list
if (adminAddresses != null) { if (adminAddresses != null) {
Set<String> adminAddressSet = new HashSet<String>(); Set<String> adminAddressSet = new HashSet<String>();
for (String adminAddressItem: adminAddresses.split(",")) { for (String adminAddressItem: adminAddresses.split(",")) {
if (adminAddressItem.trim().length()>0 && !adminAddressSet.contains(adminAddressItem)) { if (adminAddressItem.trim().length()>0) {
adminAddressSet.add(adminAddressItem); adminAddressSet.add(adminAddressItem);
} }
} }
if (adminAddressSet==null || adminAddressSet.size()==0) {
adminAddressList = new ArrayList<String>(adminAddressSet); adminAddressList = new ArrayList<String>(adminAddressSet);
} }
} }
public static boolean allowCallApi(){
// parse boolean allowCallApi = (adminAddressList!=null && adminAddressList.size()>0);
allowCallApi = (adminAddressList!=null && adminAddressList.size()>0); return allowCallApi;
} }
public static ReturnT<String> callApiFailover(String subUrl, Object requestObj) throws Exception { public static ReturnT<String> callApiFailover(String subUrl, Object requestObj) throws Exception {
if (!allowCallApi) { if (!allowCallApi()) {
return new ReturnT<String>(ReturnT.FAIL_CODE, "allowCallback fail."); return new ReturnT<String>(ReturnT.FAIL_CODE, "allowCallApi fail.");
} }
for (String adminAddress: adminAddressList) { for (String adminAddress: adminAddressList) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册