qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] 逻辑调整

Browse Source
This commit is contained in:
acgist
2023-04-19 20:43:59 +08:00
parent 257355fd1f
commit aadd59a51b
19 changed files with 661 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java
View File

@@ -70,12 +70,12 @@ public interface Protocol {
Message build(Object body);
/**
* @param code 状态编码
* @param messageCode 状态编码
* @param body 消息主体
*
* @return 信令消息
*/
Message build(MessageCode code, Object body);
Message build(MessageCode messageCode, Object body);
/**
* @param message 状态描述
@@ -86,22 +86,22 @@ public interface Protocol {
Message build(String message, Object body);
/**
* @param code 状态编码
* @param messageCode 状态编码
* @param message 状态描述
* @param body 消息主体
*
* @return 信令消息
*/
Message build(MessageCode code, String message, Object body);
Message build(MessageCode messageCode, String message, Object body);
/**
* @param id 消息标识
* @param code 状态编码
* @param messageCode 状态编码
* @param message 状态描述
* @param body 消息主体
*
* @return 信令消息
*/
Message build(Long id, MessageCode code, String message, Object body);
Message build(Long id, MessageCode messageCode, String message, Object body);
}

12
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java
View File

@@ -79,8 +79,8 @@ public abstract class ProtocolAdapter implements Protocol {
}
@Override
public Message build(MessageCode code, Object body) {
return this.build(null, code, null, body);
public Message build(MessageCode messageCode, Object body) {
return this.build(null, messageCode, null, body);
}
@Override
@@ -89,12 +89,12 @@ public abstract class ProtocolAdapter implements Protocol {
}
@Override
public Message build(MessageCode code, String message, Object body) {
return this.build(null, code, message, body);
public Message build(MessageCode messageCode, String message, Object body) {
return this.build(null, messageCode, message, body);
}
@Override
public Message build(Long id, MessageCode code, String message, Object body) {
public Message build(Long id, MessageCode messageCode, String message, Object body) {
// 消息标识
if(id == null) {
id = this.idService.buildId();
@@ -107,7 +107,7 @@ public abstract class ProtocolAdapter implements Protocol {
.build();
final Message build = Message.builder().build();
// 设置状态编码、状态描述：默认成功
build.setCode(code == null ? MessageCode.CODE_0000 : code, message);
build.setCode(messageCode == null ? MessageCode.CODE_0000 : messageCode, message);
// 设置消息头部
build.setHeader(header);
// 设置消息主体

6
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/PlatformErrorProtocol.java
View File

@@ -32,7 +32,7 @@ public class PlatformErrorProtocol extends ProtocolClientAdapter {
}
@Override
public Message build(Long id, MessageCode code, String message, Object body) {
public Message build(Long id, MessageCode messageCode, String message, Object body) {
final Long oldId = this.idLocal.get();
if(oldId == null) {
id = this.idService.buildId();
@@ -41,7 +41,7 @@ public class PlatformErrorProtocol extends ProtocolClientAdapter {
this.idLocal.remove();
}
// 默认设置失败状态
return super.build(id, code == null ? MessageCode.CODE_9999 : code, message, body);
return super.build(id, messageCode == null ? MessageCode.CODE_9999 : messageCode, message, body);
}
/**
@@ -61,7 +61,7 @@ public class PlatformErrorProtocol extends ProtocolClientAdapter {
final String exceptionMessage = e.getMessage();
if(e instanceof MessageCodeException messageCodeException) {
// 自定义的异常
message.setCode(messageCodeException.getCode(), messageCodeException.getMessage());
message.setCode(messageCodeException.getMessageCode(), messageCodeException.getMessage());
} else if(StringUtils.isNotEmpty(exceptionMessage) && exceptionMessage.length() <= Byte.MAX_VALUE) {
// 少量信息返回异常信息
message.setMessage(exceptionMessage);