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-06-13 08:10:37 +08:00
parent c35869df0c
commit ebda8b0bbd
11 changed files with 159 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/MediaAudioProperties.java
View File

@@ -22,21 +22,21 @@ public class MediaAudioProperties {
* @author acgist
*/
public enum Format {
G722,
// G711A
PCMA,
// G711U
PCMU,
OPUS;
}
@Schema(title = "格式", description = "格式", example = "G722|PCMA|PCMU|OPUS")
private Format format;
@Schema(title = "比特率", description = "比特率", example = "96|128|256")
private Integer bitrate;
@Schema(title = "采样位数", description = "采样位数", example = "8|16|32")
@Schema(title = "采样位数（位深）", description = "采样位数（位深）", example = "8|16|32")
private Integer sampleSize;
@Schema(title = "采样率", description = "采样率", example = "8000|16000|32000|48000")
private Integer sampleRate;

16
taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SecurityProperties.java
View File

@@ -17,16 +17,16 @@ import lombok.Setter;
@Schema(title = "安全配置", description = "安全配置")
@ConfigurationProperties(prefix = "taoyao.security")
public class SecurityProperties {
@Schema(title = "是否启用", description = "是否启用")
private Boolean enabled;
private Boolean enabled;
@Schema(title = "安全范围", description = "安全范围")
private String realm;
private String realm;
@Schema(title = "公共地址", description = "公共地址")
private String[] permit;
@Schema(title = "名称", description = "名称")
private String username;
private String[] permit;
@Schema(title = "帐号", description = "帐号")
private String username;
@Schema(title = "密码", description = "密码")
private String password;
private String password;
}

57
taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java
View File

@@ -1,8 +1,8 @@
package com.acgist.taoyao.boot.utils;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
@@ -15,6 +15,7 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.model.MessageCode;
import com.acgist.taoyao.boot.model.MessageCodeException;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.ConstraintViolation;
@@ -78,7 +79,7 @@ public final class ErrorUtils {
* @return 错误消息
*/
public static final Message message(HttpServletRequest request, HttpServletResponse response) {
return message(null, request, response);
return ErrorUtils.message(null, request, response);
}
/**
@@ -91,11 +92,11 @@ public final class ErrorUtils {
public static final Message message(Throwable t, HttpServletRequest request, HttpServletResponse response) {
final Message message;
// 错误状态编码
int status = globalStatus(request, response);
int status = ErrorUtils.globalStatus(request, response);
// 全局异常
final Object globalError = t == null ? globalError(request) : t;
final Object globalError = t == null ? ErrorUtils.globalError(request) : t;
// 原始异常
final Object rootError = rootException(globalError);
final Object rootError = ErrorUtils.rootException(globalError);
if(rootError instanceof MessageCodeException messageCodeException) {
// 状态编码异常
final MessageCode messageCode = messageCodeException.getMessageCode();
@@ -103,9 +104,9 @@ public final class ErrorUtils {
message = Message.fail(messageCode, messageCodeException.getMessage());
} else if(rootError instanceof Throwable throwable) {
// 未知异常：异常转换
final MessageCode messageCode = messageCode(status, throwable);
final MessageCode messageCode = ErrorUtils.messageCode(status, throwable);
status = messageCode.getStatus();
message = Message.fail(messageCode, message(messageCode, throwable));
message = Message.fail(messageCode, ErrorUtils.message(messageCode, throwable));
} else {
// 没有异常
final MessageCode messageCode = MessageCode.of(status);
@@ -116,9 +117,19 @@ public final class ErrorUtils {
status = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
}
response.setStatus(status);
// 打印信息
final String path = Objects.toString(request.getAttribute(SERVLET_REQUEST_URI), request.getServletPath());
final String query = request.getQueryString();
// 请求地址
final String path = ErrorUtils.getFirstParams(
request.getAttribute(RequestDispatcher.FORWARD_REQUEST_URI),
request.getAttribute(RequestDispatcher.FORWARD_SERVLET_PATH),
request.getAttribute(SERVLET_REQUEST_URI),
request.getServletPath()
);
// 请求参数
final String query = ErrorUtils.getFirstParams(
request.getAttribute(RequestDispatcher.FORWARD_QUERY_STRING),
request.getQueryString()
);
// 请求方法
final String method = request.getMethod();
if(globalError instanceof Throwable) {
log.error("""
@@ -140,11 +151,11 @@ public final class ErrorUtils {
原始信息：{}
""", path, query, method, message, status, globalError);
}
// final Map<String, String> body = new HashMap<>();
// body.put("url", path);
// body.put("query", query);
// body.put("method", method);
// message.setBody(body);
final Map<String, String> body = new HashMap<>();
body.put("path", path);
body.put("query", query);
body.put("method", method);
message.setBody(body);
return message;
}
@@ -241,7 +252,7 @@ public final class ErrorUtils {
*/
public static final Object rootException(Object t) {
if(t instanceof Throwable throwable) {
return rootException(throwable);
return ErrorUtils.rootException(throwable);
}
return t;
}
@@ -263,4 +274,18 @@ public final class ErrorUtils {
return t;
}
/**
* @param params 参数列表
*
* @return 首个参数
*/
private static final String getFirstParams(Object ... params) {
for (Object object : params) {
if(object != null) {
return object.toString();
}
}
return null;
}
}