zs

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/DBMigrateServiceImpl.java

@@ -161,7 +161,7 @@ public class DBMigrateServiceImpl implements DBMigrateService {
                                             tableName += insert.charAt(j);
                                         }
                                     }
-                                    WebSocketServer.sendIn(uuid,TimeUtil.getNowDate() + " 数据库适配：" + tableName + "表中正在插入");
+                                    WebSocketServer.sendIn(uuid,TimeUtil.getNowDate() + " 数据库适配：" + tableName + "表正在插入");
                                     SQLExecuteTask sqlExecuteTask = new SQLExecuteTask(dbManage1);
                                     sqlExecuteTask.setSql(insert);
                                     pool.submit(sqlExecuteTask);

src/main/java/com/zjty/adaptationmaster/utils/ApusicDeployer.java

 package com.zjty.adaptationmaster.utils;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zjty.adaptationmaster.adaptor.controller.WebSocketServer;
 import com.zjty.adaptationmaster.adaptor.entity.Project;
 import com.zjty.adaptationmaster.base.entity.ProjectStatueFromMiddleware;
@@ -27,17 +28,32 @@ public class ApusicDeployer {
     }
     public List<ProjectStatueFromMiddleware> list(){
         List<ProjectStatueFromMiddleware> result = new ArrayList<>();
-        String command = ctlPath+" -p '"+ctlPwd+"' list";
+        String command = ctlPath+" list";
+        System.out.println("command：" + command);
         try {
             Process exec = Runtime.getRuntime().exec(command);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream()));
+            String password = Const.CTLPWD;
+            OutputStream outputStream = exec.getOutputStream();
+            outputStream.write(password.getBytes());
+            outputStream.flush();
+            outputStream.close();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream(),"GBK"));
             boolean titleEnd = false;
             String line = null;
             while ((line = reader.readLine()) != null) {
-                if(line.startsWith("---------------"))titleEnd = true;
+                System.out.println(line);
+                if(line.contains("---------------")){
+                    titleEnd = true;
+                    continue;
+                }
                 if(titleEnd){
                     String[] split = line.split("\\s{2,}");
-                    ProjectStatueFromMiddleware projectStatue = new ProjectStatueFromMiddleware(split[0],split[1],split[2]);
+                    ProjectStatueFromMiddleware projectStatue = null;
+                    if(split.length < 3){
+                        projectStatue = new ProjectStatueFromMiddleware(split[0],null,split[1]);
+                    }else {
+                        projectStatue = new ProjectStatueFromMiddleware(split[0],split[1],split[2]);
+                    }
                     result.add(projectStatue);
                 }
             }

src/main/java/com/zjty/adaptationmaster/utils/Regular.java

@@ -289,10 +289,6 @@ public class Regular {
 
 
     public static void main(String[] args) {
-        //mySqlRegular("D:\\sqlFile\\uploads\\63c6e098-73fd-4999-b289-b3d120a07e87.sql","test11111");
-        //
-        File file = new File("D:\\root\\projects\\adaptationMaster\\uploads\\czq测试系统5\\swiper-4.5.0/target/threem-0.0.1-SNAPSHOT.war");
-        System.out.println(file.length());
-        System.out.println(file.getName());
+        mySqlRegular("C:\\Users\\admin\\Desktop\\database\\three.sql","three");
     }
 }