From 15d13dc84fd38a8e45fd28b376dc3cbeccb68690 Mon Sep 17 00:00:00 2001 From: 3y Date: Sun, 29 Jan 2023 17:41:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E5=96=84hive=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E6=95=99=E7=A8=8B=202=E3=80=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E9=A1=B9=E7=9B=AE=E5=92=8C=E4=BB=A3=E7=A0=81=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=98=BF=E9=87=8C=E6=8F=92=E4=BB=B6=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INSTALL.md | 338 +++++++++++++++++- README.md | 5 +- .../common/constant/AustinConstant.java | 7 - .../common/constant/CommonConstant.java | 3 - .../OfficialAccountParamConstant.java | 1 - .../common/constant/SendAccountConstant.java | 1 + .../austin/common/domain/AnchorInfo.java | 1 + .../java3y/austin/common/domain/LogParam.java | 2 +- .../dto/account/WeChatMiniProgramAccount.java | 1 - .../dto/account/WeChatOfficialAccount.java | 1 - .../common/dto/account/YunPianSmsAccount.java | 2 +- .../model/AlipayMiniProgramContentModel.java | 2 +- .../common/dto/model/PushContentModel.java | 2 +- .../common/dto/model/SmsContentModel.java | 2 +- .../austin/common/enums/AnchorState.java | 31 ++ .../austin/common/enums/AuditStatus.java | 8 +- .../austin/common/enums/ChannelType.java | 40 ++- .../common/enums/DeduplicationType.java | 9 + .../java3y/austin/common/enums/FileType.java | 12 + .../java3y/austin/common/enums/IdType.java | 27 ++ .../austin/common/enums/MessageStatus.java | 20 +- .../austin/common/enums/MessageType.java | 18 +- .../austin/common/enums/SendMessageType.java | 83 ++++- .../austin/common/enums/ShieldType.java | 11 +- .../java3y/austin/common/enums/SmsStatus.java | 18 +- .../austin/common/enums/SmsSupplier.java | 12 +- .../austin/common/enums/TemplateType.java | 7 + .../austin/common/vo/BasicResultVO.java | 196 +++++----- .../config/CronAsyncThreadPoolConfig.java | 1 + .../cron/dto/getui/QueryTokenParamDTO.java | 6 +- .../austin/cron/handler/CronTaskHandler.java | 1 + .../NightShieldLazyPendingHandler.java | 2 +- .../RefreshDingDingAccessTokenHandler.java | 2 - .../RefreshGeTuiAccessTokenHandler.java | 2 - .../cron/service/impl/TaskHandlerImpl.java | 4 +- .../java3y/austin/cron/vo/CrowdInfoVo.java | 1 + .../austin/cron/xxl/config/XxlJobConfig.java | 2 +- .../austin/cron/xxl/entity/XxlJobInfo.java | 1 + .../xxl/enums/ExecutorBlockStrategyEnum.java | 1 + .../xxl/enums/ExecutorRouteStrategyEnum.java | 31 ++ .../austin/cron/xxl/enums/GlueTypeEnum.java | 22 ++ .../cron/xxl/enums/MisfireStrategyEnum.java | 1 + .../cron/xxl/enums/ScheduleTypeEnum.java | 3 + .../cron/xxl/service/CronTaskService.java | 7 +- .../xxl/service/impl/CronTaskServiceImpl.java | 4 +- .../austin/cron/xxl/utils/XxlJobUtils.java | 2 +- .../austin/datahouse/AustinHiveBootStrap.java | 12 +- .../AlipayMiniProgramAccountServiceImpl.java | 6 +- .../config/HandlerThreadPoolConfig.java | 1 + .../DeduplicationRuleService.java | 1 - .../build/ContentDeduplicationBuilder.java | 2 +- .../limit/AbstractLimitService.java | 3 +- .../deduplication/limit/LimitService.java | 5 +- .../limit/SimpleLimitService.java | 4 +- .../limit/SlideWindowLimitService.java | 1 + .../service/AbstractDeduplicationService.java | 2 +- .../service/DeduplicationService.java | 1 + .../discard/DiscardMessageService.java | 5 +- .../domain/dingding/DingDingRobotParam.java | 12 +- .../domain/push/getui/SendPushParam.java | 1 + .../domain/push/getui/SendPushResult.java | 1 + .../handler/domain/sms/YunPianSendResult.java | 1 + .../handler/enums/RateLimitStrategy.java | 6 + .../flowcontrol/FlowControlFactory.java | 12 +- .../annotations/LocalRateLimit.java | 3 +- .../impl/RequestRateLimitServiceImpl.java | 23 +- .../impl/SendUserNumRateLimitServiceImpl.java | 23 +- .../austin/handler/handler/BaseHandler.java | 6 +- .../impl/AlipayMiniProgramAccountHandler.java | 4 +- .../handler/impl/DingDingRobotHandler.java | 10 +- .../impl/DingDingWorkNoticeHandler.java | 17 +- .../handler/handler/impl/EmailHandler.java | 2 +- .../handler/impl/EnterpriseWeChatHandler.java | 2 - .../impl/EnterpriseWeChatRobotHandler.java | 4 +- .../handler/impl/FeiShuRobotHandler.java | 12 +- .../handler/handler/impl/PushHandler.java | 1 - .../handler/receipt/MessageReceipt.java | 2 +- .../handler/receiver/kafka/Receiver.java | 16 +- .../handler/receiver/kafka/ReceiverStart.java | 1 + .../service/impl/ConsumeServiceImpl.java | 1 - .../austin/handler/script/SmsScript.java | 1 + .../handler/script/impl/TencentSmsScript.java | 2 +- .../austin/handler/shield/ShieldService.java | 1 + .../shield/impl/ShieldServiceImpl.java | 5 +- .../handler/utils/GroupIdMappingUtils.java | 1 + .../impl/action/AfterParamCheckAction.java | 2 + .../api/impl/action/AssembleAction.java | 2 - .../api/impl/action/PreParamCheckAction.java | 1 - .../api/impl/config/PipelineConfig.java | 10 +- .../api/impl/service/RecallServiceImpl.java | 1 + .../api/impl/service/SendServiceImplTest.java | 15 - .../service/api/domain/MessageParam.java | 3 +- .../service/api/domain/SendRequest.java | 2 +- .../service/api/domain/SendResponse.java | 1 + .../service/api/enums/BusinessCode.java | 16 +- .../service/api/service/RecallService.java | 1 - .../service/api/service/SendService.java | 2 + .../stream/constants/AustinFlinkConstant.java | 1 + .../support/config/OkHttpConfiguration.java | 4 +- .../config/SupportThreadPoolConfig.java | 1 - .../support/dao/MessageTemplateDao.java | 3 + .../support/domain/MessageTemplate.java | 3 +- .../austin/support/domain/SmsRecord.java | 2 +- .../support/mq/eventbus/EventBusListener.java | 2 + .../eventbus/EventBusSendMqServiceImpl.java | 4 +- .../mq/rabbit/RabbitSendMqServiceImpl.java | 2 +- .../rocketmq/RocketMqSendMqServiceImpl.java | 4 +- .../support/pipeline/BusinessProcess.java | 1 + .../austin/support/pipeline/ProcessModel.java | 1 + .../support/pipeline/ProcessTemplate.java | 2 + .../austin/support/service/ConfigService.java | 1 + .../austin/support/utils/NacosUtils.java | 4 +- .../austin/support/utils/RedisUtils.java | 1 - .../austin/support/utils/TaskInfoUtils.java | 2 +- .../web/config/SwaggerConfiguration.java | 4 +- .../austin/web/config/WeChatLoginConfig.java | 8 +- .../austin/web/controller/DataController.java | 5 +- .../web/controller/MaterialController.java | 5 +- .../web/controller/MiniProgramController.java | 5 +- .../controller/OfficialAccountController.java | 2 +- .../controller/RefreshTokenController.java | 1 + .../austin/web/controller/SendController.java | 5 +- .../web/service/ChannelAccountService.java | 5 +- .../austin/web/service/MaterialService.java | 3 + .../web/service/MessageTemplateService.java | 2 + .../java3y/austin/web/utils/Convert4Amis.java | 34 +- .../austin/web/utils/SpringFileUtils.java | 1 - .../com/java3y/austin/web/vo/DataParam.java | 2 - .../austin/web/vo/MessageTemplateVo.java | 2 +- .../austin/web/vo/UploadResponseVo.java | 1 + .../java3y/austin/web/vo/amis/EchartsVo.java | 8 +- docker-compose.yml | 13 +- 132 files changed, 1011 insertions(+), 355 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 4c56b33..a2e3f52 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -190,7 +190,6 @@ docker exec -it kafka sh 创建两个topic(这里我的**topicName**就叫austinBusiness、austinTraceLog、austinRecall，你们可以改成自己的) ``` - $KAFKA_HOME/bin/kafka-topics.sh --create --topic austinBusiness --partitions 1 --zookeeper zookeeper:2181 --replication-factor 1 $KAFKA_HOME/bin/kafka-topics.sh --create --topic austinTraceLog --partitions 1 --zookeeper zookeeper:2181 --replication-factor 1 @@ -558,8 +557,343 @@ services: - TZ=Asia/Shanghai ``` +## 10、HIVE + +部署Flink也是直接上docker-compose就完事了 + +1、把仓库拉到自己的服务器上 + +```shell +git clone git@github.com:big-data-europe/docker-hive.git +``` + +2、进入到项目的文件夹里 + +```shell +cd docker-hive +``` + +3、微调下docker-compose文件，内容如下（主要是增加了几个通信的端口） + +```yml +version: "3" + +services: + namenode: + image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8 + volumes: + - namenode:/hadoop/dfs/name + environment: + - CLUSTER_NAME=test + env_file: + - ./hadoop-hive.env + ports: + - "50070:50070" + - "9000:9000" + - "8020:8020" + datanode: + image: bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8 + volumes: + - datanode:/hadoop/dfs/data + env_file: + - ./hadoop-hive.env + environment: + SERVICE_PRECONDITION: "namenode:50070" + ports: + - "50075:50075" + - "50010:50010" + - "50020:50020" + hive-server: + image: bde2020/hive:2.3.2-postgresql-metastore + env_file: + - ./hadoop-hive.env + environment: + HIVE_CORE_CONF_javax_jdo_option_ConnectionURL: "jdbc:postgresql://hive-metastore/metastore" + SERVICE_PRECONDITION: "hive-metastore:9083" + ports: + - "10000:10000" + hive-metastore: + image: bde2020/hive:2.3.2-postgresql-metastore + env_file: + - ./hadoop-hive.env + command: /opt/hive/bin/hive --service metastore + environment: + SERVICE_PRECONDITION: "namenode:50070 datanode:50075 hive-metastore-postgresql:5432" + ports: + - "9083:9083" + hive-metastore-postgresql: + image: bde2020/hive-metastore-postgresql:2.3.0 + ports: + - "5432:5432" + presto-coordinator: + image: shawnzhu/prestodb:0.181 + ports: + - "8080:8080" +volumes: + namenode: + datanode: +``` + +4、最后，我们可以连上`hive`的客户端，感受下快速安装好`hive`的成功感。 + +```shell +# 进入bash +docker-compose exec hive-server bash + +# 使用beeline客户端连接 +/opt/hive/bin/beeline -u jdbc:hive2://localhost:10000 +``` + +## 11、FLINK和HIVE融合 + +实时流处理的flink用的是docker-compose进行部署，而与hive融合的flink我这边是正常的姿势安装（主要是涉及的环境很多，用docker-compose就相对没那么方便了） + +### 11.1 安装flink环境 + +1、下载`flink`压缩包 + +```shell +wget https://dlcdn.apache.org/flink/flink-1.16.0/flink-1.16.0-bin-scala_2.12.tgz +``` + +2、解压`flink` + +```shell +tar -zxf flink-1.16.0-bin-scala_2.12.tgz +``` + +3、修改该目录下的`conf`下的`flink-conf.yaml`文件中`rest.bind-address`配置，不然**远程访问不到**`8081`端口，将其改为`0.0.0.0` + +```shell +rest.bind-address: 0.0.0.0 +``` + +4、将`flink`官网提到连接`hive`所需要的`jar`包下载到`flink`的`lib`目录下(一共4个) + +```shell +wget https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-hive-2.3.9_2.12/1.16.0/flink-sql-connector-hive-2.3.9_2.12-1.16.0.jar + +wget https://repo.maven.apache.org/maven2/org/apache/hive/hive-exec/2.3.4/hive-exec-2.3.4.jar + +wget https://repo.maven.apache.org/maven2/org/apache/flink/flink-connector-hive_2.12/1.16.0/flink-connector-hive_2.12-1.16.0.jar + +wget https://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar +``` + +5、按照官网指示把`flink-table-planner_2.12-1.16.0.jar`和`flink-table-planner-loader-1.16.0.jar` 这俩个`jar`包移动其目录； + +```shell +mv $FLINK_HOME/opt/flink-table-planner_2.12-1.16.0.jar $FLINK_HOME/lib/flink-table-planner_2.12-1.16.0.jar +mv $FLINK_HOME/lib/flink-table-planner-loader-1.16.0.jar $FLINK_HOME/opt/flink-table-planner-loader-1.16.0.jar +``` + +6、把后续`kafka`所需要的依赖也下载到`lib`目录下 + +```shell +wget https://repo1.maven.org/maven2/org/apache/flink/flink-connector-kafka/1.16.0/flink-connector-kafka-1.16.0.jar + +wget https://repo1.maven.org/maven2/org/apache/kafka/kafka-clients/3.3.1/kafka-clients-3.3.1.jar +``` + +7、把工程下的`hive-site.xml`文件拷贝到`$FLINK_HOME/conf`下，内容如下(**hive_ip**自己变动) + +```xml + + + + + + + javax.jdo.option.ConnectionURL + jdbc:postgresql://hive_ip:5432/metastore?createDatabaseIfNotExist=true + JDBC connect string for a JDBC metastore + + + + javax.jdo.option.ConnectionDriverName + org.postgresql.Driver + Driver class name for a JDBC metastore + + + + javax.jdo.option.ConnectionUserName + hive + username to use against metastore database + + + + javax.jdo.option.ConnectionPassword + hive + password to use against metastore database + + + + hive.metastore.uris + thrift://hive_ip:9083 + Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore. + + + + + datanucleus.schema.autoCreateAll + true + + + +``` + +### 11.2 安装hadoop环境 + +由于`hive`的镜像已经锁死了`hadoop`的版本为`2.7.4`，所以我这边`flink`所以来的`hadoop`也是下载`2.7.4`版本 + +1、下载`hadoop`压缩包 + +```shell +wget https://archive.apache.org/dist/hadoop/common/hadoop-2.7.4/hadoop-2.7.4.tar.gz +``` + +2、解压`hadoop` + +```shell +tar -zxf hadoop-2.7.4.tar.gz +``` + +3、`hadoop`的配置文件`hdfs-site.xml`增加以下内容（我的目录在`/root/hadoop-2.7.4/etc/hadoop`） + +```xml + + dfs.client.use.datanode.hostname + true + only cofig in clients + +``` + +### 11.3 安装jdk11 + +由于高版本的`flink`需要`jdk 11`，所以这边安装下该版本的`jdk`： + +```shell +yum install java-11-openjdk.x86_64 +yum install java-11-openjdk-devel.x86_64 +``` + +### 11.4 配置jdk、hadoop的环境变量 + +这一步为了能让`flink`在启动的时候，加载到`jdk`和`hadoop`的环境。 + +1、编辑`/etc/profile`文件 + +```shell +vim /etc/profile +``` + +2、文件内容最底下增加以下配置： + +```shell +JAVA_HOME=/usr/lib/jvm/java-11-openjdk-11.0.17.0.8-2.el7_9.x86_64 +JRE_HOME=$JAVA_HOME/jre +CLASS_PATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar:$JRE_HOME/lib +PATH=$PATH:$JAVA_HOME/bin:$JRE_HOME/bin +export JAVA_HOME JRE_HOME CLASS_PATH PATH +export HADOOP_HOME=/root/hadoop-2.7.4 +export PATH=$HADOOP_HOME/bin:$PATH +export HADOOP_CLASSPATH=`hadoop classpath` +``` + +3、让配置文件生效 + +```shell +source /etc/profile +``` + +### 11.5 增加hosts进行通信（flink和namenode/datanode之间） + +在部署`flink`服务器上增加`hosts`，有以下(`ip`为部署`hive`的地址）： + +```shell +127.0.0.1 namenode +127.0.0.1 datanode +127.0.0.1 b2a0f0310722 +``` + +其中 `b2a0f0310722`是`datanode`的主机名，该主机名会随着`hive`的`docker`而变更，我们可以登录`namenode`的后台地址找到其主机名。而方法则是在部署`hive`的地址输入： + +``` +http://localhost:50070/dfshealth.html#tab-datanode +``` + +![](https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/384425d102464c059d462add377b4582~tplv-k3u1fbpfcp-watermark.image?) + +### 11.6 启动flink调试kafka数据到hive + +启动`flink-sql`的客户端： + +```shell +./sql-client.sh +``` + +在`sql`客户端下执行以下脚本命令，注：`hive-conf-dir`要放在`$FLINK_HOME/conf`下 + +```shell +CREATE CATALOG my_hive WITH ( + 'type' = 'hive', + 'hive-conf-dir' = '/root/flink-1.16.0/conf' +); +``` + +```shell +use catalog my_hive; +``` + +```shell +create database austin; +``` + +重启`flink`集群 + +```shell +./stop-cluster.sh +``` + +```shell +./start-cluster.sh +``` + +重新提交执行`flink`任务 + +```shell +./flink run austin-data-house-0.0.1-SNAPSHOT.jar +``` + +启动消费者的命令（将`ip`和`port`改为自己服务器所部署的Kafka信息）： + +```shell +$KAFKA_HOME/bin/kafka-console-producer.sh --topic austinTraceLog --broker-list ip:port +``` + +输入测试数据： + +```json +{"state":"1","businessId":"2","ids":[1,2,3],"logTimestamp":"123123"} +``` + +## 12、安装METABASE + +部署`Metabase`很简单，也是使用`docker`进行安装部署，就两行命令（后续我会将其加入到`docker-compose`里面）。 + +```shell +docker pull metabase/metabase:latest +``` + +```shell +docker run -d -p 5001:3000 --name metabase metabase/metabase +``` + +完了之后，我们就可以打开`5001`端口到`Metabase`的后台了。 + + -## 10、未完待续 +## 13、未完待续 安装更详细的过程以及整个文章系列的更新思路都在公众号**Java3y**连载哟！ diff --git a/README.md b/README.md index 470fa7d..feac1ee 100644 --- a/README.md +++ b/README.md @@ -181,8 +181,9 @@ austin项目**强依赖**`MySQL`/`Redis`/(**大概需要2G内存**)，**弱依 - [x] 测试环境完成微信服务号扫码登录功能 - [x] 测试环境docker-compose完成接入MySQL/Redis/Flink/xxl-job/Kafka - [x] 在线演示第一版发布 +- [x] 数据仓库模块完成 - [ ] 总体架构已完成，持续做基础建设和优化代码 -**近期更新时间**：12月29号 +**近期更新时间**：2023年1月29号 -**近期更新功能**：完善企业微信（应用消息）和企业微信（机器人）所支持的消息类型，以及素材的上传 \ No newline at end of file +**近期更新功能**：数据仓库模块`austin-data-house`调试成功 \ No newline at end of file diff --git a/austin-common/src/main/java/com/java3y/austin/common/constant/AustinConstant.java b/austin-common/src/main/java/com/java3y/austin/common/constant/AustinConstant.java index eb8a5df..961848a 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/constant/AustinConstant.java +++ b/austin-common/src/main/java/com/java3y/austin/common/constant/AustinConstant.java @@ -8,11 +8,6 @@ package com.java3y.austin.common.constant; */ public class AustinConstant { - /** - * 跨域地址端口 - */ - public static final String ORIGIN_VALUE = "http://localhost:3000"; - /** * businessId默认的长度 * 生成的逻辑：com.java3y.austin.support.utils.TaskInfoUtils#generateBusinessId(java.lang.Long, java.lang.Integer) @@ -42,6 +37,4 @@ public class AustinConstant { public static final String DEFAULT_AUDITOR = "Java3y"; - - } diff --git a/austin-common/src/main/java/com/java3y/austin/common/constant/CommonConstant.java b/austin-common/src/main/java/com/java3y/austin/common/constant/CommonConstant.java index 15cd874..c661948 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/constant/CommonConstant.java +++ b/austin-common/src/main/java/com/java3y/austin/common/constant/CommonConstant.java @@ -80,7 +80,4 @@ public class CommonConstant { public final static String ENV_TEST = "test"; - - - } \ No newline at end of file diff --git a/austin-common/src/main/java/com/java3y/austin/common/constant/OfficialAccountParamConstant.java b/austin-common/src/main/java/com/java3y/austin/common/constant/OfficialAccountParamConstant.java index bd7d927..048707d 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/constant/OfficialAccountParamConstant.java +++ b/austin-common/src/main/java/com/java3y/austin/common/constant/OfficialAccountParamConstant.java @@ -44,5 +44,4 @@ public class OfficialAccountParamConstant { public static final String UNSUBSCRIBE_TIPS = "老乡别走！"; - } diff --git a/austin-common/src/main/java/com/java3y/austin/common/constant/SendAccountConstant.java b/austin-common/src/main/java/com/java3y/austin/common/constant/SendAccountConstant.java index 67b5df8..ae4b000 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/constant/SendAccountConstant.java +++ b/austin-common/src/main/java/com/java3y/austin/common/constant/SendAccountConstant.java @@ -3,6 +3,7 @@ package com.java3y.austin.common.constant; /** * 发送账号的常量信息汇总 + * * @author 3y */ public class SendAccountConstant { diff --git a/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java b/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java index 3790649..d674e8d 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java +++ b/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java @@ -9,6 +9,7 @@ import java.util.Set; /** * 埋点信息 + * * @author 3y */ @Data diff --git a/austin-common/src/main/java/com/java3y/austin/common/domain/LogParam.java b/austin-common/src/main/java/com/java3y/austin/common/domain/LogParam.java index 88704e5..3001001 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/domain/LogParam.java +++ b/austin-common/src/main/java/com/java3y/austin/common/domain/LogParam.java @@ -6,8 +6,8 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * * 日志参数 + * * @author 3y */ @Data diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/account/WeChatMiniProgramAccount.java b/austin-common/src/main/java/com/java3y/austin/common/dto/account/WeChatMiniProgramAccount.java index 1e8d4e5..3294dec 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/account/WeChatMiniProgramAccount.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/account/WeChatMiniProgramAccount.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * * 小程序订阅消息参数 *

