cuihaojie
/
xiaoxi.austin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.merge

Browse Source 
1.遵循阿里插件规划 修正代码
master
3y 3 years ago
parent 01061c6093
commit 15220b5cee
16 changed files with 75 additions and 97 deletions
Show Stats Download Patch File Download Diff File

2
austin-common/src/main/java/com/java3y/austin/enums/ChannelType.java
Unescape View File

@ -43,7 +43,7 @@ public enum ChannelType {
/**
* 英文标识
*/
private String code_en;
private String codeEn;
/**
* 通过code获取class

2
austin-common/src/main/java/com/java3y/austin/enums/MessageType.java
Unescape View File

@ -30,7 +30,7 @@ public enum MessageType {
/**
* 英文标识
*/
private String code_en;
private String codeEn;
/**

52
austin-handler/src/main/java/com/java3y/austin/handler/BaseHandler.java
Unescape View File

@ -0,0 +1,52 @@
package com.java3y.austin.handler;
import com.java3y.austin.domain.AnchorInfo;
import com.java3y.austin.domain.TaskInfo;
import com.java3y.austin.enums.AnchorState;
import com.java3y.austin.utils.LogUtils;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
/**
* @author 3y
* 发送各个渠道的handler
*/
public abstract class BaseHandler implements Handler {
/**
* 标识渠道的Code
* 子类初始化的时候指定
*/
protected Integer channelCode;
@Autowired
private HandlerHolder handlerHolder;
/**
* 初始化渠道与Handler的映射关系
*/
@PostConstruct
private void init() {
handlerHolder.putHandler(channelCode, this);
}
@Override
public void doHandler(TaskInfo taskInfo) {
if (handler(taskInfo)) {
LogUtils.print(AnchorInfo.builder().state(AnchorState.SEND_SUCCESS.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build());
return;
}
LogUtils.print(AnchorInfo.builder().state(AnchorState.SEND_FAIL.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build());
}
/**
* 统一处理的handler接口
*
* @param taskInfo
* @return
*/
public abstract boolean handler(TaskInfo taskInfo);
}

2
austin-handler/src/main/java/com/java3y/austin/handler/EmailHandler.java
Unescape View File

@ -21,7 +21,7 @@ import org.springframework.stereotype.Component;
*/
@Component
@Slf4j
public class EmailHandler extends Handler {
public class EmailHandler extends BaseHandler implements Handler {
private static final String EMAIL_ACCOUNT_KEY = "emailAccount";
private static final String PREFIX = "email_";

42
austin-handler/src/main/java/com/java3y/austin/handler/Handler.java
Unescape View File

@ -1,51 +1,17 @@
package com.java3y.austin.handler;
import com.java3y.austin.domain.AnchorInfo;
import com.java3y.austin.domain.TaskInfo;
import com.java3y.austin.enums.AnchorState;
import com.java3y.austin.utils.LogUtils;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
/**
* @author 3y
* 发送各个渠道的handler
* 消息处理器
*/
public abstract class Handler {
/**
* 标识渠道的Code
* 子类初始化的时候指定
*/
protected Integer channelCode;
@Autowired
private HandlerHolder handlerHolder;
/**
* 初始化渠道与Handler的映射关系
*/
@PostConstruct
private void init() {
handlerHolder.putHandler(channelCode, this);
}
public void doHandler(TaskInfo taskInfo) {
if (handler(taskInfo)) {
LogUtils.print(AnchorInfo.builder().state(AnchorState.SEND_SUCCESS.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build());
return;
}
LogUtils.print(AnchorInfo.builder().state(AnchorState.SEND_FAIL.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build());
}
public interface Handler {
/**
* 统一处理的handler接口
*
* 处理器
* @param taskInfo
* @return
*/
public abstract boolean handler(TaskInfo taskInfo);
void doHandler(TaskInfo taskInfo);
}

2
austin-handler/src/main/java/com/java3y/austin/handler/SmsHandler.java
Unescape View File

@ -24,7 +24,7 @@ import java.util.List;
*/
@Component
@Slf4j
public class SmsHandler extends Handler {
public class SmsHandler extends BaseHandler implements Handler {
public SmsHandler() {
channelCode = ChannelType.SMS.getCode();

3
austin-handler/src/main/java/com/java3y/austin/script/SmsScript.java
Unescape View File

@ -11,12 +11,11 @@ import java.util.List;
*/
public interface SmsScript {
/**
* 发送短信
*
* @param smsParam
* @return 渠道商接口返回值
* @throws Exception
*/
List<SmsRecord> send(SmsParam smsParam) throws Exception;

2
austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/AbstractDeduplicationService.java
Unescape View File

@ -94,7 +94,7 @@ public abstract class AbstractDeduplicationService implements DeduplicationServi
}
}
if (CollUtil.isNotEmpty(keyValues)) {
redisUtils.pipelineSetEX(keyValues, param.getDeduplicationTime());
redisUtils.pipelineSetEx(keyValues, param.getDeduplicationTime());
}
}

6
austin-handler/src/main/java/com/java3y/austin/utils/GroupIdMappingUtils.java
Unescape View File

@ -23,7 +23,7 @@ public class GroupIdMappingUtils {
List<String> groupIds = new ArrayList<>();
for (ChannelType channelType : ChannelType.values()) {
for (MessageType messageType : MessageType.values()) {
groupIds.add(channelType.getCode_en() + "." + messageType.getCode_en());
groupIds.add(channelType.getCodeEn() + "." + messageType.getCodeEn());
}
}
return groupIds;
@ -36,8 +36,8 @@ public class GroupIdMappingUtils {
* @return
*/
public static String getGroupIdByTaskInfo(TaskInfo taskInfo) {
String channelCodeEn = ChannelType.getEnumByCode(taskInfo.getSendChannel()).getCode_en();
String msgCodeEn = MessageType.getEnumByCode(taskInfo.getMsgType()).getCode_en();
String channelCodeEn = ChannelType.getEnumByCode(taskInfo.getSendChannel()).getCodeEn();
String msgCodeEn = MessageType.getEnumByCode(taskInfo.getMsgType()).getCodeEn();
return channelCodeEn + "." + msgCodeEn;
}
}

4
austin-support/src/main/java/com/java3y/austin/utils/ContentHolderUtil.java
Unescape View File

@ -27,7 +27,7 @@ public class ContentHolderUtil {
private static final StandardEvaluationContext EVALUATION_CONTEXT;
private static final PropertyPlaceholderHelper propertyPlaceholderHelper = new PropertyPlaceholderHelper(
private static final PropertyPlaceholderHelper PROPERTY_PLACEHOLDER_HELPER = new PropertyPlaceholderHelper(
PLACE_HOLDER_PREFIX, PLACE_HOLDER_SUFFIX);
static {
@ -36,7 +36,7 @@ public class ContentHolderUtil {
}
public static String replacePlaceHolder(final String template, final Map<String, String> paramMap) {
String replacedPushContent = propertyPlaceholderHelper.replacePlaceholders(template,
String replacedPushContent = PROPERTY_PLACEHOLDER_HELPER.replacePlaceholders(template,
new CustomPlaceholderResolver(paramMap));
return replacedPushContent;
}

3
austin-support/src/main/java/com/java3y/austin/utils/LogUtils.java
Unescape View File

@ -8,10 +8,9 @@ import com.java3y.austin.domain.LogParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.Date;
/**
* 所有的日志都存在
* @author 3y
*/
@Slf4j
@Component

2
austin-support/src/main/java/com/java3y/austin/utils/RedisUtils.java
Unescape View File

@ -47,7 +47,7 @@ public class RedisUtils {
/**
* pipeline 设置 key-value 并设置过期时间
*/
public void pipelineSetEX(Map<String, String> keyValues, Long seconds) {
public void pipelineSetEx(Map<String, String> keyValues, Long seconds) {
try {
redisTemplate.executePipelined((RedisCallback<String>) connection -> {
for (Map.Entry<String, String> entry : keyValues.entrySet()) {

3
austin-support/src/main/java/com/java3y/austin/utils/TaskInfoUtils.java
Unescape View File

@ -13,6 +13,7 @@ import java.util.Date;
public class TaskInfoUtils {
private static final int TYPE_FLAG = 1000000;
private static final char PARAM = '?';
/**
* 生成BusinessId
@ -30,7 +31,7 @@ public class TaskInfoUtils {
public static String generateUrl(String url, Long templateId, Integer templateType) {
url = url.trim();
Long businessId = generateBusinessId(templateId, templateType);
if (url.indexOf('?') == -1) {
if (url.indexOf(PARAM) == -1) {
return url + "?track_code_bid=" + businessId;
} else {
return url + "&track_code_bid=" + businessId;

4
austin-web/src/main/java/com/java3y/austin/config/SwaggerConfiguration.java
Unescape View File

@ -12,6 +12,10 @@ import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
/**
* swagger配置类
* @author 3y
*/
@Component
@EnableOpenApi
@ApiModel

18
austin-web/src/main/java/com/java3y/austin/controller/ApolloController.java
Unescape View File

@ -1,18 +0,0 @@
package com.java3y.austin.controller;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class ApolloController {
@ApolloConfig("boss.austin")
private Config config;
@RequestMapping("/apollo")
public String testApollo() {
return config.getProperty("a", "b");
}
}

25
austin-web/src/main/java/com/java3y/austin/controller/RedisController.java
Unescape View File

@ -1,25 +0,0 @@
package com.java3y.austin.controller;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 3y
* @date 2021/12/9
*/
@RestController
@Slf4j
public class RedisController {
@Autowired
private RedisTemplate<String, String> redisTemplate;
@RequestMapping("/redis")
public void testRedis() {
log.info(redisTemplate.opsForValue().get("1"));
}
}
Write Preview
Loading…
Cancel
Save