调整了一些代码结构

src/main/java/com/yeejoin/amos/api/tool/controller/AmosToolTemplateController.java

@@ -3,9 +3,7 @@ package com.yeejoin.amos.api.tool.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.AmosToolTemplateModel;
 import com.yeejoin.amos.api.tool.face.model.AmosToolTemplateVoModel;
-import com.yeejoin.amos.api.tool.face.model.ProjectModel;
 import com.yeejoin.amos.api.tool.face.service.AmosToolTemplateService;
-import com.yeejoin.amos.api.tool.utils.DataBaseUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +14,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 

src/main/java/com/yeejoin/amos/api/tool/controller/DataApiResource.java

@@ -3,7 +3,7 @@ package com.yeejoin.amos.api.tool.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.ProjectModel;
 import com.yeejoin.amos.api.tool.face.service.StudioResourceService;
-import com.yeejoin.amos.api.tool.utils.DataBaseUtils;
+import com.yeejoin.amos.api.tool.utils.DatabaseUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.logging.log4j.LogManager;
@@ -98,7 +98,7 @@ DataApiResource {
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(
-                DataBaseUtils.listToPage(studioResourceService.getAppList(sequenceNbr, projectNbr), current, size));
+                DatabaseUtils.listToPage(studioResourceService.getAppList(sequenceNbr, projectNbr), current, size));
     }
 
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@@ -113,7 +113,7 @@ DataApiResource {
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(
-                DataBaseUtils.listToPage(studioResourceService.getIdx(ipSeq, agencyCode), current, size));
+                DatabaseUtils.listToPage(studioResourceService.getIdx(ipSeq, agencyCode), current, size));
     }
 }
 

src/main/java/com/yeejoin/amos/api/tool/controller/DataBaseLinkResource.java → src/main/java/com/yeejoin/amos/api/tool/controller/DatabaseConnectionResource.java

@@ -2,9 +2,8 @@ package com.yeejoin.amos.api.tool.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.AgencyModel;
-import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
-import com.yeejoin.amos.api.tool.face.model.TemplateVoModel;
-import com.yeejoin.amos.api.tool.face.service.DataBaseLinkService;
+import com.yeejoin.amos.api.tool.face.model.DatabaseConnectionModel;
+import com.yeejoin.amos.api.tool.face.service.DatabaseConnectionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +13,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
@@ -26,22 +24,22 @@ import java.util.List;
 @RestController
 @Api(tags = "数据库信息")
 @RequestMapping(value = "/database_link")
