Commit 24f51ccd by wqc

换druid版本

parent a3f7112e
...@@ -93,6 +93,9 @@ ...@@ -93,6 +93,9 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
......
...@@ -84,7 +84,6 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo ...@@ -84,7 +84,6 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
public Object checkConnect(QueryDb queryDb) { public Object checkConnect(QueryDb queryDb) {
QueryDb queryDb1 = queryDbDao.selectById(queryDb.getId()); QueryDb queryDb1 = queryDbDao.selectById(queryDb.getId());
//jdbc:mysql://47.107.148.253:3306/nnjcy_data_model
String jdbcUrl = queryDb1.getDbIp(); String jdbcUrl = queryDb1.getDbIp();
try { try {
return SqlUtils.testConnection(jdbcUrl, queryDb1.getUsername(), queryDb1.getPassword()); return SqlUtils.testConnection(jdbcUrl, queryDb1.getUsername(), queryDb1.getPassword());
...@@ -394,7 +393,6 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo ...@@ -394,7 +393,6 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
e.printStackTrace(); e.printStackTrace();
} }
} }
preparedStatement.close();
} }
@Override @Override
...@@ -407,7 +405,7 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo ...@@ -407,7 +405,7 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
long times = System.currentTimeMillis() - startTime; long times = System.currentTimeMillis() - startTime;
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("executeTime", times); map.put("executeTime", times);
map.put("oldCount", listMap.size()); map.put("oldCount", list.size());
map.put("newCount", newCount.size()); map.put("newCount", newCount.size());
return map; return map;
} }
......
package com.zq.dataoperation.vo; package com.zq.dataoperation.vo;
import com.zq.system.utils.StringUtils; //import com.zq.system.utils.StringUtils;
import lombok.Data; import lombok.Data;
@Data @Data
...@@ -14,12 +14,12 @@ public class Index { ...@@ -14,12 +14,12 @@ public class Index {
String params; String params;
public void addParams(String param) { // public void addParams(String param) {
if (StringUtils.isBlank(params)) { // if (StringUtils.isBlank(params)) {
params = param; // params = param;
} else { // } else {
params = params + "," + param; // params = params + "," + param;
} // }
} // }
} }
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<project.build.sourceencwoding>UTF-8</project.build.sourceencwoding> <project.build.sourceencwoding>UTF-8</project.build.sourceencwoding>
<project.reporting.outputencoding>UTF-8</project.reporting.outputencoding> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
<swagger.version>2.8.0</swagger.version> <swagger.version>2.8.0</swagger.version>
<druid.version>1.1.22</druid.version> <druid.version>1.2.6</druid.version>
<log4jdbc.version>1.16</log4jdbc.version> <log4jdbc.version>1.16</log4jdbc.version>
<mybatis.plus.version>3.4.0</mybatis.plus.version> <mybatis.plus.version>3.4.0</mybatis.plus.version>
<alibaba.transmittable.version>2.11.2</alibaba.transmittable.version> <alibaba.transmittable.version>2.11.2</alibaba.transmittable.version>
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
<module>spider-flow-web</module> <module>spider-flow-web</module>
<module>spider-flow-selenium</module> <module>spider-flow-selenium</module>
<module>dataoperation-server</module> <module>dataoperation-server</module>
<module>data-collect-server</module>
</modules> </modules>
<profiles> <profiles>
......
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