Compare commits

...

32 Commits

Author SHA1 Message Date
987ac44575 add company 2FA in utool.py and remove old rokae files 2024-08-16 10:11:24 +08:00
e8159fc8cb [modify] change scripts path with mid-fix "/git/", and do a exclude for syncthing due to too big tar ball 2024-06-02 08:01:54 +08:00
cc1463b166 [modify] textbox color, nagative value 2024-05-31 18:33:36 +08:00
14c72fe080 [modify] change vers location again 2024-05-31 08:52:18 +08:00
2922806e9c [modify] change domain to intranet addr in vers check 2024-05-30 20:25:32 +08:00
06e5111309 5. 重新在write2textbox中添加exitcode参数,并补齐相关逻辑和修改brake中的调用方式
6. 修复参数检查无效的情况
7. 屏蔽电流相关的功能
2024-05-30 17:12:43 +08:00
b04b9e9205 v0.1.1(2024/05/30)
1. 增加版本检测功能
2. 修改了无效数据下的动作
3. textbox只在开始和结束时改变状态,而不是每次写入都更改
4. 调整了brake的结构
2024-05-30 16:24:54 +08:00
cad7792fa1 [modify] skip when data is invalid 2024-05-30 15:08:42 +08:00
fd553b3442 [modify] minor modification 2024-05-30 14:37:39 +08:00
9b849897e2 [modify] minor modification, change write2textbox and using shorter func name 2024-05-30 08:28:59 +08:00
05f461f8c1 v0.1.0(2024/05/29)
1. 修改为customtkinter图形化界面
2. 支持工业机器人制动数据处理(理论上支持,测试数据有问题,待验证)
3. 删除configs.xlsx配置表格,直接在界面配置,新增layout.xlsx文件,存储customtkinter布局
4. 电流尚未支持
2024-05-29 19:15:44 +08:00
1cee89cd0a v0.0.7(2024/05/27)
1. 该版本制动数据处理变动较大,重写了find_row_start & copy_data_to_result,删除了delete_excel_files
2. 主要是修改了数据处理的方式,直接使用pandas进行数据处理,跳过了openpyxl来回变换,节省了大量的IO以及时间
2024-05-27 19:15:29 +08:00
203138947b [modify] AXIS is int, and add wb_data param in find_row_start() and modify accordingly; also the info of damage of result files 2024-05-23 20:52:06 +08:00
3d2e0e33af [modify] change icon.ico to true ico, and modify time format 2024-05-23 20:12:07 +08:00
e11dc60438 [modify]
v0.0.6(2024/05/23)
1. 为了调整多功能框架,aio.py文件将会作为入口程序存在,不实现具体功能,功能的实现将由具体的功能脚本实现,aio.py只负责条件调用
2. 新增了自动化处理电流数据(电机/过载)的功能
2024-05-23 17:35:34 +08:00
7123fa1147 [modify] rename workdir 2024-05-23 17:33:26 +08:00
f1fd1aaff5 [modify] add attention sheet 2024-05-23 16:19:17 +08:00
2dec392e50 [modify] minor modifications, see readme.txt in v0.0.5 the later half part 2024-05-23 16:12:35 +08:00
6cb768a05e [modify] change var place in initialization func 2024-05-23 15:11:22 +08:00
a0f8f49b27 [modify] delete some comments 2024-05-23 14:11:53 +08:00
09d63b6630 [add] icon.ico and readme.txt 2024-05-23 14:00:32 +08:00
44ef429d5a [modify]
v0.0.5(2024/05/23)
1. 完善了函数注释
2. 调整了阈值和步长
3. 删除了just_open函数,以及对应的win32com库(Thank GOD!终于可以不用这个库了)
4. 重写了获取开始点位的代码,直接使用speed来判断,而不用角度,所以find_row_start_dp以及copy_data_to_excel_file函数也被一并删除
2024-05-23 13:59:06 +08:00
de6d1d47c8 [midify]
v0.0.4(2024/05/22)
1. 重新标定了get_threshold_step函数,让处理更加准确
2. 新定义了now_doing_msg函数,实时输出处理信息
3. 修改了find_row_start和find_row_start_dp函数,增加的部分相同,处理数据的时候,先判断是否是空值,或者是0,此时可以加快步进
4. 修改了just_open函数,不在做重试
2024-05-23 11:25:45 +08:00
b335f61c72 [modify] v0.0.3(2024/05/21)
1. just_open函数打开失败的信息中,添加文件名
2. 删除global变量,函数全部通过传参实现
3. configuration.xlsx配置文件增加AXIS常量,表示那个轴,取值为 j1/j2/j3/j4/j5/j6/j7
4. [bugfix] 增加get_threshold_step函数,用来获取在计算row_start时合适的阈值和步长,主要是解决了二轴最差工况下,最大速度是个尖端的问题:
    a. load100_speed100_reachxxx 二轴 threshold = 50 step = 20
    b. 其他 threshold = 50 step = 100
    如上是一个比较保守的设定,因为设定的step比较小,找到点之后要往后延200最好
