From b41a6efe17ba61d150c5a9b7309651cebae54e0d Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 03 九月 2021 16:40:43 +0800 Subject: [PATCH] 韩迷TV相关bug修改,电视直播完善(后台+前端API) --- src/main/java/com/yeshi/buwan/controller/TestController.java | 23 +++-------------------- 1 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/yeshi/buwan/controller/TestController.java b/src/main/java/com/yeshi/buwan/controller/TestController.java index 290f213..e95efb2 100644 --- a/src/main/java/com/yeshi/buwan/controller/TestController.java +++ b/src/main/java/com/yeshi/buwan/controller/TestController.java @@ -1,16 +1,11 @@ package com.yeshi.buwan.controller; import com.yeshi.buwan.domain.system.DetailSystem; -import com.yeshi.buwan.domain.vip.OrderRecord; -import com.yeshi.buwan.exception.PPTVException; -import com.yeshi.buwan.exception.vip.VIPException; -import com.yeshi.buwan.funtv.FunTVUtil; +import com.yeshi.buwan.videos.funtv.FunTVUtil; import com.yeshi.buwan.service.imp.DetailSystemConfigService; import com.yeshi.buwan.service.imp.SearchService; import com.yeshi.buwan.service.inter.order.OrderService; import com.yeshi.buwan.service.inter.vip.VIPService; -import com.yeshi.buwan.util.JsonUtilV2; -import net.sf.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -19,7 +14,6 @@ import javax.annotation.Resource; import java.io.PrintWriter; -import java.util.Date; import java.util.Map; @Controller @@ -59,22 +53,11 @@ logger.error("娴嬭瘯"); out.print("success"); } - - @RequestMapping("vipPay") - public void vipPay(String id) { - OrderRecord record = orderService.getOrderRecord(id); - try { - orderService.paySuccess(record.getId(), OrderRecord.PAY_WAY_ALIPAY, record.getMoney(), new Date()); - } catch (VIPException e) { - e.printStackTrace(); - } catch (PPTVException e) { - e.printStackTrace(); - } - } + @RequestMapping("searchAlbum") public void searchAlbum(String key, PrintWriter out) { - SearchService.SearchResult result = searchService.searchAlbum(0, key, 1, 20); + SearchService.SearchResult result = searchService.searchAlbum(0, key, null,1, 20); out.print(JsonUtil.loadTrueResult(result)); } -- Gitblit v1.8.0