add company 2FA in utool.py and remove old rokae files

6. 修复参数检查无效的情况
7. 屏蔽电流相关的功能

alert/docker_alarm.sh

@@ -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
 

rokae/brake/brake.py

@@ -1,368 +0,0 @@
-# coding: utf-8
-import os
-import sys
-import openpyxl
-from win32com.client import DispatchEx
-import time
-from threading import Thread
-import pythoncom
-import pandas
-
-
-def just_open(filename):
-    pythoncom.CoInitialize()
-    xlapp = DispatchEx("Excel.Application")
-    xlapp.Visible = False
-    xlbook = xlapp.Workbooks.Open(filename)
-    xlapp.DisplayAlerts = 0
-    xlbook.SaveAs(filename)
-    xlbook.Close()
-    xlapp.Quit()
-
-
-def traversal_files(path):
-    if not os.path.exists(path):
-        msg = f'数据文件夹{path}不存在，请确认后重试......'
-        warn_pause_exit(msg, 1, 11)
-    else:
-        dirs = []
-        files = []
-        for item in os.scandir(path):
-            if item.is_dir():
-                dirs.append(item.path)
-            elif item.is_file():
-                files.append(item.path)
-
-        return dirs, files
-
-
-def get_threshold_step(excel_file, AXIS):
-    conditions = sorted(excel_file.split('\\')[-2].split('_'))
-    # 只有负载和速度是100%时，才会启用更敏感的step
-    flg = 1 if conditions[0][-3:] == '100' and conditions[2][-3:] == '100' else 0
-    if flg == 1 and AXIS == 'j2':
-        threshold = 50
-        step = 20
-    else:
-        threshold = 50
-        step = 100
-
-    return threshold, step
-
-
-def find_row_start(excel_file, ws_data, conditions, AV, RR, AXIS):
-    ratio = float(conditions[1].removeprefix('speed'))/100
-    speed_max = AV * ratio * RR / 6
-
-    row_max = ws_data.max_row
-    row_start = row_max - 1000
-
-    threshold, step = get_threshold_step(excel_file, AXIS)
-    while row_start > 0:
-        speed = ws_data[f"A{row_start}"].value
-        if speed is None or int(speed) < 1:
-            row_start -= step
-            continue
-
-        row_end = row_start - step
-        if row_end < 2:
-            msg = f"可能是{excel_file.replace('xlsx', 'data')}, 这个文件数据采集有问题，也有可能是程序步长设定问题......" \
-                  f"建议重新采集，或者先删除该文件夹，重新运行程序，先手动处理"
-            warn_pause_exit(msg, 1, 10)
-        _a = ws_data[f"A{row_start}"].value
-        _b = ws_data[f"A{row_end}"].value
-        if abs(_a-speed_max) < threshold and abs(_b-speed_max) < threshold and abs(_a-_b) < threshold:
-            row_start -= (step + 200)
-            break
-        else:
-            row_start -= step
-    else:
-        os.remove(excel_file)
-        msg = f"可能是{excel_file.replace('xlsx', 'data')},这个文件数据采集有问题，比如采集的时机不对，请检查......"
-        warn_pause_exit(msg, 1, 9)
-
-    return row_max, row_start
-
-
-def find_result_sheet_name(conditions, count):
-    # 该函数比较简单，功能是获取结果文件准确的sheet页名称
-    # 33%臂展_33%速度_正1
-    reach = conditions[0].removeprefix('reach')
-    speed = conditions[1].removeprefix('speed')
-    result_sheet_name = f"{reach}%臂展_{speed}%速度_正{count}"
-
-    return result_sheet_name
-
-
-def copy_data_to_result(ws_data, ws_result, row_max, row_start):
-    # 结果文件数据清零
-    for row in ws_result.iter_rows(min_row=2, min_col=1, max_row=6000 - row_start + 2, max_col=2):
-        for cell in row:
-            cell.value = None
-
-    # 将合适的数据复制到结果文件
-    data = []
-    for row in ws_data.iter_rows(min_row=row_start, min_col=1, max_row=row_max, max_col=2):
-        for cell in row:
-            data.append(cell.value)
-    i = 0
-    for row in ws_result.iter_rows(min_row=2, min_col=1, max_row=row_max - row_start + 2, max_col=2):
-        for cell in row:
-            cell.value = data[i]
-            i = i + 1
-
-
-def copy_data_to_excel_file(wb_data, ws_result, row_max, row_start, excel_file, RC, RR):
-    try:
-        del wb_data['dp']
-        wb_data.create_sheet('dp')
-        ws_dp = wb_data['dp']
-    except Exception as Err:
-        wb_data.create_sheet('dp')
-        ws_dp = wb_data['dp']
-
-    data = []
-    for row in ws_result.iter_rows(min_row=1, min_col=1, max_row=row_max-row_start+2, max_col=5):
-        for cell in row:
-            data.append(cell.value)
-    i = 0
-    for row in ws_dp.iter_rows(min_row=1, min_col=1, max_row=row_max-row_start+2, max_col=5):
-        for cell in row:
-            cell.value = data[i]
-            i = i + 1
-
-    ws_dp.cell(row=5, column=7).value = RC
-    ws_dp.cell(row=6, column=7).value = RR
-
-    wb_data.save(excel_file)
-    wb_data.close()
-    just_open(excel_file)  # 为了能读取到公式计算的数值，必须要用 win32com 打开关闭一次
-    wb_data = openpyxl.load_workbook(excel_file, data_only=True)
-    ws_dp = wb_data['dp']
-
-    return wb_data, ws_dp
-
-
-def find_row_start_dp(data_file, ws_dp, row_max, row_start, conditions, AV):
-    ratio = float(conditions[1].removeprefix('speed'))/100
-    av_max = AV * ratio
-    row_max_dp = row_max - row_start + 1 + 1  # title row
-    row_start_dp = row_max_dp - 5
-    while row_start_dp > 6:
-        # 处理异常数据：当从数据文件中拷贝的有效数据超过5000时，会触发下面代码块
-        angular = ws_dp.cell(row=row_start_dp, column=4).value
-        if angular is None or str(angular) == '0':
-            row_start_dp -= 50
-            continue
-        _a = float(ws_dp.cell(row=row_start_dp, column=4).value)
-        _b = float(ws_dp.cell(row=row_start_dp - 1, column=4).value)
-        _c = float(ws_dp.cell(row=row_start_dp - 2, column=4).value)
-        _d = float(ws_dp.cell(row=row_start_dp - 3, column=4).value)
-        _e = float(ws_dp.cell(row=row_start_dp - 4, column=4).value)
-        avg = (_a + _b + _c + _d + _e) / 5
-        if abs(avg - av_max) < 1:
-            row_start_dp = row_start_dp + 10 - 5  # +10 是因为结果文件 C2 的值是 10，-5是做了保守处理，相当于再往前移动 5 个点位
-            break
-        else:
-            row_start_dp -= 5  # 保守一点，每次移动 5 个点位，如果想要加快程序运行，可适当调整更大一些，建议不超过 15
-    else:
-        msg = "数据有误，未找到平衡的点，请确认！"
-        warn_pause_exit(msg, 1, 1)
-
-    return row_start_dp
-
-
-def single_file_process(data_file, wb_result, count, AV, RR, RC, AXIS):
-    excel_file = data_file.replace('.data', '.xlsx')
-    sheet_name = data_file.split('\\')[-1].removesuffix('.data')
-    df = pandas.read_csv(data_file, sep='\t')
-    df.to_excel(excel_file, sheet_name=sheet_name, index=False)
-
-    conditions = sorted(data_file.split('\\')[-2].split('_')[1:])
-    # print(f"conditions = {conditions}")
-    result_sheet_name = find_result_sheet_name(conditions, count)
-    ws_result = wb_result[result_sheet_name]
-
-    wb_data = openpyxl.load_workbook(excel_file)
-    ws_data = wb_data[sheet_name]
-    row_max, row_start = find_row_start(excel_file, ws_data, conditions, AV, RR, AXIS)
-
-    copy_data_to_result(ws_data, ws_result, row_max, row_start)
-    wb_data, ws_dp = copy_data_to_excel_file(wb_data, ws_result, row_max, row_start, excel_file, RC, RR)
-    row_start_dp = find_row_start_dp(data_file, ws_dp, row_max, row_start, conditions, AV)
-
-    ws_result["G2"] = int(row_start_dp)
-
-    wb_data.save(excel_file)
-    wb_data.close()
-
-
-def now_doing_msg(docs, flag):
-    now = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))
-    file_type = 'file' if os.path.isfile(docs) else 'dir'
-    if flag == 'start' and file_type == 'dir':
-        print(f"[{now}] 正在处理目录【{docs}】中的数据......")
-    elif flag == 'start' and file_type == 'file':
-        print(f"[{now}] 正在处理文件【{docs}】中的数据......")
-    elif flag == 'done' and file_type == 'dir':
-        print(f"[{now}] 目录【{docs}】数据文件已处理完毕......")
-    elif flag == 'done' and file_type == 'file':
-        print(f"[{now}] 文件【{docs}】数据文件已处理完毕......")
-
-
-def data_process(result_file, raw_data_dirs, AV, RR, RC, AXIS):
-    prefix = result_file.split('\\')[-1].split('_')[0]
-    wb_result = openpyxl.load_workbook(result_file)  # 打开和关闭结果文件夹十分耗时间
-    for raw_data_dir in raw_data_dirs:
-        if raw_data_dir.split('\\')[-1].split('_')[0] == prefix:
-            now_doing_msg(raw_data_dir, 'start')
-            _, data_files = traversal_files(raw_data_dir)
-            # 数据文件串行处理模式---------------------------------
-            # count = 1
-            # for data_file in data_files:
-                # now_doing_msg(data_file, 'start')
-                # single_file_process(data_file, wb_result, count, AV, RR, RC, AXIS)
-                # count += 1
-                # now_doing_msg(data_file, 'done')
-            # ---------------------------------------------------
-
-            # 数据文件并行处理模式---------------------------------
-            threads = [Thread(target=single_file_process, args=(data_files[0], wb_result, 1, AV, RR, RC, AXIS)),
-                       Thread(target=single_file_process, args=(data_files[1], wb_result, 2, AV, RR, RC, AXIS)),
-                       Thread(target=single_file_process, args=(data_files[2], wb_result, 3, AV, RR, RC, AXIS))]
-            [t.start() for t in threads]
-            [t.join() for t in threads]
-            now_doing_msg(raw_data_dir, 'done')
-            # ---------------------------------------------------
-
-    now_doing_msg(result_file, 'done')
-    print(f"保存文件需要1-2min，请耐心等待......")
-    wb_result.save(result_file)
-    wb_result.close()
-
-
-def warn_pause_exit(msg, pause_num, exit_num):
-    print(msg + '\n')
-    for i in range(pause_num):
-        _ = input("Press ENTER to continue......\n")
-    sys.exit(exit_num)
-
-
-def check_files(raw_data_dirs, result_files):
-    if len(result_files) != 3:
-        msg = "结果文件数目错误，结果文件有且只有三个，请确认！"
-        for result_file in result_files:
-            print(result_file)
-        warn_pause_exit(msg, 1, 3)
-
-    prefix = []
-    for result_file in result_files:
-        prefix.append(result_file.split('\\')[-1].split('_')[0])
-    if not sorted(prefix) == sorted(['load33', 'load66', 'load100']):
-        wd = result_files[0].split('\\')
-        del wd[-1]
-        wd = '\\'.join(wd)
-        msg = f"请关闭所有相关数据文件，并检查工作目录【{wd}】下，有且只允许有类似如下三个文件：\n" \
-              f"1. load33_自研_制动性能测试.xlsx\n" \
-              f"2. load66_自研_制动性能测试.xlsx\n" \
-              f"3. load100_自研_制动性能测试.xlsx"
-        warn_pause_exit(msg, 1, 8)
-
-    for raw_data_dir in raw_data_dirs:
-        components = raw_data_dir.split('\\')[-1].split('_')
-        sorted(components)
-        if components[0] not in ['load33', 'load66', 'load100'] or \
-                components[1] not in ['speed33', 'speed66', 'speed100'] or \
-                components[2] not in ['reach33', 'reach66', 'reach100']:
-            msg = f"报错信息：数据目录【{raw_data_dir}】命名不合规，请参考如下形式\n" \
-                  f"命名规则：\n    1. loadAA_speedBB_reachCC\n    2. loadAA_reachBB_speedCC\n" \
-                  f"规则解释：AA/BB/CC 指的是负载/速度/臂展的比例\n" \
-                  f"load66_speed100_reach33：66% 负载，100% 速度以及 33% 臂展情况下的测试结果文件夹"
-            warn_pause_exit(msg, 1, 7)
-
-        # 直接删掉 excel 文件
-        _, raw_data_files = traversal_files(raw_data_dir)
-        for raw_data_file in raw_data_files:
-            if raw_data_file.endswith(".xlsx"):
-                os.remove(raw_data_file)
-
-        _, raw_data_files = traversal_files(raw_data_dir)
-        if len(raw_data_files) != 3:
-            msg = f"数据目录【{raw_data_dir}】下数据文件个数错误，每个数据目录下有且只能有三个以 .data 为后缀的数据文件"
-            warn_pause_exit(msg, 1, 6)
-        for raw_data_file in raw_data_files:
-            if not raw_data_file.split('\\')[-1].endswith('.data'):
-                msg = f"数据文件【{raw_data_file}】后缀错误，每个数据目录下有且只能有三个以 .data 为后缀的数据文件"
-                warn_pause_exit(msg, 1, 5)
-
-    print("数据目录合规性检查结束，未发现问题......")
-
-
-def delete_excel_files(raw_data_dirs):
-    for raw_data_dir in raw_data_dirs:
-        _, raw_data_files = traversal_files(raw_data_dir)
-        for raw_data_file in raw_data_files:
-            if raw_data_file.endswith('.xlsx'):
-                os.remove(raw_data_file)
-
-
-def initialization():
-    time_start = time.time()  # 记录开始时间
-    try:
-        # read init configurations from config file
-        wb_conf = openpyxl.load_workbook('./configs.xlsx', read_only=True)
-        ws_conf = wb_conf['brake']
-
-        DATA_DIR = ws_conf.cell(row=2, column=2).value
-        AV = int(ws_conf.cell(row=3, column=2).value)
-        RR = int(ws_conf.cell(row=4, column=2).value)
-        RC = float(ws_conf.cell(row=5, column=2).value)
-        AXIS = ws_conf.cell(row=6, column=2).value
-        wb_conf.close()
-    except Exception as Err:
-        msg = "无法在当前路径下找到或打开【configs.xlsx】文件，请确认！"
-        warn_pause_exit(msg, 1, 2)
-
-    raw_data_dirs, result_files = traversal_files(DATA_DIR)
-    delete_excel_files(raw_data_dirs)
-    check_files(raw_data_dirs, result_files)
-
-    return raw_data_dirs, result_files, time_start, AV, RR, RC, AXIS
-
-
-def execution(args):
-    raw_data_dirs, result_files, time_start, AV, RR, RC, AXIS = args
-    prefix = []
-    for raw_data_dir in raw_data_dirs:
-        prefix.append(raw_data_dir.split('\\')[-1].split("_")[0])
-
-    try:
-        # threads = []
-        for result_file in result_files:
-            if result_file.split('\\')[-1].split('_')[0] not in set(prefix):
-                continue
-            else:
-                now_doing_msg(result_file, 'start')
-                data_process(result_file, raw_data_dirs, AV, RR, RC, AXIS)
-        #         threads.append(Thread(target=data_process, args=(result_file, raw_data_dirs, AV, RR, RC, AXIS)))
-        # [t.start() for t in threads]
-        # [t.join() for t in threads]
-        print("#---------------------------------------------------------")
-        print("全部处理完毕")
-        delete_excel_files(raw_data_dirs)
-    except Exception as Err:
-        print("程序运行错误，请检查配置文件是否准确设定，以及数据文件组织是否正确！")
-        delete_excel_files(raw_data_dirs)  # 运行结束之后，删除中间临时文件
-
-    time_end = time.time()  # 记录结束时间
-    time_total = time_end - time_start  # 计算的时间差为程序的执行时间，单位为秒/s
-    msg = f"数据处理时间：{time_total//3600:02} h {time_total % 3600/60:05.2f} min"
-    warn_pause_exit(msg, 1, 0)
-
-
-def main():
-    execution(initialization())
-
-
-if __name__ == "__main__":
-    main()

