diff --git a/README.md b/README.md index e3f3c0a..6634453 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,10 @@ ### 更新日志 +* 2020-03-06 + * 更新frps到0.31.2 + * 修复工具箱下载插件失败的问题 + * 2020-03-05-2 * 由于cdn缓存不刷新,还是滚回了`coding`源:`https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master` * 新增`DLNA`插件`DMS` diff --git a/apps/dms/scripts/config.sh b/apps/dms/scripts/config.sh index 895932b..3d1887d 100644 --- a/apps/dms/scripts/config.sh +++ b/apps/dms/scripts/config.sh @@ -1,4 +1,5 @@ #!/bin/sh +#copyright by monlor eval `mbdb export dms` source "$(mbdb get mixbox.main.path)"/bin/base @@ -11,7 +12,7 @@ if [ "$enable" == '1' ]; then readsh "请输入${appname}媒体服务器名称" "servername" "mixbox-dms" # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0" readsh "重启${appname}服务[1/0] " "res" "1" - [ "$res" = '1' -o -z "$res" ] && return 1 + [ "$res" = '1' -o -z "$res" ] && return 0 else - return 0 + return 1 fi \ No newline at end of file diff --git a/apps/frps/bin/frps_darwin_x86_64 b/apps/frps/bin/frps_darwin_x86_64 old mode 100644 new mode 100755 index 2398aed..c8d1573 Binary files a/apps/frps/bin/frps_darwin_x86_64 and b/apps/frps/bin/frps_darwin_x86_64 differ diff --git a/apps/frps/bin/frps_linux_arm b/apps/frps/bin/frps_linux_arm old mode 100644 new mode 100755 index bb5e56a..31fc2f0 Binary files a/apps/frps/bin/frps_linux_arm and b/apps/frps/bin/frps_linux_arm differ diff --git a/apps/frps/bin/frps_linux_mips b/apps/frps/bin/frps_linux_mips old mode 100644 new mode 100755 index 36f5a0e..43608b7 Binary files a/apps/frps/bin/frps_linux_mips and b/apps/frps/bin/frps_linux_mips differ diff --git a/apps/frps/bin/frps_linux_x86_64 b/apps/frps/bin/frps_linux_x86_64 old mode 100644 new mode 100755 index 6bd2171..e55f186 Binary files a/apps/frps/bin/frps_linux_x86_64 and b/apps/frps/bin/frps_linux_x86_64 differ diff --git a/apps/frps/config/frps.uci b/apps/frps/config/frps.uci index d7afd34..e627b6e 100644 --- a/apps/frps/config/frps.uci +++ b/apps/frps/config/frps.uci @@ -4,5 +4,5 @@ needver="0.0.1" openport="1" supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64" appinfo="内网穿透工具Frp服务端" -newinfo="frp程序更新到0.21.0" -version="1.1.2" +newinfo="frp程序更新到0.31.2" +version="1.1.3" diff --git a/apps/frps/config/mixbox.conf b/apps/frps/config/mixbox.conf deleted file mode 100644 index 98c85ce..0000000 --- a/apps/frps/config/mixbox.conf +++ /dev/null @@ -1,39 +0,0 @@ -#------------------【Frps】-------------------- -frps() { - - eval `mbdb export frps` - source /etc/mixbox/bin/base - uciset="mbdb set $appname.main" - echo "********* $service ***********" - echo "[${appinfo}]" - echo "技巧:回车表示默认或历史设置,-1表示还原默认或不启用" - readsh "启动${appname}服务[1/0] " "enable" "1" - - if [ "$enable" == '1' ]; then - # Scripts Here - read -p "修改${appname}配置信息?[1/0] " res - if [ "$res" = '1' ]; then - readsh "请输入${appname}运行端口号" "port" "7000" - readsh "请输入${appname}的udp端口号" "udp_port" "7001" - readsh "请输入${appname}的kcp配置[1/0]" "kcp" "1" - readsh "请输入${appname}用于http穿透的端口号" "http_port" "90" - readsh "请输入${appname}用于https穿透的端口号" "https_port" "91" - readsh "请输入${appname}访问密钥" "token" "12345678" - readsh "请输入${appname}子域名" "subdomain" - read -p "是否启用${appname}的web控制面板?[1/0] " res - [ -n "$res" ] && mbdb set $appname.main.dashboard="$res" - if [ "$res" = '1' ]; then - readsh "请输入${appname}控制面板端口号" "dashboard_port" "7500" - readsh "请输入${appname}控制面板用户名" "dashboard_user" "admin" - readsh "请输入${appname}控制面板密码" "dashboard_pwd" "admin" - fi - fi - readsh "请输入${appname}外网访问配置[1/0]" "openport" "1" - - ${mbroot}/apps/${appname}/scripts/${appname}.sh restart - else - ${mbroot}/apps/${appname}/scripts/${appname}.sh stop - fi - -} -#------------------【Frps】-------------------- diff --git a/apps/frps/config/version.txt b/apps/frps/config/version.txt deleted file mode 100644 index ee90284..0000000 --- a/apps/frps/config/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.0.4 diff --git a/apps/frps/scripts/config.sh b/apps/frps/scripts/config.sh new file mode 100644 index 0000000..2e671fa --- /dev/null +++ b/apps/frps/scripts/config.sh @@ -0,0 +1,35 @@ +#!/bin/sh +#copyright by monlor + +eval `mbdb export frps` +source /etc/mixbox/bin/base +uciset="mbdb set $appname.main" +echo "********* $service ***********" +echo "[${appinfo}]" +echo "技巧:回车表示默认或历史设置,-1表示还原默认或不启用" +readsh "启动${appname}服务[1/0] " "enable" "1" + +if [ "$enable" == '1' ]; then + # Scripts Here + read -p "修改${appname}配置信息?[1/0] " res + if [ "$res" = '1' ]; then + readsh "请输入${appname}运行端口号" "port" "7000" + readsh "请输入${appname}的udp端口号" "udp_port" "7001" + readsh "请输入${appname}的kcp配置[1/0]" "kcp" "1" + readsh "请输入${appname}用于http穿透的端口号" "http_port" "90" + readsh "请输入${appname}用于https穿透的端口号" "https_port" "91" + readsh "请输入${appname}访问密钥" "token" "12345678" + readsh "请输入${appname}子域名" "subdomain" + read -p "是否启用${appname}的web控制面板?[1/0] " res + [ -n "$res" ] && mbdb set $appname.main.dashboard="$res" + if [ "$res" = '1' ]; then + readsh "请输入${appname}控制面板端口号" "dashboard_port" "7500" + readsh "请输入${appname}控制面板用户名" "dashboard_user" "admin" + readsh "请输入${appname}控制面板密码" "dashboard_pwd" "admin" + fi + fi + readsh "请输入${appname}外网访问配置[1/0]" "openport" "1" + return 0 +else + return 1 +fi diff --git a/apps/ngrok/scripts/ngrok.sh b/apps/ngrok/scripts/ngrok.sh index f73b12a..d91b1d0 100644 --- a/apps/ngrok/scripts/ngrok.sh +++ b/apps/ngrok/scripts/ngrok.sh @@ -1,4 +1,5 @@ #!/bin/sh +#copyright by monlor source /etc/mixbox/bin/base eval `mbdb export ngrok` diff --git a/appsbin/frp-bin/0.31.2/frpc_darwin_x86_64 b/appsbin/frp-bin/0.31.2/frpc_darwin_x86_64 new file mode 100755 index 0000000..749b694 Binary files /dev/null and b/appsbin/frp-bin/0.31.2/frpc_darwin_x86_64 differ diff --git a/appsbin/frp-bin/0.31.2/frpc_linux_arm b/appsbin/frp-bin/0.31.2/frpc_linux_arm new file mode 100755 index 0000000..dd7fcc8 Binary files /dev/null and b/appsbin/frp-bin/0.31.2/frpc_linux_arm differ diff --git a/appsbin/frp-bin/0.31.2/frpc_linux_mips b/appsbin/frp-bin/0.31.2/frpc_linux_mips new file mode 100755 index 0000000..99255c5 Binary files /dev/null and b/appsbin/frp-bin/0.31.2/frpc_linux_mips differ diff --git a/appsbin/frp-bin/0.31.2/frpc_linux_x86_64 b/appsbin/frp-bin/0.31.2/frpc_linux_x86_64 new file mode 100755 index 0000000..ca20598 Binary files /dev/null and b/appsbin/frp-bin/0.31.2/frpc_linux_x86_64 differ