Commit fbe4c9cc authored by yanzg's avatar yanzg

Merge remote-tracking branch 'origin/xy' into xy

parents b9d986f5 f7cfe50d
package com.yanzuoguang.media; package com.yanzuoguang.media;
import com.yanzuoguang.util.helper.JsonHelper; import com.yanzuoguang.util.helper.JsonHelper;
import org.springframework.stereotype.Component;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -11,7 +10,7 @@ import java.util.Map; ...@@ -11,7 +10,7 @@ import java.util.Map;
* *
* @author 颜佐光 * @author 颜佐光
*/ */
public class MediaCacheLocal implements MediaCache { public class MediaCacheLocal implements MediaCacheBase {
private Map<String, MapLock> mapLock = new HashMap<String, MapLock>(); private Map<String, MapLock> mapLock = new HashMap<String, MapLock>();
......
...@@ -42,9 +42,6 @@ public class MediaFirst { ...@@ -42,9 +42,6 @@ public class MediaFirst {
} }
public MediaResVo start(MediaReqVo req) { public MediaResVo start(MediaReqVo req) {
if (cache == null) {
throw new CodeException("请通过程序编写视频缓存处理对象");
}
// 将临时文件移动到正式文件 // 将临时文件移动到正式文件
this.getCache().lockTempFile(req, new Runnable() { this.getCache().lockTempFile(req, new Runnable() {
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment