up

README.md

@@ -90,15 +90,9 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.9.13
-
-* 优化弹框。
-* 修复计划任务[日志切割]。
-* 优化mysql的与phpmyadmin的连接。
-* PHP添加`会话管理`功能。
-* redis优化。
-* 更新mysql[5.7]的安装。
-* OP防火墙部分功能优化。
+### 版本更新 0.9.14
+
+* 优化网站统计插件，提搞速度和并发数。
 
 ### JSDelivr安装地址
 

class/core/config_api.py

@@ -15,7 +15,7 @@ from flask import request
 
 class config_api:
 
-    __version = '0.9.13.2'
+    __version = '0.9.13.3'
 
     def __init__(self):
         pass

plugins/op_waf/install.sh

@@ -9,20 +9,79 @@ serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-
 action=$1
 version=$2
-
+sys_os=`uname`
 
 if [ -f ${rootPath}/bin/activate ];then
 	source ${rootPath}/bin/activate
 fi
 
+if [ "$sys_os" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+
 Install_of(){
 	
 	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/source/op_waf
 	mkdir -p $serverPath/op_waf
 
+	# luarocks
+	if [ ! -f $serverPath/source/op_waf/luarocks-3.5.0.tar.gz ];then
+		wget --no-check-certificate -O $serverPath/source/op_waf/luarocks-3.5.0.tar.gz http://luarocks.org/releases/luarocks-3.5.0.tar.gz
+	fi
+	
+	# which luarocks
+	# if [ "$?" != "0" ];then
+	if [ ! -d $serverPath/op_waf/luarocks ];then
+		cd $serverPath/source/op_waf && tar xvf luarocks-3.5.0.tar.gz
+		# cd luarocks-3.9.1 && ./configure && make bootstrap
+
+		cd luarocks-3.5.0 && ./configure --prefix=$serverPath/op_waf/luarocks --with-lua-include=$serverPath/openresty/luajit/include/luajit-2.1 --with-lua-bin=$serverPath/openresty/luajit/bin
+		make -I${serverPath}/openresty/luajit/bin
+		make install 
+	fi
+
+
+	if [ ! -f $serverPath/source/op_waf/lsqlite3_fsl09y.zip ];then
+		wget --no-check-certificate -O $serverPath/source/op_waf/lsqlite3_fsl09y.zip http://lua.sqlite.org/index.cgi/zip/lsqlite3_fsl09y.zip?uuid=fsl_9y
+		cd $serverPath/source/op_waf && unzip lsqlite3_fsl09y.zip
+	fi
+
+	if [ ! -d $serverPath/source/op_waf/lsqlite3_fsl09y ];then
+		cd $serverPath/source/op_waf && unzip lsqlite3_fsl09y.zip
+	fi
+
+	PATH=${serverPath}/openresty/luajit:${serverPath}/openresty/luajit/include/luajit-2.1:$PATH
+	export PATH=$PATH:$serverPath/op_waf/luarocks/bin
+
+	if [ ! -f $serverPath/op_waf/waf/conf/lsqlite3.so ];then
+		if [ "${sys_os}" == "Darwin" ];then
+			cd $serverPath/source/op_waf/lsqlite3_fsl09y
+			find_cfg=`cat Makefile | grep 'SQLITE_DIR'`
+			if [ "$find_cfg" == "" ];then
+				LIB_SQLITE_DIR=`brew info sqlite | grep /usr/local/Cellar/sqlite | cut -d \  -f 1 | awk 'END {print}'`
+				echo $LIB_SQLITE_DIR
+				sed -i $BAK "s#\$(ROCKSPEC)#\$(ROCKSPEC) SQLITE_DIR=${LIB_SQLITE_DIR}#g"  Makefile
+			fi
+			make
+		else
+			cd $serverPath/source/op_waf/lsqlite3_fsl09y && make
+		fi
+	fi
+
+	# copy to code path
+	DEFAULT_DIR=$serverPath/op_waf/luarocks/lib/lua/5.1
+	if [ -f ${DEFAULT_DIR}/lsqlite3.so ];then
+		mkdir -p $serverPath/webstats/lua
+		cp -rf ${DEFAULT_DIR}/lsqlite3.so $serverPath/op_waf/waf/conf/lsqlite3.so
+	fi
+
+
 	echo "${version}" > $serverPath/op_waf/version.pl
 	echo 'install ok' > $install_tmp
 

plugins/op_waf/t/test.sh

@@ -2,9 +2,10 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 
-# apt install apache2-utils
+# apt -y install apache2-utils
 # yum -y install httpd-tools
-# ab -c 1000 -n 1000000 http://www.zzzvps.com/
+
+# ab -c 30 -n 10000000 http://www.zzzvps.com/
 # /cc https://www.zzzvps.com/ 120
 # ab -c 10 -n 1000 http://t1.cn/wp-admin/index.php
 # ab -c 1000 -n 1000000 http://dev156.cachecha.com/