oa更新:格式化javadoc

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 {

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 {
 

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 {
     /**

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

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 飞书通知对象建造
+ * 2023-10-22 21:00
- * @date 2023-10-22 21:00
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ByteTalkFactory extends OaAbstractProviderFactory<ByteTalkOaImpl, ByteTalkConfig> {

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<ByteTalkConfig> {

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 飞书通知签名和信息构建
+ * 2023-10-19 13:07
- * @date 2023-10-19 13:07
  */
 public class ByteTalkBuilder {
 
@@ -49,9 +49,7 @@ public class ByteTalkBuilder {
             if (isNoticeAll) {
                 content.append("<at user_id=\"all\">所有人</at>");
             }
-            userNamesList.forEach(l -> {
+            userNamesList.forEach(l -> content.append("<at user_id=\"ou_xxx\">").append(l).append("</at>"));
-                content.append("<at user_id=\"ou_xxx\">").append(l).append("</at>");
-            });
             content.append(request.getContent());
             JSONObject text = new JSONObject();
             text.set("text", content);

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配置并根据配置生成对象
+ * 2023-10-22 12:39
- * @date 2023-10-22 12:39
  */
 
 @Slf4j

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
+ * 2023-11-01 18:05
- * @date 2023-11-01 18:05
  */
 @Data
 public class OaMainConfig {

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 {
     /**

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)

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 钉钉通知对象建造
+ * 2023-10-22 21:00
- * @date 2023-10-22 21:00
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class DingTalkFactory extends OaAbstractProviderFactory<DingTalkOaImpl, DingTalkConfig> {

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<DingTalkConfig> {

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 钉钉通知签名和信息构建
+ * 2023-10-19 13:07
- * @date 2023-10-19 13:07
  */
 public class DingTalkBuilder {
     public static String sign(String secret) {

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
+ * 2023-11-01 17:55
- * @date 2023-11-01 17:55
  */
 @Data
 public class OaConfig {

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 {
 

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<C extends OaSupplierConfig> implements OaSender {
 
@@ -71,9 +71,7 @@ public abstract class AbstractOaBlend<C extends OaSupplierConfig> implements OaS
 
 
     public final void senderAsync(Request request, MessageType messageType) {
-        pool.execute(() -> {
+        pool.execute(() -> sender(request, messageType));
-            sender(request, messageType);
-        });
     }
 
     public final void senderAsync(Request request, MessageType messageType, OaCallBack callBack) {

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 微信通知对象建造
+ * 2023-10-22 21:00
- * @date 2023-10-22 21:00
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class WeTalkFactory extends OaAbstractProviderFactory<WeTalkOaImpl, WeTalkConfig> {

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<WeTalkConfig> {

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 微信通知签名和信息构建
+ * 2023-10-19 13:07
- * @date 2023-10-19 13:07
  */
 public class WeTalkBuilder {