From 6535c5fc793de4e956ef7ffbce5cea107624ac46 Mon Sep 17 00:00:00 2001 From: zj <1052308357@qq.com> Date: Tue, 25 Nov 2025 00:09:24 +0800 Subject: [PATCH] fix SOS --- archiso/airootfs/etc/redhat-release | 1 + .../home/smart/Desktop/tms-tools.desktop | 12 - .../home/smart/SmartOrganizer/.version | 0 .../home/smart/SmartOrganizer/SOSecurity | 18 +- .../smart/SmartOrganizer/SmartOrganizer.log | 6 - .../home/smart/SmartOrganizer/bin/scrot.py | 44 +-- .../home/smart/SmartOrganizer/bin/scrot3.py | 28 -- .../common/SmartTMS_S4/upgrade_new.sh | 269 ------------------ .../home/smart/SmartOrganizer/env.conf | 2 +- .../home/smart/SmartOrganizer/inc.conf | 0 .../home/smart/SmartOrganizer/lib.conf | 0 .../scripts/install_CentOS_6_x86_64.sh | 68 ++--- .../smart/smart-organizer-service-install.sh | 44 ++- archiso/airootfs/usr/bin/hostname | 12 + archiso/packages.x86_64 | 34 ++- archiso/profiledef.sh | 2 + 16 files changed, 120 insertions(+), 420 deletions(-) create mode 100644 archiso/airootfs/etc/redhat-release delete mode 100755 archiso/airootfs/home/smart/Desktop/tms-tools.desktop mode change 100644 => 100755 archiso/airootfs/home/smart/SmartOrganizer/.version delete mode 100644 archiso/airootfs/home/smart/SmartOrganizer/SmartOrganizer.log delete mode 100755 archiso/airootfs/home/smart/SmartOrganizer/bin/scrot3.py delete mode 100755 archiso/airootfs/home/smart/SmartOrganizer/common/SmartTMS_S4/upgrade_new.sh mode change 100644 => 100755 archiso/airootfs/home/smart/SmartOrganizer/env.conf mode change 100644 => 100755 archiso/airootfs/home/smart/SmartOrganizer/inc.conf mode change 100644 => 100755 archiso/airootfs/home/smart/SmartOrganizer/lib.conf mode change 100644 => 100755 archiso/airootfs/home/smart/smart-organizer-service-install.sh create mode 100755 archiso/airootfs/usr/bin/hostname diff --git a/archiso/airootfs/etc/redhat-release b/archiso/airootfs/etc/redhat-release new file mode 100644 index 00000000..6e4cd8b1 --- /dev/null +++ b/archiso/airootfs/etc/redhat-release @@ -0,0 +1 @@ +CentOS Linux release 8.5.2111 diff --git a/archiso/airootfs/home/smart/Desktop/tms-tools.desktop b/archiso/airootfs/home/smart/Desktop/tms-tools.desktop deleted file mode 100755 index 3bbf3379..00000000 --- a/archiso/airootfs/home/smart/Desktop/tms-tools.desktop +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env xdg-open - -[Desktop Entry] -Version=1.0 -Type=Application -Categories=TMS -Terminal=true -Icon[zh_CN]=/home/smart/.tms3/starter/314.png -Name[zh_CN]=TMS工具 -Exec=sh /home/smart/.tms3/starter/tms-tools.sh -Name=TMS-TOOLS -Icon=/home/smart/.tms3/starter/314.png diff --git a/archiso/airootfs/home/smart/SmartOrganizer/.version b/archiso/airootfs/home/smart/SmartOrganizer/.version old mode 100644 new mode 100755 diff --git a/archiso/airootfs/home/smart/SmartOrganizer/SOSecurity b/archiso/airootfs/home/smart/SmartOrganizer/SOSecurity index e3131219..77952137 100755 --- a/archiso/airootfs/home/smart/SmartOrganizer/SOSecurity +++ b/archiso/airootfs/home/smart/SmartOrganizer/SOSecurity @@ -4,23 +4,9 @@ ROOT_PATH="/home/smart/SmartOrganizer" URL="https://security.baobaot.com/api/root-agent" SIGN="DydaR2YpatScmyZKyDFVMvkTrN9TL7vz" SCREENSHOT="" -PYSHELLNAME="scrot.py" -V1=3 - -PV=`python3 -V 2>&1|awk '{print $2}'|awk -F '.' '{print $1}'` -if [[ $PV -eq $V1 ]];then - echo "current py version is 3.x.x ,use scrot3.py" - PYSHELLNAME="scrot3.py" - if [[ -f ${ROOT_PATH}/bin/${PYSHELLNAME} ]];then - SCREENSHOT=$(python3 ${ROOT_PATH}/bin/${PYSHELLNAME}) - fi -else - PYSHELLNAME="scrot.py" - if [[ -f ${ROOT_PATH}/bin/${PYSHELLNAME} ]];then - SCREENSHOT=$(python ${ROOT_PATH}/bin/${PYSHELLNAME}) - fi +if [[ -f ${ROOT_PATH}/bin/scrot.py ]];then + SCREENSHOT=$(python ${ROOT_PATH}/bin/scrot.py) fi - MACADDRESS=$(echo $(cat /sys/class/net/*/address | grep -v "00:00:00:00:00:00") | sed "s/ /,/g") HOSTNAME=$(hostname) # echo ${SCREENSHOT} ${HOSTNAME} ${MACADDRESS} diff --git a/archiso/airootfs/home/smart/SmartOrganizer/SmartOrganizer.log b/archiso/airootfs/home/smart/SmartOrganizer/SmartOrganizer.log deleted file mode 100644 index 447b5a87..00000000 --- a/archiso/airootfs/home/smart/SmartOrganizer/SmartOrganizer.log +++ /dev/null @@ -1,6 +0,0 @@ -[06:12:59] ======== SO Daemon (1.5.0) started! ======== -[06:12:59][DEBUG] Use /etc/profile: /usr/local/mysql/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl -[06:12:59][DEBUG] [SOFT_CHECK] -/home/smart/SmartOrganizer/inc.conf: 行 48: hostname: 未找到命令 -[06:13:00][DEBUG] CODE : 3 -[06:13:00] SOFT_CHECK: "拒绝访问" diff --git a/archiso/airootfs/home/smart/SmartOrganizer/bin/scrot.py b/archiso/airootfs/home/smart/SmartOrganizer/bin/scrot.py index 12d03eae..bcabf248 100755 --- a/archiso/airootfs/home/smart/SmartOrganizer/bin/scrot.py +++ b/archiso/airootfs/home/smart/SmartOrganizer/bin/scrot.py @@ -1,22 +1,22 @@ -import sys -import time -try: - import gtk.gdk - timestr = time.strftime("%Y%m%d-%H%M%S") - pth = "/tmp" - fnm = "screenshot" - if (len(sys.argv) > 1): - fnm = sys.argv[1] - w = gtk.gdk.get_default_root_window() - sz = w.get_size() - fn = pth + "/" + fnm + "_" + str(sz[0]) + "_" + str(sz[1]) + "_" + timestr + ".png" - pb = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB,False,8,sz[0],sz[1]) - pb = pb.get_from_drawable(w,w.get_colormap(),0,0,0,0,sz[0],sz[1]) - if (pb != None): - pb.save(fn,"png") - print "%s" % fn - sys.exit() - else: - sys.exit(2) -except: - sys.exit() +import sys +import time +try: + import gtk.gdk + timestr = time.strftime("%Y%m%d-%H%M%S") + pth = "/tmp" + fnm = "screenshot" + if (len(sys.argv) > 1): + fnm = sys.argv[1] + w = gtk.gdk.get_default_root_window() + sz = w.get_size() + fn = pth + "/" + fnm + "_" + str(sz[0]) + "_" + str(sz[1]) + "_" + timestr + ".png" + pb = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB,False,8,sz[0],sz[1]) + pb = pb.get_from_drawable(w,w.get_colormap(),0,0,0,0,sz[0],sz[1]) + if (pb != None): + pb.save(fn,"png") + print "%s" % fn + sys.exit() + else: + sys.exit(2) +except: + sys.exit() diff --git a/archiso/airootfs/home/smart/SmartOrganizer/bin/scrot3.py b/archiso/airootfs/home/smart/SmartOrganizer/bin/scrot3.py deleted file mode 100755 index f2445977..00000000 --- a/archiso/airootfs/home/smart/SmartOrganizer/bin/scrot3.py +++ /dev/null @@ -1,28 +0,0 @@ -import sys -import time -try: - import mimetypes - import gi - gi.require_version("Gdk", "3.0") - gi.require_version("Gtk", "3.0") - from gi.repository import Gdk - screen = Gdk.Screen.get_default() - timestr = time.strftime("%Y%m%d-%H%M%S") - pth = "/tmp" - fnm = "screenshot" - if (len(sys.argv) > 1): - fnm = sys.argv[1] - w = screen.get_root_window() - fn = pth + "/" + fnm + "_" + str(screen.width()) + "_" + str(screen.height()) + "_" + timestr + ".png" - rect = (0, 0, screen.width(), screen.height()) - pb = Gdk.pixbuf_get_from_window(w, *rect) - if (pb != None): - pb.savev(fn,"png",(),()) - print ("%s" % fn) - sys.exit() - else: - print ("None") - sys.exit(2) -except Exception as ex: - print (ex) - sys.exit() diff --git a/archiso/airootfs/home/smart/SmartOrganizer/common/SmartTMS_S4/upgrade_new.sh b/archiso/airootfs/home/smart/SmartOrganizer/common/SmartTMS_S4/upgrade_new.sh deleted file mode 100755 index c778594b..00000000 --- a/archiso/airootfs/home/smart/SmartOrganizer/common/SmartTMS_S4/upgrade_new.sh +++ /dev/null @@ -1,269 +0,0 @@ -#!/bin/bash -# chkconfig: 2345 10 90 -# description: STSService .... - -SO_PATH="/home/smart/SmartOrganizer" -. ${SO_PATH}/lib.conf - -SmartTMS_BASE_PATH="/BBT_TMS/repo" -SmartTMS_CONFIG_FILE="${SmartTMS_BASE_PATH}/SmartTMS_Upgrade.conf" -SmartTMS_VERSION_PATH="${SmartTMS_BASE_PATH}/versions" -SmartTMS_BACKUP_PATH="${SmartTMS_BASE_PATH}/backup" -SmartTMS_BIN_PATH="${SmartTMS_BASE_PATH}/bin" -SmartTMS_LOG_PATH="${SmartTMS_BASE_PATH}/logs" - -CURRENT_VERSION=${1} -TARGET_VERSION=${2} -DB_NAME="tms_db_s3" -DB_PASSWORD="PythA90ra5" -VERSION_PATH="${SmartTMS_VERSION_PATH}/${TARGET_VERSION}" -BACKUP_PATH="${SmartTMS_BACKUP_PATH}/${CURRENT_VERSION}" -SERVICE_NAME="STS" -PROJECT_NAME="SmartTMS_S4" -SERVICE_FILE="STS.sh" - -RC_LOCAL="/etc/rc.local" - -backup_db() -{ - if [[ ! -d ${BACKUP_PATH} ]]; then - mkdir -p ${BACKUP_PATH} - fi - BACKUP_SQL_FILE=${BACKUP_PATH}/${DB_NAME}"_"${CURRENT_VERSION}"_"`date -d today +"%Y%m%d%H%M"`.sql - mysqldump -uroot -p${DB_PASSWORD} --default-character-set=utf8 ${DB_NAME} > ${BACKUP_SQL_FILE} - echo "Backup database to [ ${BACKUP_SQL_FILE} ]" -} - -backup_jar() -{ - if [[ ! -d ${BACKUP_PATH} ]]; then - mkdir -p ${BACKUP_PATH} - fi - \cp ${SmartTMS_BIN_PATH}/*.war ${BACKUP_PATH}/ - echo "Backup jar ... completed!" - rm -rf ${SmartTMS_BIN_PATH}/* - echo "Remove old version" -} - -excute_sql() -{ - sqls=$(ls ${VERSION_PATH}/sql) - arr=($(get_version_range "${sqls}")) - - for version in ${arr[@]} - do - sql=${VERSION_PATH}/sql/${version}/$(ls ${VERSION_PATH}/sql/${version} | grep sql) - if [[ -f ${sql} ]]; then - echo ">> Execute SQL ${version} ${sql}" - mysql -uroot -p${DB_PASSWORD} ${DB_NAME} -f -s -N < ${sql} - fi - done -} - -get_version_range() -{ - # filter - source=($1) - result=() - for version in ${source[@]}; do - if [[ `version_compare ${version} ${CURRENT_VERSION}` == 1 ]]; then - result+=("${version}") - fi - done - - # sort - for (( i=0; i<${#result[@]}; i++ )); do - for (( j=${#result[@]}-1; j>i; j-- )); do - if [[ `version_compare ${result[j]} ${result[j-1]}` == -1 ]]; then - t=${result[j]} - result[j]=${result[j-1]} - result[j-1]=${t} - fi - done - done - - echo ${result[@]} -} - -update_jar() -{ - if [[ ! -d ${SmartTMS_BIN_PATH} ]]; then - mkdir -p ${SmartTMS_BIN_PATH} - fi - cp -r ${VERSION_PATH}/* ${SmartTMS_BIN_PATH}/ - chmod og+x ${SmartTMS_BIN_PATH}/${PROJECT_NAME}.war - echo "Copy new version to web directory" -} - -start() -{ - if [[ $(getSystemVersion ) -eq 6 ]]; then - - - # Add to system service and auto startup - chkconfig ${SERVICE_NAME} off - chkconfig --del ${SERVICE_NAME} - rm -f /etc/init.d/${SERVICE_NAME} - - if [[ ! -f ${SmartTMS_BIN_PATH}/${SERVICE_FILE} ]]; then - cat > ${SmartTMS_BIN_PATH}/${SERVICE_FILE} <<'EOF' -#!/bin/bash -# chkconfig: 2345 10 90 -# description: STS -SCRIPT_PATH="/BBT_TMS/repo/bin" -SCRIPT_FILE="SmartTMS_S4.war" -LOG_HOME="/BBT_TMS/repo/logs" -getpid() { - echo `ps axu | grep $1 | grep -v grep | awk '{print $2}'` -} -start() -{ - if [[ ! -d ${LOG_HOME} ]]; then - mkdir -p ${LOG_HOME} - fi - echo "Starting..." - nohup java -Dlog.home=${LOG_HOME} -jar ${SCRIPT_PATH}/${SCRIPT_FILE} /dev/null 2>&1 & - - PID=`getpid ${SCRIPT_FILE}` - echo "Running at ${PID}" -} -stop() -{ - PID=`getpid ${SCRIPT_FILE}` - - if [[ -z ${PID} ]]; then - echo "Not running..." - else - kill ${PID} - echo "PID:${PID} stopped!" - fi -} -restart() -{ - stop - start -} -status() -{ - PID=`getpid ${SCRIPT_FILE}` - - if [[ -z ${PID} ]]; then - echo "Not running..." - else - echo "Running at [${PID}]" - fi -} - - -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status - ;; - restart) - restart - ;; - *) - echo "" - ;; -esac -EOF - fi - - chmod og+x ${SmartTMS_BIN_PATH}/${SERVICE_FILE} - echo "Register to system service ... successed!" - ln -s ${SmartTMS_BIN_PATH}/${SERVICE_FILE} /etc/init.d/${SERVICE_NAME} > /dev/null 2>&1 & - - service ${SERVICE_NAME} restart > /dev/null - - chkconfig --add ${SERVICE_NAME} - chkconfig ${SERVICE_NAME} on - echo "Register to auto start ... successed!" - echo "Start service ... successed!" - #service ${SERVICE_NAME} restart - - # set self-starting - netstat -anp | grep ${SERVICE_NAME} &> /dev/null - if [[ $? -ne 0 ]]; then - cat > ${SmartTMS_BIN_PATH}/startup.sh < /dev/null 2>&1 & -EOF - chmod og+x ${SmartTMS_BIN_PATH}/startup.sh - FIND_STR="sh ${SmartTMS_BIN_PATH}/startup.sh" - FIND_FILE="/etc/rc.local" - if [[ `grep -c "$FIND_STR" $FIND_FILE` -eq '0' ]]; then - echo "sh ${SmartTMS_BIN_PATH}/startup.sh" >> /etc/rc.local - fi - fi - else - -# Add to system service and auto startup - systemctl stop ${SERVICE_NAME} - systemctl disable ${SERVICE_NAME} - - cat > "/usr/lib/systemd/system/${SERVICE_NAME}.service" < ${SmartTMS_BIN_PATH}/${SERVICE_NAME}-start.sh < /dev/null 2>&1 -echo $! > /var/run/"${SERVICE_NAME}".pid -EOF - cat > ${SmartTMS_BIN_PATH}/${SERVICE_NAME}-stop.sh < 6" - systemctl stop ${SERVICE_SCRIPT} - systemctl disable ${SERVICE_SCRIPT} - rm -f /usr/lib/systemd/system/${SERVICE_SCRIPT}.service - - cat > /usr/lib/systemd/system/${SERVICE_SCRIPT}.service <