From 0290c4da9b932094d0e79331c08fbc478d17f775 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 6 May 2023 09:19:00 +0800 Subject: [PATCH] update 2023-05-06 09:19:00 --- luci-app-serverchan/root/usr/share/serverchan/serverchan | 4 ++-- v2ray-geodata/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/luci-app-serverchan/root/usr/share/serverchan/serverchan b/luci-app-serverchan/root/usr/share/serverchan/serverchan index b21540e4f..b6213fc83 100755 --- a/luci-app-serverchan/root/usr/share/serverchan/serverchan +++ b/luci-app-serverchan/root/usr/share/serverchan/serverchan @@ -1101,7 +1101,7 @@ function login_send(){ echo "" > ${dir}web_login unset login_ip login_time login_mode # SSH 登录提醒 - for login_ip in `cat ${dir}ssh_login|awk '{print $3}'|grep -v "^$"|sort -u|sed -nr 's#^(.*):.[0-9]{1,5}#\1#gp'`; do + for login_ip in `cat ${dir}ssh_login|awk '{print $3}'|grep -v "^$"|sed -nr 's#^(.*):.[0-9]{1,5}#\1#gp'|sort -u`; do [ -z "$login_ip" ] && continue add_ip_white ${login_ip} local login_time=`cat ${dir}ssh_login|grep -w ${login_ip}|awk '{print $1}'|grep -v "^$"|sort -u|head -n1` @@ -1150,7 +1150,7 @@ function login_send(){ done unset login_ip login_sum # SSH 非法登录 - for login_ip in `cat ${dir}ssh_failed|awk '{print $1}'|grep -v "^$"|sort -u|sort -u|sed -nr 's#^(.*):.[0-9]{1,5}#\1#gp'`; do + for login_ip in `cat ${dir}ssh_failed|awk '{print $1}'|grep -v "^$"|sed -nr 's#^(.*):.[0-9]{1,5}#\1#gp'|sort -u`; do [ -z "$login_ip" ] && continue echo "$ip_white_list"|grep -w -q "$login_ip" && continue local login_sum=`cat ${dir}ssh_failed|grep -w "${login_ip}"|wc -l` diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index f405d97e1..c937c0874 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=e5551e58db5c941425c00ee2a2f1f53c886a55e3841a6fe05aaf0343c78f7a41 endef -GEOSITE_VER:=20230505020950 +GEOSITE_VER:=20230505124421 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=75a18aa8e8c123047f58e61b648b2c56b0dd6a2a18749350c47259677bd62155 + HASH:=298ed6b43e49dcbe032665292ba45964465ff2ace3e8346c01ffc196c4099496 endef define Package/v2ray-geodata/template