update

plugins/mtproxy/index.py

@@ -60,11 +60,9 @@ def getArgs():
 
     return tmp
 
-
 def status():
-    data = mw.execShell(
-        "ps -ef|grep mtproxy| grep mtg |grep -v grep | grep -v python  | awk '{print $2}'")
-
+    cmd = "ps -ef|grep mtproxy| grep mtg |grep -v grep | grep -v python  | awk '{print $2}'"
+    data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'
     return 'start'
@@ -102,7 +100,7 @@ def openPort():
     for i in [port]:
         __release_port(i)
     return True
-    
+
 def delPort():
     port = getMtproxyPort()
     for i in [port]:
@@ -176,23 +174,25 @@ def initdStatus():
         return 'fail'
     return 'ok'
 
-
 def initdInstall():
     if mw.isAppleSystem():
         return "Apple Computer does not support"
-
     mw.execShell('systemctl enable mtproxy')
     return 'ok'
 
 
 def initdUinstall():
-
     if mw.isAppleSystem():
         return "Apple Computer does not support"
-
     mw.execShell('systemctl disable mtproxy')
     return 'ok'
 
+def getMtproxyUrl():
+    conf = getConfEnv()
+    content = mw.readFile(conf)
+
+    
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -215,5 +215,7 @@ if __name__ == "__main__":
         print(getServiceFile())
     elif func == 'conf_env':
         print(getConfEnv())
+    elif func == 'url':
+        print(getMtproxyUrl())
     else:
         print('error')

plugins/mtproxy/install.sh

@@ -7,17 +7,18 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
+sysArch=`arch`
+sysName=`uname`
 
 
 bash ${rootPath}/scripts/getos.sh
+echo "bash ${rootPath}/scripts/getos.sh"
 OSNAME=`cat ${rootPath}/data/osname.pl`
-OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
-
-
-VERSION=v2.1.7
 VERSION_MIN=2.1.7
-OS=$(uname | tr '[:upper:]' '[:lower:]')
+VERSION=v${VERSION_MIN}
+
+sysName=$(uname | tr '[:upper:]' '[:lower:]')
 
 ARCH=amd64
 get_arch() {
@@ -29,14 +30,13 @@ import (
 func main() { fmt.Println(runtime.GOARCH) }" > /tmp/go_arch.go
 
 	ARCH=$(go run /tmp/go_arch.go)
+	echo "ARCH:${ARCH}"
 }
 
 TARGET_DIR="${serverPath}/mtproxy"
 
-
-
 get_download_url() {
-	DOWNLOAD_URL="https://github.com/9seconds/mtg/releases/download/$VERSION/mtg-${VERSION_MIN}-${OS}-${ARCH}.tar.gz"
+	DOWNLOAD_URL="https://github.com/9seconds/mtg/releases/download/$VERSION/mtg-${VERSION_MIN}-${sysName}-${ARCH}.tar.gz"
 }
 
 # download file
@@ -64,28 +64,35 @@ download_file() {
 }
 
 # /www/server/mtproxy/mtg/mtg run /www/server/mtproxy/mt.toml
-
 Install_app()
 {
+	mkdir -p ${serverPath}/mtproxy
+	mkdir -p ${serverPath}/source/mtproxy
+	echo "${1}" > ${serverPath}/mtproxy/version.pl
 
-	if [[ $OSNAME = "centos" ]]; then
+	if [ "$OSNAME" == "centos" ]; then
     	yum install -y golang golang-src
-	elif [[ $OSNAME = "amazon" ]]; then
+	elif [ "$OSNAME" == "amazon" ]; then
 	    yum install -y golang golang-src
-	elif [[ $OSNAME = "rocky" ]]; then
+	elif [ "$OSNAME" == "rocky" ]; then
 	    yum install -y golang golang-src
-	elif [[ $OSNAME = "rhel" ]]; then
+	elif [ "$OSNAME" == "rhel" ]; then
 	    yum install -y golang golang-src
+	elif [ "$sysName" == "macos" ]; then
+	    echo "macos"
 	else
 		apt install -y golang golang-src
 	fi
 
-	mkdir -p ${serverPath}/mtproxy
-	mkdir -p ${serverPath}/source/mtproxy
-	echo "${1}" > ${serverPath}/mtproxy/version.pl
-
-	get_arch
-	get_download_url
+	if [ "$sysName" == "darwin" ]; then
+		ARCH=arm64
+		DOWNLOAD_URL="https://github.com/9seconds/mtg/releases/download/$VERSION/mtg-${VERSION_MIN}-${sysName}-arm64.tar.gz"
+	elif [ "$sysName" != "macos" ]; then
+		get_arch
+		get_download_url
+	else
+		echo "else"
+	fi
 
 	DOWNLOAD_FILE="$(mktemp).tar.gz"
 	download_file $DOWNLOAD_URL $DOWNLOAD_FILE
@@ -102,7 +109,7 @@ Install_app()
 	# curl -s https://core.telegram.org/getProxyConfig -o proxy-multi.conf
 	
 
-	mv ${serverPath}/mtproxy/mtg-${VERSION_MIN}-${OS}-${ARCH} ${serverPath}/mtproxy/mtg
+	mv ${serverPath}/mtproxy/mtg-${VERSION_MIN}-${sysName}-${ARCH} ${serverPath}/mtproxy/mtg
 	echo '安装完成'
 
 	#初始化 

plugins/mtproxy/js/mtproxy.js

@@ -28,8 +28,14 @@ function mtPost(method, version, args,callback){
 
 function mtCommonFunc(){
 	var con = '<hr/><p class="conf_p" style="text-align:center;">\
-        <button class="btn btn-default btn-sm" onclick="">获取连接地址</button>\
+        <button id="mtproxy_url" class="btn btn-default btn-sm">获取连接地址</button>\
     </p>';
 
     $(".soft-man-con").html(con);
+
+    $('#mtproxy_url').click(function(){
+    	mtPost('url', '', {}, function(rdata){
+    		console.log(rdata);
+    	});
+    });
 }