* 参数示例： diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/account/WeChatOfficialAccount.java b/austin-common/src/main/java/com/java3y/austin/common/dto/account/WeChatOfficialAccount.java index 91c1b22..e6564f7 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/account/WeChatOfficialAccount.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/account/WeChatOfficialAccount.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * * 模板消息参数 *

* 参数示例： diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/account/YunPianSmsAccount.java b/austin-common/src/main/java/com/java3y/austin/common/dto/account/YunPianSmsAccount.java index 361fe3c..12f1e10 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/account/YunPianSmsAccount.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/account/YunPianSmsAccount.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; /** * 云片账号信息 - * + *

* 参数示例： * [{"sms_20":{"url":"https://sms.yunpian.com/v2/sms/tpl_batch_send.json","apikey":"ca55d4c8544444444444622221b5cd7","tpl_id":"533332222282","supplierId":20,"supplierName":"云片"}}] * diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/model/AlipayMiniProgramContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/model/AlipayMiniProgramContentModel.java index 5ee780f..1d7e47c 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/model/AlipayMiniProgramContentModel.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/model/AlipayMiniProgramContentModel.java @@ -15,7 +15,7 @@ import java.util.Map; @Builder @AllArgsConstructor @NoArgsConstructor -public class AlipayMiniProgramContentModel extends ContentModel{ +public class AlipayMiniProgramContentModel extends ContentModel { /** * 模板消息发送的数据 diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/model/PushContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/model/PushContentModel.java index 511d436..7497697 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/model/PushContentModel.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/model/PushContentModel.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; /** * @author 3y - * + *

* 通知栏消息推送 */ @Data diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/model/SmsContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/model/SmsContentModel.java index 58fb6f7..bd13f97 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/model/SmsContentModel.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/model/SmsContentModel.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; * @author 3y *

* 短信内容模型 - * + *

