Merge pull request #469 from midoks/dev

增加命令 mw db 快捷登录数据库

plugins/mariadb/index.py

@@ -755,6 +755,11 @@ def importDbBackup():
     return mw.returnJson(True, 'ok')
 
 
+def rootPwd():
+    return pSqliteDb('config').where(
+        'id=?', (1,)).getField('mysql_root')
+
+
 def importDbExternal():
     args = getArgs()
     data = checkArgs(args, ['file', 'name'])
@@ -2740,6 +2745,8 @@ if __name__ == "__main__":
         print(setMyPort())
     elif func == 'init_pwd':
         print(initMysqlPwd())
+    elif func == 'root_pwd':
+        print(rootPwd())
     elif func == 'get_db_list':
         print(getDbList())
     elif func == 'set_db_backup':

plugins/mysql-apt/index.py

@@ -728,6 +728,11 @@ def setDbBackup():
     return mw.returnJson(True, 'ok')
 
 
+def rootPwd():
+    return pSqliteDb('config').where(
+        'id=?', (1,)).getField('mysql_root')
+
+
 def importDbExternal():
     args = getArgs()
     data = checkArgs(args, ['file', 'name'])
@@ -2809,6 +2814,8 @@ if __name__ == "__main__":
         print(setMyPort())
     elif func == 'init_pwd':
         print(initMysqlPwd())
+    elif func == 'root_pwd':
+        print(rootPwd())
     elif func == 'get_db_list':
         print(getDbList())
     elif func == 'set_db_backup':

plugins/mysql-yum/index.py

@@ -713,6 +713,11 @@ def setDbBackup():
     return mw.returnJson(True, 'ok')
 
 
+def rootPwd():
+    return pSqliteDb('config').where(
+        'id=?', (1,)).getField('mysql_root')
+
+
 def importDbExternal():
     args = getArgs()
     data = checkArgs(args, ['file', 'name'])
@@ -2786,6 +2791,8 @@ if __name__ == "__main__":
         print(setMyPort())
     elif func == 'init_pwd':
         print(initMysqlPwd())
+    elif func == 'root_pwd':
+        print(rootPwd())
     elif func == 'get_db_list':
         print(getDbList())
     elif func == 'set_db_backup':

plugins/mysql/index.py

@@ -933,6 +933,11 @@ def myPass(act, root):
     return True
 
 
+def rootPwd():
+    return pSqliteDb('config').where(
+        'id=?', (1,)).getField('mysql_root')
+
+
 def importDbExternal():
     args = getArgs()
     data = checkArgs(args, ['file', 'name'])
@@ -3032,6 +3037,8 @@ if __name__ == "__main__":
         print(setMyPort())
     elif func == 'init_pwd':
         print(initMysqlPwd())
+    elif func == 'root_pwd':
+        print(rootPwd())
     elif func == 'get_db_list':
         print(getDbList())
     elif func == 'set_db_backup':

plugins/tgbot/startup/extend/push_ad.py

@@ -41,12 +41,12 @@ def send_msg(bot, tag='ad', trigger_time=300):
     mw.writeFile(lock_file, json.dumps(lock_data))
     # 信号只在一个周期内执行一次|end
 
-    # https://t.me/gjgzs2022 ｜ 22/m
+    # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
-    # 高价收量 👑 集团收量 ❤️ 流量变现/支付宝代付 ❤️ 微信代付/实名认证/过人脸🕵️‍♀️各种账号处理✅ ｜ 28/m | next 12/28
+    # 高价收量 👑 集团收量 ❤️ 流量变现/支付宝代付 ❤️ 微信代付/实名认证/过人脸🕵️‍♀️各种账号处理✅ ｜ 28/m | next 12/28 | @laojiaoshou
-    # https://zhaoziyuan.la/ | web | 15/m | 2m | next,7/15
+    # https://zhaoziyuan.pw/ | web | 15/m | 2m | next,11/15 ｜ @baleite
     # 腾云机场 ｜9/m
