|
@@ -124,58 +124,6 @@ public class CmdServerImpl implements CmdServer {
|
|
|
|
|
|
}
|
|
|
|
|
|
-// @Override
|
|
|
-// public R exeCmdUnzip(String commandStr) {
|
|
|
-// log.info("run exeCmdUnzip");
|
|
|
-// Integer isCmd = null; // 命令运行结果 1:失败, 0:成功
|
|
|
-// try {
|
|
|
-// String[] cmd = new String[]{"/bin/sh", "-c", commandStr};
|
|
|
-// Process ps = Runtime.getRuntime().exec(cmd);
|
|
|
-//
|
|
|
-//// BufferedReader br = new BufferedReader(new InputStreamReader(ps.getInputStream()));
|
|
|
-//// BufferedReader errorBuf = new BufferedReader(new InputStreamReader(ps.getErrorStream()));
|
|
|
-////
|
|
|
-//// StringBuffer sb = new StringBuffer();
|
|
|
-//// StringBuffer errorStr = new StringBuffer();
|
|
|
-//
|
|
|
-// // error : 坑, 控制台信息是从errorBuf这里出来的
|
|
|
-//// String errorLine;
|
|
|
-//// log.info("run 111111");
|
|
|
-//// while ((errorLine = errorBuf.readLine()) != null) {
|
|
|
-//// log.info("run 2222222");
|
|
|
-//// errorStr.append(errorLine).append("\n");
|
|
|
-//// }
|
|
|
-//// log.info("run 33333333");
|
|
|
-//// log.info("error result: {}", errorStr.toString());
|
|
|
-////
|
|
|
-//// // success ,没有获取到信息
|
|
|
-//// String line;
|
|
|
-//// while ((line = br.readLine()) != null) {
|
|
|
-//// log.info("run 44444444");
|
|
|
-////// log.info("===== br.readLine: ======== {}", br.readLine());
|
|
|
-//// //执行结果加上回车
|
|
|
-//// sb.append(line).append("\n");
|
|
|
-//// }
|
|
|
-//
|
|
|
-//// log.info("result: {}", sb.toString());
|
|
|
-//
|
|
|
-// // 结束命令行
|
|
|
-// isCmd = ps.waitFor();
|
|
|
-// log.info("run 5555555");
|
|
|
-// // 关闭流
|
|
|
-//// br.close();
|
|
|
-//// errorBuf.close();
|
|
|
-//
|
|
|
-// } catch (Exception e) {
|
|
|
-// e.printStackTrace();
|
|
|
-// }
|
|
|
-//
|
|
|
-// if (isCmd == 0) {
|
|
|
-// return new R(200, MsgCode.SUCCESS);
|
|
|
-// } else {
|
|
|
-// return new R(200, MsgCode.E50005);
|
|
|
-// }
|
|
|
-// }
|
|
|
|
|
|
@Override
|
|
|
public Integer exeCmdInt(String cmd) {
|
|
@@ -413,6 +361,8 @@ public class CmdServerImpl implements CmdServer {
|
|
|
return isCmd;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
// 匹配数字
|
|
|
private boolean numRegex(String str) {
|
|
|
String reg = "\\d";
|