* 在前端填写的时候分开，但最后处理的时候会将url拼接在content上 */ @Data diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java b/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java index ff852a0..8415fc9 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java @@ -15,16 +15,47 @@ import lombok.ToString; @AllArgsConstructor public enum AnchorState { + /** + * 消息接收成功（获取到请求） + */ RECEIVE(10, "消息接收成功"), + /** + * 消息被丢弃（从Kafka消费后，被丢弃） + */ DISCARD(20, "消费被丢弃"), + /** + * 消息被夜间屏蔽（模板设置了夜间屏蔽） + */ NIGHT_SHIELD(22, "夜间屏蔽"), + /** + * 消息被夜间屏蔽（模板设置了夜间屏蔽，次日9点再发送） + */ NIGHT_SHIELD_NEXT_SEND(24, "夜间屏蔽(次日早上9点发送)"), + + /** + * 消息被内容去重（重复内容5min内多次发送） + */ CONTENT_DEDUPLICATION(30, "消息被内容去重"), + /** + * 消息被频次去重（同一个渠道短时间内发送多次消息给用户） + */ RULE_DEDUPLICATION(40, "消息被频次去重"), + /** + * 白名单过滤（非正式环境，不在白名单内） + */ WHITE_LIST(50, "白名单过滤"), + /** + * 下发成功（调用渠道接口成功） + */ SEND_SUCCESS(60, "消息下发成功"), + /** + * 下发失败（调用渠道接口失败） + */ SEND_FAIL(70, "消息下发失败"), + /** + * 点击（下发的消息被点击） + */ CLICK(0100, "消息被点击"), ; diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java index 8b0868e..97797ff 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java @@ -15,10 +15,16 @@ import lombok.ToString; public enum AuditStatus { /** - * 10.待审核 20.审核成功 30.被拒绝' + * 10.待审核 */ WAIT_AUDIT(10, "待审核"), + /** + * 20.审核成功 + */ AUDIT_SUCCESS(20, "审核成功"), + /** + * 30.被拒绝' + */ AUDIT_REJECT(30, "被拒绝"); private final Integer code; diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java index e9ea330..16ca665 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java @@ -17,18 +17,54 @@ import lombok.ToString; public enum ChannelType { + /** + * IM(站内信) -- 未实现该渠道 + */ IM(10, "IM(站内信)", ImContentModel.class, "im"), + /** + * push(通知栏) --安卓 已接入 个推 + */ PUSH(20, "push(通知栏)", PushContentModel.class, "push"), + /** + * sms(短信) -- 腾讯云、云片 + */ SMS(30, "sms(短信)", SmsContentModel.class, "sms"), + /** + * email(邮件) -- QQ、163邮箱 + */ EMAIL(40, "email(邮件)", EmailContentModel.class, "email"), + /** + * officialAccounts(微信服务号) -- 官方测试账号 + */ OFFICIAL_ACCOUNT(50, "officialAccounts(服务号)", OfficialAccountsContentModel.class, "official_accounts"), + /** + * miniProgram(微信小程序) + */ MINI_PROGRAM(60, "miniProgram(小程序)", MiniProgramContentModel.class, "mini_program"), + /** + * enterpriseWeChat(企业微信) + */ ENTERPRISE_WE_CHAT(70, "enterpriseWeChat(企业微信)", EnterpriseWeChatContentModel.class, "enterprise_we_chat"), + /** + * dingDingRobot(钉钉机器人) + */ DING_DING_ROBOT(80, "dingDingRobot(钉钉机器人)", DingDingRobotContentModel.class, "ding_ding_robot"), + /** + * dingDingWorkNotice(钉钉工作通知) + */ DING_DING_WORK_NOTICE(90, "dingDingWorkNotice(钉钉工作通知)", DingDingWorkContentModel.class, "ding_ding_work_notice"), + /** + * enterpriseWeChat(企业微信机器人) + */ ENTERPRISE_WE_CHAT_ROBOT(100, "enterpriseWeChat(企业微信机器人)", EnterpriseWeChatRobotContentModel.class, "enterprise_we_chat_robot"), + /** + * feiShuRoot(飞书机器人) + */ FEI_SHU_ROBOT(110, "feiShuRoot(飞书机器人)", FeiShuRobotContentModel.class, "fei_shu_robot"), - ALIPAY_MINI_PROGRAM(120,"alipayMiniProgram(支付宝小程序)",AlipayMiniProgramContentModel.class,"alipay_mini_program"), + /** + * alipayMiniProgram(支付宝小程序) + */ + ALIPAY_MINI_PROGRAM(120, "alipayMiniProgram(支付宝小程序)", AlipayMiniProgramContentModel.class, "alipay_mini_program"), ; /** @@ -53,6 +89,7 @@ public enum ChannelType { /** * 通过code获取class + * * @param code * @return */ @@ -68,6 +105,7 @@ public enum ChannelType { /** * 通过code获取enum + * * @param code * @return */ diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java index 6524309..1cfa77f 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java @@ -9,6 +9,7 @@ import java.util.List; /** * 去重类型枚举 + * * @author 3y */ @Getter @@ -16,7 +17,14 @@ import java.util.List; @AllArgsConstructor public enum DeduplicationType { + /** + * 相同内容去重 + */ CONTENT(10, "N分钟相同内容去重"), + + /** + * 渠道接受消息 频次 去重 + */ FREQUENCY(20, "一天内N次相同渠道去重"), ; private final Integer code; @@ -25,6 +33,7 @@ public enum DeduplicationType { /** * 获取去重渠道的列表 + * * @return */ public static List getDeduplicationList() { diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java index c5f994a..8d57357 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java @@ -14,9 +14,21 @@ import lombok.ToString; @ToString @AllArgsConstructor public enum FileType { + /** + * 图片 + */ IMAGE("10", "image"), + /** + * 语音 + */ VOICE("20", "voice"), + /** + * 普通文件 + */ COMMON_FILE("30", "file"), + /** + * 视频 + */ VIDEO("40", "video"), ; private final String code; diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java index 0799512..2861f48 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java @@ -14,14 +14,41 @@ import lombok.ToString; @ToString @AllArgsConstructor public enum IdType { + /** + * 站内userId + */ USER_ID(10, "userId"), + /** + * 手机设备号 + */ DID(20, "did"), + /** + * 手机号 + */ PHONE(30, "phone"), + /** + * 微信体系的openId + */ OPEN_ID(40, "openId"), + /** + * 邮件 + */ EMAIL(50, "email"), + /** + * 企业微信userId + */ ENTERPRISE_USER_ID(60, "enterprise_user_id"), + /** + * 钉钉userId + */ DING_DING_USER_ID(70, "ding_ding_user_id"), + /** + * 个推cid + */ CID(80, "cid"), + /** + * 飞书userId + */ FEI_SHU_USER_ID(90, "fei_shu_user_id"), ; diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java index 7930316..0d29926 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java @@ -14,14 +14,32 @@ import lombok.ToString; public enum MessageStatus { /** - * 10.新建 20.停用 30.启用 40.等待发送 50.发送中 60.发送成功 70.发送失败 + * 10.新建 */ INIT(10, "初始化状态"), + /** + * 20.停用 + */ STOP(20, "停用"), + /** + * 30.启用 + */ RUN(30, "启用"), + /** + * 40.等待发送 + */ PENDING(40, "等待发送"), + /** + * 50.发送中 + */ SENDING(50, "发送中"), + /** + * 60.发送成功 + */ SEND_SUCCESS(60, "发送成功"), + /** + * 70.发送失败 + */ SEND_FAIL(70, "发送失败"); private final Integer code; diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java index 0f24bdc..de40d1f 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java @@ -6,6 +6,7 @@ import lombok.ToString; /** * 发送的消息类型 + * * @author 3y */ @Getter @@ -13,10 +14,18 @@ import lombok.ToString; @AllArgsConstructor public enum MessageType { - NOTICE(10,"通知类消息","notice"), - MARKETING(20,"营销类消息","marketing"), - AUTH_CODE(30,"验证码消息","auth_code") - ; + /** + * 通知类消息 + */ + NOTICE(10, "通知类消息", "notice"), + /** + * 营销类消息 + */ + MARKETING(20, "营销类消息", "marketing"), + /** + * 验证码消息 + */ + AUTH_CODE(30, "验证码消息", "auth_code"); /** * 编码值 @@ -37,6 +46,7 @@ public enum MessageType { /** * 通过code获取enum + * * @param code * @return */ diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SendMessageType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SendMessageType.java index d733662..32340b7 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SendMessageType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/SendMessageType.java @@ -14,24 +14,70 @@ import lombok.ToString; @AllArgsConstructor public enum SendMessageType { - TEXT("10", "文本", "text", "text","text","text"), - VOICE("20", "语音", null, "voice",null,null), - VIDEO("30", "视频", null, null,null,null), - NEWS("40", "图文", "feedCard", null,"news",null), - TEXT_CARD("50", "文本卡片", null, null,null,null), - FILE("60", "文件", null, "file","file",null), - MINI_PROGRAM_NOTICE("70", "小程序通知", null, null,null,null), - MARKDOWN("80", "markdown", "markdown", "markdown","markdown",null), - TEMPLATE_CARD("90", "模板卡片", null, null,"template_card",null), - IMAGE("100", "图片", null, "image","image","image"), - LINK("110", "链接消息", "link", "link",null,null), - ACTION_CARD("120", "跳转卡片消息", "actionCard", "action_card",null,"interactive"), - OA("130", "OA消息", null, "oa",null,null), - MP_NEWS("140", "图文消息(mpNews)", null, null,null,null), - RICH_TEXT("150", "富文本", null, null,null,"post"), - SHARE_CHAT("160", "群名片", null, null,null,"share_chat") - - ; + /** + * 文本类型的消息 + */ + TEXT("10", "文本", "text", "text", "text", "text"), + /** + * 语音类型的消息 + */ + VOICE("20", "语音", null, "voice", null, null), + /** + * 视频类型的消息 + */ + VIDEO("30", "视频", null, null, null, null), + /** + * 图文类型的消息 + */ + NEWS("40", "图文", "feedCard", null, "news", null), + /** + * 文本卡片类型的消息 + */ + TEXT_CARD("50", "文本卡片", null, null, null, null), + /** + * 文件类型的消息 + */ + FILE("60", "文件", null, "file", "file", null), + /** + * 小程序通知类型的消息 + */ + MINI_PROGRAM_NOTICE("70", "小程序通知", null, null, null, null), + /** + * markdown类型的消息 + */ + MARKDOWN("80", "markdown", "markdown", "markdown", "markdown", null), + /** + * 模板卡片类型的消息 + */ + TEMPLATE_CARD("90", "模板卡片", null, null, "template_card", null), + /** + * 图片类型的消息 + */ + IMAGE("100", "图片", null, "image", "image", "image"), + /** + * 链接消息类型的消息 + */ + LINK("110", "链接消息", "link", "link", null, null), + /** + * 跳转卡片消息类型的消息 + */ + ACTION_CARD("120", "跳转卡片消息", "actionCard", "action_card", null, "interactive"), + /** + * OA消息类型的消息 + */ + OA("130", "OA消息", null, "oa", null, null), + /** + * 图文消息(mpNews)类型的消息 + */ + MP_NEWS("140", "图文消息(mpNews)", null, null, null, null), + /** + * 富文本类型的消息 + */ + RICH_TEXT("150", "富文本", null, null, null, "post"), + /** + * 群名片类型的消息 + */ + SHARE_CHAT("160", "群名片", null, null, null, "share_chat"); private final String code; private final String description; @@ -101,6 +147,7 @@ public enum SendMessageType { } return null; } + /** * 通过code获取企业微信机器人的Type值 * diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java index e854a69..e5e68d4 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java @@ -15,14 +15,21 @@ import lombok.ToString; public enum ShieldType { + /** + * 模板设置为夜间不屏蔽 + */ NIGHT_NO_SHIELD(10, "夜间不屏蔽"), + /** + * 模板设置为夜间屏蔽 -- 凌晨接受到的消息会过滤掉 + */ NIGHT_SHIELD(20, "夜间屏蔽"), + /** + * 模板设置为夜间屏蔽(次日早上9点发送) -- 凌晨接受到的消息会次日发送 + */ NIGHT_SHIELD_BUT_NEXT_DAY_SEND(30, "夜间屏蔽(次日早上9点发送)"); private final Integer code; private final String description; - - } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java index e2fd44b..c7d2511 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java @@ -6,6 +6,7 @@ import lombok.ToString; /** * 短信状态信息 + * * @author 3y */ @Getter @@ -13,9 +14,21 @@ import lombok.ToString; @AllArgsConstructor public enum SmsStatus { - SEND_SUCCESS(10,"调用渠道接口发送成功"), - RECEIVE_SUCCESS(20,"用户收到短信(收到渠道短信回执，状态成功)"), + /** + * 调用渠道接口发送成功 + */ + SEND_SUCCESS(10, "调用渠道接口发送成功"), + /** + * 用户收到短信(收到渠道短信回执，状态成功) + */ + RECEIVE_SUCCESS(20, "用户收到短信(收到渠道短信回执，状态成功)"), + /** + * 用户收不到短信(收到渠道短信回执，状态失败) + */ RECEIVE_FAIL(30, "用户收不到短信(收到渠道短信回执，状态失败)"), + /** + * 调用渠道接口发送失败 + */ SEND_FAIL(40, "调用渠道接口发送失败"); private final Integer code; @@ -24,6 +37,7 @@ public enum SmsStatus { /** * 根据状态获取描述信息 + * * @param code * @return */ diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java index 5084d09..1fcc07b 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java @@ -7,6 +7,7 @@ import lombok.ToString; /** * 短信渠道商 + * * @author 3y */ @Getter @@ -15,14 +16,21 @@ import lombok.ToString; public enum SmsSupplier { - TENCENT(10,"腾讯渠道商"), - YUN_PAIN(20,"云片渠道商"); + /** + * 腾讯渠道商 + */ + TENCENT(10, "腾讯渠道商"), + /** + * 云片渠道商 + */ + YUN_PAIN(20, "云片渠道商"); private final Integer code; private final String description; /** * 根据状态获取描述信息 + * * @param code * @return */ diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java index 0349ccd..2900033 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java @@ -6,6 +6,7 @@ import lombok.ToString; /** * 模板枚举信息 + * * @author 3y */ @Getter @@ -13,7 +14,13 @@ import lombok.ToString; @AllArgsConstructor public enum TemplateType { + /** + * 定时类的模板(后台定时调用) + */ CLOCKING(10, "定时类的模板(后台定时调用)"), + /** + * 实时类的模板(接口实时调用) + */ REALTIME(20, "实时类的模板(接口实时调用)"), ; diff --git a/austin-common/src/main/java/com/java3y/austin/common/vo/BasicResultVO.java b/austin-common/src/main/java/com/java3y/austin/common/vo/BasicResultVO.java index 3d4bd98..e3d97ea 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/vo/BasicResultVO.java +++ b/austin-common/src/main/java/com/java3y/austin/common/vo/BasicResultVO.java @@ -17,103 +17,103 @@ import lombok.ToString; @NoArgsConstructor public final class BasicResultVO { - /** - * 响应状态 - */ - private String status; - - /** - * 响应编码 - */ - private String msg; - - /** - * 返回数据 - */ - private T data; - - public BasicResultVO(RespStatusEnum status) { - this(status, null); - } - - public BasicResultVO(RespStatusEnum status, T data) { - this(status, status.getMsg(), data); - } - - public BasicResultVO(RespStatusEnum status, String msg, T data) { - this.status = status.getCode(); - this.msg = msg; - this.data = data; - } - - /** - * @return 默认成功响应 - */ - public static BasicResultVO success() { - return new BasicResultVO<>(RespStatusEnum.SUCCESS); - } - - /** - * 自定义信息的成功响应 - *

通常用作插入成功等并显示具体操作通知如: return BasicResultVO.success("发送信息成功")

- * - * @param msg 信息 - * @return 自定义信息的成功响应 - */ - public static BasicResultVO success(String msg) { - return new BasicResultVO<>(RespStatusEnum.SUCCESS, msg, null); - } - - /** - * 带数据的成功响应 - * - * @param data 数据 - * @return 带数据的成功响应 - */ - public static BasicResultVO success(T data) { - return new BasicResultVO<>(RespStatusEnum.SUCCESS, data); - } - - /** - * @return 默认失败响应 - */ - public static BasicResultVO fail() { - return new BasicResultVO<>( - RespStatusEnum.FAIL, - RespStatusEnum.FAIL.getMsg(), - null - ); - } - - /** - * 自定义错误信息的失败响应 - * - * @param msg 错误信息 - * @return 自定义错误信息的失败响应 - */ - public static BasicResultVO fail(String msg) { - return fail(RespStatusEnum.FAIL, msg); - } - - /** - * 自定义状态的失败响应 - * - * @param status 状态 - * @return 自定义状态的失败响应 - */ - public static BasicResultVO fail(RespStatusEnum status) { - return fail(status, status.getMsg()); - } - - /** - * 自定义状态和信息的失败响应 - * - * @param status 状态 - * @param msg 信息 - * @return 自定义状态和信息的失败响应 - */ - public static BasicResultVO fail(RespStatusEnum status, String msg) { - return new BasicResultVO<>(status, msg, null); - } + /** + * 响应状态 + */ + private String status; + + /** + * 响应编码 + */ + private String msg; + + /** + * 返回数据 + */ + private T data; + + public BasicResultVO(RespStatusEnum status) { + this(status, null); + } + + public BasicResultVO(RespStatusEnum status, T data) { + this(status, status.getMsg(), data); + } + + public BasicResultVO(RespStatusEnum status, String msg, T data) { + this.status = status.getCode(); + this.msg = msg; + this.data = data; + } + + /** + * @return 默认成功响应 + */ + public static BasicResultVO success() { + return new BasicResultVO<>(RespStatusEnum.SUCCESS); + } + + /** + * 自定义信息的成功响应 + *

通常用作插入成功等并显示具体操作通知如: return BasicResultVO.success("发送信息成功")

+ * + * @param msg 信息 + * @return 自定义信息的成功响应 + */ + public static BasicResultVO success(String msg) { + return new BasicResultVO<>(RespStatusEnum.SUCCESS, msg, null); + } + + /** + * 带数据的成功响应 + * + * @param data 数据 + * @return 带数据的成功响应 + */ + public static BasicResultVO success(T data) { + return new BasicResultVO<>(RespStatusEnum.SUCCESS, data); + } + + /** + * @return 默认失败响应 + */ + public static BasicResultVO fail() { + return new BasicResultVO<>( + RespStatusEnum.FAIL, + RespStatusEnum.FAIL.getMsg(), + null + ); + } + + /** + * 自定义错误信息的失败响应 + * + * @param msg 错误信息 + * @return 自定义错误信息的失败响应 + */ + public static BasicResultVO fail(String msg) { + return fail(RespStatusEnum.FAIL, msg); + } + + /** + * 自定义状态的失败响应 + * + * @param status 状态 + * @return 自定义状态的失败响应 + */ + public static BasicResultVO fail(RespStatusEnum status) { + return fail(status, status.getMsg()); + } + + /** + * 自定义状态和信息的失败响应 + * + * @param status 状态 + * @param msg 信息 + * @return 自定义状态和信息的失败响应 + */ + public static BasicResultVO fail(RespStatusEnum status, String msg) { + return new BasicResultVO<>(status, msg, null); + } } diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/config/CronAsyncThreadPoolConfig.java b/austin-cron/src/main/java/com/java3y/austin/cron/config/CronAsyncThreadPoolConfig.java index d98563f..19fea23 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/config/CronAsyncThreadPoolConfig.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/config/CronAsyncThreadPoolConfig.java @@ -27,6 +27,7 @@ public class CronAsyncThreadPoolConfig { * 业务：消费pending队列实际的线程池 * 配置：核心线程可以被回收，当线程池无被引用且无核心线程数，应当被回收 * 动态线程池且被Spring管理：false + * * @return */ public static ExecutorService getConsumePendingThreadPool() { diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/QueryTokenParamDTO.java b/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/QueryTokenParamDTO.java index 6a1a848..03bfa14 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/QueryTokenParamDTO.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/QueryTokenParamDTO.java @@ -1,10 +1,5 @@ package com.java3y.austin.cron.dto.getui; -import cn.hutool.crypto.SecureUtil; -import cn.hutool.http.ContentType; -import cn.hutool.http.Header; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; @@ -14,6 +9,7 @@ import lombok.NoArgsConstructor; /** * 请求token时的参数 + * * @author 3y * https://docs.getui.com/getui/server/rest_v2/token/ */ diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/handler/CronTaskHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/CronTaskHandler.java index f824375..7587e3c 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/handler/CronTaskHandler.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/handler/CronTaskHandler.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; /** * 后台提交的定时任务处理类 + * * @author 3y */ @Service diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java index 0ee2191..2114fe9 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java @@ -19,7 +19,7 @@ import java.util.Arrays; /** * 夜间屏蔽的延迟处理类 - * + *

* example:当消息下发至austin平台时，已经是凌晨1点，业务希望此类消息在次日的早上9点推送 * * @author 3y diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshDingDingAccessTokenHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshDingDingAccessTokenHandler.java index 84b5c59..0f35987 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshDingDingAccessTokenHandler.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshDingDingAccessTokenHandler.java @@ -7,7 +7,6 @@ import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiGettokenRequest; import com.dingtalk.api.response.OapiGettokenResponse; import com.google.common.base.Throwables; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.constant.SendAccountConstant; import com.java3y.austin.common.dto.account.DingDingWorkNoticeAccount; @@ -15,7 +14,6 @@ import com.java3y.austin.common.enums.ChannelType; import com.java3y.austin.support.config.SupportThreadPoolConfig; import com.java3y.austin.support.dao.ChannelAccountDao; import com.java3y.austin.support.domain.ChannelAccount; -import com.java3y.austin.support.utils.AccountUtils; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshGeTuiAccessTokenHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshGeTuiAccessTokenHandler.java index 94977fe..678b0eb 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshGeTuiAccessTokenHandler.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshGeTuiAccessTokenHandler.java @@ -7,7 +7,6 @@ import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.google.common.base.Throwables; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.constant.SendAccountConstant; import com.java3y.austin.common.dto.account.GeTuiAccount; @@ -17,7 +16,6 @@ import com.java3y.austin.cron.dto.getui.QueryTokenParamDTO; import com.java3y.austin.support.config.SupportThreadPoolConfig; import com.java3y.austin.support.dao.ChannelAccountDao; import com.java3y.austin.support.domain.ChannelAccount; -import com.java3y.austin.support.utils.AccountUtils; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java b/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java index 1408fac..e95491f 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java @@ -48,14 +48,14 @@ public class TaskHandlerImpl implements TaskHandler { CrowdBatchTaskPending crowdBatchTaskPending = context.getBean(CrowdBatchTaskPending.class); ReadFileUtils.getCsvRow(messageTemplate.getCronCrowdPath(), row -> { if (CollUtil.isEmpty(row.getFieldMap()) - || StrUtil.isBlank(row.getFieldMap().get(ReadFileUtils.RECEIVER_KEY))) { + || StrUtil.isBlank(row.getFieldMap().get(ReadFileUtils.RECEIVER_KEY))) { return; } // 3. 每一行处理交给LazyPending HashMap params = ReadFileUtils.getParamFromLine(row.getFieldMap()); CrowdInfoVo crowdInfoVo = CrowdInfoVo.builder().receiver(row.getFieldMap().get(ReadFileUtils.RECEIVER_KEY)) - .params(params).messageTemplateId(messageTemplateId).build(); + .params(params).messageTemplateId(messageTemplateId).build(); crowdBatchTaskPending.pending(crowdInfoVo); // 4. 判断是否读取文件完成回收资源且更改状态 diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/vo/CrowdInfoVo.java b/austin-cron/src/main/java/com/java3y/austin/cron/vo/CrowdInfoVo.java index b6b8874..4a49886 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/vo/CrowdInfoVo.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/vo/CrowdInfoVo.java @@ -11,6 +11,7 @@ import java.util.Map; /** * 每一行csv的记录 + * * @author 3y * @date 2022/2/9 */ diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java index 6286868..39c0ed9 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; */ @Slf4j @Configuration -@ConditionalOnProperty(name = "austin.xxl.job.enabled",havingValue = "true") +@ConditionalOnProperty(name = "austin.xxl.job.enabled", havingValue = "true") public class XxlJobConfig { @Value("${xxl.job.admin.addresses}") diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobInfo.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobInfo.java index 64b24ab..27dc4b3 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobInfo.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobInfo.java @@ -12,6 +12,7 @@ import java.util.Date; /** * xxl 任务信息 配置 + * * @author 3y */ @Data diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorBlockStrategyEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorBlockStrategyEnum.java index b65b608..3078d4f 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorBlockStrategyEnum.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorBlockStrategyEnum.java @@ -2,6 +2,7 @@ package com.java3y.austin.cron.xxl.enums; /** * 执行阻塞队列 + * * @author 3y */ public enum ExecutorBlockStrategyEnum { diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorRouteStrategyEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorRouteStrategyEnum.java index 1f22ffd..a41f272 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorRouteStrategyEnum.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorRouteStrategyEnum.java @@ -3,19 +3,50 @@ package com.java3y.austin.cron.xxl.enums; /** * 路由策略 + * * @author 3y */ public enum ExecutorRouteStrategyEnum { + /** + * FIRST + */ FIRST, + /** + * LAST + */ LAST, + /** + * ROUND + */ ROUND, + /** + * RANDOM + */ RANDOM, + /** + * CONSISTENT_HASH + */ CONSISTENT_HASH, + /** + * LEAST_FREQUENTLY_USED + */ LEAST_FREQUENTLY_USED, + /** + * LEAST_RECENTLY_USED + */ LEAST_RECENTLY_USED, + /** + * FAILOVER + */ FAILOVER, + /** + * BUSYOVER + */ BUSYOVER, + /** + * SHARDING_BROADCAST + */ SHARDING_BROADCAST; ExecutorRouteStrategyEnum() { diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/GlueTypeEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/GlueTypeEnum.java index 96cb286..42bac30 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/GlueTypeEnum.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/GlueTypeEnum.java @@ -2,16 +2,38 @@ package com.java3y.austin.cron.xxl.enums; /** * GlueTyp 类型（默认BEAN) + * * @author 3y */ public enum GlueTypeEnum { + /** + * BEAN + */ BEAN, + /** + * GLUE_GROOVY + */ GLUE_GROOVY, + /** + * GLUE_SHELL + */ GLUE_SHELL, + /** + * GLUE_PYTHON + */ GLUE_PYTHON, + /** + * GLUE_PHP + */ GLUE_PHP, + /** + * GLUE_NODEJS + */ GLUE_NODEJS, + /** + * GLUE_POWERSHELL + */ GLUE_POWERSHELL; GlueTypeEnum() { diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/MisfireStrategyEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/MisfireStrategyEnum.java index 93fd718..a5d9d4b 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/MisfireStrategyEnum.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/MisfireStrategyEnum.java @@ -2,6 +2,7 @@ package com.java3y.austin.cron.xxl.enums; /** * 调度过期策略 + * * @author 3y */ public enum MisfireStrategyEnum { diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ScheduleTypeEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ScheduleTypeEnum.java index 5da2e35..e3eebf1 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ScheduleTypeEnum.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ScheduleTypeEnum.java @@ -7,6 +7,9 @@ package com.java3y.austin.cron.xxl.enums; */ public enum ScheduleTypeEnum { + /** + * NONE + */ NONE, /** * schedule by cron diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/CronTaskService.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/CronTaskService.java index 1e21209..ab50c9b 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/CronTaskService.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/CronTaskService.java @@ -1,11 +1,12 @@ package com.java3y.austin.cron.xxl.service; +import com.java3y.austin.common.vo.BasicResultVO; import com.java3y.austin.cron.xxl.entity.XxlJobGroup; import com.java3y.austin.cron.xxl.entity.XxlJobInfo; -import com.java3y.austin.common.vo.BasicResultVO; /** * 定时任务服务 + * * @author 3y */ public interface CronTaskService { @@ -13,8 +14,8 @@ public interface CronTaskService { /** * 新增/修改 定时任务 - * @param xxlJobInfo * + * @param xxlJobInfo * @return 新增时返回任务Id，修改时无返回 */ BasicResultVO saveCronTask(XxlJobInfo xxlJobInfo); @@ -47,6 +48,7 @@ public interface CronTaskService { /** * 得到执行器Id + * * @param appName * @param title * @return BasicResultVO @@ -55,6 +57,7 @@ public interface CronTaskService { /** * 创建执行器 + * * @param xxlJobGroup * @return BasicResultVO */ diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java index 129892b..a2e9ec9 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java @@ -6,12 +6,12 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.google.common.base.Throwables; +import com.java3y.austin.common.enums.RespStatusEnum; +import com.java3y.austin.common.vo.BasicResultVO; import com.java3y.austin.cron.xxl.constants.XxlJobConstant; import com.java3y.austin.cron.xxl.entity.XxlJobGroup; import com.java3y.austin.cron.xxl.entity.XxlJobInfo; -import com.java3y.austin.common.enums.RespStatusEnum; import com.java3y.austin.cron.xxl.service.CronTaskService; -import com.java3y.austin.common.vo.BasicResultVO; import com.xxl.job.core.biz.model.ReturnT; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java index a2651b4..5bdf90c 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java @@ -2,7 +2,6 @@ package com.java3y.austin.cron.xxl.utils; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.enums.RespStatusEnum; import com.java3y.austin.common.vo.BasicResultVO; @@ -77,6 +76,7 @@ public class XxlJobUtils { /** * 根据就配置文件的内容获取jobGroupId，没有则创建 + * * @return */ private Integer queryJobGroupId() { diff --git a/austin-data-house/src/main/java/com/java3y/austin/datahouse/AustinHiveBootStrap.java b/austin-data-house/src/main/java/com/java3y/austin/datahouse/AustinHiveBootStrap.java index e696bdf..656e264 100644 --- a/austin-data-house/src/main/java/com/java3y/austin/datahouse/AustinHiveBootStrap.java +++ b/austin-data-house/src/main/java/com/java3y/austin/datahouse/AustinHiveBootStrap.java @@ -30,7 +30,7 @@ public class AustinHiveBootStrap { // 2.创建Kafka源表 String kafkaSourceTableCreate = "DROP TABLE IF EXISTS " + DataHouseConstant.CATALOG_DEFAULT_DATABASE + "." + DataHouseConstant.KAFKA_SOURCE_TABLE_NAME; tableEnv.executeSql(kafkaSourceTableCreate); - String kafkaSourceTableDDL = "CREATE TABLE . (\n" + + String kafkaSourceTableDdl = "CREATE TABLE . (\n" + "`ids` String,\n" + "`state` String,\n" + "`businessId` String,\n" + @@ -45,17 +45,17 @@ public class AustinHiveBootStrap { " 'json.ignore-parse-errors' = 'false',\n" + " 'scan.topic-partition-discovery.interval'='1s',\n" + " 'scan.startup.mode' = 'latest-offset')"; - kafkaSourceTableDDL = kafkaSourceTableDDL.replace("", DataHouseConstant.CATALOG_DEFAULT_DATABASE) + kafkaSourceTableDdl = kafkaSourceTableDdl.replace("", DataHouseConstant.CATALOG_DEFAULT_DATABASE) .replace("", DataHouseConstant.KAFKA_SOURCE_TABLE_NAME) .replace("", DataHouseConstant.KAFKA_IP_PORT) .replace("", DataHouseConstant.KAFKA_TOPIC); - tableEnv.executeSql(kafkaSourceTableDDL); + tableEnv.executeSql(kafkaSourceTableDdl); // 创建写入hive的表 tableEnv.getConfig().setSqlDialect(SqlDialect.HIVE); tableEnv.executeSql("DROP TABLE IF EXISTS " + DataHouseConstant.CATALOG_DEFAULT_DATABASE + "." + DataHouseConstant.KAFKA_SINK_TABLE_NAME); - String kafkaSinkTableDDL = "CREATE TABLE IF NOT EXISTS . (\n" + + String kafkaSinkTableDdl = "CREATE TABLE IF NOT EXISTS . (\n" + "`ids` String,\n" + "`state` String,\n" + "`businessId` String,\n" + @@ -68,9 +68,9 @@ public class AustinHiveBootStrap { " 'sink.buffer-flush.max-rows'='10',\n" + " 'sink.buffer-flush.interval' = '5s'\n" + ")"; - kafkaSinkTableDDL = kafkaSinkTableDDL.replace("", DataHouseConstant.CATALOG_DEFAULT_DATABASE) + kafkaSinkTableDdl = kafkaSinkTableDdl.replace("", DataHouseConstant.CATALOG_DEFAULT_DATABASE) .replace("", DataHouseConstant.KAFKA_SINK_TABLE_NAME); - tableEnv.executeSql(kafkaSinkTableDDL); + tableEnv.executeSql(kafkaSinkTableDdl); // 3. 将kafka_source 数据写入到kafka_sink 完成 tableEnv.getConfig().setSqlDialect(SqlDialect.DEFAULT); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/alipay/impl/AlipayMiniProgramAccountServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/alipay/impl/AlipayMiniProgramAccountServiceImpl.java index 1f5f814..84caa4b 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/alipay/impl/AlipayMiniProgramAccountServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/alipay/impl/AlipayMiniProgramAccountServiceImpl.java @@ -2,8 +2,6 @@ package com.java3y.austin.handler.alipay.impl; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; -import com.alipay.api.AlipayConfig; -import com.alipay.api.DefaultAlipayClient; import com.alipay.api.domain.AlipayOpenAppMiniTemplatemessageSendModel; import com.alipay.api.request.AlipayOpenAppMiniTemplatemessageSendRequest; import com.java3y.austin.common.dto.account.AlipayMiniProgramAccount; @@ -50,11 +48,11 @@ public class AlipayMiniProgramAccountServiceImpl implements AlipayMiniProgramAcc /** * 组装模板消息的参数 */ - private List assembleReq(AlipayMiniProgramParam alipayMiniProgramParam, AlipayMiniProgramAccount alipayMiniProgramAccount){ + private List assembleReq(AlipayMiniProgramParam alipayMiniProgramParam, AlipayMiniProgramAccount alipayMiniProgramAccount) { Set receiver = alipayMiniProgramParam.getToUserId(); List requestList = new ArrayList<>(receiver.size()); - for(String toUserId : receiver){ + for (String toUserId : receiver) { AlipayOpenAppMiniTemplatemessageSendRequest request = new AlipayOpenAppMiniTemplatemessageSendRequest(); AlipayOpenAppMiniTemplatemessageSendModel model = new AlipayOpenAppMiniTemplatemessageSendModel(); model.setToUserId(toUserId); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/config/HandlerThreadPoolConfig.java b/austin-handler/src/main/java/com/java3y/austin/handler/config/HandlerThreadPoolConfig.java index 62aff41..713769f 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/config/HandlerThreadPoolConfig.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/config/HandlerThreadPoolConfig.java @@ -16,6 +16,7 @@ import java.util.concurrent.TimeUnit; public class HandlerThreadPoolConfig { private static final String PRE_FIX = "austin."; + /** * 业务：处理某个渠道的某种类型消息的线程池 * 配置：不丢弃消息，核心线程数不会随着keepAliveTime而减少(不会被回收) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java index b225822..bf9595d 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java @@ -1,6 +1,5 @@ package com.java3y.austin.handler.deduplication; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.DeduplicationType; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java index e946395..941791a 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java @@ -24,7 +24,7 @@ public class ContentDeduplicationBuilder extends AbstractDeduplicationBuilder im public DeduplicationParam build(String deduplication, TaskInfo taskInfo) { DeduplicationParam deduplicationParam = getParamsFromConfig(deduplicationType, deduplication, taskInfo); if (Objects.isNull(deduplicationParam)) { - return null; + return null; } deduplicationParam.setAnchorState(AnchorState.CONTENT_DEDUPLICATION); return deduplicationParam; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/AbstractLimitService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/AbstractLimitService.java index 432022e..8ff7820 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/AbstractLimitService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/AbstractLimitService.java @@ -3,7 +3,8 @@ package com.java3y.austin.handler.deduplication.limit; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.handler.deduplication.service.AbstractDeduplicationService; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * @author cao diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/LimitService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/LimitService.java index 65d8b04..8f5ea10 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/LimitService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/LimitService.java @@ -15,9 +15,10 @@ public interface LimitService { /** * 去重限制 - * @param service 去重器对象 + * + * @param service 去重器对象 * @param taskInfo - * @param param 去重参数 + * @param param 去重参数 * @return 返回不符合条件的手机号码 */ Set limitFilter(AbstractDeduplicationService service, TaskInfo taskInfo, DeduplicationParam param); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java index 84efc77..d45c960 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java @@ -1,7 +1,6 @@ package com.java3y.austin.handler.deduplication.limit; import cn.hutool.core.collection.CollUtil; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.handler.deduplication.DeduplicationParam; @@ -15,6 +14,7 @@ import java.util.stream.Collectors; /** * 采用普通的计数去重方法，限制的是每天发送的条数。 + * * @author cao * @date 2022-04-20 13:41 */ @@ -60,7 +60,7 @@ public class SimpleLimitService extends AbstractLimitService { * @param readyPutRedisReceiver */ private void putInRedis(Map readyPutRedisReceiver, - Map inRedisValue, Long deduplicationTime) { + Map inRedisValue, Long deduplicationTime) { Map keyValues = new HashMap<>(readyPutRedisReceiver.size()); for (Map.Entry entry : readyPutRedisReceiver.entrySet()) { String key = entry.getValue(); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java index ff3d04a..5b26ff3 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java @@ -18,6 +18,7 @@ import java.util.Set; /** * 滑动窗口去重器（内容去重采用基于redis中zset的滑动窗口去重，可以做到严格控制单位时间内的频次。） + * * @author cao * @date 2022-04-20 11:34 */ diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/AbstractDeduplicationService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/AbstractDeduplicationService.java index 5937374..5b46b10 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/AbstractDeduplicationService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/AbstractDeduplicationService.java @@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.PostConstruct; -import java.util.*; +import java.util.Set; /** * @author 3y diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/DeduplicationService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/DeduplicationService.java index a34a0b6..b90a82b 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/DeduplicationService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/DeduplicationService.java @@ -11,6 +11,7 @@ public interface DeduplicationService { /** * 去重 + * * @param param */ void deduplication(DeduplicationParam param); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/discard/DiscardMessageService.java b/austin-handler/src/main/java/com/java3y/austin/handler/discard/DiscardMessageService.java index e056ed6..57939e0 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/discard/DiscardMessageService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/discard/DiscardMessageService.java @@ -2,7 +2,6 @@ package com.java3y.austin.handler.discard; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.TaskInfo; @@ -14,6 +13,7 @@ import org.springframework.stereotype.Service; /** * 丢弃模板消息 + * * @author 3y. */ @Service @@ -25,10 +25,11 @@ public class DiscardMessageService { @Autowired private LogUtils logUtils; - + /** * 丢弃消息，配置在apollo + * * @param taskInfo * @return */ diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/dingding/DingDingRobotParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/dingding/DingDingRobotParam.java index c5f6c01..c007110 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/dingding/DingDingRobotParam.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/dingding/DingDingRobotParam.java @@ -1,5 +1,6 @@ package com.java3y.austin.handler.domain.dingding; +import com.alibaba.fastjson.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -9,7 +10,7 @@ import java.util.List; /** * 钉钉自定义机器人 入参 - * + *

* https://open.dingtalk.com/document/group/custom-robot-access * * @author 3y @@ -168,7 +169,8 @@ public class DingDingRobotParam { /** * actionURL */ - private String actionURL; + @JSONField(name = "actionURL") + private String actionUrl; } } @@ -200,11 +202,13 @@ public class DingDingRobotParam { /** * messageURL */ - private String messageURL; + @JSONField(name = "messageURL") + private String messageUrl; /** * picURL */ - private String picURL; + @JSONField(name = "picURL") + private String picUrl; } } } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushParam.java index 664d748..73b3ca1 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushParam.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushParam.java @@ -10,6 +10,7 @@ import java.util.Set; /** * 推送消息的param + * * @author 3y * https://docs.getui.com/getui/server/rest_v2/push/ */ diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushResult.java index 5175d27..6e2409a 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushResult.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushResult.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; /** * 发送消息后的返回值 + * * @author 3y * https://docs.getui.com/getui/server/rest_v2/common_args/?id=doc-title-1 */ diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/YunPianSendResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/YunPianSendResult.java index 8a02a47..8d4fd86 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/YunPianSendResult.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/YunPianSendResult.java @@ -9,6 +9,7 @@ import java.util.List; /** * 云片网短信调用发送接口返回值 + * * @author 3y */ @NoArgsConstructor diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/enums/RateLimitStrategy.java b/austin-handler/src/main/java/com/java3y/austin/handler/enums/RateLimitStrategy.java index 2109cfc..8a13572 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/enums/RateLimitStrategy.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/enums/RateLimitStrategy.java @@ -15,7 +15,13 @@ import lombok.ToString; public enum RateLimitStrategy { + /** + * 根据真实请求数限流 (实际意义上的QPS） + */ REQUEST_RATE_LIMIT(10, "根据真实请求数限流"), + /** + * 根据发送用户数限流（人数限流） + */ SEND_USER_NUM_RATE_LIMIT(20, "根据发送用户数限流"), ; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java index e617032..d55e258 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java @@ -3,17 +3,12 @@ package com.java3y.austin.handler.flowcontrol; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.util.concurrent.RateLimiter; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.ChannelType; import com.java3y.austin.handler.enums.RateLimitStrategy; import com.java3y.austin.handler.flowcontrol.annotations.LocalRateLimit; import com.java3y.austin.support.service.ConfigService; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.support.AopUtils; import org.springframework.beans.BeansException; @@ -22,6 +17,11 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Service; +import javax.annotation.PostConstruct; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + /** * @author 3y * @date 2022/4/18 @@ -63,7 +63,7 @@ public class FlowControlFactory implements ApplicationContextAware { double costTime = flowControlService.flowControl(taskInfo, flowControlParam); if (costTime > 0) { log.info("consumer {} flow control time {}", - ChannelType.getEnumByCode(taskInfo.getSendChannel()).getDescription(), costTime); + ChannelType.getEnumByCode(taskInfo.getSendChannel()).getDescription(), costTime); } } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/annotations/LocalRateLimit.java b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/annotations/LocalRateLimit.java index b8b5f6a..ce41578 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/annotations/LocalRateLimit.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/annotations/LocalRateLimit.java @@ -9,6 +9,7 @@ import java.lang.annotation.*; * 单机限流注解 * Created by TOM * On 2022/7/21 17:03 + * * @author TOM */ @Target({ElementType.TYPE}) @@ -16,5 +17,5 @@ import java.lang.annotation.*; @Documented @Service public @interface LocalRateLimit { - RateLimitStrategy rateLimitStrategy() default RateLimitStrategy.REQUEST_RATE_LIMIT; + RateLimitStrategy rateLimitStrategy() default RateLimitStrategy.REQUEST_RATE_LIMIT; } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/impl/RequestRateLimitServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/impl/RequestRateLimitServiceImpl.java index 6953769..fd295a3 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/impl/RequestRateLimitServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/impl/RequestRateLimitServiceImpl.java @@ -10,20 +10,21 @@ import com.java3y.austin.handler.flowcontrol.annotations.LocalRateLimit; /** * Created by TOM * On 2022/7/21 17:05 + * * @author TOM */ @LocalRateLimit(rateLimitStrategy = RateLimitStrategy.REQUEST_RATE_LIMIT) public class RequestRateLimitServiceImpl implements FlowControlService { - /** - * 根据渠道进行流量控制 - * - * @param taskInfo - * @param flowControlParam - */ - @Override - public Double flowControl(TaskInfo taskInfo, FlowControlParam flowControlParam) { - RateLimiter rateLimiter = flowControlParam.getRateLimiter(); - return rateLimiter.acquire(1); - } + /** + * 根据渠道进行流量控制 + * + * @param taskInfo + * @param flowControlParam + */ + @Override + public Double flowControl(TaskInfo taskInfo, FlowControlParam flowControlParam) { + RateLimiter rateLimiter = flowControlParam.getRateLimiter(); + return rateLimiter.acquire(1); + } } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/impl/SendUserNumRateLimitServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/impl/SendUserNumRateLimitServiceImpl.java index c84911e..35cd467 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/impl/SendUserNumRateLimitServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/impl/SendUserNumRateLimitServiceImpl.java @@ -10,20 +10,21 @@ import com.java3y.austin.handler.flowcontrol.annotations.LocalRateLimit; /** * Created by TOM * On 2022/7/21 17:14 + * * @author TOM */ @LocalRateLimit(rateLimitStrategy = RateLimitStrategy.SEND_USER_NUM_RATE_LIMIT) public class SendUserNumRateLimitServiceImpl implements FlowControlService { - /** - * 根据渠道进行流量控制 - * - * @param taskInfo - * @param flowControlParam - */ - @Override - public Double flowControl(TaskInfo taskInfo, FlowControlParam flowControlParam) { - RateLimiter rateLimiter = flowControlParam.getRateLimiter(); - return rateLimiter.acquire(taskInfo.getReceiver().size()); - } + /** + * 根据渠道进行流量控制 + * + * @param taskInfo + * @param flowControlParam + */ + @Override + public Double flowControl(TaskInfo taskInfo, FlowControlParam flowControlParam) { + RateLimiter rateLimiter = flowControlParam.getRateLimiter(); + return rateLimiter.acquire(taskInfo.getReceiver().size()); + } } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java index d25b6e9..748eb06 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java @@ -6,9 +6,9 @@ import com.java3y.austin.common.enums.AnchorState; import com.java3y.austin.handler.flowcontrol.FlowControlFactory; import com.java3y.austin.handler.flowcontrol.FlowControlParam; import com.java3y.austin.support.utils.LogUtils; -import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.PostConstruct; import java.util.Objects; /** @@ -54,6 +54,7 @@ public abstract class BaseHandler implements Handler { flowControlFactory.flowControl(taskInfo, flowControlParam); } } + @Override public void doHandler(TaskInfo taskInfo) { flowControl(taskInfo); @@ -65,8 +66,6 @@ public abstract class BaseHandler implements Handler { } - - /** * 统一处理的handler接口 * @@ -76,5 +75,4 @@ public abstract class BaseHandler implements Handler { public abstract boolean handler(TaskInfo taskInfo); - } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/AlipayMiniProgramAccountHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/AlipayMiniProgramAccountHandler.java index 6b90bae..651ea47 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/AlipayMiniProgramAccountHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/AlipayMiniProgramAccountHandler.java @@ -34,7 +34,7 @@ public class AlipayMiniProgramAccountHandler extends BaseHandler implements Hand AlipayMiniProgramParam miniProgramParam = buildMiniProgramParam(taskInfo); try { alipayMiniProgramAccountService.send(miniProgramParam); - }catch (Exception e) { + } catch (Exception e) { log.error("AlipayMiniProgramAccountHandler#handler fail:{},params:{}", Throwables.getStackTraceAsString(e), JSON.toJSONString(taskInfo)); return false; @@ -48,7 +48,7 @@ public class AlipayMiniProgramAccountHandler extends BaseHandler implements Hand * @param taskInfo 任务信息 * @return AlipayMiniProgramParam */ - private AlipayMiniProgramParam buildMiniProgramParam(TaskInfo taskInfo){ + private AlipayMiniProgramParam buildMiniProgramParam(TaskInfo taskInfo) { AlipayMiniProgramParam param = AlipayMiniProgramParam.builder() .toUserId(taskInfo.getReceiver()) .messageTemplateId(taskInfo.getMessageTemplateId()) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingRobotHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingRobotHandler.java index 997db58..d8dbcb2 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingRobotHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingRobotHandler.java @@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; -import com.java3y.austin.common.constant.SendAccountConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.dto.account.DingDingRobotAccount; import com.java3y.austin.common.dto.model.DingDingRobotContentModel; @@ -65,7 +64,6 @@ public class DingDingRobotHandler extends BaseHandler implements Handler { } - private DingDingRobotParam assembleParam(TaskInfo taskInfo) { // 接收者相关 @@ -91,13 +89,13 @@ public class DingDingRobotHandler extends BaseHandler implements Handler { param.setLink(DingDingRobotParam.LinkVO.builder().title(contentModel.getTitle()).text(contentModel.getContent()).messageUrl(contentModel.getUrl()).picUrl(contentModel.getPicUrl()).build()); } if (SendMessageType.NEWS.getCode().equals(contentModel.getSendType())) { - List linksVOS = JSON.parseArray(contentModel.getFeedCards(), DingDingRobotParam.FeedCardVO.LinksVO.class); - DingDingRobotParam.FeedCardVO feedCardVO = DingDingRobotParam.FeedCardVO.builder().links(linksVOS).build(); + List linksVoS = JSON.parseArray(contentModel.getFeedCards(), DingDingRobotParam.FeedCardVO.LinksVO.class); + DingDingRobotParam.FeedCardVO feedCardVO = DingDingRobotParam.FeedCardVO.builder().links(linksVoS).build(); param.setFeedCard(feedCardVO); } if (SendMessageType.ACTION_CARD.getCode().equals(contentModel.getSendType())) { - List btnsVOS = JSON.parseArray(contentModel.getBtns(), DingDingRobotParam.ActionCardVO.BtnsVO.class); - DingDingRobotParam.ActionCardVO actionCardVO = DingDingRobotParam.ActionCardVO.builder().title(contentModel.getTitle()).text(contentModel.getContent()).btnOrientation(contentModel.getBtnOrientation()).btns(btnsVOS).build(); + List btnsVoS = JSON.parseArray(contentModel.getBtns(), DingDingRobotParam.ActionCardVO.BtnsVO.class); + DingDingRobotParam.ActionCardVO actionCardVO = DingDingRobotParam.ActionCardVO.builder().title(contentModel.getTitle()).text(contentModel.getContent()).btnOrientation(contentModel.getBtnOrientation()).btns(btnsVoS).build(); param.setActionCard(actionCardVO); } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java index 19e5954..a2d3bef 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java @@ -7,8 +7,10 @@ import com.alibaba.fastjson.JSON; import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request; +import com.dingtalk.api.request.OapiMessageCorpconversationGetsendresultRequest; import com.dingtalk.api.request.OapiMessageCorpconversationRecallRequest; import com.dingtalk.api.response.OapiMessageCorpconversationAsyncsendV2Response; +import com.dingtalk.api.response.OapiMessageCorpconversationGetsendresultResponse; import com.dingtalk.api.response.OapiMessageCorpconversationRecallResponse; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.AustinConstant; @@ -202,14 +204,13 @@ public class DingDingWorkNoticeHandler extends BaseHandler implements Handler { */ public void pull(Long accountId) { try { -// DingDingWorkNoticeAccount account = accountUtils.getAccountById(accountId, DingDingWorkNoticeAccount.class); -// String accessToken = redisTemplate.opsForValue().get(SendAccountConstant.DING_DING_ACCESS_TOKEN_PREFIX + accountId); -// DingTalkClient client = new DefaultDingTalkClient(PULL_URL); -// OapiMessageCorpconversationGetsendresultRequest req = new OapiMessageCorpconversationGetsendresultRequest(); -// req.setAgentId(Long.valueOf(account.getAgentId())); -// req.setTaskId(456L); -// OapiMessageCorpconversationGetsendresultResponse rsp = client.execute(req, accessToken); -// System.out.println(rsp.getBody()); + DingDingWorkNoticeAccount account = accountUtils.getAccountById(accountId.intValue(), DingDingWorkNoticeAccount.class); + String accessToken = redisTemplate.opsForValue().get(SendAccountConstant.DING_DING_ACCESS_TOKEN_PREFIX + accountId); + DingTalkClient client = new DefaultDingTalkClient(PULL_URL); + OapiMessageCorpconversationGetsendresultRequest req = new OapiMessageCorpconversationGetsendresultRequest(); + req.setAgentId(Long.valueOf(account.getAgentId())); + req.setTaskId(456L); + OapiMessageCorpconversationGetsendresultResponse rsp = client.execute(req, accessToken); } catch (Exception e) { log.error("DingDingWorkNoticeHandler#pull fail:{}", Throwables.getStackTraceAsString(e)); } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EmailHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EmailHandler.java index a9512b2..6442662 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EmailHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EmailHandler.java @@ -5,7 +5,6 @@ import cn.hutool.extra.mail.MailAccount; import cn.hutool.extra.mail.MailUtil; import com.google.common.base.Throwables; import com.google.common.util.concurrent.RateLimiter; -import com.java3y.austin.common.constant.SendAccountConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.dto.model.EmailContentModel; import com.java3y.austin.common.enums.ChannelType; @@ -74,6 +73,7 @@ public class EmailHandler extends BaseHandler implements Handler { } return account; } + @Override public void recall(MessageTemplate messageTemplate) { diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatHandler.java index 4b6a6ae..e319757 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatHandler.java @@ -1,12 +1,10 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; -import com.java3y.austin.common.constant.SendAccountConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.dto.model.EnterpriseWeChatContentModel; import com.java3y.austin.common.enums.ChannelType; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatRobotHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatRobotHandler.java index ba4666d..fb72fc1 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatRobotHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatRobotHandler.java @@ -76,8 +76,8 @@ public class EnterpriseWeChatRobotHandler extends BaseHandler implements Handler param.setFile(EnterpriseWeChatRobotParam.FileDTO.builder().mediaId(contentModel.getMediaId()).build()); } if (SendMessageType.NEWS.getCode().equals(contentModel.getSendType())) { - List articlesDTOS = JSON.parseArray(contentModel.getArticles(), EnterpriseWeChatRobotParam.NewsDTO.ArticlesDTO.class); - param.setNews(EnterpriseWeChatRobotParam.NewsDTO.builder().articles(articlesDTOS).build()); + List articlesDtoS = JSON.parseArray(contentModel.getArticles(), EnterpriseWeChatRobotParam.NewsDTO.ArticlesDTO.class); + param.setNews(EnterpriseWeChatRobotParam.NewsDTO.builder().articles(articlesDtoS).build()); } if (SendMessageType.TEMPLATE_CARD.getCode().equals(contentModel.getSendType())) { // diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/FeiShuRobotHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/FeiShuRobotHandler.java index a18ff07..722b5ce 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/FeiShuRobotHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/FeiShuRobotHandler.java @@ -1,25 +1,17 @@ package com.java3y.austin.handler.handler.impl; -import cn.hutool.core.codec.Base64; -import cn.hutool.core.io.file.FileReader; -import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.http.ContentType; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.google.common.base.Throwables; -import com.java3y.austin.common.constant.SendAccountConstant; import com.java3y.austin.common.domain.TaskInfo; -import com.java3y.austin.common.dto.account.EnterpriseWeChatRobotAccount; import com.java3y.austin.common.dto.account.FeiShuRobotAccount; -import com.java3y.austin.common.dto.model.EnterpriseWeChatRobotContentModel; import com.java3y.austin.common.dto.model.FeiShuRobotContentModel; import com.java3y.austin.common.enums.ChannelType; import com.java3y.austin.common.enums.SendMessageType; import com.java3y.austin.handler.domain.feishu.FeiShuRobotParam; import com.java3y.austin.handler.domain.feishu.FeiShuRobotResult; -import com.java3y.austin.handler.domain.wechat.robot.EnterpriseWeChatRobotParam; import com.java3y.austin.handler.handler.BaseHandler; import com.java3y.austin.handler.handler.Handler; import com.java3y.austin.support.domain.MessageTemplate; @@ -78,9 +70,9 @@ public class FeiShuRobotHandler extends BaseHandler implements Handler { param.setContent(FeiShuRobotParam.ContentDTO.builder().text(contentModel.getContent()).build()); } if (SendMessageType.RICH_TEXT.getCode().equals(contentModel.getSendType())) { - List postContentDTOS = JSON.parseArray(contentModel.getPostContent(), FeiShuRobotParam.ContentDTO.PostDTO.ZhCnDTO.PostContentDTO.class); + List postContentDtoS = JSON.parseArray(contentModel.getPostContent(), FeiShuRobotParam.ContentDTO.PostDTO.ZhCnDTO.PostContentDTO.class); List> postContentList = new ArrayList<>(); - postContentList.add(postContentDTOS); + postContentList.add(postContentDtoS); FeiShuRobotParam.ContentDTO.PostDTO postDTO = FeiShuRobotParam.ContentDTO.PostDTO.builder() .zhCn(FeiShuRobotParam.ContentDTO.PostDTO.ZhCnDTO.builder().title(contentModel.getTitle()).content(postContentList).build()) .build(); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java index 8856452..dfefcb0 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java @@ -12,7 +12,6 @@ import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.dto.account.GeTuiAccount; import com.java3y.austin.common.dto.model.PushContentModel; import com.java3y.austin.common.enums.ChannelType; - import com.java3y.austin.handler.domain.push.PushParam; import com.java3y.austin.handler.domain.push.getui.BatchSendPushParam; import com.java3y.austin.handler.domain.push.getui.SendPushParam; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receipt/MessageReceipt.java b/austin-handler/src/main/java/com/java3y/austin/handler/receipt/MessageReceipt.java index 5b80be1..6c3deb9 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receipt/MessageReceipt.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receipt/MessageReceipt.java @@ -29,7 +29,7 @@ public class MessageReceipt { while (true) { try { for (ReceiptMessageStater receiptMessageStater : receiptMessageStaterList) { - receiptMessageStater.start(); + //receiptMessageStater.start(); } Thread.sleep(2000); } catch (Exception e) { diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java index b9c41d4..4319111 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java @@ -2,24 +2,16 @@ package com.java3y.austin.handler.receiver.kafka; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; -import com.java3y.austin.common.domain.AnchorInfo; -import com.java3y.austin.common.domain.LogParam; import com.java3y.austin.common.domain.TaskInfo; -import com.java3y.austin.common.enums.AnchorState; -import com.java3y.austin.handler.handler.HandlerHolder; -import com.java3y.austin.handler.pending.Task; -import com.java3y.austin.handler.pending.TaskPendingHolder; import com.java3y.austin.handler.receiver.service.ConsumeService; import com.java3y.austin.handler.utils.GroupIdMappingUtils; import com.java3y.austin.support.constans.MessageQueuePipeline; import com.java3y.austin.support.domain.MessageTemplate; -import com.java3y.austin.support.utils.LogUtils; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Scope; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.kafka.support.KafkaHeaders; @@ -40,6 +32,7 @@ import java.util.Optional; public class Receiver { @Autowired private ConsumeService consumeService; + /** * 发送消息 * @@ -64,12 +57,13 @@ public class Receiver { /** * 撤回消息 + * * @param consumerRecord */ - @KafkaListener(topics = "#{'${austin.business.recall.topic.name}'}",groupId = "#{'${austin.business.recall.group.name}'}",containerFactory = "filterContainerFactory") - public void recall(ConsumerRecord consumerRecord){ + @KafkaListener(topics = "#{'${austin.business.recall.topic.name}'}", groupId = "#{'${austin.business.recall.group.name}'}", containerFactory = "filterContainerFactory") + public void recall(ConsumerRecord consumerRecord) { Optional kafkaMessage = Optional.ofNullable(consumerRecord.value()); - if(kafkaMessage.isPresent()){ + if (kafkaMessage.isPresent()) { MessageTemplate messageTemplate = JSON.parseObject(kafkaMessage.get(), MessageTemplate.class); consumeService.consume2recall(messageTemplate); } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/ReceiverStart.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/ReceiverStart.java index 3ba8f00..0ed2951 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/ReceiverStart.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/ReceiverStart.java @@ -80,6 +80,7 @@ public class ReceiverStart { /** * 针对tag消息过滤 * producer 将tag写进header里 + * * @return */ @Bean diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/service/impl/ConsumeServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/service/impl/ConsumeServiceImpl.java index 1983869..f62aa3d 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/service/impl/ConsumeServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/service/impl/ConsumeServiceImpl.java @@ -1,7 +1,6 @@ package com.java3y.austin.handler.receiver.service.impl; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.LogParam; import com.java3y.austin.common.domain.TaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/SmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/SmsScript.java index 4facaba..e062b02 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/SmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/script/SmsScript.java @@ -25,6 +25,7 @@ public interface SmsScript { /** * 拉取回执 + * * @param scriptName 标识账号的脚本名 * @return 渠道商回执接口返回值 */ diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java index 1394cd8..a10fcc3 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java @@ -66,7 +66,7 @@ public class TencentSmsScript implements SmsScript { PullSmsSendStatusResponse resp = client.PullSmsSendStatus(req); return assemblePullSmsRecord(account, resp); } catch (Exception e) { - // log.error("TencentSmsReceipt#pull fail!{}", Throwables.getStackTraceAsString(e)); + log.error("TencentSmsReceipt#pull fail!{}", Throwables.getStackTraceAsString(e)); return null; } } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/shield/ShieldService.java b/austin-handler/src/main/java/com/java3y/austin/handler/shield/ShieldService.java index e0107b2..c1ef99e 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/shield/ShieldService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/shield/ShieldService.java @@ -12,6 +12,7 @@ public interface ShieldService { /** * 屏蔽消息 + * * @param taskInfo */ void shield(TaskInfo taskInfo); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java index 1e5b7b7..e3b9f69 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java @@ -20,6 +20,7 @@ import java.util.HashSet; /** * 屏蔽服务 + * * @author 3y */ @Service @@ -50,7 +51,7 @@ public class ShieldServiceImpl implements ShieldService { } if (ShieldType.NIGHT_SHIELD_BUT_NEXT_DAY_SEND.getCode().equals(taskInfo.getShieldType())) { redisUtils.lPush(NIGHT_SHIELD_BUT_NEXT_DAY_SEND_KEY, JSON.toJSONString(taskInfo, - SerializerFeature.WriteClassName), + SerializerFeature.WriteClassName), (DateUtil.offsetDay(new Date(), 1).getTime() / 1000) - DateUtil.currentSeconds()); logUtils.print(AnchorInfo.builder().state(AnchorState.NIGHT_SHIELD_NEXT_SEND.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build()); } @@ -64,7 +65,7 @@ public class ShieldServiceImpl implements ShieldService { * @return */ private boolean isNight() { - return LocalDateTime.now().getHour() < 8; + return LocalDateTime.now().getHour() < 8; } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java b/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java index dc34b70..183e799 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java @@ -32,6 +32,7 @@ public class GroupIdMappingUtils { /** * 根据TaskInfo获取当前消息的groupId + * * @param taskInfo * @return */ diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java index 0e30b6f..9dcd0e6 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java @@ -33,6 +33,7 @@ public class AfterParamCheckAction implements BusinessProcess { public static final String EMAIL_REGEX_EXP = "^[A-Za-z0-9-_\\u4e00-\\u9fa5]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"; public static final HashMap CHANNEL_REGEX_EXP = new HashMap<>(); + static { CHANNEL_REGEX_EXP.put(IdType.PHONE.getCode(), PHONE_REGEX_EXP); CHANNEL_REGEX_EXP.put(IdType.EMAIL.getCode(), EMAIL_REGEX_EXP); @@ -55,6 +56,7 @@ public class AfterParamCheckAction implements BusinessProcess { /** * 如果指定类型是手机号，检测输入手机号是否合法 * 如果指定类型是邮件，检测输入邮件是否合法 + * * @param taskInfo */ private void filterIllegalReceiver(List taskInfo) { diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java index 61881a9..7360002 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java @@ -5,9 +5,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.google.common.base.Throwables; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.dto.model.ContentModel; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java index 5ae1665..671748f 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java @@ -12,7 +12,6 @@ import com.java3y.austin.support.pipeline.ProcessContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/config/PipelineConfig.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/config/PipelineConfig.java index 1c7d4d1..ad8e045 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/config/PipelineConfig.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/config/PipelineConfig.java @@ -6,18 +6,19 @@ import com.java3y.austin.service.api.impl.action.AfterParamCheckAction; import com.java3y.austin.service.api.impl.action.AssembleAction; import com.java3y.austin.service.api.impl.action.PreParamCheckAction; import com.java3y.austin.service.api.impl.action.SendMqAction; -import com.java3y.austin.service.api.impl.domain.SendTaskModel; -import com.java3y.austin.support.pipeline.BusinessProcess; import com.java3y.austin.support.pipeline.ProcessController; import com.java3y.austin.support.pipeline.ProcessTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; /** * api层的pipeline配置类 + * * @author 3y */ @Configuration @@ -38,6 +39,7 @@ public class PipelineConfig { * 2. 组装参数 * 3. 后置参数校验 * 4. 发送消息至MQ + * * @return */ @Bean("commonSendTemplate") @@ -52,6 +54,7 @@ public class PipelineConfig { * 消息撤回执行流程 * 1.组装参数 * 2.发送MQ + * * @return */ @Bean("recallMessageTemplate") @@ -64,6 +67,7 @@ public class PipelineConfig { /** * pipeline流程控制器 * 后续扩展则加BusinessCode和ProcessTemplate + * * @return */ @Bean diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/RecallServiceImpl.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/RecallServiceImpl.java index 7b89e48..145a358 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/RecallServiceImpl.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/RecallServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; /** * 撤回接口 + * * @author 3y */ @Service diff --git a/austin-service-api-impl/src/test/java/com/java3y/austin/service/api/impl/service/SendServiceImplTest.java b/austin-service-api-impl/src/test/java/com/java3y/austin/service/api/impl/service/SendServiceImplTest.java index 92a8a62..c7d2ad4 100644 --- a/austin-service-api-impl/src/test/java/com/java3y/austin/service/api/impl/service/SendServiceImplTest.java +++ b/austin-service-api-impl/src/test/java/com/java3y/austin/service/api/impl/service/SendServiceImplTest.java @@ -1,15 +1,6 @@ package com.java3y.austin.service.api.impl.service; -import com.java3y.austin.common.enums.RespStatusEnum; -import com.java3y.austin.common.vo.BasicResultVO; -import com.java3y.austin.service.api.domain.BatchSendRequest; -import com.java3y.austin.service.api.domain.MessageParam; -import com.java3y.austin.service.api.domain.SendRequest; -import com.java3y.austin.service.api.domain.SendResponse; -import com.java3y.austin.service.api.enums.BusinessCode; -import com.java3y.austin.service.api.impl.domain.SendTaskModel; import com.java3y.austin.support.pipeline.BusinessProcess; -import com.java3y.austin.support.pipeline.ProcessContext; import com.java3y.austin.support.pipeline.ProcessController; import com.java3y.austin.support.pipeline.ProcessTemplate; import org.junit.jupiter.api.Test; @@ -19,14 +10,8 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Arrays; -import java.util.HashMap; import java.util.Map; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class SendServiceImplTest { diff --git a/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/MessageParam.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/MessageParam.java index 509efa2..5fbb17f 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/MessageParam.java +++ b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/MessageParam.java @@ -11,6 +11,7 @@ import java.util.Map; /** * 消息参数 * single + * * @author 3y */ @Data @@ -38,5 +39,5 @@ public class MessageParam { * @Description: 扩展参数 * 可选 */ - private Map extra; + private Map extra; } diff --git a/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendRequest.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendRequest.java index 3651ed2..4484a83 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendRequest.java +++ b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendRequest.java @@ -9,6 +9,7 @@ import lombok.experimental.Accessors; /** * 发送/撤回接口的参数 + * * @author 3y */ @Data @@ -39,5 +40,4 @@ public class SendRequest { private MessageParam messageParam; - } diff --git a/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendResponse.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendResponse.java index 7c3da90..bb0d496 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendResponse.java +++ b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendResponse.java @@ -7,6 +7,7 @@ import lombok.experimental.Accessors; /** * 发送接口返回值 + * * @author 3y */ @Data diff --git a/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java index 3ef3e49..e0b4b95 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java +++ b/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java @@ -13,17 +13,25 @@ import lombok.ToString; @AllArgsConstructor public enum BusinessCode { - /** 普通发送流程 */ + /** + * 普通发送流程 + */ COMMON_SEND("send", "普通发送"), - /** 撤回流程 */ + /** + * 撤回流程 + */ RECALL("recall", "撤回消息"); - /** code 关联着责任链的模板 */ + /** + * code 关联着责任链的模板 + */ private final String code; - /** 类型说明 */ + /** + * 类型说明 + */ private final String description; diff --git a/austin-service-api/src/main/java/com/java3y/austin/service/api/service/RecallService.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/service/RecallService.java index 95a2897..7795f4f 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/service/api/service/RecallService.java +++ b/austin-service-api/src/main/java/com/java3y/austin/service/api/service/RecallService.java @@ -1,6 +1,5 @@ package com.java3y.austin.service.api.service; -import com.java3y.austin.service.api.domain.BatchSendRequest; import com.java3y.austin.service.api.domain.SendRequest; import com.java3y.austin.service.api.domain.SendResponse; diff --git a/austin-service-api/src/main/java/com/java3y/austin/service/api/service/SendService.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/service/SendService.java index 5ca147d..7de2c69 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/service/api/service/SendService.java +++ b/austin-service-api/src/main/java/com/java3y/austin/service/api/service/SendService.java @@ -14,6 +14,7 @@ public interface SendService { /** * 单文案发送接口 + * * @param sendRequest * @return */ @@ -22,6 +23,7 @@ public interface SendService { /** * 多文案发送接口 + * * @param batchSendRequest * @return */ diff --git a/austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java b/austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java index 5881070..7bf2262 100644 --- a/austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java +++ b/austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java @@ -2,6 +2,7 @@ package com.java3y.austin.stream.constants; /** * Flink常量信息 + * * @author 3y */ public class AustinFlinkConstant { diff --git a/austin-support/src/main/java/com/java3y/austin/support/config/OkHttpConfiguration.java b/austin-support/src/main/java/com/java3y/austin/support/config/OkHttpConfiguration.java index 974942d..7437288 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/config/OkHttpConfiguration.java +++ b/austin-support/src/main/java/com/java3y/austin/support/config/OkHttpConfiguration.java @@ -49,7 +49,7 @@ public class OkHttpConfiguration { .connectionPool(pool()) .connectTimeout(connectTimeout, TimeUnit.SECONDS) .readTimeout(readTimeout, TimeUnit.SECONDS) - .writeTimeout(writeTimeout,TimeUnit.SECONDS) + .writeTimeout(writeTimeout, TimeUnit.SECONDS) .hostnameVerifier((hostname, session) -> true) .build(); } @@ -61,10 +61,12 @@ public class OkHttpConfiguration { public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { } + @Override public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { } + @Override public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; diff --git a/austin-support/src/main/java/com/java3y/austin/support/config/SupportThreadPoolConfig.java b/austin-support/src/main/java/com/java3y/austin/support/config/SupportThreadPoolConfig.java index 9474209..85c00fb 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/config/SupportThreadPoolConfig.java +++ b/austin-support/src/main/java/com/java3y/austin/support/config/SupportThreadPoolConfig.java @@ -10,7 +10,6 @@ import java.util.concurrent.TimeUnit; /** * @author 3y * support 线程池配置类 - * */ public class SupportThreadPoolConfig { diff --git a/austin-support/src/main/java/com/java3y/austin/support/dao/MessageTemplateDao.java b/austin-support/src/main/java/com/java3y/austin/support/dao/MessageTemplateDao.java index 645e3eb..00f976b 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/dao/MessageTemplateDao.java +++ b/austin-support/src/main/java/com/java3y/austin/support/dao/MessageTemplateDao.java @@ -10,6 +10,7 @@ import java.util.List; /** * 消息模板Dao + * * @author 3y */ public interface MessageTemplateDao extends JpaRepository, JpaSpecificationExecutor { @@ -17,6 +18,7 @@ public interface MessageTemplateDao extends JpaRepository /** * 查询 列表（分页) + * * @param deleted 0：未删除 1：删除 * @param pageable 分页对象 * @return @@ -26,6 +28,7 @@ public interface MessageTemplateDao extends JpaRepository /** * 统计未删除的条数 + * * @param deleted * @return */ diff --git a/austin-support/src/main/java/com/java3y/austin/support/domain/MessageTemplate.java b/austin-support/src/main/java/com/java3y/austin/support/domain/MessageTemplate.java index d856c88..717c36d 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/domain/MessageTemplate.java +++ b/austin-support/src/main/java/com/java3y/austin/support/domain/MessageTemplate.java @@ -27,7 +27,7 @@ import java.io.Serializable; public class MessageTemplate implements Serializable { @Id - @GeneratedValue(strategy= GenerationType.IDENTITY) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; /** @@ -145,5 +145,4 @@ public class MessageTemplate implements Serializable { private Integer updated; - } diff --git a/austin-support/src/main/java/com/java3y/austin/support/domain/SmsRecord.java b/austin-support/src/main/java/com/java3y/austin/support/domain/SmsRecord.java index 889e7fe..f7ca74e 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/domain/SmsRecord.java +++ b/austin-support/src/main/java/com/java3y/austin/support/domain/SmsRecord.java @@ -22,7 +22,7 @@ import javax.persistence.Id; public class SmsRecord { @Id - @GeneratedValue(strategy= GenerationType.IDENTITY) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; /** diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusListener.java b/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusListener.java index 5f771fe..172ba4f 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusListener.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusListener.java @@ -15,12 +15,14 @@ public interface EventBusListener { /** * 消费消息 + * * @param lists */ void consume(List lists); /** * 撤回消息 + * * @param messageTemplate */ void recall(MessageTemplate messageTemplate); diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java index 5162178..aa7caad 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java @@ -7,7 +7,6 @@ import com.java3y.austin.support.constans.MessageQueuePipeline; import com.java3y.austin.support.domain.MessageTemplate; import com.java3y.austin.support.mq.SendMqService; import lombok.extern.slf4j.Slf4j; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -30,8 +29,10 @@ public class EventBusSendMqServiceImpl implements SendMqService { private String sendTopic; @Value("${austin.business.recall.topic.name}") private String recallTopic; + /** * 单机 队列默认不支持 tagId过滤（单机无必要） + * * @param topic * @param jsonValue * @param tagId @@ -45,6 +46,7 @@ public class EventBusSendMqServiceImpl implements SendMqService { eventBus.post(JSON.parseObject(jsonValue, MessageTemplate.class)); } } + @Override public void send(String topic, String jsonValue) { send(topic, jsonValue, null); diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/rabbit/RabbitSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/rabbit/RabbitSendMqServiceImpl.java index 79b56ec..71fafc3 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/rabbit/RabbitSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/rabbit/RabbitSendMqServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; /** - * @author xzcawl + * @author xzcawl * @Date 2022/7/15 17:29 */ @Slf4j diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/rocketmq/RocketMqSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/rocketmq/RocketMqSendMqServiceImpl.java index 7caa3ea..bd1800a 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/rocketmq/RocketMqSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/rocketmq/RocketMqSendMqServiceImpl.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; public class RocketMqSendMqServiceImpl implements SendMqService { @Autowired - private RocketMQTemplate rocketMQTemplate; + private RocketMQTemplate rocketMqTemplate; @Override public void send(String topic, String jsonValue, String tagId) { @@ -34,6 +34,6 @@ public class RocketMqSendMqServiceImpl implements SendMqService { @Override public void send(String topic, String jsonValue) { - rocketMQTemplate.send(topic, MessageBuilder.withPayload(jsonValue).build()); + rocketMqTemplate.send(topic, MessageBuilder.withPayload(jsonValue).build()); } } diff --git a/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java index 06367c6..6552dec 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java +++ b/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java @@ -9,6 +9,7 @@ public interface BusinessProcess { /** * 真正处理逻辑 + * * @param context */ void process(ProcessContext context); diff --git a/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessModel.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessModel.java index 2501e0e..dc8bede 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessModel.java +++ b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessModel.java @@ -3,6 +3,7 @@ package com.java3y.austin.support.pipeline; /** * 真正存储着责任链的数据 + * * @author 3y */ public interface ProcessModel { diff --git a/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessTemplate.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessTemplate.java index b773041..3e1a99e 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessTemplate.java +++ b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessTemplate.java @@ -4,6 +4,7 @@ import java.util.List; /** * 业务执行模板（把责任链的逻辑串起来） + * * @author 3y */ public class ProcessTemplate { @@ -13,6 +14,7 @@ public class ProcessTemplate { public List getProcessList() { return processList; } + public void setProcessList(List processList) { this.processList = processList; } diff --git a/austin-support/src/main/java/com/java3y/austin/support/service/ConfigService.java b/austin-support/src/main/java/com/java3y/austin/support/service/ConfigService.java index b73e09a..b5004f4 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/service/ConfigService.java +++ b/austin-support/src/main/java/com/java3y/austin/support/service/ConfigService.java @@ -12,6 +12,7 @@ public interface ConfigService { * 读取配置 * 1、当启动使用了apollo或者nacos，优先读取远程配置 * 2、当没有启动远程配置，读取本地 local.properties 配置文件的内容 + * * @param key * @param defaultValue * @return diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java index 10f7707..4437659 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java @@ -55,8 +55,8 @@ public class NacosUtils { try { request.put(PropertyKeyConst.SERVER_ADDR, nacosServer); request.put(PropertyKeyConst.NAMESPACE, nacosNamespace); - request.put(PropertyKeyConst.USERNAME,nacosUsername); - request.put(PropertyKeyConst.PASSWORD,nacosPassword); + request.put(PropertyKeyConst.USERNAME, nacosUsername); + request.put(PropertyKeyConst.PASSWORD, nacosPassword); context = NacosFactory.createConfigService(request) .getConfig(nacosDataId, nacosGroup, 5000); } catch (NacosException e) { diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java index bd01ed1..d44ed2d 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java @@ -2,7 +2,6 @@ package com.java3y.austin.support.utils; import cn.hutool.core.collection.CollUtil; import com.google.common.base.Throwables; -import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/TaskInfoUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/TaskInfoUtils.java index 87936f9..f450d77 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/TaskInfoUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/TaskInfoUtils.java @@ -2,7 +2,6 @@ package com.java3y.austin.support.utils; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import com.java3y.austin.common.constant.CommonConstant; import java.util.Date; @@ -33,6 +32,7 @@ public class TaskInfoUtils { public static Long getMessageTemplateIdFromBusinessId(Long businessId) { return Long.valueOf(String.valueOf(businessId).substring(1, 8)); } + /** * 从businessId切割出日期 */ diff --git a/austin-web/src/main/java/com/java3y/austin/web/config/SwaggerConfiguration.java b/austin-web/src/main/java/com/java3y/austin/web/config/SwaggerConfiguration.java index fb0a879..f3b543e 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/config/SwaggerConfiguration.java +++ b/austin-web/src/main/java/com/java3y/austin/web/config/SwaggerConfiguration.java @@ -14,6 +14,7 @@ import springfox.documentation.spring.web.plugins.Docket; /** * swagger配置类 + * * @author 3y */ @Component @@ -22,7 +23,7 @@ import springfox.documentation.spring.web.plugins.Docket; public class SwaggerConfiguration { /** * 对C端用户的接口文档 - * + *

* 地址：http://localhost:8080/swagger-ui/index.html * * @return @@ -42,6 +43,7 @@ public class SwaggerConfiguration { //.paths(PathSelectors.ant("/api/**")) .build(); } + private ApiInfo apiInfo() { return new ApiInfoBuilder() .title("austin平台") diff --git a/austin-web/src/main/java/com/java3y/austin/web/config/WeChatLoginConfig.java b/austin-web/src/main/java/com/java3y/austin/web/config/WeChatLoginConfig.java index 287c986..01056bd 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/config/WeChatLoginConfig.java +++ b/austin-web/src/main/java/com/java3y/austin/web/config/WeChatLoginConfig.java @@ -49,7 +49,7 @@ public class WeChatLoginConfig { private WxMpMessageRouter wxMpMessageRouter; @Autowired - private Map WxMpMessageHandlers; + private Map wxMpMessageHandlers; @PostConstruct @@ -66,9 +66,9 @@ public class WeChatLoginConfig { */ private void initRouter() { wxMpMessageRouter = new WxMpMessageRouter(officialAccountLoginService); - wxMpMessageRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT).event(WxConsts.EventType.SUBSCRIBE).handler(WxMpMessageHandlers.get(OfficialAccountParamConstant.SUBSCRIBE_HANDLER)).end(); - wxMpMessageRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT).event(WxConsts.EventType.SCAN).handler(WxMpMessageHandlers.get(OfficialAccountParamConstant.SCAN_HANDLER)).end(); - wxMpMessageRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT).event(WxConsts.EventType.UNSUBSCRIBE).handler(WxMpMessageHandlers.get(OfficialAccountParamConstant.UNSUBSCRIBE_HANDLER)).end(); + wxMpMessageRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT).event(WxConsts.EventType.SUBSCRIBE).handler(wxMpMessageHandlers.get(OfficialAccountParamConstant.SUBSCRIBE_HANDLER)).end(); + wxMpMessageRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT).event(WxConsts.EventType.SCAN).handler(wxMpMessageHandlers.get(OfficialAccountParamConstant.SCAN_HANDLER)).end(); + wxMpMessageRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT).event(WxConsts.EventType.UNSUBSCRIBE).handler(wxMpMessageHandlers.get(OfficialAccountParamConstant.UNSUBSCRIBE_HANDLER)).end(); } /** diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java index c98191b..8c59ad8 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java @@ -12,7 +12,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.Objects; diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/MaterialController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/MaterialController.java index 642ab1a..a7c8310 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/MaterialController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/MaterialController.java @@ -8,7 +8,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/MiniProgramController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/MiniProgramController.java index a7c11c4..c5ac85e 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/MiniProgramController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/MiniProgramController.java @@ -14,7 +14,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.bean.subscribemsg.TemplateInfo; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java index e4f75fb..d73284f 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java @@ -210,7 +210,7 @@ public class OfficialAccountController { */ @RequestMapping("/delete/test/user") @ApiOperation("/删除测试号的测试用户") - public BasicResultVO deleteTestUser(HttpServletRequest request ) { + public BasicResultVO deleteTestUser(HttpServletRequest request) { try { String cookie = request.getHeader("Cookie"); List openIds = loginUtils.getLoginConfig() diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/RefreshTokenController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/RefreshTokenController.java index e0f89a5..a4f21f8 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/RefreshTokenController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/RefreshTokenController.java @@ -27,6 +27,7 @@ public class RefreshTokenController { /** * 按照不同的渠道刷新对应的Token，channelType取值来源com.java3y.austin.common.enums.ChannelType + * * @param channelType * @return */ diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java index 9259433..dda2f74 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; * @author 三歪 */ -@Api(tags={"发送消息"}) +@Api(tags = {"发送消息"}) @RestController public class SendController { @@ -26,9 +26,10 @@ public class SendController { /** * 发送消息接口 * 入参完整示例：curl -XPOST "127.0.0.1:8080/send" -H 'Content-Type: application/json' -d '{"code":"send","messageParam":{"receiver":"13788888888","variables":{"title":"yyyyyy","contentValue":"6666164180"}},"messageTemplateId":1}' + * * @return */ - @ApiOperation(value = "下发接口",notes = "多渠道多类型下发消息，目前支持邮件和短信，类型支持：验证码、通知类、营销类。") + @ApiOperation(value = "下发接口", notes = "多渠道多类型下发消息，目前支持邮件和短信，类型支持：验证码、通知类、营销类。") @PostMapping("/send") public SendResponse send(@RequestBody SendRequest sendRequest) { return sendService.send(sendRequest); diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/ChannelAccountService.java b/austin-web/src/main/java/com/java3y/austin/web/service/ChannelAccountService.java index 7667c2e..7e940f2 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/ChannelAccountService.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/ChannelAccountService.java @@ -25,15 +25,16 @@ public interface ChannelAccountService { * 根据渠道标识查询账号信息 * * @param channelType 渠道标识 - * @param creator 创建者 + * @param creator 创建者 * @return */ - List queryByChannelType(Integer channelType,String creator); + List queryByChannelType(Integer channelType, String creator); /** * 列表信息 * + * @param creator * @return */ List list(String creator); diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/MaterialService.java b/austin-web/src/main/java/com/java3y/austin/web/service/MaterialService.java index dfeb0b7..89c0557 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/MaterialService.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/MaterialService.java @@ -14,6 +14,7 @@ public interface MaterialService { /** * 钉钉素材上传 + * * @param file * @param sendAccount * @param fileType @@ -24,6 +25,7 @@ public interface MaterialService { /** * 企业微信（机器人）素材上传 + * * @param file * @param sendAccount * @param fileType @@ -33,6 +35,7 @@ public interface MaterialService { /** * 企业微信（应用消息）素材上传 + * * @param file * @param sendAccount * @param fileType diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/MessageTemplateService.java b/austin-web/src/main/java/com/java3y/austin/web/service/MessageTemplateService.java index bdceb26..7a80666 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/MessageTemplateService.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/MessageTemplateService.java @@ -66,6 +66,7 @@ public interface MessageTemplateService { /** * 启动模板的定时任务 + * * @param id * @return */ @@ -73,6 +74,7 @@ public interface MessageTemplateService { /** * 暂停模板的定时任务 + * * @param id * @return */ diff --git a/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java b/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java index 6b3a398..9d47f7b 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java +++ b/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java @@ -60,7 +60,7 @@ public class Convert4Amis { * 需要格式化为jsonArray返回的字段 * (前端是一个JSONArray传递进来) */ - private static final List PARSE_JSON_ARRAY = Arrays.asList("feedCards", "btns","articles"); + private static final List PARSE_JSON_ARRAY = Arrays.asList("feedCards", "btns", "articles"); /** * (前端是一个JSONObject传递进来，返回一个JSONArray回去) @@ -166,7 +166,7 @@ public class Convert4Amis { .editable(true) .needConfirm(false) .build(); - List columnsDTOS = new ArrayList<>(); + List columnsDtoS = new ArrayList<>(); for (String datum : data) { String name = datum.substring(datum.indexOf("{{") + 2, datum.indexOf(".")); CommonAmisVo.ColumnsDTO.ColumnsDTOBuilder dtoBuilder = CommonAmisVo.ColumnsDTO.builder().name(name).type("input-text").required(true).quickEdit(true); @@ -177,9 +177,9 @@ public class Convert4Amis { } else { dtoBuilder.label(datum.split("：")[0]); } - columnsDTOS.add(dtoBuilder.build()); + columnsDtoS.add(dtoBuilder.build()); } - officialAccountParam.setColumns(columnsDTOS); + officialAccountParam.setColumns(columnsDtoS); } } @@ -209,12 +209,12 @@ public class Convert4Amis { .editable(true) .needConfirm(false) .build(); - List columnsDTOS = new ArrayList<>(); + List columnsDtoS = new ArrayList<>(); for (String param : placeholderList) { CommonAmisVo.ColumnsDTO dto = CommonAmisVo.ColumnsDTO.builder().name(param).label(param).type("input-text").required(true).quickEdit(true).build(); - columnsDTOS.add(dto); + columnsDtoS.add(dto); } - testParam.setColumns(columnsDTOS); + testParam.setColumns(columnsDtoS); return testParam; } @@ -304,15 +304,15 @@ public class Convert4Amis { .editable(true) .needConfirm(false) .build(); - List columnsDTOS = new ArrayList<>(); + List columnsDtoS = new ArrayList<>(); for (String datum : data) { String name = datum.substring(datum.indexOf("{{") + 2, datum.indexOf(".")); String label = datum.split(":")[0]; CommonAmisVo.ColumnsDTO columnsDTO = CommonAmisVo.ColumnsDTO.builder() .name(name).type("input-text").required(true).quickEdit(true).label(label).build(); - columnsDTOS.add(columnsDTO); + columnsDtoS.add(columnsDTO); } - officialAccountParam.setColumns(columnsDTOS); + officialAccountParam.setColumns(columnsDtoS); } } @@ -349,7 +349,7 @@ public class Convert4Amis { CommonAmisVo service = CommonAmisVo.builder().type("service") .api(CommonAmisVo.ApiDTO.builder().url("${ls:backend_url}/officialAccount/check/login?sceneId=" + id) - .adaptor(adaptor).requestAdaptor(requestAdaptor).build()).interval(2000).silentPolling(true).build(); + .adaptor(adaptor).requestAdaptor(requestAdaptor).build()).interval(2000).silentPolling(true).build(); return CommonAmisVo.builder().type("form").title("登录").mode("horizontal").body(Arrays.asList(image, service)).build(); } @@ -373,6 +373,7 @@ public class Convert4Amis { /** * 【这个方法不用看】，纯粹为了适配amis前端 * 获取 EchartsVo + * * @param anchorResult * @param businessId * @return @@ -394,9 +395,9 @@ public class Convert4Amis { return EchartsVo.builder() .title(EchartsVo.TitleVO.builder().text(title).build()) .legend(EchartsVo.LegendVO.builder().data(Arrays.asList("人数")).build()) - .xAxis(EchartsVo.XAxisVO.builder().data(xAxisList).build()) + .xAxis(EchartsVo.XaxisVO.builder().data(xAxisList).build()) .series(Arrays.asList(EchartsVo.SeriesVO.builder().name("人数").type("bar").data(actualData).build())) - .yAxis(EchartsVo.YAxisVO.builder().build()) + .yAxis(EchartsVo.YaxisVO.builder().build()) .tooltip(EchartsVo.TooltipVO.builder().build()) .build(); @@ -405,12 +406,13 @@ public class Convert4Amis { /** * 【这个方法不用看】，纯粹为了适配amis前端 * 获取 SmsTimeLineVo + * * @return */ public static SmsTimeLineVo getSmsTimeLineVo(Map> maps) { - ArrayList itemsVOS = new ArrayList<>(); - SmsTimeLineVo smsTimeLineVo = SmsTimeLineVo.builder().items(itemsVOS).build(); + ArrayList itemsVoS = new ArrayList<>(); + SmsTimeLineVo smsTimeLineVo = SmsTimeLineVo.builder().items(itemsVoS).build(); for (Map.Entry> entry : maps.entrySet()) { SmsTimeLineVo.ItemsVO itemsVO = SmsTimeLineVo.ItemsVO.builder().build(); @@ -427,7 +429,7 @@ public class Convert4Amis { itemsVO.setReceiveTime(DateUtil.format(new Date(Long.valueOf(smsRecord.getUpdated() * 1000L)), DatePattern.NORM_DATETIME_PATTERN)); } } - itemsVOS.add(itemsVO); + itemsVoS.add(itemsVO); } return smsTimeLineVo; diff --git a/austin-web/src/main/java/com/java3y/austin/web/utils/SpringFileUtils.java b/austin-web/src/main/java/com/java3y/austin/web/utils/SpringFileUtils.java index bccd966..ce6892e 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/utils/SpringFileUtils.java +++ b/austin-web/src/main/java/com/java3y/austin/web/utils/SpringFileUtils.java @@ -12,7 +12,6 @@ import java.util.Objects; /** * @author 3y * multipartFile 转成 File 对象 - * */ public class SpringFileUtils { diff --git a/austin-web/src/main/java/com/java3y/austin/web/vo/DataParam.java b/austin-web/src/main/java/com/java3y/austin/web/vo/DataParam.java index 416bb29..ca05462 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/vo/DataParam.java +++ b/austin-web/src/main/java/com/java3y/austin/web/vo/DataParam.java @@ -37,6 +37,4 @@ public class DataParam { private Long dateTime; - - } diff --git a/austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateVo.java b/austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateVo.java index 0e9d27f..c5b97c6 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateVo.java +++ b/austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateVo.java @@ -22,7 +22,7 @@ public class MessageTemplateVo { /** * 返回List列表 */ - private List> rows; + private List> rows; /** * 总条数 diff --git a/austin-web/src/main/java/com/java3y/austin/web/vo/UploadResponseVo.java b/austin-web/src/main/java/com/java3y/austin/web/vo/UploadResponseVo.java index de7c0ef..0dd0130 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/vo/UploadResponseVo.java +++ b/austin-web/src/main/java/com/java3y/austin/web/vo/UploadResponseVo.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; /** * 上传后成功返回素材的Id + * * @author 3y */ @Builder diff --git a/austin-web/src/main/java/com/java3y/austin/web/vo/amis/EchartsVo.java b/austin-web/src/main/java/com/java3y/austin/web/vo/amis/EchartsVo.java index 04b84ba..dd7522f 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/vo/amis/EchartsVo.java +++ b/austin-web/src/main/java/com/java3y/austin/web/vo/amis/EchartsVo.java @@ -38,12 +38,12 @@ public class EchartsVo { * xAxis x轴 */ @JsonProperty - private XAxisVO xAxis; + private XaxisVO xAxis; /** * yAxis y轴 */ @JsonProperty - private YAxisVO yAxis; + private YaxisVO yAxis; /** * series 系列列表 *

@@ -91,7 +91,7 @@ public class EchartsVo { @Data @Builder - public static class XAxisVO { + public static class XaxisVO { /** * data */ @@ -103,7 +103,7 @@ public class EchartsVo { */ @Data @Builder - public static class YAxisVO { + public static class YaxisVO { private String type; } diff --git a/docker-compose.yml b/docker-compose.yml index 0db2999..ade9d9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,13 +14,13 @@ services: volumes: - ./sql/austin.sql:/docker-entrypoint-initdb.d/init.sql ports: - - 23306:3306 + - "23306:3306" networks: - app austin-redis: image: redis:3.2 ports: - - 16379:6379 + - "16379:6379" restart: always container_name: austin-redis volumes: @@ -104,11 +104,18 @@ services: - app depends_on: - austin-mysql + austin-metabase: + image: metabase:latest + container_name: austin-metabase + ports: + - "5001:3000" + networks: + - app austin: build: context: ./ ports: - - 7777:7777 + - "7777:7777" restart: always container_name: austin environment: