|
@@ -12,7 +12,6 @@ import com.fdkankan.tk.service.ITencentYunService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.tencentyun.TLSSigAPIv2;
|
|
|
import io.agora.media.RtcTokenBuilder;
|
|
|
-import io.agora.media.RtcTokenBuilder2;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -71,10 +70,12 @@ public class TencentYunServiceImpl extends ServiceImpl<ITencentYunMapper, Tencen
|
|
|
}
|
|
|
|
|
|
|
|
|
- static HashMap<Integer,RtcTokenBuilder2.Role> roleMap = new HashMap<>();
|
|
|
+ static HashMap<Integer,RtcTokenBuilder.Role> roleMap = new HashMap<>();
|
|
|
private void setRoleMap (){
|
|
|
- roleMap.put(RtcTokenBuilder2.Role.ROLE_PUBLISHER.initValue,RtcTokenBuilder2.Role.ROLE_PUBLISHER);
|
|
|
- roleMap.put(RtcTokenBuilder2.Role.ROLE_SUBSCRIBER.initValue,RtcTokenBuilder2.Role.ROLE_SUBSCRIBER);
|
|
|
+ roleMap.put(RtcTokenBuilder.Role.Role_Admin.initValue,RtcTokenBuilder.Role.Role_Admin);
|
|
|
+ roleMap.put(RtcTokenBuilder.Role.Role_Publisher.initValue,RtcTokenBuilder.Role.Role_Publisher);
|
|
|
+ roleMap.put(RtcTokenBuilder.Role.Role_Subscriber.initValue,RtcTokenBuilder.Role.Role_Subscriber);
|
|
|
+ roleMap.put(RtcTokenBuilder.Role.Role_Attendee.initValue,RtcTokenBuilder.Role.Role_Attendee);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -95,8 +96,8 @@ public class TencentYunServiceImpl extends ServiceImpl<ITencentYunMapper, Tencen
|
|
|
throw new BusinessException(ResultCode.TENCENT_YUN_ERROR);
|
|
|
}
|
|
|
TencentYun tencentYun = list.get(0);
|
|
|
- RtcTokenBuilder2 token = new RtcTokenBuilder2();
|
|
|
- String result = token.buildTokenWithUid(tencentYun.getAppid(), tencentYun.getSecretkey(), channelName, userId,roleMap.get(roleId) ,tencentYun.getExTime(),tencentYun.getExTime());
|
|
|
+ RtcTokenBuilder token = new RtcTokenBuilder();
|
|
|
+ String result = token.buildTokenWithUid(tencentYun.getAppid(), tencentYun.getSecretkey(), channelName, userId,roleMap.get(roleId) ,tencentYun.getExTime());
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("sdkAppId",tencentYun.getSdkAppid());
|
|
|
jsonObject.put("expire",tencentYun.getExTime());
|