diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index 5ff89355a..7d1a1e3a1 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -77,7 +77,8 @@
pni.project_name as project_name,
pm.params_template_id as params_template_id,
pt.params_template_name as params_template_name,
- pm.params_template_publish_version as params_template_publish_version
+ pm.params_template_publish_version as params_template_publish_version,
+ pm.create_time as create_time
from params_manifest pm
left join params_template pt on pm.params_template_id = pt.id
left join project_library_base as plb on plb.id = pm.project_id
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
index 05f0af194..dbeda896e 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
@@ -133,6 +133,14 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl sdtMap = new HashMap<>();
+ sdtMap.put("id", collectManifestEO.getId());
+ sdtMap.put("state", collectManifestEO.getState());
+ sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ","));
+ sdtMap.put("dataValue", collectManifestEO.getSdt());
+ manifestMap.put("sdt", sdtMap);
+
listMap.add(manifestMap);
});
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index b175f3671..f9d66015d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -353,6 +353,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl sysConfigs = iSysConfigService.queryList();
+ if(CollectionUtils.isNotEmpty(sysConfigs)){
+ for (SysConfig sysConfig : sysConfigs) {
+ obj.put(sysConfig.getConfigName(),sysConfig.getConfig());
+ }
+ }
+
obj.put("token", token);
obj.put("userInfo", sysUser);
obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
index 96ade5cb4..b9b300176 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
@@ -293,20 +293,17 @@ public class CommonController {
InputStream inputStream = null;
OutputStream outputStream = null;
try {
- String fileName = "";
//本地下载
String filePath = ossFile.getUrl();
File file = new File(filePath);
- if(!file.exists()){
+ if(!CosBootUtil.doesObjectExist(filePath)){
response.setStatus(404);
throw new RuntimeException("文件不存在..");
}
// 文件名称
- fileName = file.getName();
- inputStream = new BufferedInputStream(new FileInputStream(filePath));
response.setContentType("application/force-download");// 设置强制下载不打开
response.addHeader("Content-Disposition", "attachment;fileName=" + new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
- inputStream = new BufferedInputStream(new FileInputStream(filePath));
+ inputStream = CosBootUtil.download(filePath);
outputStream = response.getOutputStream();
byte[] buf = new byte[1024];
int len;