-    # 🚀鲲鹏VPN | 13/m | next,10/13
+    # 🚀鲲鹏VPN | 13/m | next,10/13 | @libin88888
-    # ✨极品资源采集 ｜ 14/m
+    # ✨极品资源采集 ｜ 14/m |
     keyboard = [
         [
             types.InlineKeyboardButton(

scripts/init.d/mw.tpl

@@ -12,11 +12,24 @@
 # Description:       starts the mw
 ### END INIT INFO
 
+RED='\033[31m'
+GREEN='\033[32m'
+YELLOW='\033[33m'
+BLUE='\033[34m'
+PLAIN='\033[0m'
+BOLD='\033[1m'
+SUCCESS='[\033[32mOK\033[0m]'
+COMPLETE='[\033[32mDONE\033[0m]'
+WARN='[\033[33mWARN\033[0m]'
+ERROR='[\033[31mERROR\033[0m]'
+WORKING='[\033[34m*\033[0m]'
+
 
 PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export LANG=en_US.UTF-8
 
 mw_path={$SERVER_PATH}
+ROOT_PATH=$(dirname "$mw_path")
 PATH=$PATH:$mw_path/bin
 
 
@@ -287,6 +300,96 @@ mw_debug(){
     gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
 }
 
+
+# choose mysql login
+
+declare -A DB_TYPE
+
+if [ -d "${ROOT_PATH}/mysql" ];then
+    DB_TYPE["mysql"]="mysql"
+fi
+
+if [ -d "${ROOT_PATH}/mariadb" ];then
+    DB_TYPE["mariadb"]="mariadb"
+fi
+
+if [ -d "${ROOT_PATH}/mysql-apt" ];then
+    DB_TYPE["mysql-apt"]="mysql-apt"
+fi
+
+if [ -d "${ROOT_PATH}/mysql-yum" ];then
+    DB_TYPE["mysql-yum"]="mysql-yum"
+fi
+
+SOURCE_LIST_KEY_SORT_TMP=$(echo ${!DB_TYPE[@]} | tr ' ' '\n' | sort -n)
+SOURCE_LIST_KEY=(${SOURCE_LIST_KEY_SORT_TMP//'\n'/})
+SOURCE_LIST_LEN=${#DB_TYPE[*]}
+
+function AutoSizeStr(){
+    NAME_STR=$1
+    NAME_NUM=$2
+
+    NAME_STR_LEN=`echo "$NAME_STR" | wc -L`
+    NAME_NUM_LEN=`echo "$NAME_NUM" | wc -L`
+
+    fix_len=35
+    remaining_len=`expr $fix_len - $NAME_STR_LEN - $NAME_NUM_LEN`
+    FIX_SPACE=' '
+    for ((ass_i=1;ass_i<=$remaining_len;ass_i++))
+    do 
+        FIX_SPACE="$FIX_SPACE "
+    done
+    echo -e " ❖   ${1}${FIX_SPACE}${2})"
+}
+
+mw_connect_mysql(){
+    if [ "$SOURCE_LIST_LEN" == "0" ]; then
+        echo -e "no data!"
+        exit 1
+    fi
+
+    cm_i=0
+    for M in ${SOURCE_LIST_KEY[@]}; do
+        num=`expr $cm_i + 1`
+        AutoSizeStr "${M}" "$num"
+        cm_i=`expr $cm_i + 1`
+    done
+    CHOICE_A=$(echo -e "\n${BOLD}└─ Please select and enter the database you want to log in to [ 1-${SOURCE_LIST_LEN} ]：${PLAIN}")
+    read -p "${CHOICE_A}" INPUT
+
+    if [ "$INPUT" == "" ]; then
+        echo -e "\nDefault not selected!"
+        exit 1
+    fi
+
+    if [ "$INPUT" -lt "0" ] || [ "$INPUT" -gt "${SOURCE_LIST_LEN}" ]; then
+        echo -e "\nBoundary error not selected!"
+        exit 1
+    fi
+
+    INPUT=`expr $INPUT - 1`
+    INPUT_KEY=${SOURCE_LIST_KEY[$INPUT]}
+    CHOICE_DB=${DB_TYPE[$INPUT_KEY]}
+    echo "login to ${CHOICE_DB}:"
+    pwd=$(cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/${CHOICE_DB}/index.py root_pwd)
+    if [ "$CHOICE_DB" == "mysql" ];then
+        ${ROOT_PATH}/mysql/bin/mysql -uroot -p"${pwd}"
+    fi
+
+    if [ "$CHOICE_DB" == "mariadb" ];then
+        ${ROOT_PATH}/mariadb/bin/mariadb  -S ${ROOT_PATH}/mariadb/mysql.sock -uroot -p"${pwd}"
+    fi
+
+    if [ "$CHOICE_DB" == "mysql-apt" ];then
+        ${ROOT_PATH}/mysql-apt/bin/usr/bin/mysql -S ${ROOT_PATH}/mysql-apt/mysql.sock -uroot -p"${pwd}"
+    fi
+
+    if [ "$CHOICE_DB" == "mysql-yum" ];then
+        ${ROOT_PATH}/mysql-yum/bin/usr/bin/mysql -S ${ROOT_PATH}/mysql-yum/mysql.sock -uroot -p"${pwd}"
+    fi
+
+}
+
 case "$1" in
     'start') mw_start;;
     'stop') mw_stop;;
@@ -311,6 +414,7 @@ case "$1" in
     'unbind_domain') mw_unbind_domain;;
     'debug') mw_debug;;
     'mirror') mw_mirror;;
+    'db') mw_connect_mysql;;
     'default')
         cd $mw_path
         port=7200