From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播
---
src/main/java/com/yeshi/buwan/controller/TestController.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 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..8160426 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
@@ -60,21 +54,10 @@
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, false);
out.print(JsonUtil.loadTrueResult(result));
}
--
Gitblit v1.8.0