From 4ebe7c447e964e1b3ead12abb1d95b75faf67426 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 27 二月 2021 15:22:46 +0800
Subject: [PATCH] PPTV完善,兼容多个系统的框架搭建

---
 src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java b/src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java
index d23efa9..f6cb833 100644
--- a/src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java
+++ b/src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java
@@ -68,7 +68,7 @@
             tag = "璇勫垎锛�" + score;
         } else if (videoType.getId() == VideoConstant.VIDEO_CATEGORY_DIANSHIJU || videoType.getId() == VideoConstant.VIDEO_CATEGORY_DONGMAN) {
             //鐢佃鍓э紝鍔ㄦ极
-            if (series.getSeriesCount().trim().equalsIgnoreCase(series.getCurrentNum().trim())) {
+            if (series.getCurrentNum() != null && series.getSeriesCount().trim().equalsIgnoreCase(series.getCurrentNum().trim())) {
                 tag = series.getSeriesCount() + "闆嗗叏";
             } else {
                 tag = "鏇存柊鑷�" + series.getCurrentNum() + "闆�";
@@ -148,7 +148,7 @@
     public static String getPPTVCode(String pptvUid) {
         if (StringUtil.isNullOrEmpty(pptvUid))
             return null;
-        return AESUtil.encrypt(pptvUid + "#" + System.currentTimeMillis());
+        return AESUtil.encrypt(pptvUid + "#" + System.currentTimeMillis()).replace("/", "_").replace("=", "-");
     }
 
     public static String getUidFromPPTVUid(String pptvUid) {
@@ -163,6 +163,7 @@
      * @return
      */
     public static PPTVCodeInfo decryptPPTVCode(String code) {
+        code = code.replace("_", "/").replace("-", "=");
         String info = AESUtil.decrypt(code);
         if (StringUtil.isNullOrEmpty(info)) {
             return null;
@@ -188,6 +189,7 @@
     public static String getPlayUrl(PPTVSeries series, PPTVProgram program) {
         //programtype 鐢靛奖-3  鍏朵粬-2
         return String.format("https://acmd.api.pptv.com/2021/bwysdqmovie_thrid_h5.html?cid=%s&vid=%s&programtype=%s", series.getSeriesCode(), program.getProgramCode(), series.getProgramType().contains("鐢靛奖") ? 3 : 2);
+//        return String.format(" http://vip.pptv.com/activity/2021/pg_bwysdqmovie?cid=%s&vid=%s&programtype=%s", series.getSeriesCode(), program.getProgramCode(), series.getProgramType().contains("鐢靛奖") ? 3 : 2);
     }
 
 

--
Gitblit v1.8.0