From f06a592dd1a7e995bf313ccb5efe7dff73ccfc4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 四月 2023 18:25:52 +0800
Subject: [PATCH] 增加本地获取IP归属地/广告优化
---
src/main/java/com/yeshi/buwan/util/SpringContext.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/util/SpringContext.java b/src/main/java/com/yeshi/buwan/util/SpringContext.java
index 5446fad..2d0f49f 100644
--- a/src/main/java/com/yeshi/buwan/util/SpringContext.java
+++ b/src/main/java/com/yeshi/buwan/util/SpringContext.java
@@ -7,12 +7,12 @@
import com.yeshi.buwan.domain.VideoResource;
import com.yeshi.buwan.domain.video.InternetSearchVideo;
import com.yeshi.buwan.dto.mq.*;
-import com.yeshi.buwan.funtv.entity.FunTVAlbum2;
-import com.yeshi.buwan.iqiyi.IqiYiNewAPI;
-import com.yeshi.buwan.iqiyi.entity.IqiyiAlbum2;
-import com.yeshi.buwan.iqiyi.entity.VideoIqiyi2;
-import com.yeshi.buwan.iqiyi.util.IqiyiUtil2;
-import com.yeshi.buwan.pptv.entity.PPTVSeries;
+import com.yeshi.buwan.videos.funtv.entity.FunTVAlbum2;
+import com.yeshi.buwan.videos.iqiyi.IqiYiNewAPI;
+import com.yeshi.buwan.videos.iqiyi.entity.IqiyiAlbum2;
+import com.yeshi.buwan.videos.iqiyi.entity.VideoIqiyi2;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil2;
+import com.yeshi.buwan.videos.pptv.entity.PPTVSeries;
import com.yeshi.buwan.service.imp.JobThreadExecutorServiceImpl;
import com.yeshi.buwan.service.imp.ResourceVideoService;
import com.yeshi.buwan.service.imp.VideoInfoService;
@@ -20,8 +20,8 @@
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
import com.yeshi.buwan.service.inter.juhe.Iqiyi2Service;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
-import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
-import com.yeshi.buwan.service.manager.SolrInternetSearchVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrAlbumVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrInternetSearchVideoDataManager;
import com.yeshi.buwan.util.mq.CMQManager;
import io.seata.rm.datasource.DataSourceProxy;
import org.slf4j.Logger;
@@ -53,6 +53,9 @@
private Iqiyi2Service iqiyi2Service;
@Resource
+ private IqiyiUtil2 iqiyiUtil2;
+
+ @Resource
private FunTV2Service funTV2Service;
@Resource
@@ -60,6 +63,7 @@
@Resource
private PPTVService pptvService;
+
private static boolean isInited = false;
@@ -88,7 +92,7 @@
private void init() {
logger.error("鍒濆鍖�");
- if (!Constant.JobTasker) {
+// if (!Constant.JobTasker) {
doSolrJob();
doAddIqiyi2Video();
doAddFunTV2Video();
@@ -97,7 +101,8 @@
doUpdateVideoExtraInfo();
doInternetSearchVideoUpdateJob();
doUpdateResourceVideoJob();
- }
+// }
+// doUpdateResourceVideoJob();
}
private void doSolrJob() {
@@ -178,7 +183,9 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
+ System.out.println("娑堣垂缁撴潫锛歞oUpdateResourceVideoJob");
List<UpdateResourceVideoMQMsg> msgList = CMQManager.getInstance().consumeUpdateResourceVideoMsg(16);
+ System.out.println("娑堣垂缁撴潫锛歞oUpdateResourceVideoJob");
if (msgList != null)
for (UpdateResourceVideoMQMsg videoMQMsg : msgList) {
try {
@@ -186,6 +193,8 @@
String key = "resourcevideo-update-" + StringUtil.Md5(videoMQMsg.getResourceId() + "#" + videoMQMsg.getId());
//鍙互鏇存柊
if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+ //12灏忔椂鍐呬笉鍐嶆洿鏂�
+ redisManager.cacheCommonString(key, "1", 60 * 60 * 12);
switch (videoMQMsg.getResourceId()) {
case IqiyiUtil2
.RESOURCE_ID:
@@ -197,13 +206,15 @@
//涓嬫灦
resourceVideoService.delete(videoIqiyi2.getVideoId() + "", videoMQMsg.getResourceId() + "");
}
+ //鍒犻櫎鐖卞鑹鸿祫婧�
+ iqiyi2Service.offlineIqiyiAlbum(Long.parseLong(videoMQMsg.getId()));
+ } else {
+ //淇濆瓨
+ iqiyiUtil2.syncByAid(iqiyiAlbum2.getId(), false);
}
- //鍒犻櫎鐖卞鑹鸿祫婧�
- iqiyi2Service.offlineIqiyiAlbum(Long.parseLong(videoMQMsg.getId()));
break;
}
- //12灏忔椂鍐呬笉鍐嶆洿鏂�
- redisManager.cacheCommonString(key, "1", 60 * 60 * 12);
+
}
}
} catch (Exception e) {
--
Gitblit v1.8.0