合并分支 'zs' 到 'master'

src/main/java/com/zjty/adaptationmaster/adaptor/entity/db/DatabaseResponse.java

@@ -13,4 +13,5 @@ public class DatabaseResponse {
     private String createType;//生成库类型
     private String sqlPath;//上传数据库地址
     private Integer id;//用户ID
+    private String uuid;//uuid
 }

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

@@ -76,7 +76,8 @@ public class AdaptationServiceImpl implements AdaptationService {
     public ServerResponse unZipProject(String path, Project project) {
         Project project1 = projectDao.getOne(project.getId());
         //FileUtil fileUtil = new FileUtil();
-        project1.setCodeUrl(Const.UPLOAD_LOCATION+File.separator+project1.getProjectName());
+        //project1.setCodeUrl(Const.UPLOAD_LOCATION+File.separator+project1.getProjectName());
+        project1.setCodeUrl(Const.UPLOAD_LOCATION+project1.getProjectName());
         try {
             FileZip.unzip(new File(path),project1.getCodeUrl());
             project1.setStage(project.getStage());
@@ -120,4 +121,8 @@ public class AdaptationServiceImpl implements AdaptationService {
         }
         return pro;
     }
+
+    public static void main(String[] args) {
+        System.out.println(File.separator);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.zjty.adaptationmaster.adaptor.service.Impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.zjty.adaptationmaster.adaptor.controller.WebSocketServer;
 import com.zjty.adaptationmaster.adaptor.entity.db.*;
 import com.zjty.adaptationmaster.adaptor.repository.DBManageDao;
 import com.zjty.adaptationmaster.adaptor.repository.DBRecordDao;
@@ -51,6 +52,11 @@ public class DBMigrateServiceImpl implements DBMigrateService {
     @Override
     public ServerResponse dbMigrate(DatabaseResponse databaseResponse) {
         if(databaseResponse != null && databaseResponse.getDatabaseName() != null){
+            String uuid = null;
+            if(databaseResponse.getUuid() != null){
+                uuid = databaseResponse.getUuid();
+            }
+            System.out.println(uuid);
             String databaseName = databaseResponse.getDatabaseName();
             //查询新建的数据库是否存在
             ServerResponse serverResponse = findDBByDBType(databaseResponse.getId());
@@ -134,17 +140,25 @@ public class DBMigrateServiceImpl implements DBMigrateService {
                                 }
                                 sql += s;
                                 if(s.contains(";")){
+                                    if(Regular.lowerAndUpper(s,"CREATE") && Regular.lowerAndUpper(s,"TABLE")){
+                                        String tableName = s.substring(s.indexOf("\"") + 1,s.lastIndexOf("\""));
+                                        WebSocketServer.sendIn(uuid,tableName + "表创建");
+                                    }
                                     preparedStatement1 = connection1.prepareStatement(sql);
                                     preparedStatement1.execute();
                                     sql = "";
                                 }
                             }
+                            if(insertList != null && insertList.size() != 0){
                                 for(String insert:insertList){
+                                    String tableName = s.substring(s.indexOf("\"") + 1,s.lastIndexOf("\""));
+                                    WebSocketServer.sendIn(uuid,tableName + "表中正在插入");
                                     SQLExecuteTask sqlExecuteTask = new SQLExecuteTask(connection1);
                                     sqlExecuteTask.setSql(insert);
                                     pool.submit(sqlExecuteTask);
                                     System.out.println("核心线程数" + pool.getPoolSize() + "\t" + "存活线程数：" + pool.getActiveCount() + "\t" + "等待数量：" +  pool.getQueue().size() +"\t" + "任务数量：" + pool.getTaskCount());
                                 }
+                            }
                             //数据库连接池关闭
                             pool.shutdown();
                             try {
@@ -153,11 +167,14 @@ public class DBMigrateServiceImpl implements DBMigrateService {
                                 e.printStackTrace();
                             }
                             //关闭后执行新建索引和外键的sql语句
+                            if(elseList != null && elseList.size() != 0){
                                 for(String elseChar:elseList){
+                                    WebSocketServer.sendIn(uuid,"正在创建索引或外键");
                                     SQLExecuteTask sqlExecuteTask = new SQLExecuteTask(connection1);
                                     sqlExecuteTask.setSql(elseChar);
                                     pool.submit(sqlExecuteTask);
                                 }
+                            }
                             System.out.println("sql执行时间为：" + (System.currentTimeMillis() - b));
                             log.info(databaseResponse.getSqlPath() + "执行完成");
                         } catch (Exception e) {

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

@@ -35,6 +35,9 @@ public class InspectServiceImpl implements InspectService {
             suffixLanguageMapping.put("jsp",Report.Language.JSP);
             //suffixLanguageMapping.put("html",Report.Language.ONLYVIEW);
             Report report = new Inspector(project, suffixLanguageMapping).inspect();
+            if(report.getPackagePath() == null){
+                report.setPackagePath(project.getCodeUrl());
+            }
             reportDao.save(report);
             Project one = projectDao.getOne(project.getId());
             one.setReport(report);

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

@@ -59,12 +59,12 @@ public class ApusicDeployer {
     private void appctl(String command,String webSocketName,String projectName){
         try {
             Process exec = Runtime.getRuntime().exec(command);
-            String password = "Qwert123!@#";
+            String password = Const.CTLPWD;
             OutputStream outputStream = exec.getOutputStream();
             outputStream.write(password.getBytes());
             outputStream.flush();
             outputStream.close();
-            BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream(),"GBK"));
             String line = null;
             while ((line = reader.readLine()) != null) {
                 WebSocketServer.sendInfo(webSocketName, line, "部署", "running", projectName);