Merge pull request #628 from midoks/dev

0.17.4

Author: midoks

.gitignore

@@ -183,3 +183,6 @@ plugins/tidb
 plugins/goedge-admin
 plugins/goedge-node
 plugins/goedge-happy
+plugins/dztasks
+
+data/default_new.pl

README.md

@@ -182,6 +182,11 @@ curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev
 
 curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh | bash
 curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
+
+
+
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
 ```
 
 ### 捐赠地址 USDT（TRC20）

class/core/config_api.py

@@ -28,7 +28,7 @@
 
 class config_api:
 
-    __version = '0.17.3'
+    __version = '0.17.4'
     __api_addr = 'data/api.json'
 
     # 统一默认配置文件
@@ -42,7 +42,7 @@ class config_api:
         'bind_domain' : 'data/bind_domain.pl',                  # 面板域名绑定
         'unauth_status' : 'data/unauthorized_status.pl',        # URL路径未成功显示状态
         'auth_secret': 'data/auth_secret.pl',                   # 二次验证密钥
-        'ssl':'ssl/choose.pl',                                    # ssl设置
+        'ssl':'ssl/choose.pl',                                  # ssl设置
         'hook_database' : 'data/hook_database.json',            # 数据库钩子
         'hook_menu' : 'data/hook_menu.json',                    # 菜单钩子
         'hook_global_static' : 'data/hook_global_static.json',  # 静态文件钩子

class/core/files_api.py

@@ -1074,9 +1074,9 @@ def getDir(self, path, page=1, page_size=10, order = '', search=None):
 
         order_arr = order.split(' ')
         if len(order_arr) < 2:
-            plist = mw.sortFileList(path, order_arr[0],'')
+            plist = mw.sortFileList(path, order_arr[0], '')
         else:
-            plist = mw.sortFileList(path, order_arr[0],order_arr[1])
+            plist = mw.sortFileList(path, order_arr[0], order_arr[1])
 
         for filename in plist:
             if search:

class/core/logs_api.py

@@ -173,14 +173,12 @@ def getAuditFileApi(self):
 
     def __to_date2(self, date_str):
         tmp = date_str.split()
-        s_date = str(tmp[-1]) + '-' + self.__months.get(tmp[1],
-                                                        tmp[1]) + '-' + tmp[2] + ' ' + tmp[3]
+        s_date = str(tmp[-1]) + '-' + self.__months.get(tmp[1], tmp[1]) + '-' + tmp[2] + ' ' + tmp[3]
         return s_date
 
     def __to_date3(self, date_str):
         tmp = date_str.split()
-        s_date = str(datetime.now().year) + '-' + \
-            self.__months.get(tmp[1], tmp[1]) + '-' + tmp[2] + ' ' + tmp[3]
+        s_date = str(datetime.now().year) + '-' + self.__months.get(tmp[1], tmp[1]) + '-' + tmp[2] + ' ' + tmp[3]
         return s_date
 
     def __to_date4(self, date_str):

class/core/mw.py

@@ -593,8 +593,11 @@ def writeLog(stype, msg, args=()):
         if 'uid' in session:
             uid = session['uid']
     except Exception as e:
-        pass
+        print('writeL:',e)
+        # pass
         # writeFileLog(getTracebackInfo())
+
+    print(stype, msg)
     return writeDbLog(stype, msg, args, uid)
 
 
@@ -716,11 +719,9 @@ def enPunycode(domain):
             newdomain += dkey + '.'
         else:
             if sys.version_info[0] == 2:
-                newdomain += 'xn--' + \
-                    dkey.decode('utf-8').encode('punycode') + '.'
+                newdomain += 'xn--' + dkey.decode('utf-8').encode('punycode') + '.'
             else:
-                newdomain += 'xn--' + \
-                    dkey.encode('punycode').decode('utf-8') + '.'
+                newdomain += 'xn--' + dkey.encode('punycode').decode('utf-8') + '.'
     if tmp[0] == '*':
         newdomain = "*." + newdomain
     return newdomain[0:-1]
@@ -732,8 +733,7 @@ def dePunycode(domain):
     newdomain = ''
     for dkey in tmp:
         if dkey.find('xn--') >= 0:
-            newdomain += dkey.replace('xn--',
-                                      '').encode('utf-8').decode('punycode') + '.'
+            newdomain += dkey.replace('xn--','').encode('utf-8').decode('punycode') + '.'
         else:
             newdomain += dkey + '.'
     return newdomain[0:-1]

class/core/plugins_api.py

@@ -663,7 +663,7 @@ def getVersion(self, path):
             return mw.readFile(version_f).strip()
         return ''
 
-     # 构造本地插件信息
+    # 构造本地插件信息
     def getPluginInfo(self, info):
         checks = ''
         path = ''