2020-03-03 20:43:38

applist.txt

@@ -8,18 +8,18 @@ fastdick|迅雷快鸟，快带提速工具||0.0.2|FastDick|linux_arm,linux_mips,
 filebrowser|Web文件浏览器|更新arm二进制至2.0.3|0.0.3|FileBrowser|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
 firewall|防火墙端口开放插件|支持添加多种端口号类型|0.0.2|FireWall|linux_arm,linux_mips,linux_x86_64
 frpc|内网穿透工具，相对于ngrok资源占用较多|修复自定义域名配置错误|0.0.5|Frpc|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
-frps|内网穿透工具Frp服务端|frp程序更新到0.21.0|..2|Frps|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
+frps|内网穿透工具Frp服务端|frp程序更新到0.21.0|1.1.2|Frps|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
 httpfile|搭建简单的web文件浏览页面||0.0.2|HttpFile|linux_arm,linux_mips,linux_x86_64
 jetbrains|快速搭建JetBrains激活服务器||0.0.2|JetBrains|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
 kms|快速搭建Windows、Office激活服务器|Support for Windows 10 1809, Windows Server 2019 and Office 2019 built-in|0.0.2|Kms|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
 kodexplorer|可道云，在线文档管理器，需要entware环境|修复unzip命令缺失|0.0.4|KodExplorer|linux_arm,linux_mips,linux_x86_64
 koolproxy|简单，快速屏蔽网页或视频广告，TG：https://t.me/joinchat/AAAAAD-tO7GPvfOU131_vg|修改为coding规则地址，由于coding连接数限制可能导致规则下载失败！|1.5.2|KoolProxy|linux_arm,linux_mips,linux_x86_64
 miwifi|小米路由器系统管理，修改samba禁用系统更新等|现在修复小米路由器远程访问会自动开放8098端口|0.0.4|MIWIFI|linux_arm,linux_mips
-mixbox|一款支持多平台，多架构的Shell工具箱|修复由于mbdb导致frpc配置无法识别的bug|0.0.7|MIXBOX|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
+mixbox|一款支持多平台，多架构的Shell工具箱|新增功能parse_str，用于解析变量|0.0.8|MIXBOX|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
 ngrok|轻量级的内网穿透工具||0.0.2|Ngrok|linux_arm,linux_mips
 npc|一款轻量级、高性能、功能强大的内网穿透代理服务器||0.0.2|NPC|linux_arm,linux_mips
 pptpd|简单但并不安全的VPN服务器||0.0.2|PPTPD|linux_arm,linux_mips,linux_x86_64
-qiandao|koolshare merlin 自动签到程序||0.0.2|QianDao|linux_arm,linux_x86_64
+qiandao|koolshare merlin 自动签到程序|签到程序更新到版本2.1，支持更多网站的签到，并且支持mipsel设备|0.0.3|QianDao|linux_arm,linux_mips,linux_x86_64
 shadowsocks|最好的翻墙工具，没有之一，还可以加速国内外游戏|修复kcptun配置错误|0.1.1|ShadowSocks|linux_arm,linux_mips,linux_x86_64
 smartdns|DNS加速工具，从多个上游DNS服务器查询，避免DS污染|更新smartdns程序版本|0.0.3|SmartDNS|linux_arm,linux_mips,linux_x86_64
 ssserver|快速搭建ss服务端程序||0.0.2|SSServer|linux_arm,linux_x86_64

apps/frps/config/frps.uci

@@ -5,4 +5,4 @@ openport="1"
 supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="内网穿透工具Frp服务端"
 newinfo="frp程序更新到0.21.0"
-version="..2"
+version="1.1.2"

apps/mixbox/bin/base

@@ -279,3 +279,10 @@ bincheck () {
 	return $?
 }
 
+
+# 通过传入一个字符串，取变量名称等于该字符串的变量值
+function parse_str() {
+
+    [ -z "${1}" ] && echo -n "" || eval echo -n '$'"${1}"
+
+}

apps/mixbox/config/mixbox.uci

@@ -3,5 +3,5 @@ appname="mixbox"
 needver=""
 supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="一款支持多平台，多架构的Shell工具箱"
-newinfo="修复由于mbdb导致frpc配置无法识别的bug"
+newinfo="新增功能parse_str，用于解析变量"
-version="0.0.7"
+version="0.0.8"

apps/npc/scripts/npc.sh

@@ -1,4 +1,5 @@
 #!/bin/sh 
+#copyright by monlor
 eval `mbdb export npc`
 source "$(mbdb get mixbox.main.path)"/bin/base
 port=""

apps/qiandao/bin/cookie.txt

