Merge pull request #640 from midoks/dev

修复站点根目录未指定默认值

plugins/tgbot/startup/extend/push_ad.py

@@ -111,7 +111,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="@ME", url='tg://user?id=5568699210'),
             types.InlineKeyboardButton(
-                text="150RMB/M[已满]", url='tg://user?id=5568699210')
+                text="150rmb/月[已满]", url='tg://user?id=5568699210')
         ]
     ]
     markup = types.InlineKeyboardMarkup(keyboard)

plugins/tgbot/startup/extend/push_notice_msg.py

@@ -120,7 +120,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="@ME", url='tg://user?id=5568699210'),
             types.InlineKeyboardButton(
-                text="150RMB/M[已满]", url='tg://user?id=5568699210')
+                text="150RMB/月[已满]", url='tg://user?id=5568699210')
         ]
     ]
     markup = types.InlineKeyboardMarkup(keyboard)

web/core/mw.py

@@ -121,7 +121,7 @@ def getPanelTaskExecLog():
 
 def getWwwDir():
     import thisdb
-    site_path = thisdb.getOption('site_path')
+    site_path = thisdb.getOption('site_path', default=getFatherDir()+'/wwwroot')
     return site_path
 
 def getBackupDir():