From a275c00067bed5fb717a3befd2f10bfcec7dfe34 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 9 Jun 2022 13:38:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=8F=98=E6=9B=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/collect/mapper/xml/ParamsManifestEOMapper.xml | 3 ++- .../impl/ParamsCollectManifestHistoryEOServiceImpl.java | 8 ++++++++ .../collect/service/impl/ParamsManifestEOServiceImpl.java | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 Date: Thu, 9 Jun 2022 17:38:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?sso=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opensso/controller/SSOLoginController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java index 99f07dbab..234dfd7ef 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java @@ -11,6 +11,8 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.RedisUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.base.service.BaseCommonService; +import com.jero.modules.config.entity.SysConfig; +import com.jero.modules.config.service.ISysConfigService; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysDepartService; @@ -21,6 +23,7 @@ import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -57,6 +60,8 @@ public class SSOLoginController { private ISysDictService sysDictService; @Resource private BaseCommonService baseCommonService; + @Autowired + private ISysConfigService iSysConfigService; private static final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890"; //密码登录错误的次数前缀 @@ -193,6 +198,14 @@ public class SSOLoginController { // update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去 obj.put("multi_depart", 2); } + //获取配置信息 + List 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()); From 5978500d018012ea4928dd29510eb4c03e370e57 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 9 Jun 2022 18:01:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?word,excel=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/controller/CommonController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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;