Skip to content

Commit a3d5d0b

Browse files
committed
🐳 废弃 DevConfig。
简化部分代码。 从 BarSkeletonBuilderParamConfig 中移除一些过期的代码。
1 parent 71dd570 commit a3d5d0b

File tree

9 files changed

+23
-21
lines changed

9 files changed

+23
-21
lines changed

common/common-core/src/main/java/com/iohao/game/action/skeleton/core/BarSkeletonBuilderParamConfig.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
package com.iohao.game.action.skeleton.core;
2020

2121
import com.iohao.game.action.skeleton.annotation.ActionController;
22-
import com.iohao.game.action.skeleton.annotation.DocActionSends;
2322
import com.iohao.game.action.skeleton.core.doc.BroadcastDocBuilder;
2423
import com.iohao.game.action.skeleton.core.enhance.BarSkeletonBuilderEnhances;
2524
import com.iohao.game.action.skeleton.core.exception.ActionErrorEnum;
2625
import com.iohao.game.action.skeleton.core.exception.MsgExceptionInfo;
2726
import com.iohao.game.action.skeleton.toy.IoGameBanner;
2827
import com.iohao.game.common.kit.ClassScanner;
28+
import com.iohao.game.action.skeleton.core.doc.IoGameDocumentHelper;
2929
import lombok.AccessLevel;
3030
import lombok.Getter;
3131
import lombok.Setter;
@@ -59,15 +59,14 @@ public final class BarSkeletonBuilderParamConfig {
5959
/** action send class. class has @DocActionSend */
6060
final List<Class<?>> actionSendClassList = new ArrayList<>();
6161
/** 错误码 class */
62+
@Deprecated
6263
final List<MsgExceptionInfo> msgExceptionInfoList = new ArrayList<>();
6364

6465
/** true 打印广播日志,默认不打印 */
6566
boolean broadcastLog;
6667

6768
/** ActionController filter */
6869
Predicate<Class<?>> actionControllerPredicate = clazz -> Objects.nonNull(clazz.getAnnotation(ActionController.class));
69-
/** 推送相关的 class */
70-
Predicate<Class<?>> actionSendPredicate = clazz -> Objects.nonNull(clazz.getAnnotation(DocActionSends.class));
7170
boolean enhance = true;
7271

7372
/**
@@ -83,17 +82,11 @@ public BarSkeletonBuilder createBuilder() {
8382
BarSkeletonBuilder builder = BarSkeleton.newBuilder();
8483
enhance(builder);
8584

86-
// action send class. class has @DocActionSend
87-
// this.scanClassActionSend(builder::addActionSend);
88-
8985
// action controller class. class has @ActionController
9086
this.scanClassActionController(builder::addActionController);
9187

92-
// 错误码相关的
93-
this.getMsgExceptionInfoList().forEach(builder::addMsgExceptionInfo);
94-
9588
// true 打印广播日志,默认不打印
96-
DevConfig.broadcastLog = this.broadcastLog;
89+
IoGameCommonCoreConfig.broadcastLog = this.broadcastLog;
9790

9891
extracted();
9992

@@ -135,7 +128,9 @@ public BarSkeletonBuilderParamConfig scanActionSendPackage(Class<?> actionSendCl
135128
*
136129
* @param msgExceptionInfoArray msgExceptionInfoArray
137130
* @return this
131+
* @deprecated 请使用 {@link IoGameDocumentHelper#addErrorCodeClass(Class)}
138132
*/
133+
@Deprecated
139134
public BarSkeletonBuilderParamConfig addErrorCode(MsgExceptionInfo[] msgExceptionInfoArray) {
140135
msgExceptionInfoList.addAll(Arrays.asList(msgExceptionInfoArray));
141136
return this;

common/common-core/src/main/java/com/iohao/game/action/skeleton/core/DevConfig.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,17 @@
2929
* @author 渔民小镇
3030
* @date 2022-05-19
3131
*/
32-
32+
@Deprecated
3333
public final class DevConfig {
3434
/**
3535
* true 打印广播日志,默认不打印
3636
* <p>
3737
* see {@link BarSkeletonBuilderParamConfig#createBuilder()}
38+
*
39+
* @deprecated 请使用 {@link IoGameCommonCoreConfig#broadcastLog}
3840
*/
3941
@Getter
42+
@Deprecated
4043
static boolean broadcastLog;
4144

4245
/**

common/common-core/src/main/java/com/iohao/game/action/skeleton/core/IoGameCommonCoreConfig.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
@UtilityClass
3030
public class IoGameCommonCoreConfig {
3131
public boolean eventBusLog;
32+
/**
33+
* true 打印广播日志,默认不打印
34+
* <p>
35+
* see {@link BarSkeletonBuilderParamConfig#createBuilder()}
36+
*/
37+
public boolean broadcastLog;
3238

3339
public interface ExternalBizCode {
3440
/** 用户(玩家)的元信息同步,AttachmentExternalBizRegion */

common/common-core/src/main/java/com/iohao/game/action/skeleton/core/doc/IoGameDocumentHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.util.concurrent.CopyOnWriteArrayList;
3232

3333
/**
34-
* 对接文档生成器辅助
34+
* 对接文档生成器辅助,<a href="https://www.yuque.com/iohao/game/irth38">游戏对接文档生成</a>
3535
* <p>
3636
* for example
3737
* <pre>{@code

common/common-core/src/main/java/com/iohao/game/action/skeleton/core/flow/InternalAboutFlowContext.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,7 @@ private void extractedSourceClientId(ResponseMessage responseMessage, long userI
571571
* @see HeadMetadata#getCmdInfo()
572572
*/
573573
default void broadcastMe(Object bizData) {
574-
var headMetadata = this.getHeadMetadata();
575-
var cmdInfo = headMetadata.getCmdInfo();
574+
var cmdInfo = this.getCmdInfo();
576575
this.broadcastMe(cmdInfo, bizData);
577576
}
578577

@@ -683,8 +682,7 @@ default void broadcast(final ResponseMessage responseMessage, final Collection<L
683682
* @see HeadMetadata#getCmdInfo()
684683
*/
685684
default void broadcastOrderMe(Object bizData) {
686-
var headMetadata = this.getHeadMetadata();
687-
var cmdInfo = headMetadata.getCmdInfo();
685+
var cmdInfo = this.getCmdInfo();
688686
this.broadcastOrderMe(cmdInfo, bizData);
689687
}
690688

common/common-core/src/main/java/com/iohao/game/action/skeleton/core/flow/internal/DebugInOut.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void fuckOut(final FlowContext flowContext) {
143143
paramMap.put("time", ms);
144144
paramMap.put("lineNumber", actionCommandDoc.getLineNumber());
145145
// 路由信息
146-
CmdInfo cmdInfo = flowContext.getRequest().getHeadMetadata().getCmdInfo();
146+
CmdInfo cmdInfo = flowContext.getCmdInfo();
147147
paramMap.put("cmdInfo", CmdKit.mergeToShort(cmdInfo.getCmdMerge()));
148148
paramMap.put("userId", flowContext.getUserId());
149149

common/common-core/src/main/java/com/iohao/game/action/skeleton/core/flow/internal/TraceIdInOut.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public final class TraceIdInOut implements ActionMethodInOut {
3636
@Override
3737
public void fuckIn(FlowContext flowContext) {
3838

39-
HeadMetadata headMetadata = flowContext.getRequest().getHeadMetadata();
39+
HeadMetadata headMetadata = flowContext.getHeadMetadata();
4040
String traceId = headMetadata.getTraceId();
4141

4242
if (Objects.nonNull(traceId)) {

common/common-core/src/main/java/com/iohao/game/action/skeleton/kit/ExecutorSelectKit.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public class ExecutorSelectKit {
4545
* @return true 表示请求被执行
4646
*/
4747
public boolean processLogic(BarSkeleton barSkeleton, FlowContext flowContext) {
48-
HeadMetadata headMetadata = flowContext.getRequest().getHeadMetadata();
49-
48+
HeadMetadata headMetadata = flowContext.getHeadMetadata();
5049
final ThreadExecutor threadExecutor = getThreadExecutor(barSkeleton, headMetadata);
5150

5251
if (Objects.isNull(threadExecutor)) {

net-bolt/bolt-core/src/main/java/com/iohao/game/bolt/broker/core/client/Broadcast.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import com.alipay.remoting.exception.RemotingException;
2222
import com.iohao.game.action.skeleton.core.DevConfig;
23+
import com.iohao.game.action.skeleton.core.IoGameCommonCoreConfig;
2324
import com.iohao.game.action.skeleton.protocol.HeadMetadata;
2425
import com.iohao.game.action.skeleton.protocol.ResponseMessage;
2526
import com.iohao.game.bolt.broker.core.message.BroadcastMessage;
@@ -94,7 +95,7 @@ void internalBroadcast(BroadcastMessage broadcastMessage) {
9495
log.error(e.getMessage(), e);
9596
}
9697

97-
if (DevConfig.isBroadcastLog()) {
98+
if (IoGameCommonCoreConfig.broadcastLog) {
9899
// 打印广播日志
99100
BroadcastDebug.print(broadcastMessage);
100101
}

0 commit comments

Comments
 (0)