diff --git a/sms4j-oa-plugin/sms4j-oa-api/src/main/java/org/dromara/oa/api/OaCallBack.java b/sms4j-oa-plugin/sms4j-oa-api/src/main/java/org/dromara/oa/api/OaCallBack.java index a18b2210..5601e642 100644 --- a/sms4j-oa-plugin/sms4j-oa-api/src/main/java/org/dromara/oa/api/OaCallBack.java +++ b/sms4j-oa-plugin/sms4j-oa-api/src/main/java/org/dromara/oa/api/OaCallBack.java @@ -4,7 +4,7 @@ import org.dromara.oa.comm.entity.Response; /** * @author dongfeng - * @date 2023-10-28 14:26 + * 2023-10-28 14:26 */ @FunctionalInterface public interface OaCallBack { diff --git a/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/config/OaSupplierConfig.java b/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/config/OaSupplierConfig.java index 215ae747..8dfa7449 100644 --- a/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/config/OaSupplierConfig.java +++ b/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/config/OaSupplierConfig.java @@ -2,7 +2,7 @@ package org.dromara.oa.comm.config; /** * @author dongfeng - * @date 2023-10-19 13:36 + * 2023-10-19 13:36 */ public interface OaSupplierConfig { diff --git a/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/content/OaContent.java b/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/content/OaContent.java index ad24c74e..1a3ea8b3 100644 --- a/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/content/OaContent.java +++ b/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/content/OaContent.java @@ -2,7 +2,7 @@ package org.dromara.oa.comm.content; /** * @author dongfeng - * @date 2023-10-22 13:50 + * 2023-10-22 13:50 */ public class OaContent { /** diff --git a/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/entity/Request.java b/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/entity/Request.java index 1a574d70..e774c593 100644 --- a/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/entity/Request.java +++ b/sms4j-oa-plugin/sms4j-oa-comm/src/main/java/org/dromara/oa/comm/entity/Request.java @@ -4,7 +4,6 @@ package org.dromara.oa.comm.entity; import lombok.Data; import org.dromara.oa.comm.enums.MessageType; -import java.util.Collection; import java.util.List; @Data diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/config/ByteTalkFactory.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/config/ByteTalkFactory.java index 29b1a1bd..6b8416cc 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/config/ByteTalkFactory.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/config/ByteTalkFactory.java @@ -7,9 +7,9 @@ import org.dromara.oa.core.byteTalk.service.ByteTalkOaImpl; import org.dromara.oa.core.provider.factory.OaAbstractProviderFactory; /** + * 飞书通知对象建造 * @author dongfeng - * @description 飞书通知对象建造 - * @date 2023-10-22 21:00 + * 2023-10-22 21:00 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class ByteTalkFactory extends OaAbstractProviderFactory { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/service/ByteTalkOaImpl.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/service/ByteTalkOaImpl.java index 1da5b306..77b06135 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/service/ByteTalkOaImpl.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/service/ByteTalkOaImpl.java @@ -20,7 +20,7 @@ import static org.dromara.oa.comm.enums.OaType.BYTETALK; /** * @author dongfeng - * @date 2023-10-22 21:01 + * 2023-10-22 21:01 */ @Slf4j public class ByteTalkOaImpl extends AbstractOaBlend { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/utils/ByteTalkBuilder.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/utils/ByteTalkBuilder.java index d29d7361..74bc018f 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/utils/ByteTalkBuilder.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/utils/ByteTalkBuilder.java @@ -15,9 +15,9 @@ import java.util.List; import static org.dromara.oa.comm.enums.MessageType.TEXT; /** + * 飞书通知签名和信息构建 * @author dongfeng - * @description 飞书通知签名和信息构建 - * @date 2023-10-19 13:07 + * 2023-10-19 13:07 */ public class ByteTalkBuilder { @@ -49,9 +49,7 @@ public class ByteTalkBuilder { if (isNoticeAll) { content.append("所有人"); } - userNamesList.forEach(l -> { - content.append("").append(l).append(""); - }); + userNamesList.forEach(l -> content.append("").append(l).append("")); content.append(request.getContent()); JSONObject text = new JSONObject(); text.set("text", content); diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaBlendsInitializer.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaBlendsInitializer.java index 0fa3d9c4..db7edf1d 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaBlendsInitializer.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaBlendsInitializer.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.Map; /** + * 注册工厂, 读取yaml配置并根据配置生成对象 * @author dongfeng - * @description 注册工厂, 读取yaml配置并根据配置生成对象 - * @date 2023-10-22 12:39 + * 2023-10-22 12:39 */ @Slf4j diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaMainConfig.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaMainConfig.java index 86751962..77ca6332 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaMainConfig.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaMainConfig.java @@ -13,8 +13,7 @@ import java.util.concurrent.Executor; /** * @author dongfeng - * @description TODO - * @date 2023-11-01 18:05 + * 2023-11-01 18:05 */ @Data public class OaMainConfig { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaSupplierConfig.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaSupplierConfig.java index 8c4a2acb..bc56064d 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaSupplierConfig.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaSupplierConfig.java @@ -13,7 +13,7 @@ import java.util.Map; /** * @author dongfeng - * @date 2023-10-22 12:50 + * 2023-10-22 12:50 */ public class OaSupplierConfig { /** diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/config/DingTalkConfig.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/config/DingTalkConfig.java index 41761c22..3d6d4530 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/config/DingTalkConfig.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/config/DingTalkConfig.java @@ -8,7 +8,7 @@ import org.dromara.oa.core.provider.config.OaBaseConfig; /** * @author dongfeng - * @date 2023-10-19 13:38 + * 2023-10-19 13:38 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/config/DingTalkFactory.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/config/DingTalkFactory.java index 32b4ef15..64850761 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/config/DingTalkFactory.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/config/DingTalkFactory.java @@ -6,12 +6,11 @@ import org.dromara.oa.comm.content.OaContent; import org.dromara.oa.core.dingTalk.service.DingTalkOaImpl; import org.dromara.oa.core.provider.factory.OaAbstractProviderFactory; -import java.util.concurrent.Executor; /** + * 钉钉通知对象建造 * @author dongfeng - * @description 钉钉通知对象建造 - * @date 2023-10-22 21:00 + * 2023-10-22 21:00 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class DingTalkFactory extends OaAbstractProviderFactory { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/service/DingTalkOaImpl.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/service/DingTalkOaImpl.java index 4223e2a5..636f0123 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/service/DingTalkOaImpl.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/service/DingTalkOaImpl.java @@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.oa.comm.entity.Request; import org.dromara.oa.comm.entity.Response; import org.dromara.oa.comm.enums.MessageType; -import org.dromara.oa.comm.enums.OaType; import org.dromara.oa.comm.errors.OaException; import org.dromara.oa.core.dingTalk.config.DingTalkConfig; import org.dromara.oa.core.dingTalk.utils.DingTalkBuilder; @@ -21,7 +20,7 @@ import static org.dromara.oa.comm.enums.OaType.DINGTALK; /** * @author dongfeng - * @date 2023-10-22 21:01 + * 2023-10-22 21:01 */ @Slf4j public class DingTalkOaImpl extends AbstractOaBlend { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/utils/DingTalkBuilder.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/utils/DingTalkBuilder.java index 7b0130f9..59a750fe 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/utils/DingTalkBuilder.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/utils/DingTalkBuilder.java @@ -19,9 +19,9 @@ import java.util.Objects; import static org.dromara.oa.comm.enums.MessageType.*; /** + * 钉钉通知签名和信息构建 * @author dongfeng - * @description 钉钉通知签名和信息构建 - * @date 2023-10-19 13:07 + * 2023-10-19 13:07 */ public class DingTalkBuilder { public static String sign(String secret) { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/config/OaConfig.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/config/OaConfig.java index b01b4c92..e36a67b0 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/config/OaConfig.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/config/OaConfig.java @@ -3,9 +3,9 @@ package org.dromara.oa.core.provider.config; import lombok.Data; /** + * Oa线程池配置 * @author dongfeng - * @description TODO - * @date 2023-11-01 17:55 + * 2023-11-01 17:55 */ @Data public class OaConfig { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/factory/ProviderFactoryHolder.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/factory/ProviderFactoryHolder.java index 9502d48a..ce5b7a61 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/factory/ProviderFactoryHolder.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/factory/ProviderFactoryHolder.java @@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * @author dongfeng - * @date 2023-10-22 21:12 + * 2023-10-22 21:12 */ public class ProviderFactoryHolder { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/service/AbstractOaBlend.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/service/AbstractOaBlend.java index 382ac2de..f645a055 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/service/AbstractOaBlend.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/service/AbstractOaBlend.java @@ -17,7 +17,7 @@ import java.util.concurrent.PriorityBlockingQueue; /** * @author dongfeng - * @date 2023-10-22 21:03 + * 2023-10-22 21:03 */ public abstract class AbstractOaBlend implements OaSender { @@ -71,9 +71,7 @@ public abstract class AbstractOaBlend implements OaS public final void senderAsync(Request request, MessageType messageType) { - pool.execute(() -> { - sender(request, messageType); - }); + pool.execute(() -> sender(request, messageType)); } public final void senderAsync(Request request, MessageType messageType, OaCallBack callBack) { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/config/WeTalkFactory.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/config/WeTalkFactory.java index 77f62087..0bfe4ec6 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/config/WeTalkFactory.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/config/WeTalkFactory.java @@ -7,9 +7,9 @@ import org.dromara.oa.core.provider.factory.OaAbstractProviderFactory; import org.dromara.oa.core.weTalk.service.WeTalkOaImpl; /** + * 微信通知对象建造 * @author dongfeng - * @description 微信通知对象建造 - * @date 2023-10-22 21:00 + * 2023-10-22 21:00 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class WeTalkFactory extends OaAbstractProviderFactory { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/service/WeTalkOaImpl.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/service/WeTalkOaImpl.java index bc800521..a173c2d6 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/service/WeTalkOaImpl.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/service/WeTalkOaImpl.java @@ -20,7 +20,7 @@ import static org.dromara.oa.comm.enums.OaType.WETALK; /** * @author dongfeng - * @date 2023-10-22 21:01 + * 2023-10-22 21:01 */ @Slf4j public class WeTalkOaImpl extends AbstractOaBlend { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/utils/WeTalkBuilder.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/utils/WeTalkBuilder.java index 11046292..93b5ff46 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/utils/WeTalkBuilder.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/utils/WeTalkBuilder.java @@ -11,9 +11,9 @@ import static org.dromara.oa.comm.enums.MessageType.MARKDOWN; import static org.dromara.oa.comm.enums.MessageType.TEXT; /** + * 企业微信--签名和消息构建 * @author dongfeng - * @description 微信通知签名和信息构建 - * @date 2023-10-19 13:07 + * 2023-10-19 13:07 */ public class WeTalkBuilder {