Bladeren bron

直播接口修改-字幕

private_deployment
谈文友 1 jaar geleden
bovenliggende
commit
919dd9e989
3 gewijzigde bestanden met toevoegingen van 14 en 21 verwijderingen
  1. +8
    -15
      suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java
  2. +4
    -4
      suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java
  3. +2
    -2
      suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java

+ 8
- 15
suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java Bestand weergeven

@@ -181,12 +181,10 @@ public class UserLiveController extends BaseController {

@PostMapping("/avatarList")
@ApiOperation(value = "视频模板列表", notes = "{\"username\",\"string\",\"code\",\"string\"}")
public ResultData avatarList(@RequestHeader(value = "token") String token) {
public ResultData avatarList(@RequestBody Map<String, String> params) {
String ipaddress = getIpAddr();
logger.debug("[" + ipaddress + "] WxUserGrantController::getAvatarList");
if (token==null||token.isEmpty()){
//用户未登录
}

long id = getMemberId();
WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getById(id);

@@ -201,13 +199,11 @@ public class UserLiveController extends BaseController {

@PostMapping("/audioList")
@ApiOperation(value = "音频模板列表", notes = "{\"username\",\"string\",\"code\",\"string\"}")
public ResultData audioList(@RequestHeader(value = "token") String token) {
public ResultData audioList(@RequestBody Map<String, String> params) {
String ipaddress = getIpAddr();
logger.debug("[" + ipaddress + "] WxUserGrantController::getAudioList");
if (token==null||token.isEmpty()){
//用户未登录
}
// 已登录


long id = getMemberId();


@@ -221,17 +217,14 @@ public class UserLiveController extends BaseController {

@ApiOperation(value = "资源权限查询", notes = "{\"username\",\"string\",\"code\",\"string\",\"type\",\"int\",\"resource_id\",\"long\"}")
@PostMapping("/author")
public ResultData getAuthor(@RequestBody Map<String, String> params,@RequestHeader(value = "token") String token) {
public ResultData getAuthor(@RequestBody Map<String, String> params) {
String ipaddress = getIpAddr();
logger.debug("[" + ipaddress + "] WxUserGrantController::getAuthor");

if (token==null||token.isEmpty()){
//用户未登录
}
// 已登录

long id = getMemberId();

// String username = params.get("username");
String username = params.get("username");
String code = params.get("code");
Integer type = Integer.parseInt(params.get("type"));
Long resourceId = Long.valueOf(params.get("resource_id"));


+ 4
- 4
suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java Bestand weergeven

@@ -221,10 +221,10 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {

Integer voiceFrom = photoSpeakVideo.getVoiceFrom();
String voiceMaterialUrl = photoSpeakVideo.getVoiceMaterialUrl();
if (photoSpeakVideo.getSubtitleEnabled()==1){
//开启字幕 查询字幕列表
param.setSubtitle_params(photoSpeakVideo.getSubtitleParams());
}
// if (photoSpeakVideo.getSubtitleEnabled()==1){
// //开启字幕 查询字幕列表
// param.setSubtitle_params(photoSpeakVideo.getSubtitleParams());
// }

if (EnumVoiceFrom.FROM_MOULD.getCode().equals(voiceFrom)) {
param.setGen_txt(photoSpeakVideo.getPaperwork().replaceAll(str, "[*]"));


+ 2
- 2
suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java Bestand weergeven

@@ -26,7 +26,7 @@ public class AiPhotoSpeakParam {
private String img;
private Long task_id;
private String callback_url;
private String subtitle_params;
//private String subtitle_params;


public String neglectImgString() {
@@ -40,7 +40,7 @@ public class AiPhotoSpeakParam {
str.append("\"img\":").append("\"").append(img);
str.append("\"task_id\":").append("\"").append(task_id);
str.append("\"callback_url\":").append("\"").append(callback_url).append("\"}");
str.append("\"callback_url\":").append("\"").append(subtitle_params).append("\"}");
// str.append("\"callback_url\":").append("\"").append(subtitle_params).append("\"}");
return str.toString();
}
}

Laden…
Annuleren
Opslaan