Commit f09aa192 by 涂亚平

contentVod别名

1 parent 7f91af80
...@@ -132,15 +132,25 @@ public class RenSheJuJob { ...@@ -132,15 +132,25 @@ public class RenSheJuJob {
if ("prod".equals(env)) { if ("prod".equals(env)) {
renSheJuService.uploadClassCode(); renSheJuService.uploadClassCode();
} }
System.gc();
} }
/** // /**
* POST-9 获取推送失败班级列表 // * POST-9 获取推送失败班级列表
*/ // */
@Scheduled(cron = "0 35 1 * * ?") // @Scheduled(cron = "0 35 1 * * ?")
public void getErrorClass()throws IOException{ // public void getErrorClass()throws IOException{
renSheJuService.getErrorClass(); // renSheJuService.getErrorClass();
} // }
// /**
// * 定时gc
// */
// @Scheduled(cron = "0 10 16 * * ?")
// public void gc(){
// Runtime.getRuntime().gc();
// }
/** /**
* 强制用户用户下线(websocket强制下线) * 强制用户用户下线(websocket强制下线)
......
...@@ -677,14 +677,14 @@ public class RenSheJuServiceImpl implements RenSheJuService { ...@@ -677,14 +677,14 @@ public class RenSheJuServiceImpl implements RenSheJuService {
if (null != rensheResponseVO.getCtt()){ if (null != rensheResponseVO.getCtt()){
renshejuHistoryDO.setOutputParam(rensheResponseVO.getCtt().toString()); renshejuHistoryDO.setOutputParam(rensheResponseVO.getCtt().toString());
}else { }else {
response.body().toString(); renshejuHistoryDO.setOutputParam(response.body().toString());
} }
} else { } else {
renshejuHistoryDO.setOutputParam(RenSheJuConstant.API_ERROR); renshejuHistoryDO.setOutputParam(RenSheJuConstant.API_ERROR);
} }
renshejuHistoryMapper.insert(renshejuHistoryDO); renshejuHistoryMapper.insert(renshejuHistoryDO);
return rensheResponseVO; return rensheResponseVO;
// return null; // return null;
} catch (Exception e) { } catch (Exception e) {
RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO(); RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO();
renshejuHistoryDO.setInterfaceName(RenSheJuConstant.POST_8); renshejuHistoryDO.setInterfaceName(RenSheJuConstant.POST_8);
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
SELECT SELECT
t.id, t.id,
t.vod_url, t.vod_url,
cvm.vod_alias_name, ifnull(cvm.vod_alias_name,t.vod_name) as vod_alias_name,
t.vod_type, t.vod_type,
t.vod_length, t.vod_length,
cvm.order_no as or1, cvm.order_no as or1,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!