diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java index a1a2c97d7..7e12371ec 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; @Slf4j public class TRTCCallbackFilter implements Filter { - @Value("${trtc.secretKey}") + @Value("${trtc.video.callback.secretKey:null}") private String secretkey; @Override @@ -31,31 +31,31 @@ public class TRTCCallbackFilter implements Filter { @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { -// HttpServletRequest request = (HttpServletRequest) servletRequest; -// String uri = request.getRequestURI(); -// //不是腾讯云音视频回调请求 -// if (!uri.startsWith("/partner/pc/video")) { -// filterChain.doFilter(servletRequest, servletResponse); -// return; -// } -// if (!"POST".equals(request.getMethod())) { -// return; -// } -// String requestBody = request.getReader().lines().collect(Collectors.joining()); -// //回调的签名 -// String sign = request.getHeader("Sign"); -// //服务器端生成的签名 -// String newSign = ""; -// try { -// newSign = getResultSign(secretkey, requestBody); -// } catch (Exception e) { -// log.error("腾讯云音视频回调签名生成错误,e:\t{}", e.getMessage()); -// return; -// } -// if (StringUtil.isEmpty(sign) || !newSign.equals(sign)) { -// log.error("腾讯云音视频回调签名错误, sign:\t{}, newSign:\t{}", sign, newSign); -// return; -// } + HttpServletRequest request = (HttpServletRequest) servletRequest; + String uri = request.getRequestURI(); + //不是腾讯云音视频回调请求 + if (!uri.startsWith("/partner/pc/video")) { + filterChain.doFilter(servletRequest, servletResponse); + return; + } + if (!"POST".equals(request.getMethod())) { + return; + } + String requestBody = request.getReader().lines().collect(Collectors.joining()); + //回调的签名 + String sign = request.getHeader("Sign"); + //服务器端生成的签名 + String newSign = ""; + try { + newSign = getResultSign(secretkey, requestBody); + } catch (Exception e) { + log.error("腾讯云音视频回调签名生成错误,e:\t{}", e.getMessage()); + return; + } + if (StringUtil.isEmpty(sign) || !newSign.equals(sign)) { + log.error("腾讯云音视频回调签名错误, sign:\t{}, newSign:\t{}", sign, newSign); + return; + } filterChain.doFilter(servletRequest, servletResponse); } diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index 82013e2d1..0824c1f2a 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -55,6 +55,7 @@ cdn.url=https://testhsaypic.coolstore.cn #TRTC trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 +trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index 5f0639fd7..dfded31a0 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -52,6 +52,7 @@ corp.id = 171cddee76471740 #TRTC trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 +trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 diff --git a/coolstore-partner-webb/src/main/resources/application-hd.properties b/coolstore-partner-webb/src/main/resources/application-hd.properties index 50f132839..68a52a3fb 100644 --- a/coolstore-partner-webb/src/main/resources/application-hd.properties +++ b/coolstore-partner-webb/src/main/resources/application-hd.properties @@ -52,6 +52,7 @@ corp.id = 171cddee76471740 #TRTC trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 +trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 3dfc50671..fc6389d30 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -58,6 +58,7 @@ cdn.url=https://testhsaypic.coolstore.cn #TRTC trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 +trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties index b055f644a..0880a6389 100644 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ b/coolstore-partner-webb/src/main/resources/application-online.properties @@ -52,6 +52,7 @@ corp.id = 171cddee76471740 #TRTC trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 +trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 diff --git a/coolstore-partner-webb/src/main/resources/application-pre.properties b/coolstore-partner-webb/src/main/resources/application-pre.properties index b055f644a..0880a6389 100644 --- a/coolstore-partner-webb/src/main/resources/application-pre.properties +++ b/coolstore-partner-webb/src/main/resources/application-pre.properties @@ -52,6 +52,7 @@ corp.id = 171cddee76471740 #TRTC trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 +trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 diff --git a/coolstore-partner-webb/src/main/resources/application-test.properties b/coolstore-partner-webb/src/main/resources/application-test.properties index d8a746a27..ec9163915 100644 --- a/coolstore-partner-webb/src/main/resources/application-test.properties +++ b/coolstore-partner-webb/src/main/resources/application-test.properties @@ -52,6 +52,7 @@ corp.id = 171cddee76471740 #TRTC trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 +trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318