| @@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.beans.factory.annotation.Value; | |||||
| import org.springframework.scheduling.annotation.Async; | import org.springframework.scheduling.annotation.Async; | ||||
| import org.springframework.scheduling.annotation.AsyncResult; | import org.springframework.scheduling.annotation.AsyncResult; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| @@ -60,6 +61,13 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { | |||||
| @Autowired | @Autowired | ||||
| String videoType; | String videoType; | ||||
| @Value("${photo.url}") | |||||
| private String url; | |||||
| @Value("${photo.hy_url}") | |||||
| private String hy_url; | |||||
| @Value("${photo.talk}") | |||||
| private String talk_url; | |||||
| @Override | @Override | ||||
| public PageInfo<UserMouldVideo> listAsPage(UserMouldVideo record, Integer pageIndex, Integer pageSize) { | public PageInfo<UserMouldVideo> listAsPage(UserMouldVideo record, Integer pageIndex, Integer pageSize) { | ||||
| @@ -378,7 +386,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { | |||||
| public void uploadVideo(UserMouldVideo mouldVideo){ | public void uploadVideo(UserMouldVideo mouldVideo){ | ||||
| if(EnumVideoStatus.success.getCode().equals(mouldVideo.getVideoStatus()) | if(EnumVideoStatus.success.getCode().equals(mouldVideo.getVideoStatus()) | ||||
| || EnumVideoStatus.upload_fail.getCode().equals(mouldVideo.getVideoStatus())){ | || EnumVideoStatus.upload_fail.getCode().equals(mouldVideo.getVideoStatus())){ | ||||
| String url = mouldVideo.getVideoPathUri() + mouldVideo.getVideoPath(); | |||||
| String url = talk_url + mouldVideo.getVideoPath(); | |||||
| VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoPath(mouldVideo.getTitle(), url); | VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoPath(mouldVideo.getTitle(), url); | ||||
| if(result.isSuccess()){ | if(result.isSuccess()){ | ||||
| UserMouldVideo videoUpd = new UserMouldVideo(); | UserMouldVideo videoUpd = new UserMouldVideo(); | ||||