mirror of
https://github.com/LamGC/ContentGrabbingJi.git
synced 2025-07-02 05:17:26 +00:00
Compare commits
29 Commits
v2.5.0-202
...
v2.5.1
Author | SHA1 | Date | |
---|---|---|---|
6bace4b048 | |||
597aac4e95 | |||
181d60285b | |||
c06b8717c3 | |||
b4a28b6735 | |||
40057c3683 | |||
4beb4d78fb | |||
d9edaa681f | |||
7b52abde60 | |||
2cb4fe1dbc | |||
5830327dad | |||
cbd10ff281 | |||
84b8006f89 | |||
d32d891ad7 | |||
aabd35ce71 | |||
a36eb713d7 | |||
f452c1c128 | |||
cb42aadb15 | |||
b969bb29b2 | |||
0d74007a98 | |||
edade24883 | |||
34f57404ca | |||
99b6e14ff7 | |||
c8fe2c3fdd | |||
49a33d4078 | |||
cd1d2316ee | |||
cf08353ed9 | |||
bef6a684b9 | |||
04960889b4 |
6
pom.xml
6
pom.xml
@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>net.lamgc</groupId>
|
||||
<artifactId>ContentGrabbingJi</artifactId>
|
||||
<version>2.5.0-20200504.01-SNAPSHOT</version>
|
||||
<version>2.5.1</version>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
@ -86,7 +86,7 @@
|
||||
<dependency>
|
||||
<groupId>net.lamgc</groupId>
|
||||
<artifactId>java-utils</artifactId>
|
||||
<version>1.1.0_5-SNAPSHOT</version>
|
||||
<version>1.2.0_20200505.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@ -172,7 +172,7 @@
|
||||
<dependency>
|
||||
<groupId>net.lamgc</groupId>
|
||||
<artifactId>PixivLoginProxyServer</artifactId>
|
||||
<version>1.1.0</version>
|
||||
<version>1.1.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.squareup</groupId>
|
||||
|
@ -42,7 +42,7 @@ import java.util.zip.ZipOutputStream;
|
||||
@SpringBootApplication
|
||||
public class Main {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger("Main");
|
||||
private final static Logger log = LoggerFactory.getLogger(Main.class.getName());
|
||||
|
||||
private final static File storeDir = new File("store/");
|
||||
|
||||
|
@ -20,9 +20,7 @@ import java.util.*;
|
||||
|
||||
public class BotAdminCommandProcess {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class.getSimpleName());
|
||||
|
||||
private final static File globalPropFile = new File(System.getProperty("cgj.botDataDir"), "global.properties");
|
||||
private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class.getName());
|
||||
|
||||
private final static File pushListFile = new File(System.getProperty("cgj.botDataDir"), "pushList.json");
|
||||
|
||||
@ -39,59 +37,47 @@ public class BotAdminCommandProcess {
|
||||
}
|
||||
|
||||
@Command
|
||||
public static String setGlobalProperty(@Argument(name = "key") String key, @Argument(name = "value") String value, @Argument(name = "save", force = false) boolean saveNow) {
|
||||
String lastValue = BotCommandProcess.globalProp.getProperty(key);
|
||||
BotCommandProcess.globalProp.setProperty(key, Strings.nullToEmpty(value));
|
||||
if(saveNow) {
|
||||
saveGlobalProperties();
|
||||
public static String setProperty(
|
||||
@Argument(name = "group", force = false) long groupId,
|
||||
@Argument(name = "key") String key,
|
||||
@Argument(name = "value") String value
|
||||
) {
|
||||
if(Strings.isNullOrEmpty(key)) {
|
||||
return "未选择配置项key.";
|
||||
}
|
||||
return "全局配置项 " + key + " 现已设置为: " + value + " (设置前的值: " + lastValue + ")";
|
||||
String lastValue = SettingProperties.setProperty(groupId, key, value.equals("null") ? null : value);
|
||||
return (groupId <= 0 ? "已更改全局配置 " : "已更改群组 " + groupId + " 配置 ") +
|
||||
key + " 的值: '" + value + "' (原配置值: '" + lastValue + "')";
|
||||
}
|
||||
|
||||
@Command
|
||||
public static String getGlobalProperty(@Argument(name = "key") String key) {
|
||||
return "全局配置项 " + key + " 当前值: " + BotCommandProcess.globalProp.getProperty(key, "(Empty)");
|
||||
public static String getProperty(
|
||||
@Argument(name = "group", force = false) long groupId,
|
||||
@Argument(name = "key") String key
|
||||
) {
|
||||
if(Strings.isNullOrEmpty(key)) {
|
||||
return "未选择配置项key.";
|
||||
}
|
||||
return (groupId <= 0 ? "全局配置 " : "群组 " + groupId + " 配置 ") +
|
||||
key + " 设定值: '" + SettingProperties.getProperty(groupId, key, "(empty)") + "'";
|
||||
}
|
||||
|
||||
@Command
|
||||
public static String saveGlobalProperties() {
|
||||
log.info("正在保存全局配置文件...");
|
||||
|
||||
try {
|
||||
if(!globalPropFile.exists()) {
|
||||
if(!globalPropFile.createNewFile()) {
|
||||
log.error("全局配置项文件保存失败!({})", "文件创建失败");
|
||||
return "全局配置项文件保存失败!";
|
||||
}
|
||||
}
|
||||
BotCommandProcess.globalProp.store(new FileOutputStream(globalPropFile), "");
|
||||
log.info("全局配置文件保存成功!");
|
||||
return "保存全局配置文件 - 操作已完成.";
|
||||
} catch (IOException e) {
|
||||
log.error("全局配置项文件保存失败!", e);
|
||||
return "全局配置项文件保存失败!";
|
||||
}
|
||||
public static String saveProperties() {
|
||||
log.info("正在保存配置文件...");
|
||||
SettingProperties.saveProperties();
|
||||
log.info("配置文件保存操作已完成.");
|
||||
return "保存配置 - 操作已完成.";
|
||||
}
|
||||
|
||||
@Command
|
||||
public static String loadGlobalProperties(@Argument(name = "reload", force = false) boolean reload) {
|
||||
Properties cache = new Properties();
|
||||
if(!globalPropFile.exists()) {
|
||||
return "未找到全局配置文件, 无法重载";
|
||||
}
|
||||
|
||||
try(Reader reader = new BufferedReader(new FileReader(globalPropFile))) {
|
||||
cache.load(reader);
|
||||
} catch (IOException e) {
|
||||
log.error("重载全局配置文件时发生异常", e);
|
||||
return "加载全局配置文件时发生错误!";
|
||||
}
|
||||
|
||||
public static String loadProperties(@Argument(name = "reload", force = false) boolean reload) {
|
||||
if(reload) {
|
||||
BotCommandProcess.globalProp.clear();
|
||||
SettingProperties.clearProperties();
|
||||
}
|
||||
BotCommandProcess.globalProp.putAll(cache);
|
||||
return "全局配置文件重载完成.";
|
||||
|
||||
SettingProperties.loadProperties();
|
||||
return "操作已完成.";
|
||||
}
|
||||
|
||||
@Command
|
||||
@ -125,6 +111,30 @@ public class BotAdminCommandProcess {
|
||||
@Argument(name = "type", force = false, defaultValue = "ILLUST") String rankingContentType,
|
||||
@Argument(name = "original", force = false, defaultValue = "false") boolean original
|
||||
) {
|
||||
if(minTime <= 0 || floatTime <= 0) {
|
||||
return "时间不能为0或负数!";
|
||||
} else if(rankingStart <= 0 || rankingStop - rankingStart <= 0) {
|
||||
return "排行榜范围选取错误!";
|
||||
}
|
||||
|
||||
PixivURL.RankingContentType type;
|
||||
PixivURL.RankingMode mode;
|
||||
try {
|
||||
type = PixivURL.RankingContentType.valueOf("TYPE_" + rankingContentType.toUpperCase());
|
||||
} catch(IllegalArgumentException e) {
|
||||
return "无效的排行榜类型参数!";
|
||||
}
|
||||
|
||||
try {
|
||||
mode = PixivURL.RankingMode.valueOf("MODE_" + rankingMode.toUpperCase());
|
||||
} catch(IllegalArgumentException e) {
|
||||
return "无效的排行榜模式参数!";
|
||||
}
|
||||
|
||||
if(!type.isSupportedMode(mode)) {
|
||||
return "不兼容的排行榜模式与类型!";
|
||||
}
|
||||
|
||||
long group = groupId <= 0 ? fromGroup : groupId;
|
||||
JsonObject setting = new JsonObject();
|
||||
setting.addProperty(RANKING_SETTING_TIME_MIN, minTime);
|
||||
@ -141,7 +151,8 @@ public class BotAdminCommandProcess {
|
||||
removePushGroup(fromGroup, groupId);
|
||||
}
|
||||
|
||||
log.info("正在增加Timer...(Setting: {})", setting);
|
||||
log.info("群组 {} 新推送配置: {}", group, setting);
|
||||
log.info("正在增加Timer...");
|
||||
pushInfoMap.put(group, setting);
|
||||
addPushTimer(group, setting);
|
||||
return "已在 " + group + " 开启定时推送功能。";
|
||||
|
@ -2,7 +2,6 @@ package net.lamgc.cgj.bot;
|
||||
|
||||
import com.google.common.base.Strings;
|
||||
import com.google.common.base.Throwables;
|
||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
import com.google.gson.*;
|
||||
import io.netty.handler.codec.http.HttpHeaderNames;
|
||||
import net.lamgc.cgj.Main;
|
||||
@ -15,7 +14,6 @@ import net.lamgc.cgj.pixiv.PixivURL;
|
||||
import net.lamgc.cgj.util.URLs;
|
||||
import net.lamgc.utils.base.runner.Argument;
|
||||
import net.lamgc.utils.base.runner.Command;
|
||||
import net.lamgc.utils.event.EventExecutor;
|
||||
import net.lz1998.cq.utils.CQCode;
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.apache.http.client.methods.HttpGet;
|
||||
@ -25,14 +23,10 @@ import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
@SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter", "SameParameterValue"})
|
||||
@ -40,61 +34,60 @@ public class BotCommandProcess {
|
||||
|
||||
private final static PixivDownload pixivDownload = new PixivDownload(Main.cookieStore, Main.proxy);
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class.getSimpleName());
|
||||
private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class.getName());
|
||||
|
||||
private final static File imageStoreDir = new File(System.getProperty("cgj.botDataDir"), "data/image/cgj/");
|
||||
public final static Properties globalProp = new Properties();
|
||||
private final static Gson gson = new GsonBuilder()
|
||||
.serializeNulls()
|
||||
.create();
|
||||
|
||||
/* -------------------- 缓存 -------------------- */
|
||||
|
||||
private final static Hashtable<String, File> imageCache = new Hashtable<>();
|
||||
private final static CacheStore<JsonElement> illustInfoCache = new JsonRedisCacheStore(BotEventHandler.redisServer, "illustInfo", gson);
|
||||
private final static CacheStore<JsonElement> illustPreLoadDataCache = new HotDataCacheStore<>(
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "illustPreLoadData", gson),
|
||||
new LocalHashCacheStore<>(), 3600000, 900000);
|
||||
private final static CacheStore<JsonElement> searchBodyCache = new JsonRedisCacheStore(BotEventHandler.redisServer, "searchBody", gson);
|
||||
private final static CacheStore<List<JsonObject>> rankingCache = new JsonObjectRedisListCacheStore(BotEventHandler.redisServer, "ranking", gson);
|
||||
private final static CacheStore<List<String>> pagesCache = new StringListRedisCacheStore(BotEventHandler.redisServer, "imagePages");
|
||||
public final static CacheStore<JsonElement> reportStore = new JsonRedisCacheStore(BotEventHandler.redisServer, "report", gson);
|
||||
|
||||
/**
|
||||
* 图片异步缓存执行器
|
||||
* 作品信息缓存 - 不过期
|
||||
*/
|
||||
private final static EventExecutor imageCacheExecutor = new EventExecutor(new ThreadPoolExecutor(
|
||||
Runtime.getRuntime().availableProcessors() >= 2 ? 2 : 1,
|
||||
(int) Math.ceil(Runtime.getRuntime().availableProcessors() / 2F),
|
||||
5L, TimeUnit.SECONDS,
|
||||
new LinkedBlockingQueue<>(128),
|
||||
new ThreadFactoryBuilder()
|
||||
.setNameFormat("imageCacheThread-%d")
|
||||
.build(),
|
||||
new ThreadPoolExecutor.DiscardOldestPolicy()
|
||||
));
|
||||
private final static CacheStore<JsonElement> illustInfoCache =
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "illustInfo", gson);
|
||||
|
||||
/**
|
||||
* 作品信息预加载数据 - 有效期 2 小时, 本地缓存有效期1 ± 0.25
|
||||
*/
|
||||
private final static CacheStore<JsonElement> illustPreLoadDataCache =
|
||||
CacheStoreUtils.hashLocalHotDataStore(
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "illustPreLoadData", gson),
|
||||
3600000, 900000);
|
||||
/**
|
||||
* 搜索内容缓存, 有效期 2 小时
|
||||
*/
|
||||
private final static CacheStore<JsonElement> searchBodyCache =
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "searchBody", gson);
|
||||
|
||||
/**
|
||||
* 排行榜缓存, 不过期
|
||||
*/
|
||||
private final static CacheStore<List<JsonObject>> rankingCache =
|
||||
new JsonObjectRedisListCacheStore(BotEventHandler.redisServer, "ranking", gson);
|
||||
|
||||
/**
|
||||
* 作品页面下载链接缓存 - 不过期
|
||||
*/
|
||||
private final static CacheStore<List<String>> pagesCache =
|
||||
new StringListRedisCacheStore(BotEventHandler.redisServer, "imagePages");
|
||||
|
||||
/**
|
||||
* 作品报告存储 - 不过期
|
||||
*/
|
||||
public final static CacheStore<JsonElement> reportStore =
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "report", gson);
|
||||
|
||||
private final static RankingUpdateTimer updateTimer = new RankingUpdateTimer();
|
||||
|
||||
public static void initialize() {
|
||||
log.info("正在初始化...");
|
||||
|
||||
File globalPropFile = new File(System.getProperty("cgj.botDataDir"), "global.properties");
|
||||
if(globalPropFile.exists() && globalPropFile.isFile()) {
|
||||
log.info("正在加载全局配置文件...");
|
||||
try {
|
||||
globalProp.load(new FileInputStream(globalPropFile));
|
||||
log.info("全局配置文件加载完成.");
|
||||
} catch (IOException e) {
|
||||
log.error("加载全局配置文件时发生异常", e);
|
||||
}
|
||||
} else {
|
||||
log.info("未找到全局配置文件,跳过加载.");
|
||||
}
|
||||
|
||||
try {
|
||||
imageCacheExecutor.addHandler(new ImageCacheHandler());
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
SettingProperties.loadProperties();
|
||||
|
||||
updateTimer.schedule(null);
|
||||
log.info("初始化完成.");
|
||||
@ -142,30 +135,38 @@ public class BotCommandProcess {
|
||||
return helpStrBuilder.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 作品信息查询
|
||||
* @param fromGroup 来源群(系统提供)
|
||||
* @param illustId 作品Id
|
||||
* @return 返回作品信息
|
||||
*/
|
||||
@Command(commandName = "info")
|
||||
public static String artworkInfo(@Argument(name = "id") int illustId) {
|
||||
public static String artworkInfo(@Argument(name = "$fromGroup") long fromGroup, @Argument(name = "id") int illustId) {
|
||||
if(illustId <= 0) {
|
||||
return "错误的作品id!";
|
||||
}
|
||||
|
||||
try {
|
||||
if(isNoSafe(illustId, globalProp, false) || isReported(illustId)) {
|
||||
if(isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false) || isReported(illustId)) {
|
||||
return "阅览禁止:该作品已被封印!!";
|
||||
}
|
||||
|
||||
JsonObject illustPreLoadData = getIllustPreLoadData(illustId, false);
|
||||
StringBuilder builder = new StringBuilder("---------------- 作品信息 ----------------\n");
|
||||
builder.append("作品Id: ").append(illustId).append("\n");
|
||||
builder.append("作品标题:").append(illustPreLoadData.get("illustTitle").getAsString()).append("\n");
|
||||
builder.append("作者(作者Id):").append(illustPreLoadData.get("userName").getAsString())
|
||||
.append("(").append(illustPreLoadData.get("userId").getAsInt()).append(")\n");
|
||||
builder.append("点赞数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt()).append("\n");
|
||||
builder.append("收藏数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt()).append("\n");
|
||||
builder.append("围观数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt()).append("\n");
|
||||
builder.append("评论数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt()).append("\n");
|
||||
builder.append("页数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.PAGE.attrName).getAsInt()).append("页\n");
|
||||
StringBuilder builder = new StringBuilder("色图姬帮你了解了这个作品的信息!\n");
|
||||
builder.append("---------------- 作品信息 ----------------");
|
||||
builder.append("\n作品Id: ").append(illustId);
|
||||
builder.append("\n作品标题:").append(illustPreLoadData.get("illustTitle").getAsString());
|
||||
builder.append("\n作者(作者Id):").append(illustPreLoadData.get("userName").getAsString())
|
||||
.append("(").append(illustPreLoadData.get("userId").getAsInt()).append(")");
|
||||
builder.append("\n点赞数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt());
|
||||
builder.append("\n收藏数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt());
|
||||
builder.append("\n围观数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt());
|
||||
builder.append("\n评论数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt());
|
||||
builder.append("\n页数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.PAGE.attrName).getAsInt()).append("页");
|
||||
builder.append("\n作品链接:").append(artworksLink(fromGroup, illustId)).append("\n");
|
||||
builder.append("---------------- 作品图片 ----------------\n");
|
||||
builder.append(getImageById(illustId, PixivDownload.PageQuality.REGULAR, 1)).append("\n");
|
||||
builder.append(getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1)).append("\n");
|
||||
builder.append("使用 \".cgj image -id ")
|
||||
.append(illustId)
|
||||
.append("\" 获取原图。\n如有不当作品,可使用\".cgj report -id ")
|
||||
@ -177,9 +178,20 @@ public class BotCommandProcess {
|
||||
return "尚未支持";
|
||||
}
|
||||
|
||||
/**
|
||||
* 排行榜命令
|
||||
* @param fromGroup 来源群(系统提供)
|
||||
* @param queryTime 查询时间, 格式: 年-月-日
|
||||
* @param force 是否强制查询, 当主动提供的时间不在查询范围时, 是否强制查询, 仅系统可用
|
||||
* @param contentMode 内容模式
|
||||
* @param contentType 排行榜类型
|
||||
* @return 返回排行榜信息
|
||||
*/
|
||||
@Command
|
||||
public static String ranking(
|
||||
@Argument(name = "$fromGroup") long fromGroup,
|
||||
@Argument(force = false, name = "date") Date queryTime,
|
||||
@Argument(force = false, name = "force") boolean force,
|
||||
@Argument(force = false, name = "mode", defaultValue = "DAILY") String contentMode,
|
||||
@Argument(force = false, name = "type", defaultValue = "ILLUST") String contentType
|
||||
) {
|
||||
@ -196,7 +208,7 @@ public class BotCommandProcess {
|
||||
}
|
||||
queryDate = gregorianCalendar.getTime();
|
||||
} else {
|
||||
if(new Date().before(queryDate)) {
|
||||
if(new Date().before(queryDate) && !force) {
|
||||
log.warn("查询的日期过早, 无法查询排行榜.");
|
||||
return "查询日期过早, 暂未更新指定日期的排行榜!";
|
||||
}
|
||||
@ -230,9 +242,10 @@ public class BotCommandProcess {
|
||||
try {
|
||||
int index = 0;
|
||||
int itemLimit = 10;
|
||||
String itemLimitPropertyKey = "ranking.ItemCountLimit";
|
||||
String itemLimitPropertyKey = "ranking.itemCountLimit";
|
||||
try {
|
||||
itemLimit = Integer.parseInt(globalProp.getProperty(itemLimitPropertyKey, "10"));
|
||||
itemLimit = Integer.parseInt(SettingProperties
|
||||
.getProperty(fromGroup, itemLimitPropertyKey, "10"));
|
||||
} catch(NumberFormatException e) {
|
||||
log.warn("配置项 {} 的参数值格式有误!", itemLimitPropertyKey);
|
||||
}
|
||||
@ -240,7 +253,8 @@ public class BotCommandProcess {
|
||||
int imageLimit = 3;
|
||||
String imageLimitPropertyKey = "ranking.imageCountLimit";
|
||||
try {
|
||||
imageLimit = Integer.parseInt(globalProp.getProperty(imageLimitPropertyKey, "3"));
|
||||
imageLimit = Integer.parseInt(
|
||||
SettingProperties.getProperty(fromGroup, imageLimitPropertyKey, "3"));
|
||||
} catch(NumberFormatException e) {
|
||||
log.warn("配置项 {} 的参数值格式有误!", imageLimitPropertyKey);
|
||||
}
|
||||
@ -261,7 +275,7 @@ public class BotCommandProcess {
|
||||
resultBuilder.append(rank).append(". (id: ").append(illustId).append(") ").append(title)
|
||||
.append("(Author: ").append(authorName).append(",").append(authorId).append(") ").append(pagesCount).append("p.\n");
|
||||
if (index <= imageLimit) {
|
||||
resultBuilder.append(getImageById(illustId, PixivDownload.PageQuality.REGULAR, 1)).append("\n");
|
||||
resultBuilder.append(getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1)).append("\n");
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
@ -271,6 +285,10 @@ public class BotCommandProcess {
|
||||
return resultBuilder.append("如查询当前时间获取到昨天时间,则今日排名榜未更新。\n如有不当作品,可使用\".cgj report -id 作品id\"向色图姬反馈。").toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询指定作者的作品(尚未完成)
|
||||
* @return 返回作者信息和部分作品
|
||||
*/
|
||||
@Command(commandName = "userArt")
|
||||
public static String userArtworks() {
|
||||
|
||||
@ -279,6 +297,7 @@ public class BotCommandProcess {
|
||||
|
||||
/**
|
||||
* 搜索命令
|
||||
* @param fromGroup 来源群(系统提供)
|
||||
* @param content 搜索内容
|
||||
* @param type 搜索类型
|
||||
* @param area 搜索区域
|
||||
@ -290,13 +309,15 @@ public class BotCommandProcess {
|
||||
* @throws IOException 当搜索发生异常时抛出
|
||||
*/
|
||||
@Command
|
||||
public static String search(@Argument(name = "content") String content,
|
||||
@Argument(name = "type", force = false) String type,
|
||||
@Argument(name = "area", force = false) String area,
|
||||
@Argument(name = "in", force = false) String includeKeywords,
|
||||
@Argument(name = "ex", force = false) String excludeKeywords,
|
||||
@Argument(name = "contentOption", force = false) String contentOption,
|
||||
@Argument(name = "page", force = false, defaultValue = "1") int pagesIndex
|
||||
public static String search(
|
||||
@Argument(name = "$fromGroup") long fromGroup,
|
||||
@Argument(name = "content") String content,
|
||||
@Argument(name = "type", force = false) String type,
|
||||
@Argument(name = "area", force = false) String area,
|
||||
@Argument(name = "in", force = false) String includeKeywords,
|
||||
@Argument(name = "ex", force = false) String excludeKeywords,
|
||||
@Argument(name = "contentOption", force = false) String contentOption,
|
||||
@Argument(name = "page", force = false, defaultValue = "1") int pagesIndex
|
||||
) throws IOException {
|
||||
log.info("正在执行搜索...");
|
||||
PixivSearchBuilder searchBuilder = new PixivSearchBuilder(Strings.isNullOrEmpty(content) ? "" : content);
|
||||
@ -360,7 +381,8 @@ public class BotCommandProcess {
|
||||
}
|
||||
|
||||
long expire = 7200 * 1000;
|
||||
String propValue = globalProp.getProperty("cache.searchBody.expire", "7200000");
|
||||
String propValue = SettingProperties
|
||||
.getProperty(SettingProperties.GLOBAL, "cache.searchBody.expire", "7200000");
|
||||
try {
|
||||
expire = Long.parseLong(propValue);
|
||||
} catch (Exception e) {
|
||||
@ -385,7 +407,8 @@ public class BotCommandProcess {
|
||||
log.debug("正在处理信息...");
|
||||
int limit = 8;
|
||||
try {
|
||||
limit = Integer.parseInt(globalProp.getProperty("search.ItemCountLimit", "8"));
|
||||
limit = Integer.parseInt(SettingProperties.
|
||||
getProperty(fromGroup, "search.itemCountLimit", "8"));
|
||||
} catch (Exception e) {
|
||||
log.warn("参数转换异常!将使用默认值(" + limit + ")", e);
|
||||
}
|
||||
@ -414,7 +437,7 @@ public class BotCommandProcess {
|
||||
StringBuilder builder = new StringBuilder("[");
|
||||
illustObj.get("tags").getAsJsonArray().forEach(el -> builder.append(el.getAsString()).append(", "));
|
||||
builder.replace(builder.length() - 2, builder.length(), "]");
|
||||
log.debug("{} ({} / {})\n\t作品id: {}, \n\t作者名(作者id): {} ({}), \n\t作品标题: {}, \n\t作品Tags: {}, \n\t页数: {}, \n\t作品链接: {}",
|
||||
log.debug("{} ({} / {})\n\t作品id: {}, \n\t作者名(作者id): {} ({}), \n\t作品标题: {}, \n\t作品Tags: {}, \n\t页数: {}页, \n\t作品链接: {}",
|
||||
searchArea.name(),
|
||||
count,
|
||||
illustsList.size(),
|
||||
@ -429,8 +452,8 @@ public class BotCommandProcess {
|
||||
|
||||
//pageCount
|
||||
|
||||
String imageMsg = getImageById(illustId, PixivDownload.PageQuality.REGULAR, 1);
|
||||
if (isNoSafe(illustId, globalProp, true)) {
|
||||
String imageMsg = getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1);
|
||||
if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), true)) {
|
||||
log.warn("作品Id {} 为R-18作品, 跳过.", illustId);
|
||||
continue;
|
||||
} else if(isReported(illustId)) {
|
||||
@ -438,10 +461,20 @@ public class BotCommandProcess {
|
||||
continue;
|
||||
}
|
||||
|
||||
result.append(searchArea.name()).append(" (").append(count).append(" / ").append(limit).append(")\n\t作品id: ").append(illustId)
|
||||
JsonObject illustPreLoadData = getIllustPreLoadData(illustId, false);
|
||||
result.append(searchArea.name()).append(" (").append(count).append(" / ")
|
||||
.append(limit).append(")\n\t作品id: ").append(illustId)
|
||||
.append(", \n\t作者名: ").append(illustObj.get("userName").getAsString())
|
||||
.append("\n\t作品标题: ").append(illustObj.get("illustTitle").getAsString())
|
||||
.append("\n\t作品页数: ").append(illustObj.get("pageCount").getAsInt())
|
||||
.append("\n\t作品页数: ").append(illustObj.get("pageCount").getAsInt()).append("页")
|
||||
.append("\n\t点赞数:")
|
||||
.append(illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt())
|
||||
.append("\n\t收藏数:")
|
||||
.append(illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt())
|
||||
.append("\n\t围观数:")
|
||||
.append(illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt())
|
||||
.append("\n\t评论数:")
|
||||
.append(illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt())
|
||||
.append("\n").append(imageMsg).append("\n");
|
||||
count++;
|
||||
}
|
||||
@ -452,9 +485,22 @@ public class BotCommandProcess {
|
||||
return Strings.nullToEmpty(result.toString()) + "预览图片并非原图,使用“.cgj image -id 作品id”获取原图\n如有不当作品,可使用\".cgj report -id 作品id\"向色图姬反馈。";
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取作品页面的下载链接
|
||||
* @param illustId 作品Id
|
||||
* @param quality 画质类型
|
||||
* @return 返回作品所有页面在Pixiv的下载链接(有防盗链, 考虑要不要设置镜像站)
|
||||
*/
|
||||
@Command(commandName = "pages")
|
||||
public static String getPagesList(@Argument(name = "id") int illustId, @Argument(name = "quality", force = false) PixivDownload.PageQuality quality) {
|
||||
public static String getPagesList(
|
||||
@Argument(name = "$fromGroup") long fromGroup,
|
||||
@Argument(name = "id") int illustId,
|
||||
@Argument(name = "quality", force = false) PixivDownload.PageQuality quality) {
|
||||
try {
|
||||
if(isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
|
||||
log.warn("来源群 {} 查询的作品Id {} 为R18作品, 根据配置设定, 屏蔽该作品.", fromGroup, illustId);
|
||||
return "该作品已被封印!";
|
||||
}
|
||||
List<String> pagesList = PixivDownload.getIllustAllPageDownload(pixivDownload.getHttpClient(), pixivDownload.getCookieStore(), illustId, quality);
|
||||
StringBuilder builder = new StringBuilder("作品ID ").append(illustId).append(" 共有").append(pagesList.size()).append("页:").append("\n");
|
||||
int index = 0;
|
||||
@ -468,10 +514,16 @@ public class BotCommandProcess {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取作品链接
|
||||
* @param fromGroup 来源群(系统提供)
|
||||
* @param illustId 作品Id
|
||||
* @return 返回作品在Pixiv的链接
|
||||
*/
|
||||
@Command(commandName = "link")
|
||||
public static String artworksLink(@Argument(name = "id") int illustId) {
|
||||
public static String artworksLink(@Argument(name = "$fromGroup") long fromGroup, @Argument(name = "id") int illustId) {
|
||||
try {
|
||||
if (isNoSafe(illustId, globalProp, false)) {
|
||||
if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
|
||||
log.warn("作品Id {} 已被屏蔽.", illustId);
|
||||
return "由于相关设置,该作品已被屏蔽!";
|
||||
} else if(isReported(illustId)) {
|
||||
@ -487,38 +539,22 @@ public class BotCommandProcess {
|
||||
|
||||
/**
|
||||
* 通过illustId获取作品图片
|
||||
* @param fromGroup 来源群(系统提供)
|
||||
* @param illustId 作品Id
|
||||
* @param quality 图片质量
|
||||
* @param pageIndex 指定页面索引, 从1开始
|
||||
* @return 如果成功, 返回BotCode, 否则返回错误信息.
|
||||
*/
|
||||
@Command(commandName = "image")
|
||||
public static String getImageById(@Argument(name = "id") int illustId,
|
||||
@Argument(name = "quality", force = false) PixivDownload.PageQuality quality,
|
||||
@Argument(name = "page", force = false, defaultValue = "1") int pageIndex) {
|
||||
public static String getImageById(
|
||||
@Argument(name = "$fromGroup") long fromGroup,
|
||||
@Argument(name = "id") int illustId,
|
||||
@Argument(name = "quality", force = false) PixivDownload.PageQuality quality,
|
||||
@Argument(name = "page", force = false, defaultValue = "1") int pageIndex) {
|
||||
log.debug("IllustId: {}, Quality: {}, PageIndex: {}", illustId, quality.name(), pageIndex);
|
||||
List<String> pagesList;
|
||||
try {
|
||||
pagesList = getIllustPages(illustId, quality, false);
|
||||
} catch (IOException e) {
|
||||
log.error("获取下载链接列表时发生异常", e);
|
||||
return "发生网络异常,无法获取图片!";
|
||||
}
|
||||
|
||||
if(log.isDebugEnabled()) {
|
||||
StringBuilder logBuilder = new StringBuilder("作品Id {} 所有页面下载链接: \n");
|
||||
AtomicInteger index = new AtomicInteger();
|
||||
pagesList.forEach(item -> logBuilder.append(index.incrementAndGet()).append(". ").append(item).append("\n"));
|
||||
log.debug(logBuilder.toString());
|
||||
}
|
||||
|
||||
if (pagesList.size() < pageIndex || pageIndex <= 0) {
|
||||
log.warn("指定的页数超出了总页数({} / {})", pageIndex, pagesList.size());
|
||||
return "指定的页数超出了范围(总共 " + pagesList.size() + " 页)";
|
||||
}
|
||||
|
||||
try {
|
||||
if (isNoSafe(illustId, globalProp, false)) {
|
||||
if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
|
||||
log.warn("作品 {} 存在R-18内容且设置\"image.allowR18\"为false,将屏蔽该作品不发送.", illustId);
|
||||
return "(根据设置,该作品已被屏蔽!)";
|
||||
} else if(isReported(illustId)) {
|
||||
@ -530,6 +566,26 @@ public class BotCommandProcess {
|
||||
return "发生网络异常,无法获取图片!";
|
||||
}
|
||||
|
||||
List<String> pagesList;
|
||||
try {
|
||||
pagesList = getIllustPages(illustId, quality, false);
|
||||
} catch (IOException e) {
|
||||
log.error("获取下载链接列表时发生异常", e);
|
||||
return "发生网络异常,无法获取图片!";
|
||||
}
|
||||
|
||||
if(log.isDebugEnabled()) {
|
||||
StringBuilder logBuilder = new StringBuilder("作品Id " + illustId + " 所有页面下载链接: \n");
|
||||
AtomicInteger index = new AtomicInteger();
|
||||
pagesList.forEach(item -> logBuilder.append(index.incrementAndGet()).append(". ").append(item).append("\n"));
|
||||
log.debug(logBuilder.toString());
|
||||
}
|
||||
|
||||
if (pagesList.size() < pageIndex || pageIndex <= 0) {
|
||||
log.warn("指定的页数超出了总页数({} / {})", pageIndex, pagesList.size());
|
||||
return "指定的页数超出了范围(总共 " + pagesList.size() + " 页)";
|
||||
}
|
||||
|
||||
String downloadLink = pagesList.get(pageIndex - 1);
|
||||
String fileName = URLs.getResourceName(Strings.nullToEmpty(downloadLink));
|
||||
File imageFile = new File(getImageStoreDir(), downloadLink.substring(downloadLink.lastIndexOf("/") + 1));
|
||||
@ -554,12 +610,11 @@ public class BotCommandProcess {
|
||||
}
|
||||
}
|
||||
|
||||
ImageCacheObject taskObject = new ImageCacheObject(imageCache, illustId, downloadLink, imageFile);
|
||||
try {
|
||||
imageCacheExecutor.executorSync(taskObject);
|
||||
ImageCacheStore.executeCacheRequest(new ImageCacheObject(imageCache, illustId, downloadLink, imageFile));
|
||||
} catch (InterruptedException e) {
|
||||
log.error("等待图片下载时发生中断", e);
|
||||
return "图片获取失败!";
|
||||
log.warn("图片缓存被中断", e);
|
||||
return "(错误:图片获取超时)";
|
||||
}
|
||||
} else {
|
||||
log.debug("图片 {} 缓存命中.", fileName);
|
||||
@ -605,12 +660,18 @@ public class BotCommandProcess {
|
||||
|
||||
/**
|
||||
* 举报某一作品
|
||||
* @param fromGroup 来源群(系统提供)
|
||||
* @param illustId 需要举报的作品id
|
||||
* @param reason 举报原因
|
||||
* @return 返回提示信息
|
||||
*/
|
||||
@Command
|
||||
public static String report(@Argument(name = "$fromGroup") long fromGroup, @Argument(name = "$fromQQ") long fromQQ, @Argument(name = "id") int illustId, @Argument(name = "msg", force = false) String reason) {
|
||||
public static String report(
|
||||
@Argument(name = "$fromGroup") long fromGroup,
|
||||
@Argument(name = "$fromQQ") long fromQQ,
|
||||
@Argument(name = "id") int illustId,
|
||||
@Argument(name = "msg", force = false) String reason
|
||||
) {
|
||||
log.warn("收到作品反馈(IllustId: {}, 原因: {})", illustId, reason);
|
||||
JsonObject reportJson = new JsonObject();
|
||||
reportJson.addProperty("illustId", illustId);
|
||||
@ -690,7 +751,8 @@ public class BotCommandProcess {
|
||||
.getAsJsonObject(Integer.toString(illustId));
|
||||
|
||||
long expire = 7200 * 1000;
|
||||
String propValue = globalProp.getProperty("cache.illustPreLoadData.expire", "7200000");
|
||||
String propValue = SettingProperties.
|
||||
getProperty(SettingProperties.GLOBAL, "cache.illustPreLoadData.expire", "7200000");
|
||||
log.debug("PreLoadData有效时间设定: {}", propValue);
|
||||
try {
|
||||
expire = Long.parseLong(propValue);
|
||||
|
@ -0,0 +1,77 @@
|
||||
package net.lamgc.cgj.bot;
|
||||
|
||||
import net.lamgc.cgj.bot.event.MessageEvent;
|
||||
import net.lamgc.cgj.bot.event.VirtualLoadMessageEvent;
|
||||
import net.lamgc.utils.event.EventExecutor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Properties;
|
||||
|
||||
/**
|
||||
* 消息事件处理调试器.
|
||||
* <p>当启用了消息事件处理调试后, 将会根据调试器代号调用指定调试器</p>
|
||||
*/
|
||||
@SuppressWarnings("unused")
|
||||
public enum MessageEventExecutionDebugger {
|
||||
|
||||
/**
|
||||
* PM - 压力测试
|
||||
*/
|
||||
PM ((executor, event, properties, log) -> {
|
||||
MessageEvent virtualLoadEvent = VirtualLoadMessageEvent.toVirtualLoadMessageEvent(event, false);
|
||||
int rotation = 5;
|
||||
int number = 50;
|
||||
int interval = 2500;
|
||||
|
||||
try {
|
||||
rotation = Integer.parseInt(properties.getProperty("debug.pm.rotation", "5"));
|
||||
} catch(NumberFormatException ignored) {}
|
||||
try {
|
||||
number = Integer.parseInt(properties.getProperty("debug.pm.number", "50"));
|
||||
} catch(NumberFormatException ignored) {}
|
||||
try {
|
||||
interval = Integer.parseInt(properties.getProperty("debug.pm.interval", "2500"));
|
||||
} catch(NumberFormatException ignored) {}
|
||||
|
||||
boolean interrupted = false;
|
||||
Thread currentThread = Thread.currentThread();
|
||||
for(int rotationCount = 0; rotationCount < rotation && !interrupted; rotationCount++) {
|
||||
for(int sendCount = 0; sendCount < number; sendCount++) {
|
||||
if(currentThread.isInterrupted()) {
|
||||
interrupted = true;
|
||||
break;
|
||||
}
|
||||
executor.executor(virtualLoadEvent);
|
||||
}
|
||||
try {
|
||||
Thread.sleep(interval);
|
||||
} catch (InterruptedException e) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
public final MessageExecuteDebugger debugger;
|
||||
|
||||
MessageEventExecutionDebugger(MessageExecuteDebugger debugger) {
|
||||
this.debugger = debugger;
|
||||
}
|
||||
|
||||
public static Logger getDebuggerLogger(MessageEventExecutionDebugger debugger) {
|
||||
return LoggerFactory.getLogger(MessageEventExecutionDebugger.class.getName() + "." + debugger.name());
|
||||
}
|
||||
|
||||
@FunctionalInterface
|
||||
public interface MessageExecuteDebugger {
|
||||
/**
|
||||
* 接收事件并根据指定需求处理
|
||||
* @param executor 事件执行器
|
||||
* @param event 消息事件对象
|
||||
* @param properties 配置项, 调试器应按'debug.[debuggerName].'为前缀存储相应调试信息
|
||||
* @throws Exception 当抛出异常则打断调试, 并输出至日志
|
||||
*/
|
||||
void accept(EventExecutor executor, MessageEvent event, Properties properties, Logger logger) throws Exception;
|
||||
}
|
||||
|
||||
}
|
@ -5,8 +5,6 @@ import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
@ -16,7 +14,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
||||
public class RandomIntervalSendTimer extends TimerTask {
|
||||
|
||||
private final static Timer timer = new Timer("Thread-RIST");
|
||||
private final static Logger log = LoggerFactory.getLogger("RandomIntervalSendTimer");
|
||||
private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class.getName());
|
||||
private final static Map<Long, RandomIntervalSendTimer> timerMap = new HashMap<>();
|
||||
|
||||
private final long timerId;
|
||||
@ -26,6 +24,8 @@ public class RandomIntervalSendTimer extends TimerTask {
|
||||
private final int floatTime;
|
||||
private AtomicBoolean loop = new AtomicBoolean();
|
||||
private final AtomicBoolean start = new AtomicBoolean();
|
||||
private final String hashId = Integer.toHexString(this.hashCode());
|
||||
|
||||
|
||||
/**
|
||||
* 创建一个随机延迟发送器
|
||||
@ -92,8 +92,6 @@ public class RandomIntervalSendTimer extends TimerTask {
|
||||
start(this.loop.get());
|
||||
}
|
||||
|
||||
private final static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-ss HH:mm:ss");
|
||||
|
||||
/**
|
||||
* 启动定时器
|
||||
* @param loop 是否循环, 如果为true, 则任务完成后会自动调用start方法继续循环, 直到被调用{@code #}或总定时器被销毁;
|
||||
@ -103,7 +101,7 @@ public class RandomIntervalSendTimer extends TimerTask {
|
||||
long nextDelay = time + timeRandom.nextInt(floatTime);
|
||||
Date nextDate = new Date();
|
||||
nextDate.setTime(nextDate.getTime() + nextDelay);
|
||||
log.info("定时器 {} 下一延迟: {}ms ({})", Integer.toHexString(this.hashCode()), nextDelay, dateFormat.format(nextDate));
|
||||
log.info("定时器 {} 下一延迟: {}ms ({})", hashId, nextDelay, nextDate);
|
||||
if(start.get()) {
|
||||
try {
|
||||
Field state = this.getClass().getSuperclass().getDeclaredField("state");
|
||||
|
@ -39,7 +39,7 @@ public class RandomRankingArtworksSender extends AutoSender {
|
||||
super(messageSender);
|
||||
this.mode = mode;
|
||||
this.contentType = contentType;
|
||||
log = LoggerFactory.getLogger("RecommendArtworksSender@" + Integer.toHexString(this.hashCode()));
|
||||
log = LoggerFactory.getLogger(this.toString());
|
||||
this.rankingStart = rankingStart > 0 ? rankingStart : 1;
|
||||
this.rankingStop = rankingStop > 0 ? rankingStop : 150;
|
||||
if(this.rankingStart > this.rankingStop) {
|
||||
@ -77,7 +77,7 @@ public class RandomRankingArtworksSender extends AutoSender {
|
||||
|
||||
JsonObject rankingInfo = rankingList.get(0);
|
||||
int illustId = rankingInfo.get("illust_id").getAsInt();
|
||||
if(BotCommandProcess.isNoSafe(illustId, BotCommandProcess.globalProp, false)) {
|
||||
if(BotCommandProcess.isNoSafe(illustId, SettingProperties.getProperties(SettingProperties.GLOBAL), false)) {
|
||||
log.warn("作品为r18作品, 取消本次发送.");
|
||||
return;
|
||||
} else if(BotCommandProcess.isReported(illustId)) {
|
||||
@ -89,7 +89,7 @@ public class RandomRankingArtworksSender extends AutoSender {
|
||||
message.append("#美图推送 - 今日排行榜 第 ").append(rankingInfo.get("rank").getAsInt()).append(" 名\n");
|
||||
message.append("标题:").append(rankingInfo.get("title").getAsString()).append("(").append(illustId).append(")\n");
|
||||
message.append("作者:").append(rankingInfo.get("user_name").getAsString()).append("\n");
|
||||
message.append(BotCommandProcess.getImageById(illustId, quality, 1));
|
||||
message.append(BotCommandProcess.getImageById(0, illustId, quality, 1));
|
||||
message.append("\n如有不当作品,可使用\".cgj report -id ").append(illustId).append("\"向色图姬反馈。");
|
||||
getMessageSender().sendMessage(message.toString());
|
||||
} catch (IOException e) {
|
||||
|
@ -6,6 +6,7 @@ import net.lamgc.cgj.pixiv.PixivURL;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
@ -29,8 +30,8 @@ public class RankingUpdateTimer {
|
||||
if(cal.get(Calendar.DAY_OF_YEAR) <= currentLocalDate.getDayOfYear() && cal.get(Calendar.HOUR_OF_DAY) >= 12) {
|
||||
cal.set(Calendar.DAY_OF_YEAR, currentLocalDate.getDayOfYear() + 1);
|
||||
}
|
||||
cal.set(Calendar.HOUR_OF_DAY, 12);
|
||||
cal.set(Calendar.MINUTE, 0);
|
||||
cal.set(Calendar.HOUR_OF_DAY, 11);
|
||||
cal.set(Calendar.MINUTE, 30);
|
||||
cal.set(Calendar.SECOND, 0);
|
||||
cal.set(Calendar.MILLISECOND, 0);
|
||||
|
||||
@ -51,13 +52,14 @@ public class RankingUpdateTimer {
|
||||
LocalDate currentLocalDate = LocalDate.now();
|
||||
if(calendar.get(Calendar.DAY_OF_YEAR) == currentLocalDate.getDayOfYear() ||
|
||||
calendar.get(Calendar.DAY_OF_YEAR) == currentLocalDate.getDayOfYear() - 1) {
|
||||
if(calendar.get(Calendar.HOUR_OF_DAY) < 12) {
|
||||
if(calendar.get(Calendar.HOUR_OF_DAY) < 11) {
|
||||
calendar.add(Calendar.DAY_OF_YEAR, -2);
|
||||
} else {
|
||||
calendar.add(Calendar.DAY_OF_YEAR, -1);
|
||||
}
|
||||
}
|
||||
|
||||
String dateStr = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
|
||||
log.info("正在获取 {} 期排行榜数据...", calendar.getTime());
|
||||
for (PixivURL.RankingMode rankingMode : PixivURL.RankingMode.values()) {
|
||||
for (PixivURL.RankingContentType contentType : PixivURL.RankingContentType.values()) {
|
||||
@ -65,9 +67,8 @@ public class RankingUpdateTimer {
|
||||
log.debug("不支持的类型, 填空值跳过...(类型: {}.{})", rankingMode.name(), contentType.name());
|
||||
}
|
||||
log.info("当前排行榜类型: {}.{}, 正在更新...", rankingMode.name(), contentType.name());
|
||||
BotEventHandler.executor.executor(
|
||||
new VirtualLoadMessageEvent(0,0,
|
||||
".cgj ranking -type=" + contentType.name() + " -mode=" + rankingMode.name()));
|
||||
BotEventHandler.executeMessageEvent(new VirtualLoadMessageEvent(0,0,
|
||||
".cgj ranking -type=" + contentType.name() + " -mode=" + rankingMode.name() + " -force -date " + dateStr));
|
||||
log.info("排行榜 {}.{} 负载指令已投递.", rankingMode.name(), contentType.name());
|
||||
}
|
||||
}
|
||||
|
241
src/main/java/net/lamgc/cgj/bot/SettingProperties.java
Normal file
241
src/main/java/net/lamgc/cgj/bot/SettingProperties.java
Normal file
@ -0,0 +1,241 @@
|
||||
package net.lamgc.cgj.bot;
|
||||
|
||||
import com.google.common.base.Throwables;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.*;
|
||||
|
||||
public final class SettingProperties {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger("SettingProperties");
|
||||
|
||||
private final static File globalPropFile = new File(getPropertiesDir(), "global.properties");
|
||||
private final static Properties globalProp = new Properties();
|
||||
|
||||
private final static Map<Long, Properties> groupPropMap = new HashMap<>();
|
||||
|
||||
private final static Set<Long> changeList = Collections.synchronizedSet(new HashSet<>());
|
||||
|
||||
/**
|
||||
* 全局配置项
|
||||
*/
|
||||
public final static long GLOBAL = 0;
|
||||
|
||||
/**
|
||||
* 清空所有Properties.
|
||||
*/
|
||||
public static void clearProperties() {
|
||||
groupPropMap.clear();
|
||||
globalProp.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* 加载配置文件
|
||||
*/
|
||||
public static void loadProperties() {
|
||||
loadGlobalProperties();
|
||||
|
||||
File[] files = getPropertiesDir()
|
||||
.listFiles((dir, fileName) -> fileName.startsWith("group.") && fileName.endsWith(".properties"));
|
||||
if(files == null) {
|
||||
log.error("检索群组配置文件失败, 可能是被拒绝访问.");
|
||||
return;
|
||||
}
|
||||
|
||||
for (File file : files) {
|
||||
String name = file.getName();
|
||||
long groupId;
|
||||
try {
|
||||
groupId = Long.parseLong(name.substring(name.indexOf("group.") + 6, name.lastIndexOf(".properties")));
|
||||
} catch (NumberFormatException e) {
|
||||
log.error("非法的配置文件名: {}", name);
|
||||
continue;
|
||||
}
|
||||
if(!groupPropMap.containsKey(groupId)) {
|
||||
groupPropMap.put(groupId, new Properties(globalProp));
|
||||
}
|
||||
|
||||
loadGroupProperties(groupId, groupPropMap.get(groupId));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存配置项
|
||||
*/
|
||||
public static void saveProperties() {
|
||||
log.info("正在保存所有配置...");
|
||||
saveGlobalProperties();
|
||||
|
||||
for (Long groupId : groupPropMap.keySet()) {
|
||||
if(!changeList.contains(groupId)) {
|
||||
log.debug("群组 {} 配置无改动, 忽略保存.", groupId);
|
||||
return;
|
||||
}
|
||||
log.debug("正在保存群组 {} 配置文件...", groupId);
|
||||
saveGroupProperties(groupId);
|
||||
}
|
||||
log.info("配置保存完成.");
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存指定群组的配置文件
|
||||
* @param groupId 要保存配置的群组Id
|
||||
*/
|
||||
private static void saveGroupProperties(long groupId) {
|
||||
try {
|
||||
saveGroupProperties(groupId, getGroupProperties(groupId));
|
||||
} catch (IOException e) {
|
||||
log.error("群组 {} 配置保存失败\n{}", groupId, Throwables.getStackTraceAsString(e));
|
||||
}
|
||||
}
|
||||
|
||||
private static void saveGroupProperties(Long groupId, Properties properties) throws IOException {
|
||||
File groupPropFile = new File(getPropertiesDir(), "group." + groupId + ".properties");
|
||||
if((!groupPropFile.exists() || !groupPropFile.isFile()) && (!groupPropFile.delete() || !groupPropFile.createNewFile())) {
|
||||
log.error("群组 {} 配置文件创建失败!", groupId);
|
||||
return;
|
||||
}
|
||||
|
||||
saveProperties(properties, new FileOutputStream(groupPropFile));
|
||||
}
|
||||
|
||||
private static void loadGlobalProperties() {
|
||||
if(globalPropFile.exists() && globalPropFile.isFile()) {
|
||||
log.info("正在加载全局配置文件...");
|
||||
try (Reader reader = new InputStreamReader(new FileInputStream(globalPropFile), StandardCharsets.UTF_8)) {
|
||||
globalProp.load(reader);
|
||||
log.info("全局配置文件加载完成.");
|
||||
} catch (IOException e) {
|
||||
log.error("加载全局配置文件时发生异常", e);
|
||||
}
|
||||
} else {
|
||||
log.info("未找到全局配置文件,跳过加载.");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存全局配置项
|
||||
*/
|
||||
private static void saveGlobalProperties() {
|
||||
try {
|
||||
if((!globalPropFile.exists() || !globalPropFile.isFile()) && (!globalPropFile.delete() || !globalPropFile.createNewFile())) {
|
||||
log.error("创建全局配置文件失败.");
|
||||
return;
|
||||
}
|
||||
|
||||
saveProperties(globalProp, new FileOutputStream(globalPropFile));
|
||||
} catch (IOException e) {
|
||||
log.error("全局配置文件保存时发生异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
private static void loadGroupProperties(long groupId, Properties properties) {
|
||||
File propFile = new File(getPropertiesDir(), "group." + groupId + ".properties");
|
||||
Properties groupProp = Objects.requireNonNull(properties);
|
||||
if(!propFile.exists() || !propFile.isFile()) {
|
||||
log.warn("群组 {} 配置文件不存在, 或不是一个文件.({})", groupId, propFile.getAbsolutePath());
|
||||
return;
|
||||
}
|
||||
|
||||
try (Reader reader = new InputStreamReader(new FileInputStream(propFile), StandardCharsets.UTF_8)) {
|
||||
groupProp.load(reader);
|
||||
} catch (IOException e) {
|
||||
log.error("读取群组 {} 群配置文件时发生异常:\n{}", groupId, Throwables.getStackTraceAsString(e));
|
||||
}
|
||||
}
|
||||
|
||||
private static void saveProperties(Properties properties, OutputStream stream) throws IOException {
|
||||
properties.store(new OutputStreamWriter(stream, StandardCharsets.UTF_8), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取配置文件目录
|
||||
* @return 返回目录File对象.
|
||||
*/
|
||||
private static File getPropertiesDir() {
|
||||
File propDir = new File(System.getProperty("cgj.botDataDir"), "/setting/");
|
||||
if((!propDir.exists() || !propDir.isDirectory()) && (!propDir.delete() || !propDir.mkdirs())) {
|
||||
log.warn("Setting文件夹创建失败!");
|
||||
}
|
||||
return propDir;
|
||||
}
|
||||
|
||||
public static String getProperty(long groupId, String key) {
|
||||
return getProperty(groupId, key, null);
|
||||
}
|
||||
|
||||
public static String getProperty(long groupId, String key, String defaultValue) {
|
||||
if(groupId <= 0) {
|
||||
return globalProp.getProperty(key, defaultValue);
|
||||
} else {
|
||||
Properties properties = groupPropMap.get(groupId);
|
||||
return properties == null ? defaultValue : properties.getProperty(key, defaultValue);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置配置项
|
||||
* @param groupId 群组Id, 如为0或负数则为全局配置
|
||||
* @param key 配置项key名
|
||||
* @param value 欲设置的新值, 如为null则删除该配置项
|
||||
* @return 返回上一次设定值
|
||||
*/
|
||||
public static String setProperty(long groupId, String key, String value) {
|
||||
Objects.requireNonNull(key);
|
||||
Properties targetProperties;
|
||||
if(groupId <= 0) {
|
||||
targetProperties = globalProp;
|
||||
} else {
|
||||
changeList.add(groupId);
|
||||
targetProperties = getGroupProperties(groupId);
|
||||
}
|
||||
String lastValue = targetProperties.getProperty(key);
|
||||
if(value != null) {
|
||||
targetProperties.setProperty(key, value);
|
||||
} else {
|
||||
targetProperties.remove(key);
|
||||
}
|
||||
return lastValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取GlobalProperties
|
||||
* @return 全局Properties
|
||||
*/
|
||||
private static Properties getGlobalProperties() {
|
||||
return globalProp;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取群组Properties
|
||||
* @param groupId 群组Id
|
||||
* @return 如果存在, 返回Properties, 不存在返回null.
|
||||
* @throws IllegalArgumentException 当群组Id 小于或等于0 时抛出.
|
||||
*/
|
||||
private static Properties getGroupProperties(long groupId) {
|
||||
if (groupId <= 0) {
|
||||
throw new IllegalArgumentException("Group number cannot be 0 or negative: " + groupId);
|
||||
}
|
||||
if(!groupPropMap.containsKey(groupId)) {
|
||||
groupPropMap.put(groupId, new Properties(globalProp));
|
||||
}
|
||||
return groupPropMap.get(groupId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取群组 Properties, 如果指定群组没有 Properties, 则使用GlobalProperties.
|
||||
* @param groupId 指定群组Id
|
||||
* @return 如果群组存在所属Properties, 则返回群组Properties, 否则返回GlobalProperties.
|
||||
*/
|
||||
public static Properties getProperties(long groupId) {
|
||||
if(groupPropMap.containsKey(groupId)) {
|
||||
return groupPropMap.get(groupId);
|
||||
}
|
||||
return getGlobalProperties();
|
||||
}
|
||||
|
||||
}
|
52
src/main/java/net/lamgc/cgj/bot/cache/AutoCleanTimer.java
vendored
Normal file
52
src/main/java/net/lamgc/cgj/bot/cache/AutoCleanTimer.java
vendored
Normal file
@ -0,0 +1,52 @@
|
||||
package net.lamgc.cgj.bot.cache;
|
||||
|
||||
import com.google.common.base.Throwables;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
import java.util.concurrent.CopyOnWriteArraySet;
|
||||
|
||||
public class AutoCleanTimer extends TimerTask {
|
||||
|
||||
private final static Set<Cleanable> cleanSet = new CopyOnWriteArraySet<>();
|
||||
|
||||
private final static Timer cleanTimer = new Timer("Thread-AutoClean", true);
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(AutoCleanTimer.class.getName());
|
||||
|
||||
static {
|
||||
cleanTimer.schedule(new AutoCleanTimer(), 100L);
|
||||
}
|
||||
|
||||
/**
|
||||
* 增加需要定时执行清理的缓存库
|
||||
* @param store 已实现Cleanable的对象
|
||||
*/
|
||||
public static void add(Cleanable store) {
|
||||
cleanSet.add(store);
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除已添加的缓存库
|
||||
* @param store 需要从AutoCleanTimer移除的对象
|
||||
*/
|
||||
public static void remove(Cleanable store) {
|
||||
cleanSet.remove(store);
|
||||
}
|
||||
|
||||
private AutoCleanTimer() {}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
cleanSet.forEach(cleanable -> {
|
||||
try {
|
||||
cleanable.clean();
|
||||
} catch (Exception e) {
|
||||
log.error("{} 执行清理动作时发生异常:\n{}", cleanable.toString(), Throwables.getStackTraceAsString(e));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
35
src/main/java/net/lamgc/cgj/bot/cache/CacheStoreUtils.java
vendored
Normal file
35
src/main/java/net/lamgc/cgj/bot/cache/CacheStoreUtils.java
vendored
Normal file
@ -0,0 +1,35 @@
|
||||
package net.lamgc.cgj.bot.cache;
|
||||
|
||||
public final class CacheStoreUtils {
|
||||
|
||||
private CacheStoreUtils() {}
|
||||
|
||||
/**
|
||||
* 将 CacheStore 转换成 基于 {@link LocalHashCacheStore} 的 {@link HotDataCacheStore}
|
||||
* <p>通过该方法转换, 会自动启用 自动清理</p>
|
||||
* @param cacheStore 上游缓存库
|
||||
* @param expireTime 热点缓存最小有效期
|
||||
* @param floatRange 缓存浮动最大范围
|
||||
* @param <T> 缓存库数据类型
|
||||
* @return 返回 {@link HotDataCacheStore}
|
||||
*/
|
||||
public static <T> CacheStore<T> hashLocalHotDataStore(CacheStore<T> cacheStore, long expireTime, int floatRange) {
|
||||
return hashLocalHotDataStore(cacheStore, expireTime, floatRange, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 CacheStore 转换成 基于 {@link LocalHashCacheStore} 的 {@link HotDataCacheStore}
|
||||
* @param cacheStore 上游缓存库
|
||||
* @param expireTime 热点缓存最小有效期
|
||||
* @param floatRange 缓存浮动最大范围
|
||||
* @param autoClean 是否启用自动清理
|
||||
* @param <T> 缓存库数据类型
|
||||
* @return 返回 {@link HotDataCacheStore}
|
||||
*/
|
||||
public static <T> CacheStore<T> hashLocalHotDataStore(CacheStore<T> cacheStore,
|
||||
long expireTime, int floatRange, boolean autoClean) {
|
||||
return new HotDataCacheStore<>(cacheStore, new LocalHashCacheStore<>(), expireTime, floatRange, autoClean);
|
||||
}
|
||||
|
||||
|
||||
}
|
10
src/main/java/net/lamgc/cgj/bot/cache/Cleanable.java
vendored
Normal file
10
src/main/java/net/lamgc/cgj/bot/cache/Cleanable.java
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
package net.lamgc.cgj.bot.cache;
|
||||
|
||||
/**
|
||||
* 可清理接口, 实现该接口代表该类拥有清理动作.
|
||||
*/
|
||||
public interface Cleanable {
|
||||
|
||||
void clean() throws Exception;
|
||||
|
||||
}
|
@ -10,31 +10,36 @@ import java.util.*;
|
||||
* @param <T> 存储类型
|
||||
* @author LamGC
|
||||
*/
|
||||
public class HotDataCacheStore<T> implements CacheStore<T> {
|
||||
public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
|
||||
|
||||
private final CacheStore<T> parent;
|
||||
private final CacheStore<T> current;
|
||||
private final long expireTime;
|
||||
private final int expireFloatRange;
|
||||
private final Random random = new Random();
|
||||
private final Logger log = LoggerFactory.getLogger(HotDataCacheStore.class.getSimpleName() + "@" + Integer.toHexString(this.hashCode()));
|
||||
private final Logger log = LoggerFactory.getLogger(this.toString());
|
||||
|
||||
/**
|
||||
* 构造热点缓存存储对象
|
||||
* @param parent 上级缓存存储库
|
||||
* @param current 热点缓存存储库, 最好使用本地缓存(例如 {@linkplain LocalHashCacheStore LocalHashCacheStore})
|
||||
* @param expireTime 本地缓存库的缓存项过期时间, 单位毫秒;
|
||||
* 该时间并不是所有缓存项的最终过期时间, 还需要根据expireFloatRange的设定随机设置, 公式:
|
||||
* {@code expireTime + new Random().nextInt(expireFloatRange)}
|
||||
* 该时间并不是所有缓存项的最终过期时间, 还需要根据expireFloatRange的设定随机设置, 公式:
|
||||
* {@code expireTime + new Random().nextInt(expireFloatRange)}
|
||||
* @param expireFloatRange 过期时间的浮动范围(单位毫秒), 用于防止短时间内大量缓存项失效导致的缓存雪崩
|
||||
* @param autoClean 是否交由{@link AutoCleanTimer}自动执行清理
|
||||
*/
|
||||
public HotDataCacheStore(CacheStore<T> parent, CacheStore<T> current, long expireTime, int expireFloatRange) {
|
||||
public HotDataCacheStore(CacheStore<T> parent, CacheStore<T> current, long expireTime, int expireFloatRange, boolean autoClean) {
|
||||
this.parent = parent;
|
||||
this.current = current;
|
||||
this.expireTime = expireTime;
|
||||
this.expireFloatRange = expireFloatRange;
|
||||
log.debug("HotDataCacheStore初始化完成. (Parent: {}, Current: {}, expireTime: {}, expireFloatRange: {})",
|
||||
parent, current, expireTime, expireFloatRange);
|
||||
if(autoClean) {
|
||||
AutoCleanTimer.add(this);
|
||||
}
|
||||
|
||||
log.debug("HotDataCacheStore初始化完成. (Parent: {}, Current: {}, expireTime: {}, expireFloatRange: {}, autoClean: {})",
|
||||
parent, current, expireTime, expireFloatRange, autoClean);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -121,4 +126,13 @@ public class HotDataCacheStore<T> implements CacheStore<T> {
|
||||
public boolean supportedList() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clean() {
|
||||
for(String key : this.current.keys()) {
|
||||
if(current.exists(key)) {
|
||||
current.remove(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -21,16 +21,16 @@ import java.util.Set;
|
||||
|
||||
public class ImageCacheHandler implements EventHandler {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger("ImageCacheHandler");
|
||||
private final static Logger log = LoggerFactory.getLogger(ImageCacheHandler.class.getName());
|
||||
|
||||
private final static HttpClient httpClient = HttpClientBuilder.create().setProxy(Main.proxy).build();
|
||||
|
||||
private final static Set<ImageCacheObject> cacheQueue = Collections.synchronizedSet(new HashSet<>());
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public void getImageToCache(ImageCacheObject event) {
|
||||
public void getImageToCache(ImageCacheObject event) throws Exception {
|
||||
if(cacheQueue.contains(event)) {
|
||||
log.debug("图片 {} 已存在相同缓存任务, 跳过.", event.getStoreFile().getName());
|
||||
log.warn("图片 {} 已存在相同缓存任务, 跳过.", event.getStoreFile().getName());
|
||||
return;
|
||||
} else {
|
||||
cacheQueue.add(event);
|
||||
@ -43,11 +43,11 @@ public class ImageCacheHandler implements EventHandler {
|
||||
try {
|
||||
if(!storeFile.exists() && !storeFile.createNewFile()) {
|
||||
log.error("无法创建文件(Path: {})", storeFile.getAbsolutePath());
|
||||
return;
|
||||
throw new IOException("Failed to create file");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
log.error("无法创建文件(Path: {})", storeFile.getAbsolutePath());
|
||||
e.printStackTrace();
|
||||
throw e;
|
||||
}
|
||||
|
||||
HttpGet request = new HttpGet(event.getDownloadLink());
|
||||
@ -57,11 +57,11 @@ public class ImageCacheHandler implements EventHandler {
|
||||
response = httpClient.execute(request);
|
||||
} catch (IOException e) {
|
||||
log.error("Http请求时发生异常", e);
|
||||
return;
|
||||
throw e;
|
||||
}
|
||||
if(response.getStatusLine().getStatusCode() != 200) {
|
||||
log.warn("Http请求异常:{}", response.getStatusLine());
|
||||
return;
|
||||
throw new IOException("Http Response Error: " + response.getStatusLine());
|
||||
}
|
||||
|
||||
log.debug("正在下载...(Content-Length: {}KB)", response.getEntity().getContentLength() / 1024);
|
||||
@ -69,7 +69,7 @@ public class ImageCacheHandler implements EventHandler {
|
||||
IOUtils.copy(response.getEntity().getContent(), fos);
|
||||
} catch (IOException e) {
|
||||
log.error("下载图片时发生异常", e);
|
||||
return;
|
||||
throw e;
|
||||
}
|
||||
event.getImageCache().put(URLs.getResourceName(event.getDownloadLink()), storeFile);
|
||||
} finally {
|
||||
|
109
src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java
vendored
Normal file
109
src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java
vendored
Normal file
@ -0,0 +1,109 @@
|
||||
package net.lamgc.cgj.bot.cache;
|
||||
|
||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Hashtable;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.*;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.concurrent.locks.Condition;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
public final class ImageCacheStore {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(ImageCacheStore.class.getName());
|
||||
|
||||
private final static Map<ImageCacheObject, Task> cacheMap = new Hashtable<>();
|
||||
|
||||
private final static ThreadPoolExecutor imageCacheExecutor = new ThreadPoolExecutor(
|
||||
4, 6,
|
||||
30L,
|
||||
TimeUnit.SECONDS,
|
||||
new LinkedBlockingQueue<>(100),
|
||||
new ThreadFactoryBuilder()
|
||||
.setNameFormat("ImageCacheThread-%d")
|
||||
.build()
|
||||
);
|
||||
|
||||
private final static ImageCacheHandler handler = new ImageCacheHandler();
|
||||
|
||||
private ImageCacheStore() {}
|
||||
|
||||
/**
|
||||
* 传递图片缓存任务, 并等待缓存完成.
|
||||
* @param cacheObject 缓存任务组
|
||||
*/
|
||||
public static void executeCacheRequest(ImageCacheObject cacheObject) throws InterruptedException {
|
||||
Task task = getTaskState(cacheObject);
|
||||
if(task.taskState.get() == TaskState.COMPLETE) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean locked = false;
|
||||
try {
|
||||
if(task.taskState.get() == TaskState.COMPLETE) {
|
||||
return;
|
||||
}
|
||||
task.lock.lock();
|
||||
locked = true;
|
||||
// 双重检查
|
||||
if(task.taskState.get() == TaskState.COMPLETE) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 置任务状态
|
||||
task.taskState.set(TaskState.RUNNING);
|
||||
|
||||
try {
|
||||
Throwable throwable = imageCacheExecutor.submit(() -> {
|
||||
try {
|
||||
handler.getImageToCache(cacheObject);
|
||||
} catch (Throwable e) {
|
||||
return e;
|
||||
}
|
||||
return null;
|
||||
}).get();
|
||||
|
||||
if(throwable == null) {
|
||||
task.taskState.set(TaskState.COMPLETE);
|
||||
} else {
|
||||
task.taskState.set(TaskState.ERROR);
|
||||
}
|
||||
} catch (ExecutionException e) {
|
||||
log.error("执行图片缓存任务时发生异常", e);
|
||||
}
|
||||
} finally {
|
||||
if(locked) {
|
||||
task.lock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static Task getTaskState(ImageCacheObject cacheObject) {
|
||||
if(!cacheMap.containsKey(cacheObject)) {
|
||||
cacheMap.put(cacheObject, new Task());
|
||||
}
|
||||
return cacheMap.get(cacheObject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 任务状态
|
||||
*/
|
||||
private enum TaskState {
|
||||
READY, RUNNING, COMPLETE, ERROR
|
||||
}
|
||||
|
||||
private static class Task {
|
||||
|
||||
public final ReentrantLock lock = new ReentrantLock(true);
|
||||
|
||||
public final AtomicReference<TaskState> taskState = new AtomicReference<>(TaskState.READY);
|
||||
|
||||
public final Condition condition = lock.newCondition();
|
||||
|
||||
}
|
||||
|
||||
}
|
@ -13,7 +13,7 @@ import java.util.Set;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
|
||||
public abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
|
||||
abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
|
||||
|
||||
private final JedisPool jedisPool;
|
||||
private final String keyPrefix;
|
||||
@ -36,7 +36,7 @@ public abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
|
||||
if(jedisPool.isClosed()) {
|
||||
throw new IllegalStateException("JedisPool is closed");
|
||||
}
|
||||
log = LoggerFactory.getLogger(this.getClass().getSimpleName() + "@" + Integer.toHexString(jedisPool.hashCode()));
|
||||
log = LoggerFactory.getLogger(this.getClass().getName() + "@" + Integer.toHexString(jedisPool.hashCode()));
|
||||
if(!Strings.isNullOrEmpty(keyPrefix)) {
|
||||
this.keyPrefix = keyPrefix.endsWith(".") ? keyPrefix : keyPrefix + ".";
|
||||
} else {
|
||||
|
@ -5,6 +5,8 @@ import com.google.common.base.Throwables;
|
||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
import net.lamgc.cgj.bot.BotAdminCommandProcess;
|
||||
import net.lamgc.cgj.bot.BotCommandProcess;
|
||||
import net.lamgc.cgj.bot.MessageEventExecutionDebugger;
|
||||
import net.lamgc.cgj.bot.SettingProperties;
|
||||
import net.lamgc.cgj.util.DateParser;
|
||||
import net.lamgc.cgj.util.PagesQualityParser;
|
||||
import net.lamgc.cgj.util.TimeLimitThreadPoolExecutor;
|
||||
@ -13,10 +15,8 @@ import net.lamgc.utils.base.runner.ArgumentsRunnerConfig;
|
||||
import net.lamgc.utils.base.runner.exception.DeveloperRunnerException;
|
||||
import net.lamgc.utils.base.runner.exception.NoSuchCommandException;
|
||||
import net.lamgc.utils.base.runner.exception.ParameterNoFoundException;
|
||||
import net.lamgc.utils.event.EventExecutor;
|
||||
import net.lamgc.utils.event.EventHandler;
|
||||
import net.lamgc.utils.event.*;
|
||||
import net.lamgc.utils.event.EventObject;
|
||||
import net.lamgc.utils.event.EventUncaughtExceptionHandler;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import redis.clients.jedis.JedisPool;
|
||||
@ -39,7 +39,9 @@ public class BotEventHandler implements EventHandler {
|
||||
private final ArgumentsRunner processRunner;
|
||||
private final ArgumentsRunner adminRunner;
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger("BotEventHandler");
|
||||
private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class.getName());
|
||||
|
||||
private final static Map<Long, AtomicBoolean> muteStateMap = new Hashtable<>();
|
||||
|
||||
/**
|
||||
* 所有缓存共用的JedisPool
|
||||
@ -50,10 +52,10 @@ public class BotEventHandler implements EventHandler {
|
||||
/**
|
||||
* 消息事件执行器
|
||||
*/
|
||||
public final static EventExecutor executor = new EventExecutor(new TimeLimitThreadPoolExecutor(
|
||||
60 * 1000,
|
||||
(int) Math.ceil(Runtime.getRuntime().availableProcessors() / 2F),
|
||||
Runtime.getRuntime().availableProcessors(),
|
||||
private final static EventExecutor executor = new EventExecutor(new TimeLimitThreadPoolExecutor(
|
||||
0,
|
||||
Math.max(Runtime.getRuntime().availableProcessors(), 4),
|
||||
Math.max(Math.max(Runtime.getRuntime().availableProcessors() * 2, 4), 32),
|
||||
30L,
|
||||
TimeUnit.SECONDS,
|
||||
new LinkedBlockingQueue<>(1536),
|
||||
@ -125,6 +127,29 @@ public class BotEventHandler implements EventHandler {
|
||||
BotCommandProcess.initialize();
|
||||
}
|
||||
|
||||
/**
|
||||
* 投递消息事件
|
||||
* @param event 事件对象
|
||||
*/
|
||||
@NotAccepted
|
||||
public static void executeMessageEvent(MessageEvent event) {
|
||||
String debuggerName = SettingProperties.getProperty(0, "debug.debugger");
|
||||
if(!event.getMessage().startsWith(ADMIN_COMMAND_PREFIX) &&
|
||||
!Strings.isNullOrEmpty(debuggerName)) {
|
||||
try {
|
||||
MessageEventExecutionDebugger debugger = MessageEventExecutionDebugger.valueOf(debuggerName.toUpperCase());
|
||||
debugger.debugger.accept(executor, event, SettingProperties.getProperties(SettingProperties.GLOBAL),
|
||||
MessageEventExecutionDebugger.getDebuggerLogger(debugger));
|
||||
} catch(IllegalArgumentException e) {
|
||||
log.warn("未找到指定调试器: '{}'", debuggerName);
|
||||
} catch (Exception e) {
|
||||
log.error("事件调试处理时发生异常", e);
|
||||
}
|
||||
} else {
|
||||
BotEventHandler.executor.executor(event);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 以事件形式处理消息事件
|
||||
* @param event 消息事件对象
|
||||
@ -135,6 +160,9 @@ public class BotEventHandler implements EventHandler {
|
||||
log.debug(event.toString());
|
||||
if(!match(msg)) {
|
||||
return;
|
||||
} else if(isMute(event.getFromGroup())) {
|
||||
log.debug("机器人已被禁言, 忽略请求.");
|
||||
return;
|
||||
}
|
||||
|
||||
Pattern pattern = Pattern.compile("/\\s*(\".+?\"|[^:\\s])+((\\s*:\\s*(\".+?\"|[^\\s])+)|)|(\".+?\"|[^\"\\s])+");
|
||||
@ -173,7 +201,8 @@ public class BotEventHandler implements EventHandler {
|
||||
Object result;
|
||||
try {
|
||||
if(msg.toLowerCase().startsWith(ADMIN_COMMAND_PREFIX)) {
|
||||
if(!String.valueOf(event.getFromQQ()).equals(BotCommandProcess.globalProp.getProperty("admin.adminId"))) {
|
||||
if(!String.valueOf(event.getFromQQ())
|
||||
.equals(SettingProperties.getProperty(0, "admin.adminId"))) {
|
||||
result = "你没有执行该命令的权限!";
|
||||
} else {
|
||||
result = adminRunner.run(args.length <= 1 ? new String[0] : Arrays.copyOfRange(args, 1, args.length));
|
||||
@ -195,12 +224,14 @@ public class BotEventHandler implements EventHandler {
|
||||
}
|
||||
}
|
||||
long processTime = System.currentTimeMillis() - time;
|
||||
if(Objects.requireNonNull(result) instanceof String) {
|
||||
if(Objects.requireNonNull(result) instanceof String && !isMute(event.getFromGroup())) {
|
||||
try {
|
||||
event.sendMessage((String) result);
|
||||
} catch (Exception e) {
|
||||
log.error("发送消息时发生异常", e);
|
||||
}
|
||||
} else if(isMute(event.getFromGroup())) {
|
||||
log.warn("命令反馈时机器人已被禁言, 跳过反馈.");
|
||||
}
|
||||
long totalTime = System.currentTimeMillis() - time;
|
||||
log.info("命令反馈完成.(事件耗时: {}ms, P: {}%({}ms), R: {}%({}ms))", totalTime,
|
||||
@ -217,4 +248,40 @@ public class BotEventHandler implements EventHandler {
|
||||
return message.startsWith(COMMAND_PREFIX) || message.startsWith(ADMIN_COMMAND_PREFIX);
|
||||
}
|
||||
|
||||
private static boolean isMute(long groupId) {
|
||||
Boolean mute = isMute(groupId, false);
|
||||
return mute != null && mute;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询某群是否被禁言.
|
||||
* @param groupId 群组Id
|
||||
* @param rawValue 是否返回原始值(当没有该群状态, 且本参数为true时, 将返回null)
|
||||
* @return 返回状态值, 如无该群禁言记录且rawValue = true, 则返回null
|
||||
*/
|
||||
public static Boolean isMute(long groupId, boolean rawValue) {
|
||||
if(groupId <= 0) {
|
||||
return false;
|
||||
}
|
||||
AtomicBoolean state = muteStateMap.get(groupId);
|
||||
if(state == null && rawValue) {
|
||||
return null;
|
||||
}
|
||||
return state != null && state.get();
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置机器人禁言状态.
|
||||
* <p>设置该项可防止因机器人在禁言期间反馈请求导致被封号.</p>
|
||||
* @param mute 如果被禁言, 传入true
|
||||
*/
|
||||
public static void setMuteState(long groupId, boolean mute) {
|
||||
if(!muteStateMap.containsKey(groupId)) {
|
||||
muteStateMap.put(groupId, new AtomicBoolean(mute));
|
||||
} else {
|
||||
muteStateMap.get(groupId).set(mute);
|
||||
}
|
||||
log.warn("群组 {} 机器人禁言状态已变更: {}", groupId, mute ? "已禁言" : "已解除");
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -5,6 +5,28 @@ package net.lamgc.cgj.bot.event;
|
||||
*/
|
||||
public class VirtualLoadMessageEvent extends MessageEvent {
|
||||
|
||||
/**
|
||||
* 将任意消息事件转换为假负载消息事件.
|
||||
* <p>转换之后, 除了fromGroup, fromQQ, message外其他信息不会保留</p>
|
||||
* @param event 待转换的消息事件
|
||||
* @param inheritImpl 是否继承除 sendMessage 外的其他 MessageEvent 实现
|
||||
* @return 转换后的消息事件
|
||||
*/
|
||||
public static VirtualLoadMessageEvent toVirtualLoadMessageEvent(MessageEvent event, boolean inheritImpl) {
|
||||
if(event instanceof VirtualLoadMessageEvent) {
|
||||
return (VirtualLoadMessageEvent) event;
|
||||
} else if(!inheritImpl) {
|
||||
return new VirtualLoadMessageEvent(event.getFromGroup(), event.getFromQQ(), event.getMessage());
|
||||
} else {
|
||||
return new VirtualLoadMessageEvent(event.getFromGroup(), event.getFromQQ(), event.getMessage()) {
|
||||
@Override
|
||||
public String getImageUrl(String image) {
|
||||
return event.getImageUrl(image);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public VirtualLoadMessageEvent(long fromGroup, long fromQQ, String message) {
|
||||
super(fromGroup, fromQQ, message);
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ public class CQPluginMain extends CQPlugin implements EventHandler {
|
||||
public CQPluginMain() {
|
||||
// TODO(LamGC, 2020.04.21): SpringCQ无法适配MessageSenderBuilder
|
||||
BotEventHandler.preLoad();
|
||||
LoggerFactory.getLogger(this.toString())
|
||||
LoggerFactory.getLogger(CQPluginMain.class.getName())
|
||||
.info("BotEventHandler.COMMAND_PREFIX = {}", BotEventHandler.COMMAND_PREFIX);
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ public class CQPluginMain extends CQPlugin implements EventHandler {
|
||||
if(!BotEventHandler.match(event.getMessage())) {
|
||||
return MESSAGE_IGNORE;
|
||||
}
|
||||
BotEventHandler.executor.executor(new SpringCQMessageEvent(cq, event));
|
||||
BotEventHandler.executeMessageEvent(new SpringCQMessageEvent(cq, event));
|
||||
return MESSAGE_BLOCK;
|
||||
}
|
||||
|
||||
|
@ -6,7 +6,10 @@ import net.lamgc.cgj.bot.message.MessageSenderBuilder;
|
||||
import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageSenderFactory;
|
||||
import net.mamoe.mirai.Bot;
|
||||
import net.mamoe.mirai.BotFactoryJvm;
|
||||
import net.mamoe.mirai.event.events.BotMuteEvent;
|
||||
import net.mamoe.mirai.event.events.BotUnmuteEvent;
|
||||
import net.mamoe.mirai.japt.Events;
|
||||
import net.mamoe.mirai.message.ContactMessage;
|
||||
import net.mamoe.mirai.message.FriendMessage;
|
||||
import net.mamoe.mirai.message.GroupMessage;
|
||||
import net.mamoe.mirai.utils.BotConfiguration;
|
||||
@ -19,7 +22,7 @@ import java.util.Properties;
|
||||
|
||||
public class MiraiMain implements Closeable {
|
||||
|
||||
private final Logger log = LoggerFactory.getLogger(this.toString());
|
||||
private final Logger log = LoggerFactory.getLogger(MiraiMain.class.getName());
|
||||
|
||||
private Bot bot;
|
||||
|
||||
@ -43,14 +46,33 @@ public class MiraiMain implements Closeable {
|
||||
}
|
||||
|
||||
bot = BotFactoryJvm.newBot(Long.parseLong(botProperties.getProperty("bot.qq", "0")), Base64.decodeBase64(botProperties.getProperty("bot.password", "")), new BotConfiguration());
|
||||
Events.subscribeAlways(GroupMessage.class, (msg) -> BotEventHandler.executor.executor(new MiraiMessageEvent(msg)));
|
||||
Events.subscribeAlways(FriendMessage.class, (msg) -> BotEventHandler.executor.executor(new MiraiMessageEvent(msg)));
|
||||
Events.subscribeAlways(GroupMessage.class, this::executeMessageEvent);
|
||||
Events.subscribeAlways(FriendMessage.class, this::executeMessageEvent);
|
||||
Events.subscribeAlways(BotMuteEvent.class,
|
||||
event -> BotEventHandler.setMuteState(event.getGroup().getId(), true));
|
||||
Events.subscribeAlways(BotUnmuteEvent.class,
|
||||
event -> BotEventHandler.setMuteState(event.getGroup().getId(), false));
|
||||
bot.login();
|
||||
MessageSenderBuilder.setCurrentMessageSenderFactory(new MiraiMessageSenderFactory(bot));
|
||||
BotEventHandler.preLoad();
|
||||
bot.join();
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理消息事件
|
||||
* @param message 消息事件对象
|
||||
*/
|
||||
private void executeMessageEvent(ContactMessage message) {
|
||||
if(message instanceof GroupMessage) {
|
||||
GroupMessage groupMessage = (GroupMessage) message;
|
||||
if(BotEventHandler.isMute(groupMessage.getGroup().getId(), true) == null) {
|
||||
BotEventHandler.setMuteState(groupMessage.getGroup().getId(),
|
||||
((GroupMessage) message).getGroup().getBotMuteRemaining() != 0);
|
||||
}
|
||||
}
|
||||
BotEventHandler.executeMessageEvent(new MiraiMessageEvent(message));
|
||||
}
|
||||
|
||||
public void close() {
|
||||
log.warn("正在关闭机器人...");
|
||||
bot.close(null);
|
||||
|
@ -16,7 +16,7 @@ public class MiraiMessageEvent extends MessageEvent {
|
||||
|
||||
public MiraiMessageEvent(ContactMessage message) {
|
||||
super(message instanceof GroupMessage ? ((GroupMessage) message).getGroup().getId() : 0,
|
||||
message.getSender().getId(), message.getMessage().contentToString());
|
||||
message.getSender().getId(), getMessageBodyWithoutSource(message.getMessage().toString()));
|
||||
this.messageObject = Objects.requireNonNull(message);
|
||||
if(message instanceof GroupMessage) {
|
||||
messageSender = new MiraiMessageSender(((GroupMessage) message).getGroup(), MessageSource.Group);
|
||||
@ -26,6 +26,19 @@ public class MiraiMessageEvent extends MessageEvent {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 将ContactMessage获得的消息内容删除 Mirai:source 并返回.
|
||||
* <p>该做法比较保守, 防止Mirai:source位置出现变动.</p>
|
||||
* @param message ContactMessage的消息内容;
|
||||
* @return 返回删除了Mirai:source的消息
|
||||
*/
|
||||
private static String getMessageBodyWithoutSource(String message) {
|
||||
StringBuilder builder = new StringBuilder(message);
|
||||
int startIndex = builder.indexOf("[mirai:source:");
|
||||
int endIndex = builder.indexOf("]", startIndex) + 1;
|
||||
return builder.delete(startIndex, endIndex).toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int sendMessage(final String message) {
|
||||
return messageSender.sendMessage(message);
|
||||
|
@ -29,11 +29,11 @@ public class MiraiMessageSender implements MessageSender {
|
||||
|
||||
private final Contact member;
|
||||
private final MessageSource source;
|
||||
private final static Logger log = LoggerFactory.getLogger("MiraiMessageSender");
|
||||
private final static Logger log = LoggerFactory.getLogger(MiraiMessageSender.class.getName());
|
||||
private final static CacheStore<String> imageIdCache = new HotDataCacheStore<>(
|
||||
new StringRedisCacheStore(BotEventHandler.redisServer, "mirai.imageId"),
|
||||
new LocalHashCacheStore<>(),
|
||||
5400000, 1800000);
|
||||
5400000, 1800000, true);
|
||||
|
||||
/**
|
||||
* 使用id构造发送器
|
||||
|
@ -33,7 +33,7 @@ import java.util.function.BiConsumer;
|
||||
|
||||
public class PixivDownload {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger("PixivDownload");
|
||||
private final static Logger log = LoggerFactory.getLogger(PixivDownload.class.getName());
|
||||
|
||||
private final HttpClient httpClient;
|
||||
|
||||
|
@ -30,7 +30,7 @@ import java.util.zip.ZipInputStream;
|
||||
*/
|
||||
public final class PixivUgoiraBuilder {
|
||||
|
||||
private final Logger log = LoggerFactory.getLogger(PixivUgoiraBuilder.class.getSimpleName() + "@" + Integer.toHexString(this.hashCode()));
|
||||
private final Logger log = LoggerFactory.getLogger(this.toString());
|
||||
|
||||
private final HttpClient httpClient;
|
||||
private final JsonObject ugoiraMeta;
|
||||
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||
*/
|
||||
public class PixivAccessProxyServer {
|
||||
|
||||
private final Logger log = LoggerFactory.getLogger(this.getClass().getSimpleName());
|
||||
private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class.getName());
|
||||
|
||||
private final HttpProxyServer proxyServer;
|
||||
|
||||
|
@ -31,7 +31,7 @@ public class PixivDownloadTest {
|
||||
|
||||
private static CookieStore cookieStore;
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger("PixivDownloadTest");
|
||||
private final static Logger log = LoggerFactory.getLogger(PixivDownloadTest.class.getName());
|
||||
|
||||
private static HttpHost proxy = new HttpHost("127.0.0.1", 1001);
|
||||
|
||||
@ -180,9 +180,8 @@ public class PixivDownloadTest {
|
||||
|
||||
log.info("正在调用方法...");
|
||||
try {
|
||||
pixivDownload.getRankingAsInputStream(null, null, queryDate, 5, 50, PixivDownload.PageQuality.ORIGINAL, (rank, link, rankInfo, inputStream) -> {
|
||||
log.info("空操作");
|
||||
});
|
||||
pixivDownload.getRankingAsInputStream(null, null, queryDate, 5, 50,
|
||||
PixivDownload.PageQuality.ORIGINAL, (rank, link, rankInfo, inputStream) -> log.info("空操作"));
|
||||
} finally {
|
||||
zos.finish();
|
||||
zos.flush();
|
||||
|
Reference in New Issue
Block a user