diff --git a/jeelowcode-admin/src/test/java/com/jeelowcode/tool/framework/common/util/SqlUtilsTest.java b/jeelowcode-admin/src/test/java/com/jeelowcode/tool/framework/common/util/SqlUtilsTest.java index e3fa9f6..f219ab6 100644 --- a/jeelowcode-admin/src/test/java/com/jeelowcode/tool/framework/common/util/SqlUtilsTest.java +++ b/jeelowcode-admin/src/test/java/com/jeelowcode/tool/framework/common/util/SqlUtilsTest.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; /** * 描述:生成最后执行SQL * - * @author shelly + * @author yangchenjj */ public class SqlUtilsTest extends BaseMockitoUnitTest { diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/flowable/core/listener/BpmPortalTodoEventListener.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/flowable/core/listener/BpmPortalTodoEventListener.java index a3b078f..cb0e1a9 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/flowable/core/listener/BpmPortalTodoEventListener.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/flowable/core/listener/BpmPortalTodoEventListener.java @@ -41,7 +41,7 @@ import static com.jeelowcode.tool.framework.common.util.json.JsonUtils.toJsonStr /** * 监听一些事件推送到门户待办模块 * - * @author shelly + * @author yangchenjj */ @Slf4j @Component diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/config/PortalTodoConfiguration.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/config/PortalTodoConfiguration.java index 860796d..e10673e 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/config/PortalTodoConfiguration.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/config/PortalTodoConfiguration.java @@ -10,7 +10,7 @@ import javax.annotation.Resource; /** * 门户待办配置 * - * @author shelly + * @author yangchenjj */ @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(PortalTodoProperties.class) diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/config/PortalTodoProperties.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/config/PortalTodoProperties.java index 56b0e94..28c4384 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/config/PortalTodoProperties.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/config/PortalTodoProperties.java @@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * 门户待办配置 * - * @author shelly + * @author yangchenjj */ @Data @ConfigurationProperties(prefix = "jeelowcode.portal.todo") diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/PortalRequest.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/PortalRequest.java index f1ba987..13cd1e9 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/PortalRequest.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/PortalRequest.java @@ -2,6 +2,7 @@ package com.jeelowcode.service.bpm.config.framework.portal.core; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; import com.jeelowcode.framework.plus.core.toolkit.StringUtils; import com.jeelowcode.service.bpm.config.framework.portal.core.dto.*; import com.jeelowcode.tool.framework.common.util.json.JsonUtils; @@ -14,7 +15,7 @@ import static com.jeelowcode.service.bpm.config.framework.portal.core.PortalRequ /** * 描述:请求门户信息 * - * @author shelly + * @author yangchenjj */ @Slf4j public class PortalRequest { @@ -85,7 +86,9 @@ public class PortalRequest { public PortalTodoResponseDTO receiveTodoRequest(ReceiveTodoRequestDTO requestDTO) { requestDTO.setSysCode(this.sysCode); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_RECEIVE_TODO_REQUEST_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** @@ -94,7 +97,9 @@ public class PortalRequest { public PortalTodoResponseDTO receiveCCRequest(ReceiveCCRequestDTO requestDTO) { requestDTO.setSysCode(this.sysCode); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_RECEIVE_CC_REQUEST_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** @@ -103,7 +108,9 @@ public class PortalRequest { public PortalTodoResponseDTO processDoneRequest(ProcessDoneRequestDTO requestDTO) { requestDTO.setSysCode(this.sysCode); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_PROCESS_DONE_REQUEST_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** @@ -112,7 +119,9 @@ public class PortalRequest { public PortalTodoResponseDTO processOverRequest(ProcessOverRequestDTO requestDTO) { requestDTO.setSysCode(this.sysCode); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_PROCESS_OVER_REQUEST_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** @@ -121,7 +130,9 @@ public class PortalRequest { public PortalTodoResponseDTO receiveRequestInfo(ReceiveRequestInfoDTO requestDTO) { requestDTO.setSysCode(this.sysCode); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_RECEIVE_REQUEST_INFO_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** @@ -130,7 +141,9 @@ public class PortalRequest { public PortalTodoResponseDTO deleteRequestInfo(DeleteRequestInfoDTO requestDTO) { requestDTO.setSysCode(this.sysCode); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_DELETE_REQUEST_INFO_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** @@ -139,7 +152,9 @@ public class PortalRequest { public PortalTodoResponseDTO deleteUserRequestInfo(DeleteUserRequestInfoDTO requestDTO) { requestDTO.setSysCode(this.sysCode); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_DELETE_USER_REQUEST_INFO_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** @@ -148,7 +163,9 @@ public class PortalRequest { public PortalTodoResponseDTO batchDeleteUserRequestInfo(List requestDTO) { requestDTO.forEach(request -> request.setSysCode(this.sysCode)); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_BATCH_DELETE_USER_REQUEST_INFO_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** @@ -157,7 +174,9 @@ public class PortalRequest { public PortalTodoResponseDTO batchReceiveRequestInfo(List requestDTO) { requestDTO.forEach(request -> request.setSysCode(this.sysCode)); HttpRequest httpRequest = initHttpRequest(getRequestUrl(PATH_BATCH_RECEIVE_REQUEST_INFO_BY_JSON), requestDTO); - return JsonUtils.parseObject(httpRequest.execute().body(), PortalTodoResponseDTO.class); + try (HttpResponse httpResponse = httpRequest.execute()) { + return JsonUtils.parseObject(httpResponse.body(), PortalTodoResponseDTO.class); + } } /** diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/PortalRequestConstant.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/PortalRequestConstant.java index d86fb14..07fc77e 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/PortalRequestConstant.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/PortalRequestConstant.java @@ -3,7 +3,7 @@ package com.jeelowcode.service.bpm.config.framework.portal.core; /** * 门户请求常量 * - * @author shelly + * @author yangchenjj */ public interface PortalRequestConstant { diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/DeleteRequestInfoDTO.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/DeleteRequestInfoDTO.java index 6cc980a..57db63c 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/DeleteRequestInfoDTO.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/DeleteRequestInfoDTO.java @@ -6,7 +6,7 @@ import lombok.Data; /** * 描述:删除异构系统所有待办流程请求参数 * - * @author shelly + * @author yangchenjj */ @Data public class DeleteRequestInfoDTO { diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/DeleteUserRequestInfoDTO.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/DeleteUserRequestInfoDTO.java index 8fc76c8..8e9922b 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/DeleteUserRequestInfoDTO.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/DeleteUserRequestInfoDTO.java @@ -6,7 +6,7 @@ import lombok.Data; /** * 描述:删除用户待办流程请求参数 * - * @author shelly + * @author yangchenjj */ @Data public class DeleteUserRequestInfoDTO { diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/PortalTodoResponseDTO.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/PortalTodoResponseDTO.java index 0df86b2..ed878ad 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/PortalTodoResponseDTO.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/PortalTodoResponseDTO.java @@ -7,7 +7,7 @@ import lombok.Data; /** * 描述:门户待办响应信息 * - * @author shelly + * @author yangchenjj */ @Data @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ProcessDoneRequestDTO.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ProcessDoneRequestDTO.java index 3623a17..a043682 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ProcessDoneRequestDTO.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ProcessDoneRequestDTO.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; /** * 描述:流程处理完成请求参数 * - * @author shelly + * @author yangchenjj */ @Data public class ProcessDoneRequestDTO { diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ProcessOverRequestDTO.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ProcessOverRequestDTO.java index 5878afa..5f1379c 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ProcessOverRequestDTO.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ProcessOverRequestDTO.java @@ -6,7 +6,7 @@ import lombok.Data; /** * 描述:处理办结流程请求参数 * - * @author shelly + * @author yangchenjj */ @Data public class ProcessOverRequestDTO { diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveRequestInfoDTO.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveRequestInfoDTO.java index 3989230..61925b6 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveRequestInfoDTO.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveRequestInfoDTO.java @@ -13,7 +13,7 @@ import static com.jeelowcode.tool.framework.common.util.date.DateUtils.TIME_ZONE /** * 描述:接收异构系统流程请求参数 * - * @author shelly + * @author yangchenjj */ @Data @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveTodoRequestDTO.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveTodoRequestDTO.java index 082ad7d..81a04b8 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveTodoRequestDTO.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveTodoRequestDTO.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; /** * 描述:接收待办流程请求参数 * - * @author shelly + * @author yangchenjj */ @Data public class ReceiveTodoRequestDTO { diff --git a/jeelowcode-service/jeelowcode-service-system-api/src/main/java/com/jeelowcode/service/system/dto/SocialUserRespDTO.java b/jeelowcode-service/jeelowcode-service-system-api/src/main/java/com/jeelowcode/service/system/dto/SocialUserRespDTO.java index aa79fea..b7e4faf 100644 --- a/jeelowcode-service/jeelowcode-service-system-api/src/main/java/com/jeelowcode/service/system/dto/SocialUserRespDTO.java +++ b/jeelowcode-service/jeelowcode-service-system-api/src/main/java/com/jeelowcode/service/system/dto/SocialUserRespDTO.java @@ -33,7 +33,7 @@ public class SocialUserRespDTO { private Long userId; /** - * 原始用户数据,一般是 JSON 格式 add by shelly at 2025/09/23 + * 原始用户数据,一般是 JSON 格式 add by yangchenjj at 2025/09/23 */ private String rawUserInfo; diff --git a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/config/social/ChinaSatelliteAuthSource.java b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/config/social/ChinaSatelliteAuthSource.java index 6325066..55ba201 100644 --- a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/config/social/ChinaSatelliteAuthSource.java +++ b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/config/social/ChinaSatelliteAuthSource.java @@ -7,7 +7,7 @@ import com.xingyuv.jushauth.request.AuthDefaultRequest; /** * 中国星网办公网认证源 *

- * author: shelly chan + * author: yangchenjj * date: 2025/09/19 */ public enum ChinaSatelliteAuthSource implements AuthSource { diff --git a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/service/impl/AdminUserServiceImpl.java b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/service/impl/AdminUserServiceImpl.java index 1414523..d7e57fc 100644 --- a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/service/impl/AdminUserServiceImpl.java +++ b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/service/impl/AdminUserServiceImpl.java @@ -393,7 +393,7 @@ public class AdminUserServiceImpl implements IAdminUserService { List userIds = userDeptMapper.selectList(depWrapper).stream().map(t -> t.getUserId()).collect(Collectors.toList()); if (CollectionUtil.isEmpty(userIds)) { // 如果查不到数据,返回一个空结果集,避免NPE - // modify by shelly on 2025-10-16 + // modify by yangchenjj on 2025-10-16 return new PageResult<>(Collections.emptyList(), 0L); } diff --git a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/util/SshUtils.java b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/util/SshUtils.java index f851d2c..6ac574c 100644 --- a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/util/SshUtils.java +++ b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/util/SshUtils.java @@ -8,7 +8,7 @@ import java.security.cert.X509Certificate; /** * Description: SSH工具类 - * Author: Shelly Chan + * Author: yangchenjj * Date: 2023/1/31 10:05 */ public class SshUtils {