diff --git a/pom.xml b/pom.xml
index 579a25d..8497a46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
1.8
2.1.9
2.1.9
- 5.1.38
-
+
+ 8.0.26
1.1.3
2.3.0
2.6
diff --git a/src/main/java/com/platform/config/ShiroConfig.java b/src/main/java/com/platform/config/ShiroConfig.java
index 5c6b796..57834fd 100644
--- a/src/main/java/com/platform/config/ShiroConfig.java
+++ b/src/main/java/com/platform/config/ShiroConfig.java
@@ -67,6 +67,7 @@ public class ShiroConfig {
filterMap.put("/test/**", "anon");
filterMap.put("/sys/login", "anon");
filterMap.put("/video/**", "anon");
+
filterMap.put(path(videoFileProperties.getBaseSavePath()), "anon");
// filterMap.put("/swagger/**", "anon");
// filterMap.put("/v2/api-docs", "anon");
diff --git a/src/main/java/com/platform/modules/foreign/controller/LiveForeignController.java b/src/main/java/com/platform/modules/foreign/controller/LiveForeignController.java
index 60b5569..4d2331c 100644
--- a/src/main/java/com/platform/modules/foreign/controller/LiveForeignController.java
+++ b/src/main/java/com/platform/modules/foreign/controller/LiveForeignController.java
@@ -253,7 +253,6 @@ public class LiveForeignController {
public R getWeixinJsApiTicket (String url) {
//2023年1月17日15:31:00 微信动态获取公众号编码
-
if(StringUtils.isBlank(url)){
return R.error("必填参数不能为空");
}
diff --git a/src/main/java/com/platform/modules/foreign/service/impl/LiveForeignServiceImpl.java b/src/main/java/com/platform/modules/foreign/service/impl/LiveForeignServiceImpl.java
index 14ec367..03f9d14 100644
--- a/src/main/java/com/platform/modules/foreign/service/impl/LiveForeignServiceImpl.java
+++ b/src/main/java/com/platform/modules/foreign/service/impl/LiveForeignServiceImpl.java
@@ -600,8 +600,10 @@ public class LiveForeignServiceImpl implements com.platform.modules.foreign.serv
private SysTenantDao sysTenantDao;
public JSONObject getWeixinJsApiTicket(String url){
//根据url获取到对应机构的微信公众号信息
- String wxappid=sysTenantDao.selectbyWxID(url);
- String wxappsecret=sysTenantDao.selectbysecret(url);
+ String[] parts = url.split("/");
+ String dataurl = parts[parts.length - 1];
+ String wxappid=sysTenantDao.selectbyWxID(dataurl);
+ String wxappsecret=sysTenantDao.selectbysecret(dataurl);
JSONObject jsonObject = new JSONObject();
@@ -614,11 +616,13 @@ public class LiveForeignServiceImpl implements com.platform.modules.foreign.serv
String jsapi_ticket = jsTicketApi.getJsTicketFromRedis();
if(StringUtils.isBlank(jsapi_ticket)){
+ System.out.println("jsapi_ticket为空");
return null;
}
JsSignature signature = new JsSignature(nonceStr, jsapi_ticket, timeStamp, url);
String sign = JsSignKit.sign(signature);
+ System.out.println("sign:"+sign);
//jsonObject.put("appid", liveProperties.getWeixin().getAppId());
jsonObject.put("appid",wxappid );
jsonObject.put("timeStamp", timeStamp);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7e36600..ba541d3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.jdbc.Driver
+ driverClassName: com.mysql.cj.jdbc.Driver
druid:
first: #数据源1
url: jdbc:mysql://localhost:3306/jinan-live?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ea3ed28..ab04de4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -113,7 +113,8 @@ materia:
foreign:
wapurl: http://zklive.zhongkedongxin.com
dataurl: http://zklive.zhongkedongxin.com
- mediaurl: http://test.vod.zhongkedongxin.com
+# mediaurl: http://test.vod.zhongkedongxin.com
+ mediaurl: https://v.livejinan.cn
vodmediaurl: http://test.vod.zhongkedongxin.com
platform:
tenant:
diff --git a/src/main/resources/mapper/sys/SysTenantDao.xml b/src/main/resources/mapper/sys/SysTenantDao.xml
index b986e4d..99257fd 100644
--- a/src/main/resources/mapper/sys/SysTenantDao.xml
+++ b/src/main/resources/mapper/sys/SysTenantDao.xml
@@ -46,7 +46,6 @@
SELECT st.wx_app_id
from live_scene ls LEFT JOIN sys_tenant st on ls.tenant_id= st.tenant_id
where ls.id=#{url}
-