[Change] SettingProperties 增加群号检查, 防止出现非法群号;

This commit is contained in:
LamGC 2020-06-06 15:42:35 +08:00
parent a426f80ec5
commit f54ed35a09

View File

@ -51,6 +51,10 @@ public final class SettingProperties {
long groupId; long groupId;
try { try {
groupId = Long.parseLong(name.substring(name.indexOf("group.") + 6, name.lastIndexOf(".properties"))); groupId = Long.parseLong(name.substring(name.indexOf("group.") + 6, name.lastIndexOf(".properties")));
if(groupId <= 0) {
log.warn("无效的群配置文件: {}", groupId);
continue;
}
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
log.error("非法的配置文件名: {}", name); log.error("非法的配置文件名: {}", name);
continue; continue;
@ -233,7 +237,7 @@ public final class SettingProperties {
* @return 如果群组存在所属Properties, 则返回群组Properties, 否则返回GlobalProperties. * @return 如果群组存在所属Properties, 则返回群组Properties, 否则返回GlobalProperties.
*/ */
public static Properties getProperties(long groupId) { public static Properties getProperties(long groupId) {
if(groupPropMap.containsKey(groupId)) { if(groupId > 0 && groupPropMap.containsKey(groupId)) {
return groupPropMap.get(groupId); return groupPropMap.get(groupId);
} }
return getGlobalProperties(); return getGlobalProperties();