rokae/brake/file_version_info.txt

@@ -1,43 +0,0 @@
-# UTF-8
-#
-# For more details about fixed file info 'ffi' see:
-# http://msdn.microsoft.com/en-us/library/ms646997.aspx
-VSVersionInfo(
-  ffi=FixedFileInfo(
-    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
-    # Set not needed items to zero 0.
-    filevers=(0, 0, 4, 0),
-    prodvers=(0, 0, 4, 0),
-    # Contains a bitmask that specifies the valid bits 'flags'r
-    mask=0x3f,
-    # Contains a bitmask that specifies the Boolean attributes of the file.
-    flags=0x0,
-    # The operating system for which this file was designed.
-    # 0x4 - NT and there is no need to change it.
-    OS=0x4,
-    # The general type of file.
-    # 0x1 - the file is an application.
-    fileType=0x1,
-    # The function of the file.
-    # 0x0 - the function is not defined for this fileType
-    subtype=0x0,
-    # Creation date and time stamp.
-    date=(0, 0)
-    ),
-  kids=[
-    StringFileInfo(
-      [
-      StringTable(
-        '040904b0',
-        [StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'),
-        StringStruct('FileDescription', 'All in one automatic operating tool'),
-        StringStruct('FileVersion', '0.0.4 (2024-05-20)'),
-        StringStruct('InternalName', 'AIO.exe'),
-        StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'),
-        StringStruct('OriginalFilename', 'AIO.exe'),
-        StringStruct('ProductName', 'AIO'),
-        StringStruct('ProductVersion', '0.0.4 (2024-05-20)')])
-      ]), 
-    VarFileInfo([VarStruct('Translation', [1033, 1200])])
-  ]
-)

update/backups.sh

@@ -26,7 +26,7 @@ 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

update/init.sh

@@ -2,7 +2,6 @@
 
 #==============================================================================
 /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
@@ -13,7 +12,7 @@ ifconfig > /opt/wd/99-Temp/ifconfig.txt
 # 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
 #==============================================================================
 # /usr/bin/mount -t ext4 -w UUID="b7c2c4b8-bfde-479b-80bb-655432a433b8" /opt/wd
 

update/renew.sh

@@ -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

update/restart_frpc.sh

@@ -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
 

utool/utool.py

@@ -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],