聚合视频资源包调整，接入韩迷

admin

2021-08-27 8fee151ffae0c3818694b7318583814bf92663e2

 src/main/java/com/yeshi/buwan/controller/parser/UserParser.java

@@ -17,7 +17,7 @@
import com.yeshi.buwan.dto.user.LoginInfoDto;
import com.yeshi.buwan.exception.user.LoginUserException;
import com.yeshi.buwan.exception.user.RegisterUserException;
import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.videos.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
import com.yeshi.buwan.service.inter.system.SystemConfigService;
@@ -34,7 +34,7 @@
import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.util.video.VideoCategoryConstant;
import com.yeshi.buwan.util.video.VideoConstant;
import com.yeshi.buwan.util.video.shortvideo.ShortVideoUtil;
import com.yeshi.buwan.util.video.VideoUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoListResultVO;
import net.sf.json.JSONArray;
@@ -538,11 +538,13 @@
                }
            }


            vt = new VideoType();
            vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
            vt.setName("高清");
            typeList.add(vt);
            //韩剧不返回高清
            if (!acceptData.getDetailSystem().getId().equalsIgnoreCase("48")) {
                vt = new VideoType();
                vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
                vt.setName("高清");
                typeList.add(vt);
            }


            JSONArray array1 = new JSONArray();
@@ -651,14 +653,14 @@
    public void guessLike(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {

        String videoId = request.getParameter("VideoId");
        if (!NumberUtil.isNumeric(videoId)) {
            if (ShortVideoUtil.isShortVideoId(videoId)) {
        int fromtype = VideoUtil.getVideoFromType(videoId);
        switch (fromtype) {
            case HomeVideo.FROM_TYPE_INTERNET:
                guessLikeForInternetSearch(acceptData, videoId, out);
                return;
            case HomeVideo.FROM_TYPE_SHORT:
                guessLikeForShortVideo(acceptData, videoId, out);
                return;
            }

            guessLikeForInternetSearch(acceptData, videoId, out);
            return;
        }

        DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -991,15 +993,14 @@
            return;
        }

        if (!NumberUtil.isNumeric(videoId)) {
            if (ShortVideoUtil.isShortVideoId(videoId)) {
        int fromtype = VideoUtil.getVideoFromType(videoId);
        switch (fromtype) {
            case HomeVideo.FROM_TYPE_INTERNET:
                getRelativeVideosForInternetSearch(acceptData, videoId, out);
                return;
            case HomeVideo.FROM_TYPE_SHORT:
                getRelativeVideosForShortVideo(acceptData, videoId, out);
                return;
            }


            getRelativeVideosForInternetSearch(acceptData, videoId, out);
            return;
        }

        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
@@ -1266,6 +1267,10 @@

        // 注册 --用户名,昵称,密码
        LoginUser user = userService.getLoginUser(loginUid);
        if (user.getState() != null && user.getState() == LoginUser.STATE_UNREGISTER) {
            out.print(JsonUtil.loadFalseJson("账户已注销"));
            return;
        }
        //隐藏user中的email
        user.setEmail(UserInfoVOFactory.getHiddenEmail(user.getEmail()));
        if (user.getPortrait() != null && !user.getPortrait().startsWith("http"))