xhxu 5 лет назад
Родитель
Сommit
cfbcc801b7
2 измененных файлов: 12 добавлений и 2 удалений
  1. +9
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  2. +3
    -1
      mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java

+ 9
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java Просмотреть файл

@@ -289,7 +289,12 @@ public class WxMallServiceImpl implements WxMallService {
wxMall.setTenantId("-1"); wxMall.setTenantId("-1");
this.save(wxMall); this.save(wxMall);
wxMall.setTenantId(wxMall.getId().toString()); wxMall.setTenantId(wxMall.getId().toString());

}else{
WxMall byId = this.getById(wxMall.getId());
if(byId == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"找不到组织");
}
wxMall.updateTenantInfo(byId.getTenantInfo());
} }
this.update(wxMall); this.update(wxMall);


@@ -319,6 +324,9 @@ public class WxMallServiceImpl implements WxMallService {
userInfo.setInvestRule(EnumInvestUserType.ALL.getCode()); userInfo.setInvestRule(EnumInvestUserType.ALL.getCode());
}else{ }else{
MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); MallUserInfo oldUser = userInfoService.getById(userInfo.getId());
if(oldUser == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"找不到管理员");
}
if(!oldUser.getTenantId().equals(userInfo.getTenantId())){ if(!oldUser.getTenantId().equals(userInfo.getTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"tenant_id不匹配"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"tenant_id不匹配");
} }


+ 3
- 1
mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java Просмотреть файл

@@ -45,7 +45,7 @@ public class AliyunVedioServer {
/** /**
* 获取视频上传地址和凭证 * 获取视频上传地址和凭证
* @param client 发送请求客户端
* @param
* @return CreateUploadVideoResponse 获取视频上传地址和凭证响应数据 * @return CreateUploadVideoResponse 获取视频上传地址和凭证响应数据
* @throws Exception * @throws Exception
*/ */
@@ -187,6 +187,8 @@ public class AliyunVedioServer {
try { try {
GetPlayInfoRequest request = new GetPlayInfoRequest(); GetPlayInfoRequest request = new GetPlayInfoRequest();
request.setVideoId(videoId); request.setVideoId(videoId);
request.setAuthTimeout(2592000l);//30天有效
// request.setOutputType("oss");
return client.getAcsResponse(request); return client.getAcsResponse(request);
} catch (Exception e) { } catch (Exception e) {
log.error("getVedioUrl error.",e); log.error("getVedioUrl error.",e);


Загрузка…
Отмена
Сохранить