Merge pull request #729 from midoks/dev

基本优化

plugins/openresty/versions/1.27.1/install.sh

@@ -14,7 +14,7 @@ sysName=`uname`
 action=$1
 type=$2
 
-VERSION=1.27.1.1
+VERSION=1.27.1.2
 
 openrestyDir=${serverPath}/source/openresty
 

plugins/sys-opt/index.html

@@ -6,6 +6,7 @@
 			<p onclick="pluginLogs('sys-opt','','sec_run_log', 20);">安全日志</p>
 			<p onclick="pluginLogs('sys-opt','','msg_run_log', 20);">常用日志</p>
 			<p onclick="pluginLogs('sys-opt','','cron_run_log', 20);">任务日志</p>
+			<p onclick="pluginConfig('sys-opt','','hosts');">HOSTS</p>
 			<p onclick="pluginRollingLogs('sys-opt','','sys_run_log', 20);">系统日志</p>
 			<p onclick="pRead()">说明</p>
 		</div>

plugins/sys-opt/index.py

@@ -110,6 +110,8 @@ def sysConf():
 def secRunLog():
     if os.path.exists('/var/log/auth.log'):
         return '/var/log/auth.log'
+    if os.path.exists('/var/log/messages'):
+        return '/var/log/messages'
     return '/var/log/secure'
 
 
@@ -122,12 +124,17 @@ def msgRunLog():
 def cronRunLog():
     if os.path.exists('/var/log/syslog.log'):
         return '/var/log/syslog.log'
+    if os.path.exists('/var/log/syslog'):
+        return '/var/log/syslog'
     return '/var/log/cron'
 
 
 def systemRunLog():
     return '/var/log/syslog'
 
+def showHosts():
+    return '/etc/hosts'
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -154,5 +161,7 @@ if __name__ == "__main__":
         print(cronRunLog())
     elif func == 'sys_run_log':
         print(systemRunLog())
+    elif func == 'hosts':
+        print(showHosts())
     else:
         print('err')

plugins/tgbot/startup/extend/push_ad.py

@@ -47,7 +47,6 @@ def send_msg(bot, tag='ad', trigger_time=300):
 
     # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
-    # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,6/30 | @nngzs
     # 桃花资源采集| 13/m| next,7/13 | @xiaolizi1122
     keyboard = [
@@ -59,18 +58,10 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="桃花资源采集🚀 ", url='https://thzy.me')
         ],
-        [
-            types.InlineKeyboardButton(
-                text="👑 综合包网/NG接口开户", url='https://t.me/NG_Tony')
-        ],
         [
             types.InlineKeyboardButton(
                 text="代付-代实名-备案域名-国际云服务器", url='https://t.me/gjgzs2022')
         ],
-        # [
-        #     types.InlineKeyboardButton(
-        #         text="🚀腾云机场|解锁流媒体和ChatGPT", url='https://www.tencloud.net/index.php#/register?code=OGvXSTsc')
-        # ],
         [
             types.InlineKeyboardButton(
                 text="实名认证/过人脸🕵️‍♀️各种账号处理✅", url='https://t.me/niuniu234')

plugins/tgbot/startup/extend/push_notice_msg.py

@@ -56,7 +56,6 @@ def send_msg(bot, tag='ad', trigger_time=300):
 
     # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
-    # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,6/30 | @nngzs
     # 桃花资源采集| 13/m| next,7/13 | @xiaolizi1122
     keyboard = [
@@ -68,18 +67,10 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="桃花资源采集🚀 ", url='https://thzy.me')
         ],
-        [
-            types.InlineKeyboardButton(
-                text="🚀 综合包网/NG接口开户", url='https://t.me/NG_Tony')
-        ],
         [
             types.InlineKeyboardButton(
                 text="代付-代实名-备案域名-国际云服务器", url='https://t.me/gjgzs2022')
         ],
-        # [
-        #     types.InlineKeyboardButton(
-        #         text="🚀腾云机场|解锁流媒体和ChatGPT", url='https://www.tencloud.net/index.php#/register?code=OGvXSTsc')
-        # ],
         [
             types.InlineKeyboardButton(
                 text="实名认证/过人脸🕵️‍♀️各种账号处理✅", url='https://t.me/niuniu234')