From 919dd9e9891a5a00798b90016c8491300d1cd00b Mon Sep 17 00:00:00 2001 From: twy <2301620162@qq.com> Date: Fri, 21 Jul 2023 16:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9-=E5=AD=97=E5=B9=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserLiveController.java | 23 +++++++------------ .../sm/impl/PhotoSpeakVideoServiceImpl.java | 8 +++---- .../com/iformall/sm/AiPhotoSpeakParam.java | 4 ++-- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java b/suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java index 0b93f08..7e56887 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java @@ -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 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 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 params,@RequestHeader(value = "token") String token) { + public ResultData getAuthor(@RequestBody Map 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")); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java index 73a4669..928d58a 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java @@ -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, "[*]")); diff --git a/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java b/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java index 10fea2d..5734ac5 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java +++ b/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java @@ -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(); } }