fix import

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/AbstractChecker.java

@@ -1,9 +1,9 @@
 package org.dbsyncer.biz.checker;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.BizException;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.config.Filter;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.model.AbstractConfigModel;
@@ -47,10 +47,10 @@ public abstract class AbstractChecker implements Checker {
         Assert.hasText(model.getName(), "ConfigModel name can not be empty.");
         // 名称
         String name = params.get(ConfigConstant.CONFIG_MODEL_NAME);
-        if (StringUtils.isNotBlank(name)) {
+        if (StringUtil.isNotBlank(name)) {
             model.setName(name);
         }
-        model.setId(StringUtils.isEmpty(model.getId()) ? String.valueOf(snowflakeIdWorker.nextId()) : model.getId());
+        model.setId(StringUtil.isBlank(model.getId()) ? String.valueOf(snowflakeIdWorker.nextId()) : model.getId());
         long now = Instant.now().toEpochMilli();
         model.setCreateTime(null == model.getCreateTime() ? now : model.getCreateTime());
         model.setUpdateTime(now);
@@ -65,18 +65,18 @@ public abstract class AbstractChecker implements Checker {
     protected void modifySuperConfigModel(AbstractConfigModel model, Map<String, String> params) {
         // 全局参数
         String mappingParams = params.get("params");
-        model.setParams(StringUtils.isNotBlank(mappingParams) ? JsonUtil.jsonToObj(mappingParams, Map.class) : new LinkedHashMap());
+        model.setParams(StringUtil.isNotBlank(mappingParams) ? JsonUtil.jsonToObj(mappingParams, Map.class) : new LinkedHashMap());
 
         // 过滤条件
         String filterJson = params.get("filter");
-        if (StringUtils.isNotBlank(filterJson)) {
+        if (StringUtil.isNotBlank(filterJson)) {
             List<Filter> list = jsonToList(filterJson, Filter.class);
             model.setFilter(list);
         }
 
         // 转换配置
         String convertJson = params.get("convert");
-        if (StringUtils.isNotBlank(convertJson)) {
+        if (StringUtil.isNotBlank(convertJson)) {
             List<Convert> convert = jsonToList(convertJson, Convert.class);
             model.setConvert(convert);
         }
@@ -84,11 +84,11 @@ public abstract class AbstractChecker implements Checker {
         // 插件配置
         String pluginClassName = params.get("pluginClassName");
         Plugin plugin = null;
-        if (StringUtils.isNotBlank(pluginClassName)) {
+        if (StringUtil.isNotBlank(pluginClassName)) {
             List<Plugin> plugins = manager.getPluginAll();
             if (!CollectionUtils.isEmpty(plugins)) {
                 for (Plugin p : plugins) {
-                    if (StringUtils.equals(p.getClassName(), pluginClassName)) {
+                    if (StringUtil.equals(p.getClassName(), pluginClassName)) {
                         plugin = p;
                         break;
                     }

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/config/ConfigChecker.java

@@ -1,10 +1,10 @@
 package org.dbsyncer.biz.checker.impl.config;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.BizException;
 import org.dbsyncer.biz.checker.AbstractChecker;
+import org.dbsyncer.common.util.NumberUtil;
 import org.dbsyncer.common.util.SHA1Util;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.logger.LogService;
 import org.dbsyncer.parser.logger.LogType;
@@ -66,9 +66,9 @@ public class ConfigChecker extends AbstractChecker {
         // 修改密码
         String newPwd = params.get("newPwd");
         String oldPwd = params.get("oldPwd");
-        if (StringUtils.isNotBlank(newPwd) && StringUtils.isNotBlank(oldPwd)) {
+        if (StringUtil.isNotBlank(newPwd) && StringUtil.isNotBlank(oldPwd)) {
             oldPwd = SHA1Util.b64_sha1(oldPwd);
-            if (!StringUtils.equals(config.getPassword(), oldPwd)) {
+            if (!StringUtil.equals(config.getPassword(), oldPwd)) {
                 logService.log(LogType.SystemLog.ERROR, "修改密码失败");
                 throw new BizException("修改密码失败");
             }
@@ -79,8 +79,8 @@ public class ConfigChecker extends AbstractChecker {
 
         // 刷新监控间隔（秒）
         String refreshInterval = params.get("refreshInterval");
-        if(StringUtils.isNotBlank(refreshInterval)){
-            int time = NumberUtils.toInt(refreshInterval, 10);
+        if (StringUtil.isNotBlank(refreshInterval)) {
+            int time = NumberUtil.toInt(refreshInterval, 10);
             config.setRefreshInterval(time);
         }
 

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/OracleConfigChecker.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.biz.checker.impl.connector;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.enums.OracleIncrementEnum;
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.config.Field;
 import org.dbsyncer.connector.config.MetaInfo;
 import org.dbsyncer.connector.config.Table;
@@ -48,7 +48,7 @@ public class OracleConfigChecker extends AbstractDataBaseConfigChecker {
         List<Field> targetColumn = tableGroup.getTargetTable().getColumn();
         Field targetField = null;
         for (Field f : targetColumn) {
-            if (StringUtils.equals(f.getName(), targetRowIdName)) {
+            if (StringUtil.equals(f.getName(), targetRowIdName)) {
                 targetField = f;
                 targetField.setPk(true);
                 continue;
@@ -69,7 +69,7 @@ public class OracleConfigChecker extends AbstractDataBaseConfigChecker {
             }
 
             // 排除主键关系
-            if (null != m.getTarget() && StringUtils.equals(m.getTarget().getName(), targetRowIdName)) {
+            if (null != m.getTarget() && StringUtil.equals(m.getTarget().getName(), targetRowIdName)) {
                 continue;
             }
 
@@ -151,7 +151,7 @@ public class OracleConfigChecker extends AbstractDataBaseConfigChecker {
                 continue;
             }
 
-            if (null != m.getTarget() && StringUtils.equals(m.getTarget().getName(), pk)) {
+            if (null != m.getTarget() && StringUtil.equals(m.getTarget().getName(), pk)) {
                 m.getTarget().setPk(true);
             }
             list.add(m);

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -1,10 +1,10 @@
 package org.dbsyncer.biz.checker.impl.mapping;
 
-import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.biz.checker.MappingConfigChecker;
 import org.dbsyncer.biz.checker.impl.tablegroup.TableGroupChecker;
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.common.util.NumberUtil;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.listener.enums.ListenerTypeEnum;
@@ -90,8 +90,8 @@ public class MappingChecker extends AbstractChecker {
         mapping.setModel(null != ModelEnum.getModelEnum(model) ? model : ModelEnum.FULL.getCode());
 
         // 全量配置
-        mapping.setReadNum(NumberUtils.toInt(params.get("readNum"), mapping.getReadNum()));
-        mapping.setBatchNum(NumberUtils.toInt(params.get("batchNum"), mapping.getBatchNum()));
+        mapping.setReadNum(NumberUtil.toInt(params.get("readNum"), mapping.getReadNum()));
+        mapping.setBatchNum(NumberUtil.toInt(params.get("batchNum"), mapping.getBatchNum()));
 
         // 增量配置(日志/定时)
         String incrementStrategy = params.get("incrementStrategy");

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/TimingConfigChecker.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.biz.checker.impl.mapping;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.checker.MappingConfigChecker;
+import org.dbsyncer.common.util.NumberUtil;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.listener.enums.ListenerTypeEnum;
 import org.dbsyncer.parser.model.Mapping;
@@ -32,19 +32,19 @@ public class TimingConfigChecker implements MappingConfigChecker {
         ListenerConfig config = mapping.getListener();
         Assert.notNull(config, "ListenerConfig can not be null.");
 
-        if (StringUtils.isNotBlank(period)) {
-            config.setPeriod(NumberUtils.toLong(period, 30));
+        if (StringUtil.isNotBlank(period)) {
+            config.setPeriod(NumberUtil.toLong(period, 30));
         }
-        if (StringUtils.isNotBlank(eventFieldName)) {
+        if (StringUtil.isNotBlank(eventFieldName)) {
             config.setEventFieldName(eventFieldName);
         }
-        if (StringUtils.isNotBlank(insert)) {
+        if (StringUtil.isNotBlank(insert)) {
             config.setInsert(insert);
         }
-        if (StringUtils.isNotBlank(update)) {
+        if (StringUtil.isNotBlank(update)) {
             config.setUpdate(update);
         }
-        if (StringUtils.isNotBlank(delete)) {
+        if (StringUtil.isNotBlank(delete)) {
             config.setDelete(delete);
         }
 

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/tablegroup/TableGroupChecker.java

@@ -1,6 +1,5 @@
 package org.dbsyncer.biz.checker.impl.tablegroup;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.BizException;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.biz.checker.ConnectorConfigChecker;
@@ -142,8 +141,8 @@ public class TableGroupChecker extends AbstractChecker {
         if (!CollectionUtils.isEmpty(list)) {
             for (TableGroup g : list) {
                 // 数据源表和目标表都存在
-                if (StringUtils.equals(sourceTable, g.getSourceTable().getName())
-                        && StringUtils.equals(targetTable, g.getTargetTable().getName())) {
+                if (StringUtil.equals(sourceTable, g.getSourceTable().getName())
+                        && StringUtil.equals(targetTable, g.getTargetTable().getName())) {
                     final String error = String.format("映射关系已存在.%s > %s", sourceTable, targetTable);
                     logger.error(error);
                     throw new BizException(error);

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/ConnectorServiceImpl.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.biz.impl;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.ConnectorService;
 import org.dbsyncer.biz.checker.Checker;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.logger.LogType;
 import org.dbsyncer.parser.model.ConfigModel;
@@ -57,7 +57,7 @@ public class ConnectorServiceImpl extends BaseServiceImpl implements ConnectorSe
 
     @Override
     public Connector getConnector(String id) {
-        return StringUtils.isNotBlank(id) ? manager.getConnector(id) : null;
+        return StringUtil.isNotBlank(id) ? manager.getConnector(id) : null;
     }
 
     @Override

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MappingServiceImpl.java

@@ -1,6 +1,5 @@
 package org.dbsyncer.biz.impl;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.BizException;
 import org.dbsyncer.biz.MappingService;
 import org.dbsyncer.biz.TableGroupService;
@@ -9,6 +8,7 @@ import org.dbsyncer.biz.vo.ConnectorVo;
 import org.dbsyncer.biz.vo.MappingVo;
 import org.dbsyncer.biz.vo.MetaVo;
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.monitor.Monitor;
 import org.dbsyncer.parser.enums.ModelEnum;
 import org.dbsyncer.parser.logger.LogType;
@@ -52,7 +52,7 @@ public class MappingServiceImpl extends BaseServiceImpl implements MappingServic
 
         // 匹配相似表 on
         String autoMatchTable = params.get("autoMatchTable");
-        if(StringUtils.isNotBlank(autoMatchTable)){
+        if(StringUtil.isNotBlank(autoMatchTable)){
             matchSimilarTable(model);
         }
 

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MonitorServiceImpl.java

@@ -1,7 +1,5 @@
 package org.dbsyncer.biz.impl;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.MonitorService;
 import org.dbsyncer.biz.metric.MetricDetailFormatter;
 import org.dbsyncer.biz.metric.impl.*;
@@ -9,6 +7,8 @@ import org.dbsyncer.biz.vo.*;
 import org.dbsyncer.common.model.Paging;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
+import org.dbsyncer.common.util.NumberUtil;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.monitor.Monitor;
 import org.dbsyncer.monitor.enums.DiskMetricEnum;
 import org.dbsyncer.monitor.enums.MetricEnum;
@@ -26,7 +26,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
 import javax.annotation.PostConstruct;
-import java.util.*;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -80,8 +83,8 @@ public class MonitorServiceImpl implements MonitorService {
     @Override
     public Paging queryData(Map<String, String> params) {
         String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
-        int pageNum = NumberUtils.toInt(params.get("pageNum"), 1);
-        int pageSize = NumberUtils.toInt(params.get("pageSize"), 10);
+        int pageNum = NumberUtil.toInt(params.get("pageNum"), 1);
+        int pageSize = NumberUtil.toInt(params.get("pageSize"), 10);
         String error = params.get(ConfigConstant.DATA_ERROR);
         String success = params.get(ConfigConstant.DATA_SUCCESS);
 
@@ -102,8 +105,8 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Override
     public Paging queryLog(Map<String, String> params) {
-        int pageNum = NumberUtils.toInt(params.get("pageNum"), 1);
-        int pageSize = NumberUtils.toInt(params.get("pageSize"), 10);
+        int pageNum = NumberUtil.toInt(params.get("pageNum"), 1);
+        int pageSize = NumberUtil.toInt(params.get("pageSize"), 10);
         String json = params.get(ConfigConstant.CONFIG_MODEL_JSON);
         Paging paging = monitor.queryLog(pageNum, pageSize, json);
         List<Map> data = (List<Map>) paging.getData();
@@ -153,7 +156,7 @@ public class MonitorServiceImpl implements MonitorService {
     }
 
     private String getDefaultMetaId(String id) {
-        if (StringUtils.isBlank(id)) {
+        if (StringUtil.isBlank(id)) {
             List<MetaVo> list = getMetaAll();
             if (!CollectionUtils.isEmpty(list)) {
                 return list.get(0).getId();

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/PluginServiceImpl.java

@@ -1,10 +1,10 @@
 package org.dbsyncer.biz.impl;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.BizException;
 import org.dbsyncer.biz.PluginService;
 import org.dbsyncer.biz.vo.PluginVo;
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.logger.LogService;
 import org.dbsyncer.parser.logger.LogType;
@@ -45,7 +45,7 @@ public class PluginServiceImpl implements PluginService {
             if (!CollectionUtils.isEmpty(mappingAll)) {
                 mappingAll.forEach(mapping -> {
                     Plugin plugin = mapping.getPlugin();
-                    if(null != plugin){
+                    if (null != plugin) {
                         pluginClassNameMap.putIfAbsent(plugin.getClassName(), new ArrayList<>());
                         pluginClassNameMap.get(plugin.getClassName()).add(mapping.getName());
                     }
@@ -55,7 +55,7 @@ public class PluginServiceImpl implements PluginService {
             vos.addAll(pluginAll.stream().map(plugin -> {
                 PluginVo vo = new PluginVo();
                 BeanUtils.copyProperties(plugin, vo);
-                vo.setMappingName(StringUtils.join(pluginClassNameMap.get(plugin.getClassName()), "|"));
+                vo.setMappingName(StringUtil.join(pluginClassNameMap.get(plugin.getClassName()), "|"));
                 return vo;
             }).collect(Collectors.toList()));
         }
@@ -80,10 +80,10 @@ public class PluginServiceImpl implements PluginService {
 
     @Override
     public void checkFileSuffix(String filename) {
-        if (StringUtils.isNotBlank(filename)) {
+        if (StringUtil.isNotBlank(filename)) {
             String suffix = filename.substring(filename.lastIndexOf(".") + 1, filename.length());
             if (null == FileSuffixEnum.getFileSuffix(suffix)) {
-                suffix = StringUtils.join(FileSuffixEnum.values(), ",").toLowerCase();
+                suffix = StringUtil.join(FileSuffixEnum.values(), ",").toLowerCase();
                 String msg = String.format("不正确的文件扩展名 \"%s\"，只支持 \"%s\" 的文件扩展名。", filename, suffix);
                 logService.log(LogType.PluginLog.CHECK_ERROR, msg);
                 throw new BizException(msg);

dbsyncer-common/src/main/java/org/dbsyncer/common/util/NumberUtil.java

@@ -8,6 +8,14 @@ public abstract class NumberUtil {
         return NumberUtils.toInt(str);
     }
 
+    public static int toInt(String str, int defaultValue) {
+        return NumberUtils.toInt(str, defaultValue);
+    }
+
+    public static long toLong(String str, long defaultValue) {
+        return NumberUtils.toLong(str, defaultValue);
+    }
+
     public static boolean isCreatable(String str) {
         return NumberUtils.isCreatable(str);
     }

dbsyncer-common/src/main/java/org/dbsyncer/common/util/StringUtil.java

@@ -32,6 +32,14 @@ public abstract class StringUtil {
         return StringUtils.replaceOnce(text, searchString, replacement);
     }
 
+    public static String join(Iterable<?> iterable, String separator) {
+        return StringUtils.join(iterable, separator);
+    }
+
+    public static String join(Object[] array, String separator) {
+        return StringUtils.join(array, separator);
+    }
+
     public static String substring(String str, int start) {
         return StringUtils.substring(str, start);
     }

dbsyncer-manager/src/main/java/org/dbsyncer/manager/config/FieldPicker.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.manager.config;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.CompareFilter;
 import org.dbsyncer.connector.config.Field;
 import org.dbsyncer.connector.config.Filter;
@@ -97,9 +97,9 @@ public class FieldPicker {
 
         // 解析过滤条件
         if ((filterSwitch = !CollectionUtils.isEmpty(filter))) {
-            add = filter.stream().filter(f -> StringUtils.equals(f.getOperation(), OperationEnum.AND.getName())).collect(
+            add = filter.stream().filter(f -> StringUtil.equals(f.getOperation(), OperationEnum.AND.getName())).collect(
                     Collectors.toList());
-            or = filter.stream().filter(f -> StringUtils.equals(f.getOperation(), OperationEnum.OR.getName())).collect(Collectors.toList());
+            or = filter.stream().filter(f -> StringUtil.equals(f.getOperation(), OperationEnum.OR.getName())).collect(Collectors.toList());
         }
 
         // 记录字段索引 [{"ID":0},{"NAME":1}]
@@ -128,7 +128,7 @@ public class FieldPicker {
         // 属性
         String name;
         // 索引
-        int    i;
+        int i;
 
         public Node(String name, int i) {
             this.name = name;

dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/impl/IncrementPuller.java

@@ -1,9 +1,9 @@
 package org.dbsyncer.manager.puller.impl;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.common.event.Event;
 import org.dbsyncer.common.event.RowChangedEvent;
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.common.util.UUIDUtil;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.config.ConnectorConfig;
@@ -315,7 +315,7 @@ public class IncrementPuller extends AbstractPuller implements ScheduledTaskJob,
                 pickers.parallelStream().forEach(picker -> {
                     final Map<String, Object> before = picker.getColumns(rowChangedEvent.getBeforeData());
                     final Map<String, Object> after = picker.getColumns(rowChangedEvent.getAfterData());
-                    if (picker.filter(StringUtils.equals(ConnectorConstant.OPERTION_DELETE, rowChangedEvent.getEvent()) ? before : after)) {
+                    if (picker.filter(StringUtil.equals(ConnectorConstant.OPERTION_DELETE, rowChangedEvent.getEvent()) ? before : after)) {
                         rowChangedEvent.setBefore(before);
                         rowChangedEvent.setAfter(after);
                         parser.execute(mapping, picker.getTableGroup(), rowChangedEvent);

dbsyncer-manager/src/main/java/org/dbsyncer/manager/template/impl/OperationTemplate.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.manager.template.impl;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.cache.CacheService;
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.manager.ManagerException;
 import org.dbsyncer.manager.config.OperationCallBack;
 import org.dbsyncer.manager.config.OperationConfig;
@@ -64,7 +64,7 @@ public final class OperationTemplate extends AbstractTemplate {
     }
 
     public <T> T queryObject(Class<T> clazz, String id) {
-        if (StringUtils.isBlank(id)) {
+        if (StringUtil.isBlank(id)) {
             return null;
         }
         Object o = cacheService.get(id, clazz);

dbsyncer-monitor/src/main/java/org/dbsyncer/monitor/MonitorFactory.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.monitor;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.common.model.Paging;
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.monitor.enums.MetricEnum;
@@ -75,17 +75,17 @@ public class MonitorFactory implements Monitor {
     @Override
     public Paging queryData(String id, int pageNum, int pageSize, String error, String success) {
         // 没有驱动
-        if (StringUtils.isBlank(id)) {
+        if (StringUtil.isBlank(id)) {
             return new Paging(pageNum, pageSize);
         }
 
         // 查询异常信息
         Query query = new Query(pageNum, pageSize);
-        if (StringUtils.isNotBlank(error)) {
+        if (StringUtil.isNotBlank(error)) {
             query.addFilter(ConfigConstant.DATA_ERROR, error, true);
         }
         // 查询是否成功, 默认查询失败
-        query.addFilter(ConfigConstant.DATA_SUCCESS, StringUtils.isNotBlank(success) ? success : StorageDataStatusEnum.FAIL.getCode(), false, true);
+        query.addFilter(ConfigConstant.DATA_SUCCESS, StringUtil.isNotBlank(success) ? success : StorageDataStatusEnum.FAIL.getCode(), false, true);
         return manager.queryData(query, id);
     }
 
@@ -97,7 +97,7 @@ public class MonitorFactory implements Monitor {
     @Override
     public Paging queryLog(int pageNum, int pageSize, String json) {
         Query query = new Query(pageNum, pageSize);
-        if (StringUtils.isNotBlank(json)) {
+        if (StringUtil.isNotBlank(json)) {
             query.addFilter(ConfigConstant.CONFIG_MODEL_JSON, json, true);
         }
         return manager.queryLog(query);

dbsyncer-monitor/src/main/java/org/dbsyncer/monitor/enums/MetricEnum.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.monitor.enums;
 
-import org.apache.commons.lang.StringUtils;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.monitor.MonitorException;
 
@@ -60,7 +60,7 @@ public enum MetricEnum {
 
     public static MetricEnum getMetric(String code) throws ConnectorException {
         for (MetricEnum e : MetricEnum.values()) {
-            if (StringUtils.equals(code, e.getCode())) {
+            if (StringUtil.equals(code, e.getCode())) {
                 return e;
             }
         }

dbsyncer-web/src/main/java/org/dbsyncer/web/config/WebAppConfig.java

@@ -1,10 +1,10 @@
 package org.dbsyncer.web.config;
 
-import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.ConfigService;
 import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.SHA1Util;
+import org.dbsyncer.common.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -141,7 +141,7 @@ public class WebAppConfig extends WebSecurityConfigurerAdapter implements Authen
         String password = (String) authentication.getCredentials();
         password = SHA1Util.b64_sha1(password);
 
-        if (!StringUtils.equals(username, this.username) || !StringUtils.equals(configService.getPassword(), password)) {
+        if (!StringUtil.equals(username, this.username) || !StringUtil.equals(configService.getPassword(), password)) {
             throw new BadCredentialsException("对不起,您输入的帐号或密码错误");
         }
         return new UsernamePasswordAuthenticationToken(username, password, AuthorityUtils.commaSeparatedStringToAuthorityList("admin"));

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/TestController.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.web.controller;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.RandomUtils;
 import org.dbsyncer.biz.MappingService;
+import org.dbsyncer.common.util.RandomUtil;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.web.remote.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,7 +48,7 @@ public class TestController implements InitializingBean {
     @RequestMapping("/demo")
     public String demo(ModelMap modelMap, Long id, String version) {
         logger.info("id:{},version:{}", id, version);
-        modelMap.put("data", RandomUtils.nextInt(100));
+        modelMap.put("data", RandomUtil.nextInt(1, 100));
         return id + version;
     }
 
@@ -85,13 +85,13 @@ public class TestController implements InitializingBean {
     }
 
     @Autowired
-    private RequestMappingHandlerAdapter           requestMappingHandlerAdapter;
+    private RequestMappingHandlerAdapter requestMappingHandlerAdapter;
     @Autowired
-    private ApplicationContext                     applicationContext;
-    private Map<String, String>                    parsePackage            = new HashMap<>();
-    private Map<String, InvocableHandlerMethod>    handlers                = new ConcurrentHashMap<>();
-    private HandlerMethodArgumentResolverComposite resolvers               = new HandlerMethodArgumentResolverComposite();
-    private ParameterNameDiscoverer                parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
+    private ApplicationContext applicationContext;
+    private Map<String, String> parsePackage = new HashMap<>();
+    private Map<String, InvocableHandlerMethod> handlers = new ConcurrentHashMap<>();
+    private HandlerMethodArgumentResolverComposite resolvers = new HandlerMethodArgumentResolverComposite();
+    private ParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
 
     @Override
     public void afterPropertiesSet() {
@@ -115,7 +115,7 @@ public class TestController implements InitializingBean {
                 filter = false;
                 // 匹配解析包
                 for (int i = 0; i < length; i++) {
-                    if (StringUtils.startsWith((String) array[i], obj.getKey())) {
+                    if (StringUtil.startsWith((String) array[i], obj.getKey())) {
                         Object bean = applicationContext.getBean(v.getBeanType());
                         InvocableHandlerMethod invocableHandlerMethod = new InvocableHandlerMethod(bean, v.getMethod());
                         invocableHandlerMethod.setHandlerMethodArgumentResolvers(resolvers);