-public class DataBaseLinkResource {
+public class DatabaseConnectionResource {
 
     @Autowired
-    private DataBaseLinkService dataBaseLinkService;
+    private DatabaseConnectionService databaseConnectionService;
 
     /**
      * 新增
      *
-     * @param dataBaseLinkModel 数据库连接
+     * @param dataBaseConnectionModel 数据库连接
      * @return DataBaseLinkModel
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<DataBaseLinkModel> save(@RequestBody DataBaseLinkModel dataBaseLinkModel) throws Exception {
-        return ResponseHelper.buildResponse(dataBaseLinkService.save(dataBaseLinkModel));
+    public ResponseModel<DatabaseConnectionModel> save(@RequestBody DatabaseConnectionModel dataBaseConnectionModel) throws Exception {
+        return ResponseHelper.buildResponse(databaseConnectionService.save(dataBaseConnectionModel));
     }
 
     /**
@@ -53,11 +51,11 @@ public class DataBaseLinkResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<DataBaseLinkModel> updateBySeq(
-            @RequestBody DataBaseLinkModel model,
+    public ResponseModel<DatabaseConnectionModel> updateBySeq(
+            @RequestBody DatabaseConnectionModel model,
             @PathVariable(value = "sequenceNbr") Long sequenceNbr) throws Exception {
         model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(dataBaseLinkService.update(model));
+        return ResponseHelper.buildResponse(databaseConnectionService.update(model));
     }
 
     /**
@@ -70,7 +68,7 @@ public class DataBaseLinkResource {
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
     public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(dataBaseLinkService.removeById(sequenceNbr));
+        return ResponseHelper.buildResponse(databaseConnectionService.removeById(sequenceNbr));
     }
 
     /**
@@ -81,12 +79,13 @@ public class DataBaseLinkResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<DataBaseLinkModel> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(dataBaseLinkService.queryBySeq(sequenceNbr));
+    public ResponseModel<DatabaseConnectionModel> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(databaseConnectionService.queryBySeq(sequenceNbr));
     }
 
     /**
-     * 机构分页查询
+     * 位于：脚本导出-机构管理
+     * 分页查询，获取指定地址下的机构
      *
      * @param current 当前分页
      * @param size    分页大小
@@ -99,13 +98,13 @@ public class DataBaseLinkResource {
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size,
             @RequestParam Long ipSeq) throws SQLException {
-        Page<AgencyModel> page = new Page<>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(dataBaseLinkService.queryForAgencyPage(page,ipSeq));
+        Page<AgencyModel> page = new Page<>(current, size);
+        return ResponseHelper.buildResponse(databaseConnectionService.queryForAgencyPage(page, ipSeq));
     }
 
     /**
+     * 位于：脚本导出-机构管理
+     * 获取全部数据库ip
      * 列表全部数据查询
      *
      * @return List<DataBaseLinkModel>
@@ -113,8 +112,8 @@ public class DataBaseLinkResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
-    public ResponseModel<List<DataBaseLinkModel>> selectForList() {
-        return ResponseHelper.buildResponse(dataBaseLinkService.queryForDataBaseList());
+    public ResponseModel<List<DatabaseConnectionModel>> selectForList() {
+        return ResponseHelper.buildResponse(databaseConnectionService.queryForDataBaseList());
     }
 
     /**
@@ -126,7 +125,7 @@ public class DataBaseLinkResource {
     @GetMapping(value = "/agency/list")
     @ApiOperation(httpMethod = "GET", value = "机构列表查询", notes = "列表查询")
     public ResponseModel<List<AgencyModel>> queryForList() throws SQLException, IOException {
-        return ResponseHelper.buildResponse(dataBaseLinkService.queryForAgencyList());
+        return ResponseHelper.buildResponse(databaseConnectionService.queryForAgencyList());
     }
 
 

src/main/java/com/yeejoin/amos/api/tool/controller/DataBaseNameListResource.java → src/main/java/com/yeejoin/amos/api/tool/controller/DatabaseNameListResource.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.api.tool.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.DataBaseNameListModel;
-import com.yeejoin.amos.api.tool.face.service.DataBaseNameListService;
+import com.yeejoin.amos.api.tool.face.service.DatabaseNameListService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,10 +18,10 @@ import java.util.List;
 @RestController
 @Api(tags = "数据库名称表")
 @RequestMapping(value = "/database_name")
-public class DataBaseNameListResource {
+public class DatabaseNameListResource {
 
     @Autowired
-    private DataBaseNameListService dataBaseNameListService;
+    private DatabaseNameListService databaseNameListService;
 
     /**
      * 数据库初始化
@@ -33,8 +33,7 @@ public class DataBaseNameListResource {
     @PostMapping(value = "/refresh/{ipSeq}")
     @ApiOperation(httpMethod = "POST", value = "数据库初始化", notes = "数据库初始化")
     public ResponseModel<List<String>> refresh(@PathVariable Long ipSeq) throws Exception {
-        return ResponseHelper.buildResponse(
-                dataBaseNameListService.refreshDataBase(ipSeq));
+        return ResponseHelper.buildResponse(databaseNameListService.refreshDatabase(ipSeq));
     }
 
     /**
@@ -52,7 +51,7 @@ public class DataBaseNameListResource {
             @RequestParam(value = "size") int size,
             @RequestParam Long ipSeq) throws SQLException, ClassNotFoundException {
         Page<DataBaseNameListModel> page = new Page<>();
-        return ResponseHelper.buildResponse(dataBaseNameListService.queryForDataBasePage(page, ipSeq,current,size));
+        return ResponseHelper.buildResponse(databaseNameListService.queryForDataBasePage(page, ipSeq, current, size));
     }
 
 }

src/main/java/com/yeejoin/amos/api/tool/controller/RelationResource.java

 package com.yeejoin.amos.api.tool.controller;
 
-import com.yeejoin.amos.api.tool.face.service.DataBaseLinkService;
+import com.yeejoin.amos.api.tool.face.service.DatabaseConnectionService;
 import com.yeejoin.amos.api.tool.face.service.RelationService;
 import com.yeejoin.amos.api.tool.face.service.StudioResourceService;
 import io.swagger.annotations.Api;
@@ -26,7 +26,7 @@ public class RelationResource {
     @Autowired
     private RelationService relationService;
     @Autowired
-    DataBaseLinkService dataBaseLinkService;
+    DatabaseConnectionService databaseConnectionService;
     @Autowired
     private StudioResourceService studioResourceService;
 

src/main/java/com/yeejoin/amos/api/tool/face/model/DataBaseLinkModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/DatabaseConnectionModel.java

 package com.yeejoin.amos.api.tool.face.model;
 
-import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseLink;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -15,9 +14,9 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
-//@AllArgsConstructor
-@ApiModel(value = "DataBaseLinkModel", description = "")
-public class DataBaseLinkModel extends BaseModel {
+@AllArgsConstructor
+@ApiModel(value = "DatabaseConnectionModel", description = "")
+public class DatabaseConnectionModel extends BaseModel {
 
     @ApiModelProperty(value = "主机IP")
     private String ip;
@@ -39,16 +38,4 @@ public class DataBaseLinkModel extends BaseModel {
 
     @ApiModelProperty(value = "后缀")
     private String suffix;
-
-    public DataBaseLinkModel(String ip, String port, String dbName, String userName, String passWord,String prefix,String suffix) {
-        this.ip = ip;
-        this.port = port;
-        this.dbName = dbName;
-        this.userName = userName;
-        this.passWord = passWord;
-        this.prefix=prefix;
-        this.suffix = suffix;
-    }
-    
-
 }

src/main/java/com/yeejoin/amos/api/tool/face/service/AmosToolTemplateService.java

@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import javax.annotation.Resource;
-import java.sql.*;
 import java.util.*;
 
 @Component
@@ -21,7 +20,7 @@ public class AmosToolTemplateService extends BaseService<AmosToolTemplateModel,
     private AmosToolTemplateMapper amosToolTemplateMapper;
 
     @Autowired
-    private DataBaseLinkService dataBaseLinkService;
+    private DatabaseConnectionService databaseConnectionService;
 
 
 

src/main/java/com/yeejoin/amos/api/tool/face/service/DataBaseLinkService.java → src/main/java/com/yeejoin/amos/api/tool/face/service/DatabaseConnectionService.java

@@ -6,7 +6,7 @@ import com.yeejoin.amos.api.tool.face.model.*;
 import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseLinkMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseLink;
 import com.yeejoin.amos.api.tool.utils.AESUtils;
-import com.yeejoin.amos.api.tool.utils.DataBaseUtils;
+import com.yeejoin.amos.api.tool.utils.DatabaseUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,9 +29,9 @@ import java.util.Map;
  */
 
 @Service
-public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBaseLink, DataBaseLinkMapper> {
+public class DatabaseConnectionService extends BaseService<DatabaseConnectionModel, DataBaseLink, DataBaseLinkMapper> {
 
-    private static final Logger log = LogManager.getLogger(DataBaseLinkService.class);
+    private static final Logger log = LogManager.getLogger(DatabaseConnectionService.class);
 
     @Autowired
     private DataSource dataSource;
@@ -39,23 +39,21 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
     /**
      * 新增
      */
-    public DataBaseLinkModel save(DataBaseLinkModel dataBaseLinkModel) throws Exception {
-        DataBaseLinkModel model = this.encryptPwd(dataBaseLinkModel);
-        if (this.testConnection(model)) {
+    public DatabaseConnectionModel save(DatabaseConnectionModel dataBaseConnectionModel) throws Exception {
+        DatabaseConnectionModel model = AESUtils.encryptPwd(dataBaseConnectionModel);
+        if (DatabaseUtils.isConnectionValid(model)) {
             return this.createWithModel(model);
         } else {
-            return new DataBaseLinkModel();
+            return new DatabaseConnectionModel();
         }
     }
 
     /**
      * 编辑
      */
-
-    public DataBaseLinkModel update(DataBaseLinkModel model) throws Exception {
-//        DataBaseLinkModel model = this.decryptPwd(dataBaseLinkModel);
-        if (this.testConnection(model)) {
-            return this.updateWithModel(encryptPwd(model));
+    public DatabaseConnectionModel update(DatabaseConnectionModel model) throws Exception {
+        if (DatabaseUtils.isConnectionValid(model)) {
+            return this.updateWithModel(AESUtils.encryptPwd(model));
         } else {
             return null;
         }
@@ -65,10 +63,14 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
      * 机构分页查询
      */
     public Page<AgencyModel> queryForAgencyPage(Page<AgencyModel> page, Long ipSeq) throws SQLException {
-        Connection connection = this.connectNewDatabase(this.queryBySeq(ipSeq));
-        List<Map<String, Object>> maps =
-                DataBaseUtils.getMaps("SELECT AGENCY_NAME, AGENCY_CODE, AGENCY_DESC FROM privilege_agency;", connection);
+        Connection connection = DatabaseUtils.getConnection(this.queryBySeq(ipSeq));
+        if (connection == null) {
+            throw new SQLException("db connection is null!!!");
+        }
+        String selectSql = "SELECT AGENCY_NAME, AGENCY_CODE, AGENCY_DESC FROM privilege_agency;";
+        List<Map<String, Object>> maps = DatabaseUtils.getMaps(selectSql, connection);
         connection.close();
+
         List<AgencyModel> records = new ArrayList<>();
         for (Map<String, Object> map : maps) {
             AgencyModel model = new AgencyModel();
@@ -78,7 +80,7 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
                 model.setAgencyDesc(map.get("AGENCY_DESC").toString());
             records.add(model);
         }
-        Page<AgencyModel> entiryPage = new Page(page.getCurrent(), page.getSize());
+        Page<AgencyModel> entiryPage = new Page<>(page.getCurrent(), page.getSize());
         if (!ValidationUtil.isEmpty(records)) {
             page.setTotal(records.size());
             page.setPages(entiryPage.getPages());
@@ -99,12 +101,17 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
         con.close();
         log.info(url);
         DataBaseLink dataBaseLink = getOne(new QueryWrapper<DataBaseLink>().eq("IP", url.getHost()));
-        DataBaseLinkModel dataBaseLinkModel = new DataBaseLinkModel();
-        Bean.toModel(dataBaseLink, dataBaseLinkModel);
-        Connection connection = this.connectNewDatabase(dataBaseLinkModel);
-        List<Map<String, Object>> maps = DataBaseUtils.getMaps
-                ("SELECT AGENCY_NAME, AGENCY_CODE, AGENCY_DESC FROM privilege_agency;", connection);
+        DatabaseConnectionModel dataBaseConnectionModel = new DatabaseConnectionModel();
+        Bean.toModel(dataBaseLink, dataBaseConnectionModel);
+
+        Connection connection = DatabaseUtils.getConnection(dataBaseConnectionModel);
+        if (connection == null) {
+            throw new SQLException("db connection is null!!!");
+        }
+        String selectSql = "SELECT AGENCY_NAME, AGENCY_CODE, AGENCY_DESC FROM privilege_agency;";
+        List<Map<String, Object>> maps = DatabaseUtils.getMaps(selectSql, connection);
         connection.close();
+
         List<AgencyModel> records = new ArrayList<>();
         for (Map<String, Object> map : maps) {
             AgencyModel model = new AgencyModel();
@@ -117,80 +124,11 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
         return records;
     }
 
-
     /**
      * 列表查询
      */
-    public List<DataBaseLinkModel> queryForDataBaseList() {
+    public List<DatabaseConnectionModel> queryForDataBaseList() {
         return this.queryForList("", false);
     }
 
-    /**
-     * 获取数据库名称
-     */
-    public String[] getDataBaseName(Connection connection) throws SQLException {
-        Statement stmt = connection.createStatement();
-        ResultSet rs = stmt.executeQuery("SHOW DATABASES");
-        String[] result = new String[1000];
-        int count = 0;
-        while (rs.next()) {
-            result[count++] = rs.getString(1);
-        }
-        return result;
-    }
-
-    /**
-     * 连接数据库
-     */
-    public Connection connectNewDatabase(DataBaseLinkModel model) {
-        try {
-            // 加载数据库驱动
-            Class.forName("com.mysql.cj.jdbc.Driver");
-            if (model.getPrefix() == null || model.getPrefix().isEmpty() || model.getPrefix().equals("null")) {
-                model.setPrefix("");
-            }
-            if (model.getSuffix() == null || model.getSuffix().isEmpty() || model.getSuffix().equals("null")) {
-                model.setSuffix("");
-            }
-            // 连接新增的数据库
-//            String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" +
-//                    model.getPrefix() + model.getDbName() + model.getSuffix();
-            String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" + model.getDbName() ;
-            // 解密pwd，并连接
-            return DriverManager.getConnection(dbUrl, model.getUserName(), AESUtils.decrypt(model.getPassWord()));
-        } catch (SQLException | ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return null;
-    }
-
-    /**
-     * 测试连接数据库
-     */
-    public boolean testConnection(DataBaseLinkModel model) throws Exception {
-        Connection connection = this.connectNewDatabase(model);
-        if (connection != null) {
-            connection.close();
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * 加密model里的密码
-     */
-    public DataBaseLinkModel encryptPwd(DataBaseLinkModel model) throws Exception {
-        model.setPassWord(AESUtils.encrypt(model.getPassWord()));
-        return model;
-    }
-
-    public DataBaseLinkModel decryptPwd(DataBaseLinkModel model) throws Exception {
-        model.setPassWord(AESUtils.decrypt(model.getPassWord()));
-        return model;
-    }
-
-
 }

src/main/java/com/yeejoin/amos/api/tool/face/service/DataBaseNameListService.java → src/main/java/com/yeejoin/amos/api/tool/face/service/DatabaseNameListService.java

 package com.yeejoin.amos.api.tool.face.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
+import com.yeejoin.amos.api.tool.face.model.DatabaseConnectionModel;
 import com.yeejoin.amos.api.tool.face.model.DataBaseNameListModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseNameListMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseNameList;
-import com.yeejoin.amos.api.tool.utils.DataBaseUtils;
-import org.apache.commons.beanutils.BeanUtils;
+import com.yeejoin.amos.api.tool.utils.DatabaseUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -17,9 +15,9 @@ import java.sql.*;
 import java.util.*;
 
 @Service
-public class DataBaseNameListService extends BaseService<DataBaseNameListModel, DataBaseNameList, DataBaseNameListMapper> {
+public class DatabaseNameListService extends BaseService<DataBaseNameListModel, DataBaseNameList, DataBaseNameListMapper> {
     @Autowired
-    private DataBaseLinkService dataBaseLinkService;
+    private DatabaseConnectionService databaseConnectionService;
 
     @Autowired
     private DataBaseNameListMapper dataBaseNameListMapper;
@@ -27,23 +25,23 @@ public class DataBaseNameListService extends BaseService<DataBaseNameListModel,
     /**
      * 分页查询
      */
-    public Page<DataBaseNameListModel> queryForDataBasePage(Page<DataBaseNameListModel> page,Long parentId,int current,int size) throws ClassNotFoundException, SQLException {
+    public Page<DataBaseNameListModel> queryForDataBasePage(Page<DataBaseNameListModel> page, Long parentId, int current, int size) throws ClassNotFoundException, SQLException {
         Class.forName("com.mysql.cj.jdbc.Driver");
-        DataBaseLinkModel dataBaseLinkModel = dataBaseLinkService.queryBySeq(parentId);
-        String ip=dataBaseLinkModel.getIp();
-        String port=dataBaseLinkModel.getPort();
-        String url = "jdbc:mysql://"+ip+":"+port+" ";
+        DatabaseConnectionModel dataBaseConnectionModel = databaseConnectionService.queryBySeq(parentId);
+        String ip = dataBaseConnectionModel.getIp();
+        String port = dataBaseConnectionModel.getPort();
+        String url = "jdbc:mysql://" + ip + ":" + port + " ";
         String user = "root";
         String passWord = "Yeejoin@2020";
-        String sql="show databases";
-        Connection connection = DriverManager.getConnection(url,user,passWord);
+        String sql = "show databases";
+        Connection connection = DriverManager.getConnection(url, user, passWord);
         Statement statement = connection.createStatement();
         ResultSet rs = statement.executeQuery(sql);
-        List<DataBaseNameListModel> list=new ArrayList<>();
-        long result=1;
+        List<DataBaseNameListModel> list = new ArrayList<>();
+        long result = 1;
         try {
-              while (rs.next()){
-                  DataBaseNameListModel listModel=new DataBaseNameListModel();
+            while (rs.next()) {
+                DataBaseNameListModel listModel = new DataBaseNameListModel();
                 listModel.setDbName(rs.getString("Database"));
                 listModel.setParentId(parentId);
                 listModel.setSequenceNbr(result);
@@ -74,8 +72,8 @@ public class DataBaseNameListService extends BaseService<DataBaseNameListModel,
         page.setSize(size);
         page.setCurrent(current);
         page.setTotal(count);
-         //计算分页总页数
-        page.setPages(count %10 == 0 ? count/10 :count/10+1);
+        // 计算分页总页数
+        page.setPages(count % 10 == 0 ? count / 10 : count / 10 + 1);
         int startIndex = (current - 1) * size;
         page.setRecords(list.subList(startIndex, Math.min(startIndex + size, list.size())));
         return page;
@@ -84,21 +82,19 @@ public class DataBaseNameListService extends BaseService<DataBaseNameListModel,
     /**
      * 初始化数据库名表
      */
-    public List<String> refreshDataBase(Long ipSeq) throws Exception {
-        DataBaseLinkModel dataBaseLinkModel = dataBaseLinkService.queryBySeq(ipSeq);
-        //清空表单
+    public List<String> refreshDatabase(Long ipSeq) throws Exception {
+        DatabaseConnectionModel databaseConnectionModel = databaseConnectionService.queryBySeq(ipSeq);
+        // 清空表单
         this.remove(new QueryWrapper<DataBaseNameList>().eq("PARENT_ID", ipSeq));
-        //连接数据库
-        Connection connection = dataBaseLinkService.connectNewDatabase(dataBaseLinkModel);
+        // 连接数据库
+        Connection connection = DatabaseUtils.getConnection(databaseConnectionModel);
         if (connection == null)
             return null;
         List<String> strings = new ArrayList<>();
         Collection<DataBaseNameList> dataBaseNameLists = new ArrayList<>();
-        for (String name : dataBaseLinkService.getDataBaseName(connection)) {
-            if (name == null)
-                break;
-            DataBaseNameListModel model = new DataBaseNameListModel(name, ipSeq);
-            strings.add(name);
+        for (String dbName : DatabaseUtils.getDatabaseNames(connection)) {
+            DataBaseNameListModel model = new DataBaseNameListModel(dbName, ipSeq);
+            strings.add(dbName);
             dataBaseNameLists.add(this.prepareEntity(model));
         }
         this.saveBatch(dataBaseNameLists);

src/main/java/com/yeejoin/amos/api/tool/face/service/RelationService.java

 package com.yeejoin.amos.api.tool.face.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.api.tool.enums.SourceEnum;
-import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
+import com.yeejoin.amos.api.tool.face.model.DatabaseConnectionModel;
 import com.yeejoin.amos.api.tool.face.model.DataBaseNameListModel;
 import com.yeejoin.amos.api.tool.face.model.RelationModel;
 import com.yeejoin.amos.api.tool.face.model.RelationTreeModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.RelationMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.Relation;
 import com.yeejoin.amos.api.tool.face.orm.entity.TableColumn;
-import com.yeejoin.amos.api.tool.utils.DataBaseUtils;
+import com.yeejoin.amos.api.tool.utils.DatabaseUtils;
 import com.yeejoin.amos.api.tool.utils.DateUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -33,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.yeejoin.amos.api.tool.utils.DataBaseUtils.*;
+import static com.yeejoin.amos.api.tool.utils.DatabaseUtils.*;
 
 @Service
 public class RelationService extends BaseService<RelationModel, Relation, RelationMapper> {
@@ -42,11 +41,11 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
     @Autowired
     private RelationMapper relationMapper;
     @Autowired
-    private DataBaseLinkService dataBaseLinkService;
+    private DatabaseConnectionService databaseConnectionService;
     @Autowired
     JdbcTemplate jdbcTemplate;
     @Autowired
-    private DataBaseNameListService dataBaseNameListService;
+    private DatabaseNameListService dataBaseNameListService;
     @Autowired
     public EmqKeeper emqKeeper;
     /**
@@ -55,9 +54,9 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
     public void deleteAgency(String agencyCode, String sequenceNbrs) throws Exception {
         for (Long seq : (Long[]) ConvertUtils.convert(StringUtil.string2Array(sequenceNbrs), Long.class)) {
             DataBaseNameListModel nameListModel = dataBaseNameListService.queryBySeq(seq);
-            DataBaseLinkModel model = dataBaseLinkService.queryBySeq(nameListModel.getParentId());
+            DatabaseConnectionModel model = databaseConnectionService.queryBySeq(nameListModel.getParentId());
             model.setDbName(nameListModel.getDbName());
-            Connection connection = dataBaseLinkService.connectNewDatabase(model);
+            Connection connection = DatabaseUtils.getConnection(model);
             this.deleteDataBase(
                     connection, agencyCode, model.getDbName());
         }
@@ -69,8 +68,8 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
     public void outputAgency(String agencyCode,Long ipSeq, String dbName, HttpServletResponse response) throws Exception {
 //        for (Long seq : (Long[]) ConvertUtils.convert(StringUtil.string2Array(sequenceNbrs), Long.class)) {
 //          DataBaseNameListModel nameListModel = dataBaseNameListService.queryBySeq(seq);
-            DataBaseLinkModel model = dataBaseLinkService.queryBySeq(ipSeq);
-            Connection connection = dataBaseLinkService.connectNewDatabase(model);
+            DatabaseConnectionModel model = databaseConnectionService.queryBySeq(ipSeq);
+            Connection connection = DatabaseUtils.getConnection(model);
             model.setDbName(dbName);
             this.insertData(connection, agencyCode, model.getDbName(), ipSeq, response);
 //        }
@@ -232,13 +231,13 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
                 //根据列表获取sql语句
                 for (RelationTreeModel model : array) {
                     List<RelationTreeModel> tableSet = tableRelation(model, array);
-                    List<TableColumn> columns = DataBaseUtils.getTableColumn(model.getName(), connection);
+                    List<TableColumn> columns = DatabaseUtils.getTableColumn(model.getName(), connection);
                     String selectSQL = this.getSelectSQL(tableSet, model.getName(), columns, agencyCode).toString();
                     print(seq.toString(),"开始查询"+model.getName()+"表","running");
-                    List<Map<String, Object>> dataList = DataBaseUtils.getMaps(selectSQL, connection);
+                    List<Map<String, Object>> dataList = DatabaseUtils.getMaps(selectSQL, connection);
                     print(seq.toString(),"开始创建"+model.getName()+"表insert语句","running");
                     System.out.println(selectSQL);
-                    StringBuffer insertSQL = DataBaseUtils.getInsertSQL(dataList, columns, model.getName());
+                    StringBuffer insertSQL = DatabaseUtils.getInsertSQL(dataList, columns, model.getName());
                     System.out.println(insertSQL);
                     if (!ObjectUtils.isEmpty(insertSQL))  insertSql.append(insertSQL);
                 }

src/main/java/com/yeejoin/amos/api/tool/face/service/ToolLibraryService.java

@@ -7,10 +7,9 @@ import com.yeejoin.amos.api.tool.face.model.ToolLibraryTreeModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.ToolLibraryMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.TableColumn;
 import com.yeejoin.amos.api.tool.face.orm.entity.ToolLibrary;
-import com.yeejoin.amos.api.tool.utils.DataBaseUtils;
+import com.yeejoin.amos.api.tool.utils.DatabaseUtils;
 import com.yeejoin.amos.api.tool.utils.SqlExportUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -37,12 +36,15 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
      * 由一级到二级
      */
     public List<ToolLibraryTreeModel> queryForComponentList(String designer) throws ClassNotFoundException, SQLException {
+        // DatabaseConnectionModel databaseConnectionModel = new DatabaseConnectionModel();
+        // DatabaseUtils.getConnection(databaseConnectionModel)
         Class.forName(className);
         Connection connection = DriverManager.getConnection(url, userName, passWord);
-        List<Map<String, Object>> displayMaps = DataBaseUtils.getMaps
+        List<Map<String, Object>> displayMaps = DatabaseUtils.getMaps
                 ("select display_name, DESIGNER_TYPE,SEQUENCE_NBR,parent from morphic_widget_group where DESIGNER_TYPE " +
                         "= '" + designer + "' and is_delete!=1;", connection);
         connection.close();
+
         List<ToolLibraryTreeModel> displayLists = new ArrayList<>();
         for (Map<String, Object> map : displayMaps) {
             ToolLibraryTreeModel model = new ToolLibraryTreeModel();
@@ -85,7 +87,7 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
         Class.forName(className);
         Connection connection = DriverManager.getConnection(url, userName, passWord);
         // 先查当前节点的parent，看是不是0，从而判断在叶子节点还是父节点
-        List<Map<String, Object>> clickedNodeMaps = DataBaseUtils.getMaps(
+        List<Map<String, Object>> clickedNodeMaps = DatabaseUtils.getMaps(
                 "select SEQUENCE_NBR, parent, DESIGNER_TYPE, display_name " +
                         "from morphic_widget_group " +
                         "where is_delete != 1 and SEQUENCE_NBR = " + sequenceNbr, connection);
@@ -94,20 +96,20 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
         if (parent.equals("0")) {
             // 父节点
             // 查询所有表中parent==sequenceNbr的行数据
-            List<Map<String, Object>> displayMaps = DataBaseUtils.getMaps(
+            List<Map<String, Object>> displayMaps = DatabaseUtils.getMaps(
                     "select SEQUENCE_NBR, parent, DESIGNER_TYPE, display_name " +
                             "from morphic_widget_group " +
                             "where is_delete != 1 and parent = " + sequenceNbr, connection);
             for (Map<String, Object> map: displayMaps) {
                 String seqNbr = map.get("SEQUENCE_NBR").toString();
-                displayTools.addAll(DataBaseUtils.getMaps("select SEQUENCE_NBR, category, component_key, name, thumb " +
+                displayTools.addAll(DatabaseUtils.getMaps("select SEQUENCE_NBR, category, component_key, name, thumb " +
                         "from morphic_widget where is_delete != 1 and group_id = " + seqNbr, connection));
             }
         }
         else {
             // 叶子节点
             // 查询morphic_widget表中，group_id为sequenceNbr的所有工具数据
-            displayTools.addAll(DataBaseUtils.getMaps(
+            displayTools.addAll(DatabaseUtils.getMaps(
                     "select SEQUENCE_NBR, category, component_key, name, thumb " +
                             "from morphic_widget " +
                             "where is_delete != 1 and group_id = " + sequenceNbr, connection));
@@ -145,12 +147,12 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
         try {
             Class.forName(className);
             Connection connection = DriverManager.getConnection(url, userName, passWord);
-            List<Map<String, Object>> resultMaps = DataBaseUtils.getMaps("select * from " +
+            List<Map<String, Object>> resultMaps = DatabaseUtils.getMaps("select * from " +
                     "  (select SEQUENCE_NBR from morphic_widget_group " +
                     "  where DESIGNER_TYPE='" + id + "' and is_delete!=1) as t\n" +
                     "  inner join morphic_widget mw on mw.group_id=t.SEQUENCE_NBR", connection);
-            List<TableColumn> tableColumn = DataBaseUtils.getTableColumn("morphic_widget",connection);
-            StringBuffer insertSql = DataBaseUtils.getInsertSQL(resultMaps, tableColumn, "morphic_widget");
+            List<TableColumn> tableColumn = DatabaseUtils.getTableColumn("morphic_widget",connection);
+            StringBuffer insertSql = DatabaseUtils.getInsertSQL(resultMaps, tableColumn, "morphic_widget");
             connection.close();
             exportDownload(id, insertSql, httpServletResponse);
         } catch (Exception e) {
@@ -166,7 +168,7 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
             Class.forName(className);
             Connection connection = DriverManager.getConnection(url, userName, passWord);
             // 先查当前节点的parent，看是不是0，从而判断在叶子节点还是父节点
-            List<Map<String, Object>> clickedNodeMaps = DataBaseUtils.getMaps(
+            List<Map<String, Object>> clickedNodeMaps = DatabaseUtils.getMaps(
                     "select SEQUENCE_NBR, parent, DESIGNER_TYPE, display_name " +
                             "from morphic_widget_group " +
                             "where is_delete != 1 and SEQUENCE_NBR = " + sequenceNbr, connection);
@@ -185,9 +187,9 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
                 sql = "SELECT * FROM morphic_widget\n" +
                         "WHERE is_delete!=1 AND group_id = " + sequenceNbr + ";";
             }
-            List<Map<String, Object>> resultMaps = DataBaseUtils.getMaps(sql, connection);
-            List<TableColumn> tableColumn = DataBaseUtils.getTableColumn("morphic_widget", connection);
-            StringBuffer insertSql = DataBaseUtils.getInsertSQL(resultMaps, tableColumn, "morphic_widget");
+            List<Map<String, Object>> resultMaps = DatabaseUtils.getMaps(sql, connection);
+            List<TableColumn> tableColumn = DatabaseUtils.getTableColumn("morphic_widget", connection);
+            StringBuffer insertSql = DatabaseUtils.getInsertSQL(resultMaps, tableColumn, "morphic_widget");
             connection.close();
 
             // 下载.sql文件
@@ -212,9 +214,9 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
                     "FROM morphic_widget\n" +
                     "WHERE is_delete!=1 AND SEQUENCE_NBR IN ("+sequenceNbres+");";
             Connection connection = DriverManager.getConnection(url, userName, passWord);
-            List<Map<String, Object>> resultMaps = DataBaseUtils.getMaps(sql, connection);
-            List<TableColumn> tableColumn = DataBaseUtils.getTableColumn("morphic_widget",connection);
-            StringBuffer insertSql = DataBaseUtils.getInsertSQL(resultMaps, tableColumn, "morphic_widget");
+            List<Map<String, Object>> resultMaps = DatabaseUtils.getMaps(sql, connection);
+            List<TableColumn> tableColumn = DatabaseUtils.getTableColumn("morphic_widget",connection);
+            StringBuffer insertSql = DatabaseUtils.getInsertSQL(resultMaps, tableColumn, "morphic_widget");
             connection.close();
             exportDownload("tool", insertSql, httpServletResponse);
         } catch (Exception e) {

src/main/java/com/yeejoin/amos/api/tool/utils/AESUtils.java

 package com.yeejoin.amos.api.tool.utils;
 
+import com.yeejoin.amos.api.tool.face.model.DatabaseConnectionModel;
+
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 import java.util.Base64;
@@ -13,6 +15,21 @@ public class AESUtils {
     private static final String ALGORITHM = "AES";
     private static final String SECRET_KEY = "aes-key-lima1995"; // 密钥
 
+
+    /**
+     * 加密model里的密码，并返回model
+     */
+    public static DatabaseConnectionModel encryptPwd(DatabaseConnectionModel model) throws Exception {
+        model.setPassWord(encrypt(model.getPassWord()));
+        return model;
+    }
+
+    public static DatabaseConnectionModel decryptPwd(DatabaseConnectionModel model) throws Exception {
+        model.setPassWord(decrypt(model.getPassWord()));
+        return model;
+    }
+
+
     /**
      * 加密
      */

src/main/java/com/yeejoin/amos/api/tool/utils/DataBaseUtils.java → src/main/java/com/yeejoin/amos/api/tool/utils/DatabaseUtils.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.api.tool.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.api.tool.face.model.DatabaseConnectionModel;
 import com.yeejoin.amos.api.tool.face.orm.entity.TableColumn;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
@@ -9,7 +10,7 @@ import java.sql.*;
 import java.util.*;
 
 @Component
-public class DataBaseUtils {
+public class DatabaseUtils {
 
 
     /**
@@ -40,6 +41,60 @@ public class DataBaseUtils {
 
 
     /**
+     * 连接数据库
+     * @param model DataBaseLinkModel
+     * @return 数据库连接
+     */
+    public static Connection getConnection(DatabaseConnectionModel model) {
+        try {
+            // 加载数据库驱动
+            Class.forName("com.mysql.cj.jdbc.Driver");
+            if (model.getPrefix() == null || model.getPrefix().isEmpty() || model.getPrefix().equals("null")) {
+                model.setPrefix("");
+            }
+            if (model.getSuffix() == null || model.getSuffix().isEmpty() || model.getSuffix().equals("null")) {
+                model.setSuffix("");
+            }
+            // 连接新增的数据库
+//            String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" +
+//                    model.getPrefix() + model.getDbName() + model.getSuffix();
+            String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" + model.getDbName();
+            // 解密pwd，并连接
+            return DriverManager.getConnection(dbUrl, model.getUserName(), AESUtils.decrypt(model.getPassWord()));
+
+        } catch (ClassNotFoundException e) {
+            // 处理数据库驱动加载异常
+            e.printStackTrace();
+        } catch (SQLException e) {
+            // 处理数据库连接异常
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * 测试数据库连接是否成功
+     */
+    public static boolean isConnectionValid(DatabaseConnectionModel model) throws Exception {
+        Connection connection = DatabaseUtils.getConnection(model);
+        if (connection != null) {
+            connection.close();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获取所有数据库名称，如果为空，则返回空的List<String>
+     */
+    public static List<String> getDatabaseNames(Connection connection) throws SQLException {
+        return new ArrayList<>(DatabaseUtils.getList("SHOW DATABASES;", connection));
+    }
+
+    /**
      * 获取maps
      */
     public static List<Map<String, Object>> getMaps(String sql, Connection connection) throws SQLException {
@@ -120,7 +175,7 @@ public class DataBaseUtils {
                 "\t\t\tAND table_name = \"" + tableName + "\"\n" +
                 "\t\tORDER BY\n" +
                 "\t\t\tordinal_position\t";
-        List<Map<String, Object>> columnList = DataBaseUtils.getMaps(columnSql, connection);
+        List<Map<String, Object>> columnList = DatabaseUtils.getMaps(columnSql, connection);
         List<TableColumn> columns = new ArrayList<>();
         for (Map<String, Object> map : columnList) {
             TableColumn column = JSON.parseObject(JSON.toJSONString(map), TableColumn.class);