commit 导出

src/main/java/com/yeejoin/amos/api/tool/config/DataSourceConfig.java

@@ -26,4 +26,5 @@ public class DataSourceConfig {
     public DataSource secondDataSource() {
         return DataSourceBuilder.create().build();
     }
+
 }
\ No newline at end of file

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

@@ -37,8 +37,7 @@ import java.util.Map;
 @TycloudResource(module = "atl", value = "dataApi")
 @RequestMapping(value = "/v1/dataApi")
 @Api(tags = "atl-导出")
-public class
-DataApiResource {
+public class DataApiResource {
 
     private final Logger logger = LogManager.getLogger(DataApiResource.class);
 

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

@@ -4,6 +4,7 @@ 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.DatabaseConnectionModel;
 import com.yeejoin.amos.api.tool.face.service.DatabaseConnectionService;
+import com.yeejoin.amos.api.tool.utils.AESUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,7 +80,9 @@ public class DatabaseConnectionResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<DatabaseConnectionModel> selectOne(@PathVariable Long sequenceNbr) {
+    public ResponseModel<DatabaseConnectionModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
+//        DatabaseConnectionModel databaseConnectionModel = databaseConnectionService.queryBySeq(sequenceNbr);
+//        databaseConnectionModel.setPassWord(AESUtils.decrypt(databaseConnectionModel.getPassWord()));
         return ResponseHelper.buildResponse(databaseConnectionService.queryBySeq(sequenceNbr));
     }
 

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

@@ -53,6 +53,7 @@ public class DatabaseConnectionService extends BaseService<DatabaseConnectionMod
      */
     public DatabaseConnectionModel update(DatabaseConnectionModel model) throws Exception {
         if (DatabaseUtils.isConnectionValid(model)) {
+//          return this.updateWithModel(AESUtils.encryptPwd(model));
             return this.updateWithModel(model);
         } else {
             return null;

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

@@ -85,9 +85,9 @@ public class DatabaseUtils {
                 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();
+            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()));
 
@@ -100,7 +100,6 @@ public class DatabaseUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         return null;
     }
 

src/main/resources/application-qa.properties

@@ -13,6 +13,7 @@ spring.datasource.hikari.pool-name=DatebookHikariCP
 spring.datasource.hikari.max-lifetime=1800000
 spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
+
 # second-datasource amos_studio
 spring.second-datasource.jdbc-url=jdbc:mysql://172.16.3.18:3306/amos_studio?allowMultiQueries=true
 spring.second-datasource.username=root
@@ -28,6 +29,7 @@ spring.second-datasource.hikari.max-lifetime=1800000
 spring.second-datasource.hikari.connection-timeout=30000
 spring.second-datasource.hikari.connection-test-query=SELECT 1
 
+
 #eureka
 eureka.instance.hostname=172.16.3.18
 eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/