5. 在find_row_start_dp函数中新增一个参数data_file,方便后续调试
2024-05-23 11:23:32 +08:00
c61686065e [modify] v0.0.2(2024/05/20)
1. 功能模块化,为后面其他功能奠定一个基本的框架
2. 使用了多线程提高效率
3. 优化了准备工作中的细节
4. 运行初始化时自动删除 raw_data_dir 中的 .xlsx 文件
5. 优化了输出格式
6. 使用 pyinstaller 库进行代码冻结并调试成功
2024-05-23 11:07:35 +08:00
9a001021b1 [init] v0.0.1 drafts 2024-05-23 11:03:12 +08:00
6080fe48c1 [modify] 1. systemd-networkd service 2. add a mod blacklist 3. bluetooth 4. remove unused files when do a backup 2024-05-19 11:33:36 +08:00
36a18e870f [modify] make a exception for v2raya 2024-05-19 11:31:23 +08:00
40e14b5cc7 [add] create rokae scripts dir, and add script for processing brake data 2024-05-19 11:30:57 +08:00
a96f533f8f [modify] make ifconfig output to /opt/wd/99-Temp/ifconfig.txt on the start of the system 2024-05-19 11:28:01 +08:00
b36c0b6939 [modify] delete sysctl related parts and add conf backup for netdata 2024-04-27 21:46:49 +08:00
7e68bbb891 [modify] delete jekyll related parts 2024-04-27 21:45:42 +08:00
6 changed files with 37 additions and 24 deletions

View File

@ -3,7 +3,7 @@
> /tmp/docker_alarm.log
docker ps -a --format "table {{.Names}}\t{{.Status}}" > /opt/logs/docker_status.log
while read line; do
echo $line | grep -q 'Exited'
echo $line | grep -v 'v2raya' | grep -q 'Exited'
if [[ $? -eq 0 ]]; then
name=`echo $line | awk '{print $1}'`
echo "Docker Alarm - $name: Container $name has been off line, please check ASAP." >> /tmp/docker_alarm.log
@ -12,6 +12,6 @@ done < /opt/logs/docker_status.log
if [[ -s /tmp/docker_alarm.log ]]; then
alarm=`cat /tmp/docker_alarm.log`
python3 /opt/scripts/alert/sendmail.py "Docker Alarms" "$alarm"
python3 /opt/git/scripts/alert/sendmail.py "Docker Alarms" "$alarm"
fi

View File

