Commit 35efb713 authored by zhaozhi's avatar zhaozhi

删除我自己加的不必要的注解,修改配置文件到原本的样子

parent 56347814
...@@ -39,7 +39,6 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase ...@@ -39,7 +39,6 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
private static final Logger log = LogManager.getLogger(DataBaseLinkService.class); private static final Logger log = LogManager.getLogger(DataBaseLinkService.class);
@Autowired @Autowired
// @Resource
private DataSource dataSource; private DataSource dataSource;
/** /**
* 新增 * 新增
...@@ -152,7 +151,6 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase ...@@ -152,7 +151,6 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
// 连接新增的数据库 // 连接新增的数据库
String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" + String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" +
model.getPrefix()+model.getDbName()+model.getSuffix(); model.getPrefix()+model.getDbName()+model.getSuffix();
// model.getDbName();
// 解密pwd,并连接 // 解密pwd,并连接
return DriverManager.getConnection(dbUrl, model.getUserName(), AESUtils.decrypt(model.getPassWord())); return DriverManager.getConnection(dbUrl, model.getUserName(), AESUtils.decrypt(model.getPassWord()));
} catch (SQLException | ClassNotFoundException e) { } catch (SQLException | ClassNotFoundException e) {
......
...@@ -3,8 +3,8 @@ server.servlet.context-path=/atl ...@@ -3,8 +3,8 @@ server.servlet.context-path=/atl
#server.servlet.context-path=/jcs #server.servlet.context-path=/jcs
server.port=30002 server.port=30002
#server.port=20000 #server.port=20000
#spring.profiles.active=dev spring.profiles.active=dev
spring.profiles.active=qa #spring.profiles.active=qa
management.health.elasticsearch.enabled=false management.health.elasticsearch.enabled=false
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment