mirror of
https://github.com/zongzibinbin/MallChat.git
synced 2026-03-13 21:53:41 +08:00
fix: 代码规范化修改
This commit is contained in:
@@ -6,10 +6,12 @@ import org.springframework.context.ApplicationEvent;
|
|||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public class MessageMarkEvent extends ApplicationEvent {
|
public class MessageMarkEvent extends ApplicationEvent {
|
||||||
private ChatMessageMarkDTO dto;
|
|
||||||
|
private final ChatMessageMarkDTO dto;
|
||||||
|
|
||||||
public MessageMarkEvent(Object source, ChatMessageMarkDTO dto) {
|
public MessageMarkEvent(Object source, ChatMessageMarkDTO dto) {
|
||||||
super(source);
|
super(source);
|
||||||
this.dto = dto;
|
this.dto = dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,12 @@ import org.springframework.context.ApplicationEvent;
|
|||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public class MessageRecallEvent extends ApplicationEvent {
|
public class MessageRecallEvent extends ApplicationEvent {
|
||||||
private ChatMsgRecallDTO recallDTO;
|
|
||||||
|
private final ChatMsgRecallDTO recallDTO;
|
||||||
|
|
||||||
public MessageRecallEvent(Object source, ChatMsgRecallDTO recallDTO) {
|
public MessageRecallEvent(Object source, ChatMsgRecallDTO recallDTO) {
|
||||||
super(source);
|
super(source);
|
||||||
this.recallDTO = recallDTO;
|
this.recallDTO = recallDTO;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ public abstract class AbstractRedisStringCache<IN, OUT> implements BatchCache<IN
|
|||||||
|
|
||||||
private Class<OUT> outClass;
|
private Class<OUT> outClass;
|
||||||
|
|
||||||
public AbstractRedisStringCache() {
|
protected AbstractRedisStringCache() {
|
||||||
ParameterizedType genericSuperclass = (ParameterizedType) this.getClass().getGenericSuperclass();
|
ParameterizedType genericSuperclass = (ParameterizedType) this.getClass().getGenericSuperclass();
|
||||||
this.outClass = (Class<OUT>) genericSuperclass.getActualTypeArguments()[1];
|
this.outClass = (Class<OUT>) genericSuperclass.getActualTypeArguments()[1];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
|
|||||||
import org.springframework.expression.spel.support.StandardEvaluationContext;
|
import org.springframework.expression.spel.support.StandardEvaluationContext;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Description: spring el表达式解析
|
* Description: spring el表达式解析
|
||||||
@@ -19,7 +20,7 @@ public class SpElUtils {
|
|||||||
private static final DefaultParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
|
private static final DefaultParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
|
||||||
|
|
||||||
public static String parseSpEl(Method method, Object[] args, String spEl) {
|
public static String parseSpEl(Method method, Object[] args, String spEl) {
|
||||||
String[] params = parameterNameDiscoverer.getParameterNames(method);//解析参数名
|
String[] params = Optional.ofNullable(parameterNameDiscoverer.getParameterNames(method)).orElse(new String[]{});//解析参数名
|
||||||
EvaluationContext context = new StandardEvaluationContext();//el解析需要的上下文对象
|
EvaluationContext context = new StandardEvaluationContext();//el解析需要的上下文对象
|
||||||
for (int i = 0; i < params.length; i++) {
|
for (int i = 0; i < params.length; i++) {
|
||||||
context.setVariable(params[i], args[i]);//所有参数都作为原材料扔进去
|
context.setVariable(params[i], args[i]);//所有参数都作为原材料扔进去
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public enum ItemEnum {
|
|||||||
cache = Arrays.stream(ItemEnum.values()).collect(Collectors.toMap(ItemEnum::getId, Function.identity()));
|
cache = Arrays.stream(ItemEnum.values()).collect(Collectors.toMap(ItemEnum::getId, Function.identity()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemEnum of(Integer type) {
|
public static ItemEnum of(Long type) {
|
||||||
return cache.get(type);
|
return cache.get(type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ public enum RoleEnum {
|
|||||||
cache = Arrays.stream(RoleEnum.values()).collect(Collectors.toMap(RoleEnum::getId, Function.identity()));
|
cache = Arrays.stream(RoleEnum.values()).collect(Collectors.toMap(RoleEnum::getId, Function.identity()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RoleEnum of(Integer type) {
|
public static RoleEnum of(Long type) {
|
||||||
return cache.get(type);
|
return cache.get(type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,10 +33,10 @@ import java.util.concurrent.TimeUnit;
|
|||||||
@Service
|
@Service
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class IpServiceImpl implements IpService, DisposableBean {
|
public class IpServiceImpl implements IpService, DisposableBean {
|
||||||
private static ExecutorService executor = new ThreadPoolExecutor(1, 1,
|
private static final ExecutorService EXECUTOR = new ThreadPoolExecutor(1, 1,
|
||||||
0L, TimeUnit.MILLISECONDS,
|
0L, TimeUnit.MILLISECONDS,
|
||||||
new LinkedBlockingQueue<Runnable>(500),
|
new LinkedBlockingQueue<>(500),
|
||||||
new NamedThreadFactory("refresh-ipDetail", (ThreadGroup) null, false,
|
new NamedThreadFactory("refresh-ipDetail", null, false,
|
||||||
new GlobalUncaughtExceptionHandler()));
|
new GlobalUncaughtExceptionHandler()));
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -47,7 +47,7 @@ public class IpServiceImpl implements IpService, DisposableBean {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void refreshIpDetailAsync(Long uid) {
|
public void refreshIpDetailAsync(Long uid) {
|
||||||
executor.execute(() -> {
|
EXECUTOR.execute(() -> {
|
||||||
User user = userDao.getById(uid);
|
User user = userDao.getById(uid);
|
||||||
IpInfo ipInfo = user.getIpInfo();
|
IpInfo ipInfo = user.getIpInfo();
|
||||||
if (Objects.isNull(ipInfo)) {
|
if (Objects.isNull(ipInfo)) {
|
||||||
@@ -106,7 +106,7 @@ public class IpServiceImpl implements IpService, DisposableBean {
|
|||||||
Date begin = new Date();
|
Date begin = new Date();
|
||||||
for (int i = 0; i < 100; i++) {
|
for (int i = 0; i < 100; i++) {
|
||||||
int finalI = i;
|
int finalI = i;
|
||||||
executor.execute(() -> {
|
EXECUTOR.execute(() -> {
|
||||||
IpDetail ipDetail = TryGetIpDetailOrNullTreeTimes("113.90.36.126");
|
IpDetail ipDetail = TryGetIpDetailOrNullTreeTimes("113.90.36.126");
|
||||||
if (Objects.nonNull(ipDetail)) {
|
if (Objects.nonNull(ipDetail)) {
|
||||||
Date date = new Date();
|
Date date = new Date();
|
||||||
@@ -118,13 +118,12 @@ public class IpServiceImpl implements IpService, DisposableBean {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void destroy() throws InterruptedException {
|
public void destroy() throws InterruptedException {
|
||||||
executor.shutdown();
|
EXECUTOR.shutdown();
|
||||||
if (!executor.awaitTermination(30, TimeUnit.SECONDS)) {//最多等30秒,处理不完就拉倒
|
if (!EXECUTOR.awaitTermination(30, TimeUnit.SECONDS)) {//最多等30秒,处理不完就拉倒
|
||||||
if (log.isErrorEnabled()) {
|
if (log.isErrorEnabled()) {
|
||||||
log.error("Timed out while waiting for executor [{}] to terminate", executor);
|
log.error("Timed out while waiting for executor [{}] to terminate", EXECUTOR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user