@ -8,8 +8,7 @@ cp -rf /var/spool/cron/crontabs/ /opt/configs/
cp -rf /usr/local/nginx/conf/nginx.conf /opt/configs/nginx/nginx.conf
cp -rf /usr/local/nginx/conf/domain_confs/ /opt/configs/nginx/
cp -rf /etc/docker/daemon.json /opt/configs/conf/
cp -rf /etc/sysctl.conf /opt/configs/conf/
cp -rf /etc/sysctl.d/99-tailscale.conf /opt/configs/conf/
cp -rf /etc/netdata/ /opt/configs/
cp -rf /etc/pip.conf /opt/configs/conf/
cp -rf /etc/apt/sources.list /opt/configs/conf/
cp -rf /etc/ssh/sshd_config /opt/configs/conf/
@ -21,10 +20,13 @@ cp -rf /etc/network/interfaces /opt/configs/conf/
cp -rf /root/.acme.sh/*ecc /opt/configs/acme/
cp -rf /root/.acme.sh/rustle.cc_ecc/rustle.cc.{key,cer} /opt/apps/syncthing/data/common/A_Program/nginx-1.24.0/certs/
cp -rf /opt/apps/syncthing/data/common/A_Program/FRP/* /opt/apps/frp/frpc-xtcp-visitor/
cp -rf /etc/systemd/network /opt/configs/conf/
cp -rf /etc/modprobe.d/pcspkr-blacklist.conf /opt/configs/conf/
cp -rf /lib/firmware/intel/ ibt-0040-1050* /opt/configs/conf/intel/
cd /opt && t=`date +%Y%m%dT%H%M%S`
# rsync --delete-after -avz --exclude=apps/localcr/B_koel/local/music apps configs logs scripts websites wd/72-Backups/VPS/ > /opt/logs/rsync/rsync_${t}.log
rsync --delete-after -avz apps configs logs scripts websites wd/72-Backups/VPS/ > /opt/logs/rsync/rsync_${t}.log
rsync --delete-after -avz --exclude=apps/syncthing apps configs logs git websites wd/72-Backups/VPS/ > /opt/logs/rsync/rsync_${t}.log
cd /opt/logs/rsync/
let count=`ls | wc -l`
if [[ $count -gt 10 ]]; then
@ -43,9 +45,7 @@ if [[ `date +%d` == '01' ]]; then
t=`date +%Y%m%d%H%M%S` && cd /opt/wd/72-Backups/
tar -I pigz -cf vps-${t}.tar.gz \
--exclude=VPS/apps/localcr/B_koel/local/music \
--exclude=VPS/apps/localcr/I_cloudreve/local/cloudreve/uploads \
--exclude=VPS/apps/localcr/K_nextcloud/local/nextcloud/data/nextcloud/files \
--exclude=VPS/apps/syncthing/data \
VPS/ > /dev/null 2>&1
# tar -I unpigz -xf vps-20231101162641.tar.gz

View File

@ -2,18 +2,18 @@
#==============================================================================
/usr/bin/qbittorrent-nox --webui-port=10005 -d
# /usr/bin/bash /opt/scripts/update/calibre.sh
mv /opt/wd/99-Temp/shutdown /opt/wd/99-Temp/shutdown.old
mv /opt/wd/99-Temp/reboot /opt/wd/99-Temp/reboot.old
sleep 20
ifconfig > /opt/wd/99-Temp/ifconfig.txt
#==============================================================================
# ip link set enp1s0 promisc on
# ip link set enp2s0 promisc on
# ip link set wlx90de80ca01ec promisc on
#==============================================================================
# sleep 20
# /usr/bin/bash /opt/scripts/update/macvlan.sh
# /usr/bin/bash /opt/git/scripts/update/macvlan.sh
#==============================================================================
# nohup /usr/bin/bash /opt/scripts/update/jekyll_update.sh > /dev/null 2>&1 &
# /usr/bin/mount -t ext4 -w UUID="b7c2c4b8-bfde-479b-80bb-655432a433b8" /opt/wd

View File

@ -1,7 +1,7 @@
#!/bin/bash
# get latest hosts for accelerate github visiting
curl https://raw.hellogithub.com/hosts >> /opt/logs/hosts
# curl https://raw.hellogithub.com/hosts >> /opt/logs/hosts
# renew images.json file for background picture of homepage
cd /opt/websites/homepage/
@ -9,7 +9,7 @@ node assets/js/bing.js > /dev/null 2>&1
if [[ `date +%d` == '01' ]]; then
# random logo for dash
# bash /opt/scripts/update/dash_rand_logo.sh
# bash /opt/git/scripts/update/dash_rand_logo.sh
cp /root/.acme/rustle.cc_ecc/fullchain.cer '/opt/apps/syncthing/data/common/A_Program/nginx-1.24.0/certs/'
cp /root/.acme/rustle.cc_ecc/rustle.cc.key '/opt/apps/syncthing/data/common/A_Program/nginx-1.24.0/certs/'
fi
@ -19,4 +19,4 @@ let numOfAvatar=`ls /opt/websites/homepage/assets/img/logos | wc -l`
let randNumber=$RANDOM%$numOfAvatar
cp /opt/websites/homepage/assets/img/logos/${randNumber}.jpg /opt/websites/homepage/assets/img/logo.jpg
docker exec -u www-data nextcloud php /var/www/html/occ files:scan --all
# docker exec -u www-data nextcloud php /var/www/html/occ files:scan --all

View File

@ -2,7 +2,7 @@
rss=$(ps aux | grep frpc.toml | grep -v grep | awk '{print $6}')
if [[ $rss == '' ]]; then
python3 /opt/scripts/alert/bark/msgsend.py --title "FRPC Warning" --body "Seems like FRPC Service has been down, need to check ASAP." --group 'frp' --icon 8
python3 /opt/git/scripts/alert/bark/msgsend.py --title "FRPC Warning" --body "Seems like FRPC Service has been down, need to check ASAP." --group 'frp' --icon 8
exit 9
fi

View File

@ -24,7 +24,7 @@ def utool(option):
# -a
def list_local_using_port():
exit_on_wrong_number()
os.system('/usr/bin/bash /opt/scripts/utool/ipports.sh port')
os.system('/usr/bin/bash /opt/git/scripts/utool/ipports.sh port')
# -b
def github_two_factor():
@ -34,7 +34,7 @@ def utool(option):
# -c
def get_external_ip():
exit_on_wrong_number()
os.system("/usr/bin/python3 /opt/scripts/roll_api/get_self_ip.py")
os.system("/usr/bin/python3 /opt/git/scripts/roll_api/get_self_ip.py")
# -d
def get_ip_location():
@ -44,7 +44,7 @@ def utool(option):
ipv4 = re.match(r"^((([01]?\d\d?)|(2[0-4]\d)|(25[0-5]))\.){3}(([01]?\d\d?)|(2[0-4]\d)|(25[0-5]))$", checked_ip)
if ipv4:
os.environ['checked_ip'] = checked_ip
os.system('/usr/bin/python3 /opt/scripts/roll_api/get_ip.py $checked_ip')
os.system('/usr/bin/python3 /opt/git/scripts/roll_api/get_ip.py $checked_ip')
else:
print(f"{c_br}Plz enter correct IP...{c_e}")
exit(ord(option.strip('-')))
@ -69,12 +69,12 @@ def utool(option):
def number2date():
exit_on_wrong_number(2)
os.environ['param'] = sys.argv[2]
os.system('/usr/bin/bash /opt/scripts/utool/number2d.sh $param')
os.system('/usr/bin/bash /opt/git/scripts/utool/number2d.sh $param')
# -g
def date2number():
if len(sys.argv) < 3:
print(f"{c_br}-k选项:将输入的时间转换成十进制和十六进制,需要一个字符串格式的时间作为输入,退出...{c_e}\n")
print(f"{c_br}-g选项:将输入的时间转换成十进制和十六进制,需要一个字符串格式的时间作为输入,退出...{c_e}\n")
exit(ord(option.strip('-')))
param=''
@ -82,7 +82,7 @@ def utool(option):
param += item + ' '
os.environ['param'] = param
os.system('/usr/bin/bash /opt/scripts/utool/date2n.sh $param')
os.system('/usr/bin/bash /opt/git/scripts/utool/date2n.sh $param')
# -h
def usage():
@ -92,19 +92,32 @@ def utool(option):
# -i
def ps_top_20():
exit_on_wrong_number()
os.system("/usr/bin/bash /opt/scripts/utool/ps_top_20.sh")
os.system("/usr/bin/bash /opt/git/scripts/utool/ps_top_20.sh")
# -j
def docker_pid():
exit_on_wrong_number(2)
os.environ['param'] = sys.argv[2]
os.system('/usr/bin/bash /opt/scripts/utool/pid_in_docker.sh $param')
os.system('/usr/bin/bash /opt/git/scripts/utool/pid_in_docker.sh $param')
# -k
def company_two_factor():
exit_on_wrong_number()
# method 1
# os.system("/usr/bin/echo -n 'ujjpsx7q'")
# os.system("/usr/bin/oathtool -b --totp '22IH2VYKEQYOWVFCCHY5KTU4CYTJ7Z3O'")
# method 2
pin = 'ujjpsx7q'
totp = os.popen("/usr/bin/oathtool -b --totp '22IH2VYKEQYOWVFCCHY5KTU4CYTJ7Z3O'").read()
res = pin + totp
print(res, end='')
return res
# -p
def gen_passwd():
exit_on_wrong_number(2)
os.environ['length'] = sys.argv[2]
os.system('/usr/bin/bash /opt/scripts/utool/genpw.sh length')
os.system('/usr/bin/bash /opt/git/scripts/utool/genpw.sh length')
def exit_on_wrong_number(number=1):
if len(sys.argv) != (number+1):
@ -134,7 +147,7 @@ def utool(option):
'-v': ['Reserved', None],
'-j': ['*find a docker subprocess, if true then print info', docker_pid],
'-w': ['Reserved', None],
'-k': ['Reserved', None],
'-k': [' generate two-factor key of GITHUB', company_two_factor],
'-x': ['Reserved', None],
'-l': ['Reserved', None],
'-y': ['Reserved', None],