Merge pull request #802 from midoks/dev

Update install_dev.sh

README.md

@@ -36,7 +36,7 @@ Talk is cheap, show me the code.  -- linus
 ```
 
 - [兼容性测试报告](/compatibility.md)
-- [常用命令说明](/cmd.md) [ mw default ] [ mw update_dev ]
+- [常用命令说明](/cmd.md) [ mw default ] [ mw dev ]
 
 ### 特别赞助
 

plugins/memcached/install.sh

@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 sys_os=`uname`
-VERSION=1.6.38
+VERSION=1.6.39
 
 echo $sys_os
 
@@ -18,7 +18,7 @@ Install_mem(){
 	echo '正在安装脚本文件...'
 
 	if [ ! -f $serverPath/source/memcached.tar.gz ];then
-		wget  --no-check-certificate -O $serverPath/source/memcached/memcached.tar.gz https://www.memcached.org/files/memcached-${VERSION}.tar.gz
+		wget --no-check-certificate -O $serverPath/source/memcached/memcached.tar.gz https://www.memcached.org/files/memcached-${VERSION}.tar.gz
 	fi
 	
 	cd $serverPath/source/memcached && tar -zxvf memcached.tar.gz

plugins/php/install.sh

@@ -8,6 +8,8 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
+# https://www.php.net/releases
+
 if id www &> /dev/null ;then 
     echo "www uid is `id -u www`"
     echo "www shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"

plugins/php/versions/85/install.sh

@@ -9,7 +9,7 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-version=8.5.0alpha2
+version=8.5.0beta1
 PHP_VER=85
 # md5_file_ok=14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632
 Install_php()

plugins/redis/info.json

@@ -4,7 +4,7 @@
 	"name": "redis",
 	"title": "Redis",
 	"shell": "install.sh",
-	"versions":["4.0.14","5.0.14","6.0.20","6.2.16","7.0.15","7.2.8", "7.4.3", "8.0.3"],
+	"versions":["4.0.14","5.0.14","6.0.20","6.2.16","7.0.15","7.2.9", "7.4.5", "8.0.3", "8.2.0"],
 	"tip": "soft",
 	"checks": "server/redis",
 	"path": "server/redis",

plugins/redis/install.sh

@@ -30,7 +30,7 @@ Install_App()
 	REDIS_DIR=$serverPath/source/redis
 
 	if [ ! -f $REDIS_DIR/${FILE_TGZ} ];then
-		wget -O $REDIS_DIR/${FILE_TGZ} http://download.redis.io/releases/${FILE_TGZ}
+		wget --no-check-certificate -O $REDIS_DIR/${FILE_TGZ} https://download.redis.io/releases/${FILE_TGZ}
 	fi
 	
 	cd $REDIS_DIR && tar -zxvf ${FILE_TGZ}

scripts/init.d/mw.tpl

@@ -334,6 +334,7 @@ mw_common_proxy(){
     fi
 
     if [ "$LOCAL_ADDR" != "common" ];then
+        # https://github.akams.cn
         declare -A PROXY_URL
         PROXY_URL["gh_proxy_com"]="https://gh-proxy.com/"
         PROXY_URL["github_do"]="https://github.do/"
@@ -341,6 +342,9 @@ mw_common_proxy(){
         PROXY_URL["gh_felicity_ac_cn"]="https://gh.felicity.ac.cn/https://"
         PROXY_URL["ghfast_top"]="https://ghfast.top/"
         PROXY_URL["ghproxy_net"]="https://ghproxy.net/"
+        PROXY_URL["gh_927223_xyz"]="https://gh.927223.xyz/https://"
+        PROXY_URL["gh_proxy_net"]="https://gh-proxy.net/"
+        
         PROXY_URL["source"]="https://"
 
 

scripts/install.sh

@@ -43,6 +43,9 @@ if [ "$LOCAL_ADDR" != "common" ];then
     PROXY_URL["gh_felicity_ac_cn"]="https://gh.felicity.ac.cn/https://"
     PROXY_URL["ghfast_top"]="https://ghfast.top/"
     PROXY_URL["ghproxy_net"]="https://ghproxy.net/"
+    PROXY_URL["gh_927223_xyz"]="https://gh.927223.xyz/https://"
+    PROXY_URL["gh_proxy_net"]="https://gh-proxy.net/"
+    
     PROXY_URL["source"]="https://"
 
 
@@ -224,7 +227,7 @@ if [ $OSNAME != "macos" ];then
 	mkdir -p /www/backup/site
 
 	if [ ! -d /www/server/mdserver-web ];then
-		curl --insecure -sSLo /tmp/master.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/master.tar.gz
+		curl --insecure -sSLo /tmp/master.tar.gz ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/master.tar.gz
 		cd /tmp && tar -zxvf /tmp/master.tar.gz
 		mv -f /tmp/mdserver-web-master /www/server/mdserver-web
 		rm -rf /tmp/master.tar.gz
@@ -236,7 +239,7 @@ if [ $OSNAME != "macos" ];then
 	    if [ "$LOCAL_ADDR" != "common" ];then
 	        curl --insecure -sSLo /tmp/acme.sh-master.tar.gz ${HTTP_PREFIX}github.com/acmesh-official/acme.sh/archive/refs/heads/master.tar.gz
 	        tar xvzf /tmp/acme.sh-master.tar.gz -C /tmp
-	        cd /tmp/acme.sh-master.tar.gz
+	        cd /tmp/acme.sh-master
 	        bash acme.sh install
 	    else
 	    	curl -fsSL https://get.acme.sh | bash

scripts/install_dev.sh

@@ -42,12 +42,14 @@ fi
 
 if [ "$LOCAL_ADDR" != "common" ];then
 	declare -A PROXY_URL
-	PROXY_URL["gh_proxy_com"]="https://gh-proxy.com/"
     PROXY_URL["github_do"]="https://github.do/"
     PROXY_URL["gh_llkk_cc"]="https://gh.llkk.cc/https://"
     PROXY_URL["gh_felicity_ac_cn"]="https://gh.felicity.ac.cn/https://"
     PROXY_URL["ghfast_top"]="https://ghfast.top/"
     PROXY_URL["ghproxy_net"]="https://ghproxy.net/"
+    PROXY_URL["gh_927223_xyz"]="https://gh.927223.xyz/https://"
+    PROXY_URL["gh_proxy_net"]="https://gh-proxy.net/"
+    
     PROXY_URL["source"]="https://"
 
 
@@ -232,11 +234,11 @@ if [ $OSNAME != "macos" ];then
 	mkdir -p /www/backup/site
 
 	if [ ! -d /www/server/mdserver-web ];then
-		echo "downloading ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.zip"
-		curl --insecure -sSLo /tmp/dev.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
-		cd /tmp && unzip /tmp/dev.zip
+		echo "downloading ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.tar.gz"
+		curl --insecure -sSLo /tmp/dev.tar.gz ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.tar.gz
+		cd /tmp && tar -zxvf /tmp/dev.tar.gz
 		mv -f /tmp/mdserver-web-dev /www/server/mdserver-web
-		rm -rf /tmp/dev.zip
+		rm -rf /tmp/dev.tar.gz
 		rm -rf /tmp/mdserver-web-dev
 	fi
 

scripts/update.sh

@@ -38,12 +38,14 @@ fi
 
 if [ "$LOCAL_ADDR" != "common" ];then
     declare -A PROXY_URL
-    PROXY_URL["gh_proxy_com"]="https://gh-proxy.com/"
     PROXY_URL["github_do"]="https://github.do/"
     PROXY_URL["gh_llkk_cc"]="https://gh.llkk.cc/https://"
     PROXY_URL["gh_felicity_ac_cn"]="https://gh.felicity.ac.cn/https://"
     PROXY_URL["ghfast_top"]="https://ghfast.top/"
     PROXY_URL["ghproxy_net"]="https://ghproxy.net/"
+    PROXY_URL["gh_927223_xyz"]="https://gh.927223.xyz/https://"
+    PROXY_URL["gh_proxy_net"]="https://gh-proxy.net/"
+    
     PROXY_URL["source"]="https://"
 
 

scripts/update_dev.sh

@@ -51,12 +51,14 @@ fi
 
 if [ "$LOCAL_ADDR" != "common" ];then
 	declare -A PROXY_URL
-	PROXY_URL["gh_proxy_com"]="https://gh-proxy.com/"
     PROXY_URL["github_do"]="https://github.do/"
     PROXY_URL["gh_llkk_cc"]="https://gh.llkk.cc/https://"
     PROXY_URL["gh_felicity_ac_cn"]="https://gh.felicity.ac.cn/https://"
     PROXY_URL["ghfast_top"]="https://ghfast.top/"
     PROXY_URL["ghproxy_net"]="https://ghproxy.net/"
+    PROXY_URL["gh_927223_xyz"]="https://gh.927223.xyz/https://"
+    PROXY_URL["gh_proxy_net"]="https://gh-proxy.net/"
+    
     PROXY_URL["source"]="https://"
 
 

web/static/app/public.js

@@ -1120,15 +1120,20 @@ function listOrder(skey,type,obj){
 	if(or){
 		if(or.split(' ')[1] == 'desc'){
 			orderType = 'asc';
+		} else if(or.split(' ')[1] == 'asc'){
+			orderType = 'none';
 		}
 	}
 	setCookie('order',skey + ' ' + orderType);
 	getWeb(1);
 	$(obj).find(".glyphicon-triangle-bottom").remove();
 	$(obj).find(".glyphicon-triangle-top").remove();
-	if(orderType == 'asc'){
+	$(obj).find(".glyphicon-stop").remove();
+	if(orderType == 'none'){
+		$(obj).append("<span class='glyphicon glyphicon glyphicon-stop' style='margin-left:5px;color:#bbb'></span>");
+	} else if(orderType == 'asc') {
 		$(obj).append("<span class='glyphicon glyphicon-triangle-bottom' style='margin-left:5px;color:#bbb'></span>");
-	}else{
+	} else {
 		$(obj).append("<span class='glyphicon glyphicon-triangle-top' style='margin-left:5px;color:#bbb'></span>");
 	}
 }

web/templates/default/site.html

@@ -33,15 +33,15 @@
 					<div class="divtable mtb10">
 						<div class="tablescroll">
 						<table class="table table-hover" style="min-width: 900px;border: 0 none;">
-							<thead>
+							<thead id="webBodyHeader">
 								<tr>
 									<th width="30"><input type="checkbox" onclick="checkSelect();" id="setBox"></th>
-									<th width="150" onclick="listOrder('name','site',this)" style="cursor: pointer;">域名<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span></th>
+									<th width="150" onclick="listOrder('name','site',this)" style="cursor: pointer;">域名<span class="glyphicon glyphicon-stop" style="margin-left:5px;color:#bbb"></span></th>
 									<th style="cursor: pointer;" width="98">网站状态</th>
 									<th width="58">备份</th>
 									<th width="26%">网站目录</th>
 									<th onclick="listOrder('edate','site',this)" style="cursor: pointer;" width="86">
-										到期日期<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span>
+										到期日期<span class="glyphicon glyphicon-stop" style="margin-left:5px;color:#bbb"></span>
 									</th>
 									<th>备注</th>
 									<th width='130' class='text-right'>操作</th>
@@ -75,5 +75,34 @@
 setTimeout(function(){
 	getWeb(1);
 },500);
+
+
+function initPage(){
+	var order = getCookie('order');
+	if (order){
+		var sort = order.split(' ');
+		if (sort[0] == 'name'){
+			if (sort[1] == 'desc'){
+				$($('#webBodyHeader .glyphicon-stop')[0]).removeClass('glyphicon-stop').addClass('glyphicon-triangle-top');
+			} else if (sort[1] == 'asc'){
+				$($('#webBodyHeader .glyphicon-stop')[0]).removeClass('glyphicon-stop').addClass('glyphicon-triangle-bottom');
+			}
+		}
+
+		if (sort[0] == 'edate'){
+			if (sort[1] == 'desc'){
+				$($('#webBodyHeader .glyphicon-stop')[1]).removeClass('glyphicon-stop').addClass('glyphicon-triangle-top');
+			} else if (sort[1] == 'asc'){
+				$($('#webBodyHeader .glyphicon-stop')[1]).removeClass('glyphicon-stop').addClass('glyphicon-triangle-bottom');
+			}
+		}
+	}
+
+}
+
+initPage();
+
+
+
 </script>
 {% endblock %}

web/thisdb/sites.py

@@ -85,23 +85,24 @@ def getSitesList(
     if type_id != '' and int(type_id) >= 0:
         sql_where = " type_id=" + str(type_id)
 
-
     dbM = dbC = mw.M('sites').field(__FIELD)
 
     if sql_where != '':
         count = dbC.where(sql_where).count()
+        dbM.where(sql_where)
     else:
         count = dbC.count()
 
     start = (int(page) - 1) * (int(size))
     limit = str(start) + ',' +str(size)
 
-    if order is not None:
+    if order.find("none") > -1:
+        site_list = dbM.limit(limit).order('').select()
+    elif order is not None:
         site_list = dbM.limit(limit).order(order).select()
     else:
         site_list = dbM.limit(limit).order('id desc').select()
 
-    
     data = {}
     data['list'] = site_list
     data['count'] = count

web/version.py

@@ -13,9 +13,9 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 2
+APP_SMALL_VERSION = 3
 
-# 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布
+# 应用程序版本后缀，例如"beta1"、"dev"。通常为空字符串GA发布
 APP_SUFFIX = ''