修改二次分享
This commit is contained in:
parent
624b32cc7f
commit
3d6aba0bf9
4
pom.xml
4
pom.xml
@ -20,8 +20,8 @@
|
|||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<mybatisplus.spring.boot.version>2.1.9</mybatisplus.spring.boot.version>
|
<mybatisplus.spring.boot.version>2.1.9</mybatisplus.spring.boot.version>
|
||||||
<mybatisplus.version>2.1.9</mybatisplus.version>
|
<mybatisplus.version>2.1.9</mybatisplus.version>
|
||||||
<mysql.version>5.1.38</mysql.version>
|
<!-- <mysql.version>5.1.38</mysql.version>-->
|
||||||
<!-- <mysql.version>8.0.26</mysql.version>-->
|
<mysql.version>8.0.26</mysql.version>
|
||||||
<druid.version>1.1.3</druid.version>
|
<druid.version>1.1.3</druid.version>
|
||||||
<quartz.version>2.3.0</quartz.version>
|
<quartz.version>2.3.0</quartz.version>
|
||||||
<commons.lang.version>2.6</commons.lang.version>
|
<commons.lang.version>2.6</commons.lang.version>
|
||||||
|
|||||||
@ -67,6 +67,7 @@ public class ShiroConfig {
|
|||||||
filterMap.put("/test/**", "anon");
|
filterMap.put("/test/**", "anon");
|
||||||
filterMap.put("/sys/login", "anon");
|
filterMap.put("/sys/login", "anon");
|
||||||
filterMap.put("/video/**", "anon");
|
filterMap.put("/video/**", "anon");
|
||||||
|
|
||||||
filterMap.put(path(videoFileProperties.getBaseSavePath()), "anon");
|
filterMap.put(path(videoFileProperties.getBaseSavePath()), "anon");
|
||||||
// filterMap.put("/swagger/**", "anon");
|
// filterMap.put("/swagger/**", "anon");
|
||||||
// filterMap.put("/v2/api-docs", "anon");
|
// filterMap.put("/v2/api-docs", "anon");
|
||||||
|
|||||||
@ -253,7 +253,6 @@ public class LiveForeignController {
|
|||||||
public R getWeixinJsApiTicket (String url) {
|
public R getWeixinJsApiTicket (String url) {
|
||||||
//2023年1月17日15:31:00 微信动态获取公众号编码
|
//2023年1月17日15:31:00 微信动态获取公众号编码
|
||||||
|
|
||||||
|
|
||||||
if(StringUtils.isBlank(url)){
|
if(StringUtils.isBlank(url)){
|
||||||
return R.error("必填参数不能为空");
|
return R.error("必填参数不能为空");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -600,8 +600,10 @@ public class LiveForeignServiceImpl implements com.platform.modules.foreign.serv
|
|||||||
private SysTenantDao sysTenantDao;
|
private SysTenantDao sysTenantDao;
|
||||||
public JSONObject getWeixinJsApiTicket(String url){
|
public JSONObject getWeixinJsApiTicket(String url){
|
||||||
//根据url获取到对应机构的微信公众号信息
|
//根据url获取到对应机构的微信公众号信息
|
||||||
String wxappid=sysTenantDao.selectbyWxID(url);
|
String[] parts = url.split("/");
|
||||||
String wxappsecret=sysTenantDao.selectbysecret(url);
|
String dataurl = parts[parts.length - 1];
|
||||||
|
String wxappid=sysTenantDao.selectbyWxID(dataurl);
|
||||||
|
String wxappsecret=sysTenantDao.selectbysecret(dataurl);
|
||||||
|
|
||||||
|
|
||||||
JSONObject jsonObject = new JSONObject();
|
JSONObject jsonObject = new JSONObject();
|
||||||
@ -614,11 +616,13 @@ public class LiveForeignServiceImpl implements com.platform.modules.foreign.serv
|
|||||||
|
|
||||||
String jsapi_ticket = jsTicketApi.getJsTicketFromRedis();
|
String jsapi_ticket = jsTicketApi.getJsTicketFromRedis();
|
||||||
if(StringUtils.isBlank(jsapi_ticket)){
|
if(StringUtils.isBlank(jsapi_ticket)){
|
||||||
|
System.out.println("jsapi_ticket为空");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
JsSignature signature = new JsSignature(nonceStr, jsapi_ticket, timeStamp, url);
|
JsSignature signature = new JsSignature(nonceStr, jsapi_ticket, timeStamp, url);
|
||||||
|
|
||||||
String sign = JsSignKit.sign(signature);
|
String sign = JsSignKit.sign(signature);
|
||||||
|
System.out.println("sign:"+sign);
|
||||||
//jsonObject.put("appid", liveProperties.getWeixin().getAppId());
|
//jsonObject.put("appid", liveProperties.getWeixin().getAppId());
|
||||||
jsonObject.put("appid",wxappid );
|
jsonObject.put("appid",wxappid );
|
||||||
jsonObject.put("timeStamp", timeStamp);
|
jsonObject.put("timeStamp", timeStamp);
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
spring:
|
spring:
|
||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driverClassName: com.mysql.jdbc.Driver
|
driverClassName: com.mysql.cj.jdbc.Driver
|
||||||
druid:
|
druid:
|
||||||
first: #数据源1
|
first: #数据源1
|
||||||
url: jdbc:mysql://localhost:3306/jinan-live?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true
|
url: jdbc:mysql://localhost:3306/jinan-live?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true
|
||||||
|
|||||||
@ -113,7 +113,8 @@ materia:
|
|||||||
foreign:
|
foreign:
|
||||||
wapurl: http://zklive.zhongkedongxin.com
|
wapurl: http://zklive.zhongkedongxin.com
|
||||||
dataurl: 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
|
vodmediaurl: http://test.vod.zhongkedongxin.com
|
||||||
platform:
|
platform:
|
||||||
tenant:
|
tenant:
|
||||||
|
|||||||
@ -46,7 +46,6 @@
|
|||||||
SELECT st.wx_app_id
|
SELECT st.wx_app_id
|
||||||
from live_scene ls LEFT JOIN sys_tenant st on ls.tenant_id= st.tenant_id
|
from live_scene ls LEFT JOIN sys_tenant st on ls.tenant_id= st.tenant_id
|
||||||
where ls.id=#{url}
|
where ls.id=#{url}
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
<select id="selectbysecret" resultType="java.lang.String">
|
<select id="selectbysecret" resultType="java.lang.String">
|
||||||
SELECT st.wx_app_secret
|
SELECT st.wx_app_secret
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user