From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/TestController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/TestController.java b/src/main/java/com/yeshi/buwan/controller/TestController.java
index 14f6870..e71b587 100644
--- a/src/main/java/com/yeshi/buwan/controller/TestController.java
+++ b/src/main/java/com/yeshi/buwan/controller/TestController.java
@@ -1,25 +1,20 @@
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;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.TimeUtil;
import javax.annotation.Resource;
import java.io.PrintWriter;
-import java.util.Date;
import java.util.Map;
@Controller
@@ -59,11 +54,22 @@
logger.error("娴嬭瘯");
out.print("success");
}
-
+
+
+ @RequestMapping("getTime")
+ public void getTime(PrintWriter out) {
+
+ long time = System.currentTimeMillis();
+
+ String str = TimeUtil.getGernalTime(time, "yyyyMMdd HH:mm:ss");
+
+ out.print(String.format("time: %s format:%s", time + "", str));
+ }
+
@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