chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

code optimize (#2107)

Browse Source 
* admin assembly打包

* 修改npm  profile

* code optimize

* code optimize
This commit is contained in:
rewerma
2019-08-27 22:24:53 +08:00
committed by agapple
parent c48407b449
commit 7386327af9
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnector.java
View File

@@ -138,22 +138,22 @@ public class SimpleAdminConnector implements AdminConnector {
@Override @Override
public boolean check() { public boolean check() {
return BooleanUtils.toBoolean(Integer.valueOf(doServerAdmin("check"))); return BooleanUtils.toBoolean(Integer.parseInt(doServerAdmin("check")));
} }
@Override @Override
public boolean start() { public boolean start() {
return BooleanUtils.toBoolean(Integer.valueOf(doServerAdmin("start"))); return BooleanUtils.toBoolean(Integer.parseInt(doServerAdmin("start")));
} }
@Override @Override
public boolean stop() { public boolean stop() {
return BooleanUtils.toBoolean(Integer.valueOf(doServerAdmin("stop"))); return BooleanUtils.toBoolean(Integer.parseInt(doServerAdmin("stop")));
} }
@Override @Override
public boolean restart() { public boolean restart() {
return BooleanUtils.toBoolean(Integer.valueOf(doServerAdmin("restart"))); return BooleanUtils.toBoolean(Integer.parseInt(doServerAdmin("restart")));
} }
@Override @Override
@@ -163,22 +163,22 @@ public class SimpleAdminConnector implements AdminConnector {
@Override @Override
public boolean checkInstance(String destination) { public boolean checkInstance(String destination) {
return BooleanUtils.toBoolean(Integer.valueOf(doInstanceAdmin(destination, "check"))); return BooleanUtils.toBoolean(Integer.parseInt(doInstanceAdmin(destination, "check")));
} }
@Override @Override
public boolean startInstance(String destination) { public boolean startInstance(String destination) {
return BooleanUtils.toBoolean(Integer.valueOf(doInstanceAdmin(destination, "start"))); return BooleanUtils.toBoolean(Integer.parseInt(doInstanceAdmin(destination, "start")));
} }
@Override @Override
public boolean stopInstance(String destination) { public boolean stopInstance(String destination) {
return BooleanUtils.toBoolean(Integer.valueOf(doInstanceAdmin(destination, "stop"))); return BooleanUtils.toBoolean(Integer.parseInt(doInstanceAdmin(destination, "stop")));
} }
@Override @Override
public boolean restartInstance(String destination) { public boolean restartInstance(String destination) {
return BooleanUtils.toBoolean(Integer.valueOf(doInstanceAdmin(destination, "restart"))); return BooleanUtils.toBoolean(Integer.parseInt(doInstanceAdmin(destination, "restart")));
} }
@Override @Override

2
canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
View File

@@ -113,7 +113,7 @@ public class PollingConfigController {
CanalInstanceConfig canalInstanceConfig = new CanalInstanceConfig(); CanalInstanceConfig canalInstanceConfig = new CanalInstanceConfig();
List<CanalInstanceConfig> configs = canalInstanceConfigService.findList(canalInstanceConfig); List<CanalInstanceConfig> configs = canalInstanceConfigService.findList(canalInstanceConfig);
List<String> instances = configs.stream().map(config -> config.getName()).collect(Collectors.toList()); List<String> instances = configs.stream().map(CanalInstanceConfig::getName).collect(Collectors.toList());
String data = Joiner.on(',').join(instances); String data = Joiner.on(',').join(instances);
canalInstanceConfig.setContent(data); canalInstanceConfig.setContent(data);
if (StringUtils.isEmpty(md5)) { if (StringUtils.isEmpty(md5)) {

5
canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java
View File

@@ -26,6 +26,9 @@ public class UserServiceImpl implements UserService {
return null; return null;
} }
User user = User.find.query().where().eq("username", username).findOne(); User user = User.find.query().where().eq("username", username).findOne();
if (user == null) {
throw new ServiceException("user:" + username + " auth failed!");
}
try { try {
byte[] pass = SecurityUtil.scramble411(password.getBytes(), seeds); byte[] pass = SecurityUtil.scramble411(password.getBytes(), seeds);
if (!SecurityUtil.scrambleServerAuth(pass, SecurityUtil.hexStr2Bytes(user.getPassword()), seeds)) { if (!SecurityUtil.scrambleServerAuth(pass, SecurityUtil.hexStr2Bytes(user.getPassword()), seeds)) {
@@ -35,9 +38,7 @@ public class UserServiceImpl implements UserService {
throw new ServiceException("user:" + user.getName() + " auth failed!"); throw new ServiceException("user:" + user.getName() + " auth failed!");
} }
if (user != null) {
user.setPassword(""); user.setPassword("");
}
return user; return user;
} }

2
driver/src/test/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnectorTest.java
View File

@@ -4,10 +4,12 @@ import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket; import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket;
@Ignore
public class MysqlConnectorTest { public class MysqlConnectorTest {
@Test @Test