Merge pull request #531 from midoks/dev

0.16.4
midoks · Apr 4, 2024 · a1b3e70 · a1b3e70
2 parents 87239f5 + 6f44795
commit a1b3e70
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -110,15 +110,10 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.16.3
+### 版本更新 0.16.4
 
-* 面板配置-可以配置时区。
-* PHP(GD)扩展安装优化。
-* PHP界面功能调整。
-* PHP-FPM设置多个应用池(提高高并发稳定性)。
-* MySQL(apt/yum)调整优化。
-* 网站类型优化。
-* 增加数据管理插件。
+* 二次验证。
+* OP防火墙修复。
 
 ### JSDelivr安装地址
 
@@ -196,7 +191,7 @@ TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya
 
 ### 微信赞助
 
-[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/weixin_zz.jpg)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/alipay_zz.jpg)
+[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/alipay_zz.jpg)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/alipay_zz.jpg)
 
 
 ### 无图不真相

diff --git a/class/core/config_api.py b/class/core/config_api.py
@@ -28,7 +28,7 @@
 
 class config_api:
 
-    __version = '0.16.3.1'
+    __version = '0.16.4'
     __api_addr = 'data/api.json'
 
     # 统一默认配置文件

diff --git a/plugins/op_waf/index.py b/plugins/op_waf/index.py
@@ -579,6 +579,12 @@ def reload():
     mw.opWeb('start')
     return 'ok'
 
+def reload_hook():
+    s = status()
+    if s == 'start':
+        return reload()
+    return 'ok'
+
 
 def getJsonPath(name):
     path = getServerDir() + "/waf/" + name + ".json"

diff --git a/plugins/op_waf/info.json b/plugins/op_waf/info.json
@@ -5,9 +5,9 @@
 			"site_cb": {
 				"title":"网站统计",
 				"name":"op_waf",
-				"add":{"func":"reload"},
-				"update":{"func":"reload"},
-				"delete":{"func":"reload"}
+				"add":{"func":"reload_hook"},
+				"update":{"func":"reload_hook"},
+				"delete":{"func":"reload_hook"}
 			}
 		}
 	],

diff --git a/plugins/op_waf/js/op_waf.js b/plugins/op_waf/js/op_waf.js
@@ -1614,8 +1614,9 @@ function wafSite(){
                             <label class="btswitch-btn" for="closeget_'+ i + '" onclick="setSiteObjState(\'' + k + '\',\'open\')"></label>\
                         </div>\
                     </td>\
-                    <td class="text-right"><a onclick="wafLogs(\''+ k + '\')" class="btlink ' + (v.log_size > 0 ? 'dot' : '') + '">日志</a> | <a onclick="siteWafConfig(\'' + k + '\')" class="btlink">设置</a></td>\
+                    <td class="text-right"><a onclick="wafLogs(\''+ k + '\')" class="btlink ' + (v.log_size > 0 ? 'dot' : '') + '">日志</a> </td>\
                 </tr>';
+            //| <a onclick="siteWafConfig(\'' + k + '\')" class="btlink">设置</a>
         });
 
         var con = '<div class="lib-box">\