Commit ebcd2320a9f8831bd71add870a229ba7912dea81

Authored by 648540858
1 parent e2944938

修复推流鉴权

src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -50,7 +50,7 @@ public interface UserMapper { @@ -50,7 +50,7 @@ public interface UserMapper {
50 @ResultMap(value="roleMap") 50 @ResultMap(value="roleMap")
51 List<User> selectAll(); 51 List<User> selectAll();
52 52
53 - @Select("select * from (select user.*, concat(#{callId}_', pushKey) as str1 from user) as u where md5(u.str1) = #{sign}") 53 + @Select("select * from (select user.*, concat(concat(#{callId}, '_'), pushKey) as str1 from user) as u where md5(u.str1) = #{sign}")
54 List<User> checkPushAuthorityByCallIdAndSign(String callId, String sign); 54 List<User> checkPushAuthorityByCallIdAndSign(String callId, String sign);
55 55
56 @Select("select * from user where md5(pushKey) = #{sign}") 56 @Select("select * from user where md5(pushKey) = #{sign}")
src/main/resources/all-application.yml
@@ -168,7 +168,7 @@ user-settings: @@ -168,7 +168,7 @@ user-settings:
168 # 保存移动位置历史轨迹:true:保留历史数据,false:仅保留最后的位置(默认) 168 # 保存移动位置历史轨迹:true:保留历史数据,false:仅保留最后的位置(默认)
169 save-position-history: false 169 save-position-history: false
170 # 点播等待超时时间,单位:毫秒 170 # 点播等待超时时间,单位:毫秒
171 - play-timeout: 3000 171 + play-timeout: 18000
172 # 上级点播等待超时时间,单位:毫秒 172 # 上级点播等待超时时间,单位:毫秒
173 platform-play-timeout: 60000 173 platform-play-timeout: 60000
174 # 是否开启接口鉴权 174 # 是否开启接口鉴权