合并分支 'zs' 到 'master'

src/main/java/com/zjty/adaptationmaster/AdaptationMasterApplication.java

@@ -2,7 +2,6 @@ package com.zjty.adaptationmaster;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
 public class AdaptationMasterApplication {

src/main/java/com/zjty/adaptationmaster/adaptor/entity/SystemVariable.java

+package com.zjty.adaptationmaster.adaptor.entity;
+
+import org.springframework.context.ApplicationContext;
+
+public class SystemVariable {
+    public static ApplicationContext context;
+}

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

@@ -20,8 +20,11 @@ public class DBManage {
     private String databaseType;//数据库类型
     private String address;//连接地址
     private String port;//数据库端口号
-    private String databaseName;//数据库名字
+    @Transient
+    private String databaseName;//可连接数据库名字
+    @Transient
     private String connectionType;//数据库连接时的sql
+    @Transient
     private String driver;//数据库驱动
     private Integer status;//逻辑删除 0-删除 1-未删除
 }

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

@@ -6,7 +6,6 @@ import com.zjty.adaptationmaster.adaptor.repository.DBManageDao;
 import com.zjty.adaptationmaster.adaptor.service.DBManageService;
 import com.zjty.adaptationmaster.base.response.ServerResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,12 +14,6 @@ public class DBManageServiceImpl implements DBManageService {
 
     @Autowired
     private DBManageDao databaseDao;
-    @Value("${highgo.driver}")
-    private String highDriver;
-    @Value("${highgo.connectionType}")
-    private String highConnectionType;
-    @Value("${highgo.dbName}")
-    private String highDBName;
 
     /**
      * 新增数据库配置文件
@@ -31,11 +24,6 @@ public class DBManageServiceImpl implements DBManageService {
     @Transactional
     public ServerResponse saveDatabase(DBManage databaseManagement) {
         databaseManagement.setStatus(1);//1-未删除
-        if(databaseManagement.getDatabaseType().equals("highgo")){
-            databaseManagement.setDatabaseName(highDBName);
-            databaseManagement.setDriver(highDriver);
-            databaseManagement.setConnectionType(highConnectionType);
-        }
         return ServerResponse.success(databaseDao.save(databaseManagement));
     }
 

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

@@ -12,6 +12,7 @@ import com.zjty.adaptationmaster.utils.Regular;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.BufferedReader;
@@ -34,6 +35,13 @@ public class DBMigrateServiceImpl implements DBMigrateService {
     @Autowired
     private DBRecordDao dbRecordDao;
 
+    @Value("${highgo.driver}")
+    private String highgoDriver;
+    @Value("${highgo.connectionType}")
+    private String highgoConnnectionType;
+    @Value("${highgo.dbName}")
+    private String highgoDBName;
+
     /**
      * 创建新数据库和数据库中的表
      */
@@ -62,6 +70,9 @@ public class DBMigrateServiceImpl implements DBMigrateService {
             if(databaseResponse.getCreateType().equals("highgo") && databaseResponse.getSourceType().equals("mysql")){
                 //生成数据库的名称
                 //连接系统数据库，建立新数据库
+                databaseManagement.setDatabaseName(highgoDBName);
+                databaseManagement.setDriver(highgoDriver);
+                databaseManagement.setConnectionType(highgoConnnectionType);
                 Connection connection = Regular.databaseConnection(databaseManagement);
                 if(connection != null){
                     PreparedStatement preparedStatement = null;
@@ -112,7 +123,7 @@ public class DBMigrateServiceImpl implements DBMigrateService {
                                     continue;
                                 }
                             }
-                            log.info(databaseResponse.getSqlPath() + "sql执行完成");
+                            log.info(databaseResponse.getSqlPath() + "执行完成");
                         } catch (Exception e) {
                             e.printStackTrace();
                         } finally {
@@ -126,6 +137,8 @@ public class DBMigrateServiceImpl implements DBMigrateService {
                             }
                         }
                     }
+                }else {
+                    return ServerResponse.error("创建数据库时连接数据库失败");
                 }
             }
             //保存迁移记录到数据库
@@ -165,6 +178,9 @@ public class DBMigrateServiceImpl implements DBMigrateService {
         DBManage databaseManagement = dbManageDao.findDBManageByIdAndStatus(id, 1);
         //highgo查询所有数据库
         if(databaseManagement.getDatabaseType().equals("highgo")){
+            databaseManagement.setDatabaseName(highgoDBName);
+            databaseManagement.setDriver(highgoDriver);
+            databaseManagement.setConnectionType(highgoConnnectionType);
             Connection connection = Regular.databaseConnection(databaseManagement);
             if (connection != null) {
                 dbNameReturn.setStatus(1);

src/main/resources/application.properties

@@ -38,4 +38,4 @@ spring.resources.static-locations=classpath:/uploads/
 #highgo
 highgo.driver=org.postgresql.Driver
 highgo.connectionType=postgresql
-highgo.dbName=template0
\ No newline at end of file
+highgo.dbName=template1
\ No newline at end of file

src/test/java/com/zjty/adaptationmaster/Test4.java

@@ -2,8 +2,13 @@ package com.zjty.adaptationmaster;
 
 public class Test4 {
     public static void main(String[] args) {
-        String a = "\r\n  KEY \"FK14pq56p21er9aref4rplla3ef\" (\"routine_routine_id\")\n" +
-                ");";
-        System.out.println(a.substring(0,a.indexOf("\"")));
+        String a = "sdaf = df ccc = 18 adfasdf = utf8";
+        int begin= a.indexOf("ccc");
+        for(int i = begin;i < a.length();i++){
+            String m = a.charAt(i) + "";
+            if(m.matches("\\d")){
+                System.out.println(m);
+            }
+        }
     }
 }