kris/data-dump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: kris:develop
Branches Tags
kris:master
kris:develop_携科
kris:develop
kris:master_back
..
compare: kris:master
Branches Tags
kris:develop_携科
kris:develop
kris:master
kris:master_back

No commits in common. "develop" and "master" have entirely different histories.
develop ... master

3 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
files/start.sh
View File

@ -5,7 +5,7 @@
#dbUsername="root" #dbUsername="root"
#dbPassword="celnet@2025.bln" #dbPassword="celnet@2025.bln"
#携科 #携科
dbUrl="jdbc:mysql://127.0.0.1:3306/data-dump-xxl-job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai&useSSL=false" dbUrl="jdbc:mysql://127.0.0.1:3306/data-dump-xxl-job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai"
dbUsername="root" dbUsername="root"
dbPassword="Celnet2025.QY" dbPassword="Celnet2025.QY"
#其它 #其它

2
src/main/java/com/celnet/datadump/service/impl/FileManagerServiceImpl.java
View File

@ -171,7 +171,7 @@ public class FileManagerServiceImpl implements FileManagerService {
downloadUrl = (String) map1.get("value"); downloadUrl = (String) map1.get("value");
} }
} }
if (StringUtils.isBlank(downloadUrl)) { if (StringUtils.isNotBlank(downloadUrl)) {
EmailUtil.send("DumpFile ERROR", "文件下载失败！下载地址未配置"); EmailUtil.send("DumpFile ERROR", "文件下载失败！下载地址未配置");
return; return;
} }

5
src/main/java/com/celnet/datadump/service/impl/FileServiceImpl.java
View File

@ -141,7 +141,7 @@ public class FileServiceImpl implements FileService {
downloadUrl = (String) map1.get("value"); downloadUrl = (String) map1.get("value");
} }
} }
if (StringUtils.isEmpty(downloadUrl)) { if (StringUtils.isNotBlank(downloadUrl)) {
EmailUtil.send("DumpFile ERROR", "文件下载失败！下载地址未配置"); EmailUtil.send("DumpFile ERROR", "文件下载失败！下载地址未配置");
return; return;
} }
@ -522,9 +522,8 @@ public class FileServiceImpl implements FileService {
HttpEntity he = response.getEntity(); HttpEntity he = response.getEntity();
if (he != null) { if (he != null) {
respContent = EntityUtils.toString(he, "UTF-8"); respContent = EntityUtils.toString(he, "UTF-8");
String newId = String.valueOf(JSONObject.parseObject(respContent).get("Id")); String newId = JSONObject.parseObject(respContent).get("id").toString();
if (StringUtils.isBlank(newId)) { if (StringUtils.isBlank(newId)) {
log.error("文件上传错误，返回实体信息：" + respContent);
break; break;
} }
Map<String, Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();