From e6966c242b93f0f88fb516d234a0c86e21742928 Mon Sep 17 00:00:00 2001
From: P3TERX <p3terx@outlook.com>
Date: Fri, 14 Aug 2020 05:34:08 +0800
Subject: [PATCH] Version 2.7.0: Add AriaNg URL function

---
 aria2.sh             | 13 ++++++++++---
 service/aria2_centos |  9 ++++++++-
 service/aria2_debian |  9 ++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/aria2.sh b/aria2.sh
index 6f19cf0..b68700f 100644
--- a/aria2.sh
+++ b/aria2.sh
@@ -9,10 +9,10 @@
 # https://github.com/P3TERX/aria2.sh
 # Description: Aria2 One-click installation management script
 # System Required: CentOS/Debian/Ubuntu
-# Version: 2.6.2
+# Version: 2.7.0
 #
 
-sh_ver="2.6.2"
+sh_ver="2.7.0"
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 aria2_conf_dir="/root/.aria2c"
@@ -503,13 +503,20 @@ View_Aria2() {
     [[ -z "${aria2_dir}" ]] && aria2_dir="找不到配置参数"
     [[ -z "${aria2_port}" ]] && aria2_port="找不到配置参数"
     [[ -z "${aria2_passwd}" ]] && aria2_passwd="找不到配置参数(或无密钥)"
+    if [[ -z "${IPV4}" || -z "${aria2_port}" ]]; then
+        AriaNg_URL="null"
+    else
+        AriaNg_API="/#!/settings/rpc/set/ws/${IPV4}/${aria2_port}/jsonrpc/$(echo -n ${aria2_passwd} | base64)"
+        AriaNg_URL="http://ariang.js.org${AriaNg_API}"
+    fi
     clear
     echo -e "\nAria2 简单配置信息：\n
  IPv4 地址\t: ${Green_font_prefix}${IPV4}${Font_color_suffix}
  IPv6 地址\t: ${Green_font_prefix}${IPV6}${Font_color_suffix}
  RPC 端口\t: ${Green_font_prefix}${aria2_port}${Font_color_suffix}
  RPC 密钥\t: ${Green_font_prefix}${aria2_passwd}${Font_color_suffix}
- 下载目录\t: ${Green_font_prefix}${aria2_dir}${Font_color_suffix}\n"
+ 下载目录\t: ${Green_font_prefix}${aria2_dir}${Font_color_suffix}
+ AriaNg 链接\t: ${Green_font_prefix}${AriaNg_URL}${Font_color_suffix}\n"
 }
 View_Log() {
     [[ ! -e ${aria2_log} ]] && echo -e "${Error} Aria2 日志文件不存在 !" && exit 1
diff --git a/service/aria2_centos b/service/aria2_centos
index 82ffe41..fff933f 100644
--- a/service/aria2_centos
+++ b/service/aria2_centos
@@ -62,13 +62,20 @@ View_Config() {
 	[[ -z "${Download_dir}" ]] && Download_dir="找不到配置参数"
 	[[ -z "${RPC_listen_port}" ]] && RPC_listen_port="找不到配置参数"
 	[[ -z "${RPC_secret}" ]] && RPC_secret="找不到配置参数(或无密钥)"
+    if [[ -z "${IPV4}" || -z "${RPC_listen_port}" ]]; then
+        AriaNg_URL="null"
+    else
+        AriaNg_API="/#!/settings/rpc/set/ws/${IPV4}/${RPC_listen_port}/jsonrpc/$(echo -n ${RPC_secret} | base64)"
+        AriaNg_URL="http://ariang.js.org${AriaNg_API}"
+    fi
 	clear
 	echo -e "\nAria2 简单配置信息：\n
  IPv4 地址\t: ${Green_font_prefix}${IPV4}${Font_color_suffix}
  IPv6 地址\t: ${Green_font_prefix}${IPV6}${Font_color_suffix}
  RPC 端口\t: ${Green_font_prefix}${RPC_listen_port}${Font_color_suffix}
  RPC 密钥\t: ${Green_font_prefix}${RPC_secret}${Font_color_suffix}
- 下载目录\t: ${Green_font_prefix}${Download_dir}${Font_color_suffix}\n"
+ 下载目录\t: ${Green_font_prefix}${Download_dir}${Font_color_suffix}
+ AriaNg 链接\t: ${Green_font_prefix}${AriaNg_URL}${Font_color_suffix}\n"
 }
 do_start() {
 	check_running
diff --git a/service/aria2_debian b/service/aria2_debian
index 4e21d7f..df3ed61 100644
--- a/service/aria2_debian
+++ b/service/aria2_debian
@@ -60,13 +60,20 @@ View_Config() {
 	[[ -z "${Download_dir}" ]] && Download_dir="找不到配置参数"
 	[[ -z "${RPC_listen_port}" ]] && RPC_listen_port="找不到配置参数"
 	[[ -z "${RPC_secret}" ]] && RPC_secret="找不到配置参数(或无密钥)"
+    if [[ -z "${IPV4}" || -z "${RPC_listen_port}" ]]; then
+        AriaNg_URL="null"
+    else
+        AriaNg_API="/#!/settings/rpc/set/ws/${IPV4}/${RPC_listen_port}/jsonrpc/$(echo -n ${RPC_secret} | base64)"
+        AriaNg_URL="http://ariang.js.org${AriaNg_API}"
+    fi
 	clear
 	echo -e "\nAria2 简单配置信息：\n
  IPv4 地址\t: ${Green_font_prefix}${IPV4}${Font_color_suffix}
  IPv6 地址\t: ${Green_font_prefix}${IPV6}${Font_color_suffix}
  RPC 端口\t: ${Green_font_prefix}${RPC_listen_port}${Font_color_suffix}
  RPC 密钥\t: ${Green_font_prefix}${RPC_secret}${Font_color_suffix}
- 下载目录\t: ${Green_font_prefix}${Download_dir}${Font_color_suffix}\n"
+ 下载目录\t: ${Green_font_prefix}${Download_dir}${Font_color_suffix}
+ AriaNg 链接\t: ${Green_font_prefix}${AriaNg_URL}${Font_color_suffix}\n"
 }
 do_start() {
 	check_running