@@ -0,0 +1,70 @@
+[
+    {
+		"Name": "baidu",
+		"Cookie": "##baidu_cookie##"
+	},
+	{
+		"Name": "v2ex",
+		"Cookie": "##v2ex_cookie##"
+	},
+	{
+		"Name": "hostloc",
+		"Cookie": "##hostloc_cookie##"
+	},
+	{
+		"Name": "acfun",
+		"Cookie": "##acfun_cookie##"
+	},
+	{
+		"Name": "bilibili",
+		"Cookie": "##bilibili_cookie##"
+	},
+	{
+		"Name": "163music",
+		"Cookie": "##163music_cookie##"
+	},
+	{
+		"Name": "miui",
+		"Cookie": "##miui_cookie##"
+	},
+	{
+		"Name": "52pojie",
+		"Cookie": "##52pojie_cookie##"
+	},
+	{
+		"Name": "kafan",
+		"Cookie": "##kafan_cookie##"
+	},
+	{
+		"Name": "smzdm",
+		"Cookie": "##smzdm_cookie##"
+	},
+	{
+		"Name": "gztown",
+		"Cookie": "##gztown_cookie##"
+	},
+	{
+		"Name": "meizu",
+		"Cookie": "##meizu_cookie##"
+	},
+	{
+		"Name": "hdpfans",
+		"Cookie": "##hdpfans_cookie##"
+	},
+	{
+		"Name": "chh",
+		"Cookie": "##chh_cookie##"
+	},
+	{
+		"Name": "koolshare",
+		"Cookie": "##koolshare_cookie##"
+	},
+	{
+		"Name": "right",
+		"Cookie": "##right_cookie##"
+	},
+	{
+		"Name": "huawei",
+		"Cookie": "##huawei_cookie##"
+	}
+]

apps/qiandao/config/cookie_template.txt

@@ -0,0 +1,70 @@
+[
+    {
+		"Name": "baidu",
+		"Cookie": "##baidu_cookie##"
+	},
+	{
+		"Name": "v2ex",
+		"Cookie": "##v2ex_cookie##"
+	},
+	{
+		"Name": "hostloc",
+		"Cookie": "##hostloc_cookie##"
+	},
+	{
+		"Name": "acfun",
+		"Cookie": "##acfun_cookie##"
+	},
+	{
+		"Name": "bilibili",
+		"Cookie": "##bilibili_cookie##"
+	},
+	{
+		"Name": "163music",
+		"Cookie": "##163music_cookie##"
+	},
+	{
+		"Name": "miui",
+		"Cookie": "##miui_cookie##"
+	},
+	{
+		"Name": "52pojie",
+		"Cookie": "##52pojie_cookie##"
+	},
+	{
+		"Name": "kafan",
+		"Cookie": "##kafan_cookie##"
+	},
+	{
+		"Name": "smzdm",
+		"Cookie": "##smzdm_cookie##"
+	},
+	{
+		"Name": "gztown",
+		"Cookie": "##gztown_cookie##"
+	},
+	{
+		"Name": "meizu",
+		"Cookie": "##meizu_cookie##"
+	},
+	{
+		"Name": "hdpfans",
+		"Cookie": "##hdpfans_cookie##"
+	},
+	{
+		"Name": "chh",
+		"Cookie": "##chh_cookie##"
+	},
+	{
+		"Name": "koolshare",
+		"Cookie": "##koolshare_cookie##"
+	},
+	{
+		"Name": "right",
+		"Cookie": "##right_cookie##"
+	},
+	{
+		"Name": "huawei",
+		"Cookie": "##huawei_cookie##"
+	}
+]

apps/qiandao/config/mixbox.conf

@@ -9,10 +9,9 @@ qiandao() {
         
         if [ "$enable" == '1' ]; then
                 # Scripts Here
-                qiandaos="koolshare baidu v2ex hostloc acfun bilibili smzdm xiami 163music miui 52pojie kafan right mydigit"
                 echo "支持签到的网站："
                 i=1
-                echo "$qiandaos" | tr " " "\n" | while read line
+                echo "$qiandao_support" | tr " " "\n" | while read line
                 do
                         tmp=""
                         [ -n "$(mbdb get ${appname}.main.qiandao_"${line}"_setting)" ] && tmp="[已设置]"
@@ -24,8 +23,8 @@ qiandao() {
                 do
                         read -p "请选择要签到网站(回车结束)：" res
                         [ -z "$res" ] && break
-                        name="$(echo $qiandaos | tr " " "\n" | sed -n "$res"p)"
+                        name="$(echo $qiandao_support | tr " " "\n" | sed -n "$res"p)"
-                        [ -z "$(echo $qiandaos | grep $name)" ] && echo "输入有误！" && continue
+                        [ -z "$(echo $qiandao_support | grep $name)" ] && echo "输入有误！" && continue
                         read -p "请输入$name的cookie(已设置时：0.关闭 1.启用)：" res
                         checkread $res && [ -z "$(mbdb get ${appname}.main.qiandao_"$name"_setting)" ] && echo "$name未设置cookie！" && continue
                         if [ "$res" == '0' ]; then

apps/qiandao/config/qiandao.uci

@@ -1,6 +1,8 @@
 service="QianDao"
 appname="qiandao"
-needver="0.0.1"
+needver="0.0.8"
-supports="linux_arm,linux_x86_64"
+supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="koolshare merlin 自动签到程序"
-version="0.0.2"
+newinfo="签到程序更新到版本2.1，支持更多网站的签到，并且支持mipsel设备"
+version="0.0.3"
+qiandao_support="baidu v2ex hostloc acfun bilibili 163music miui 52pojie kafan smzdm gztown meizu hdpfans chh koolshare right huawei"

apps/qiandao/config/version.txt

@@ -1 +0,0 @@
-1.0.4

apps/qiandao/scripts/qiandao.sh

@@ -2,37 +2,24 @@
 source /etc/mixbox/bin/base
 eval `mbdb export qiandao`
 
-
+SETTING_FILE="${mbroot}/apps/${appname}/bin/cookie.txt"
-SETTING_FILE="${mbtmp}/cookie.txt"
 [ -z "$qiandao_time" ] && qiandao_time="8"
 
-
 generate_cookie_conf() {
 
-        rm -rf $SETTING_FILE
+        mv -f ${mbroot}/apps/${appname}/config/cookie_template.txt ${SETTING_FILE}
-        rm -rf ${mbroot}/apps/${appname}/bin/cookie.txt
-        [ "$qiandao_koolshare" == "1" ] && [ -n "$qiandao_koolshare_setting" ] && echo -e "\"koolshare\"=$qiandao_koolshare_setting" >> $SETTING_FILE
-        [ "$qiandao_baidu" == "1" ] && [ -n "$qiandao_baidu_setting" ] && echo -e "\"baidu\"=$qiandao_baidu_setting" >> $SETTING_FILE
-        [ "$qiandao_v2ex" == "1" ] && [ -n "$qiandao_v2ex_setting" ] && echo -e "\"v2ex\"=$qiandao_v2ex_setting" >> $SETTING_FILE
-        [ "$qiandao_hostloc" == "1" ] && [ -n "$qiandao_hostloc_setting" ] && echo -e "\"hostloc\"=$qiandao_hostloc_setting" >> $SETTING_FILE
-        [ "$qiandao_acfun" == "1" ] && [ -n "$qiandao_acfun_setting" ] && echo -e "\"acfun\"=$qiandao_acfun_setting" >> $SETTING_FILE
-        [ "$qiandao_bilibili" == "1" ] && [ -n "$qiandao_bilibili_setting" ] && echo -e "\"bilibili\"=$qiandao_bilibili_setting" >> $SETTING_FILE
-        [ "$qiandao_smzdm" == "1" ] && [ -n "$qiandao_smzdm_setting" ] && echo -e "\"smzdm\"=$qiandao_smzdm_setting" >> $SETTING_FILE
-        [ "$qiandao_xiami" == "1" ] && [ -n "$qiandao_xiami_setting" ] && echo -e "\"xiami\"=$qiandao_xiami_setting" >> $SETTING_FILE
-        [ "$qiandao_163music" == "1" ] && [ -n "$qiandao_163music_setting" ] && echo -e "\"163music\"=$qiandao_163music_setting" >> $SETTING_FILE
-        [ "$qiandao_miui" == "1" ] && [ -n "$qiandao_miui_setting" ] && echo -e "\"miui\"=$qiandao_miui_setting" >> $SETTING_FILE
-        [ "$qiandao_52pojie" == "1" ] && [ -n "$qiandao_52pojie_setting" ] && echo -e "\"52pojie\"=$qiandao_52pojie_setting" >> $SETTING_FILE
-        [ "$qiandao_kafan" == "1" ] && [ -n "$qiandao_kafan_setting" ] && echo -e "\"kafan\"=$qiandao_kafan_setting" >> $SETTING_FILE
-        [ "$qiandao_right" == "1" ] && [ -n "$qiandao_right_setting" ] && echo -e "\"right\"=$qiandao_right_setting" >> $SETTING_FILE
-        [ "$qiandao_mydigit" == "1" ] && [ -n "$qiandao_mydigit_setting" ] && echo -e "\"mydigit\"=$qiandao_mydigit_setting" >> $SETTING_FILE
-        if [ -f "$SETTING_FILE" ];then
-                ln -sf $SETTING_FILE ${mbroot}/apps/${appname}/bin/cookie.txt
-        else
-                logsh "【$service】" "检测到你没有填写任何cookie配置！关闭插件！" 
-                mbdb set $appname.main.enable=0
 
-                exit 1
+        local qiandao_setting=""
-        fi
+        local qiandao_enable=""
+
+        echo "${qiandao_support}" | tr ' ' '\n' | while read line; do
+            test -z "${line}" && continue
+            qiandao_setting="$(parse_str qiandao_${line}_setting)"
+            qiandao_enable="$(parse_str ${line}_setting)"
+            # 该签到网站未启用签到程序时，将cookie置为空
+            [ "${qiandao_enable}" != "1" ] && qiandao_setting=""
+            sed -i "s/##${line}_cookie##/${qiandao_setting}" ${SETTING_FILE}
+        done
 
 }
 

tools/newapp.sh

@@ -48,6 +48,7 @@ EOF
 echo "生成插件运行脚本..."
 cat > ${appname}/scripts/${appname}.sh <<-EOF
 #!/bin/sh 
+#copyright by monlor
 eval \`mbdb export ${appname}\`
 source "\$(mbdb get mixbox.main.path)"/bin/base
 port=""