mirror of https://github.com/iohao/iogame.git
🐳 废弃 DevConfig。
简化部分代码。 从 BarSkeletonBuilderParamConfig 中移除一些过期的代码。
This commit is contained in:
parent
71dd570cb7
commit
a3d5d0b9cb
|
|
@ -19,13 +19,13 @@
|
|||
package com.iohao.game.action.skeleton.core;
|
||||
|
||||
import com.iohao.game.action.skeleton.annotation.ActionController;
|
||||
import com.iohao.game.action.skeleton.annotation.DocActionSends;
|
||||
import com.iohao.game.action.skeleton.core.doc.BroadcastDocBuilder;
|
||||
import com.iohao.game.action.skeleton.core.enhance.BarSkeletonBuilderEnhances;
|
||||
import com.iohao.game.action.skeleton.core.exception.ActionErrorEnum;
|
||||
import com.iohao.game.action.skeleton.core.exception.MsgExceptionInfo;
|
||||
import com.iohao.game.action.skeleton.toy.IoGameBanner;
|
||||
import com.iohao.game.common.kit.ClassScanner;
|
||||
import com.iohao.game.action.skeleton.core.doc.IoGameDocumentHelper;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
|
@ -59,6 +59,7 @@ public final class BarSkeletonBuilderParamConfig {
|
|||
/** action send class. class has @DocActionSend */
|
||||
final List<Class<?>> actionSendClassList = new ArrayList<>();
|
||||
/** 错误码 class */
|
||||
@Deprecated
|
||||
final List<MsgExceptionInfo> msgExceptionInfoList = new ArrayList<>();
|
||||
|
||||
/** true 打印广播日志，默认不打印 */
|
||||
|
|
@ -66,8 +67,6 @@ public final class BarSkeletonBuilderParamConfig {
|
|||
|
||||
/** ActionController filter */
|
||||
Predicate<Class<?>> actionControllerPredicate = clazz -> Objects.nonNull(clazz.getAnnotation(ActionController.class));
|
||||
/** 推送相关的 class */
|
||||
Predicate<Class<?>> actionSendPredicate = clazz -> Objects.nonNull(clazz.getAnnotation(DocActionSends.class));
|
||||
boolean enhance = true;
|
||||
|
||||
/**
|
||||
|
|
@ -83,17 +82,11 @@ public final class BarSkeletonBuilderParamConfig {
|
|||
BarSkeletonBuilder builder = BarSkeleton.newBuilder();
|
||||
enhance(builder);
|
||||
|
||||
// action send class. class has @DocActionSend
|
||||
// this.scanClassActionSend(builder::addActionSend);
|
||||
|
||||
// action controller class. class has @ActionController
|
||||
this.scanClassActionController(builder::addActionController);
|
||||
|
||||
// 错误码相关的
|
||||
this.getMsgExceptionInfoList().forEach(builder::addMsgExceptionInfo);
|
||||
|
||||
// true 打印广播日志，默认不打印
|
||||
DevConfig.broadcastLog = this.broadcastLog;
|
||||
IoGameCommonCoreConfig.broadcastLog = this.broadcastLog;
|
||||
|
||||
extracted();
|
||||
|
||||
|
|
@ -135,7 +128,9 @@ public final class BarSkeletonBuilderParamConfig {
|
|||
*
|
||||
* @param msgExceptionInfoArray msgExceptionInfoArray
|
||||
* @return this
|
||||
* @deprecated 请使用 {@link IoGameDocumentHelper#addErrorCodeClass(Class)}
|
||||
*/
|
||||
@Deprecated
|
||||
public BarSkeletonBuilderParamConfig addErrorCode(MsgExceptionInfo[] msgExceptionInfoArray) {
|
||||
msgExceptionInfoList.addAll(Arrays.asList(msgExceptionInfoArray));
|
||||
return this;
|
||||
|
|
|
|||
|
|
@ -29,14 +29,17 @@ import java.util.Map;
|
|||
* @author 渔民小镇
|
||||
* @date 2022-05-19
|
||||
*/
|
||||
|
||||
@Deprecated
|
||||
public final class DevConfig {
|
||||
/**
|
||||
* true 打印广播日志，默认不打印
|
||||
* <p>
|
||||
* see {@link BarSkeletonBuilderParamConfig#createBuilder()}
|
||||
*
|
||||
* @deprecated 请使用 {@link IoGameCommonCoreConfig#broadcastLog}
|
||||
*/
|
||||
@Getter
|
||||
@Deprecated
|
||||
static boolean broadcastLog;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -29,6 +29,12 @@ import lombok.experimental.UtilityClass;
|
|||
@UtilityClass
|
||||
public class IoGameCommonCoreConfig {
|
||||
public boolean eventBusLog;
|
||||
/**
|
||||
* true 打印广播日志，默认不打印
|
||||
* <p>
|
||||
* see {@link BarSkeletonBuilderParamConfig#createBuilder()}
|
||||
*/
|
||||
public boolean broadcastLog;
|
||||
|
||||
public interface ExternalBizCode {
|
||||
/** 用户（玩家）的元信息同步，AttachmentExternalBizRegion */
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import java.util.*;
|
|||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
|
||||
/**
|
||||
* 对接文档生成器辅助
|
||||
* 对接文档生成器辅助，<a href="https://www.yuque.com/iohao/game/irth38">游戏对接文档生成</a>
|
||||
* <p>
|
||||
* for example
|
||||
* <pre>{@code
|
||||
|
|
|
|||
|
|
@ -571,8 +571,7 @@ interface SimpleCommunicationBroadcast extends SimpleCommunication {
|
|||
* @see HeadMetadata#getCmdInfo()
|
||||
*/
|
||||
default void broadcastMe(Object bizData) {
|
||||
var headMetadata = this.getHeadMetadata();
|
||||
var cmdInfo = headMetadata.getCmdInfo();
|
||||
var cmdInfo = this.getCmdInfo();
|
||||
this.broadcastMe(cmdInfo, bizData);
|
||||
}
|
||||
|
||||
|
|
@ -683,8 +682,7 @@ interface SimpleCommunicationBroadcast extends SimpleCommunication {
|
|||
* @see HeadMetadata#getCmdInfo()
|
||||
*/
|
||||
default void broadcastOrderMe(Object bizData) {
|
||||
var headMetadata = this.getHeadMetadata();
|
||||
var cmdInfo = headMetadata.getCmdInfo();
|
||||
var cmdInfo = this.getCmdInfo();
|
||||
this.broadcastOrderMe(cmdInfo, bizData);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ public final class DebugInOut implements ActionMethodInOut {
|
|||
paramMap.put("time", ms);
|
||||
paramMap.put("lineNumber", actionCommandDoc.getLineNumber());
|
||||
// 路由信息
|
||||
CmdInfo cmdInfo = flowContext.getRequest().getHeadMetadata().getCmdInfo();
|
||||
CmdInfo cmdInfo = flowContext.getCmdInfo();
|
||||
paramMap.put("cmdInfo", CmdKit.mergeToShort(cmdInfo.getCmdMerge()));
|
||||
paramMap.put("userId", flowContext.getUserId());
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public final class TraceIdInOut implements ActionMethodInOut {
|
|||
@Override
|
||||
public void fuckIn(FlowContext flowContext) {
|
||||
|
||||
HeadMetadata headMetadata = flowContext.getRequest().getHeadMetadata();
|
||||
HeadMetadata headMetadata = flowContext.getHeadMetadata();
|
||||
String traceId = headMetadata.getTraceId();
|
||||
|
||||
if (Objects.nonNull(traceId)) {
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ public class ExecutorSelectKit {
|
|||
* @return true 表示请求被执行
|
||||
*/
|
||||
public boolean processLogic(BarSkeleton barSkeleton, FlowContext flowContext) {
|
||||
HeadMetadata headMetadata = flowContext.getRequest().getHeadMetadata();
|
||||
|
||||
HeadMetadata headMetadata = flowContext.getHeadMetadata();
|
||||
final ThreadExecutor threadExecutor = getThreadExecutor(barSkeleton, headMetadata);
|
||||
|
||||
if (Objects.isNull(threadExecutor)) {
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ package com.iohao.game.bolt.broker.core.client;
|
|||
|
||||
import com.alipay.remoting.exception.RemotingException;
|
||||
import com.iohao.game.action.skeleton.core.DevConfig;
|
||||
import com.iohao.game.action.skeleton.core.IoGameCommonCoreConfig;
|
||||
import com.iohao.game.action.skeleton.protocol.HeadMetadata;
|
||||
import com.iohao.game.action.skeleton.protocol.ResponseMessage;
|
||||
import com.iohao.game.bolt.broker.core.message.BroadcastMessage;
|
||||
|
|
@ -94,7 +95,7 @@ public record Broadcast(BrokerClientItem brokerClientItem) {
|
|||
log.error(e.getMessage(), e);
|
||||
}
|
||||
|
||||
if (DevConfig.isBroadcastLog()) {
|
||||
if (IoGameCommonCoreConfig.broadcastLog) {
|
||||
// 打印广播日志
|
||||
BroadcastDebug.print(broadcastMessage);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue