更新kp

feat: add v2ray support for aarch64, fix monlor/MIXBOX#169

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: https://www.monlor.com/images/wechat.png # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/bak/deploy.yaml

@@ -20,9 +20,10 @@ jobs:
       env:
         BRANCH_NAME: master
       run: |
+        git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
 
   test-job:
@@ -35,9 +36,10 @@ jobs:
       env:
         BRANCH_NAME: test
       run: |
+        git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
 
   dev-job:
@@ -50,7 +52,9 @@ jobs:
       env:
         BRANCH_NAME: dev
       run: |
+        git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
+

.github/workflows/bak/master.yaml

@@ -20,6 +20,7 @@ jobs:
       env:
         BRANCH_NAME: master
       run: |
+        git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
         bash ./tools/gitsync.sh pack 
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}

.github/workflows/bak/test.yaml

@@ -20,6 +20,7 @@ jobs:
       env:
         BRANCH_NAME: test
       run: |
+        git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
         bash ./tools/gitsync.sh pack 
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}

.github/workflows/main.yml

@@ -1,19 +1,60 @@
 name: Main-CI
 
-on: [push, pull_request]
+# on: [push, pull_request]
+on: 
+  push:
+    branchs:  
+      - master
+      - test
+      - dev
+    paths-ignore:
+      # - '.github/**'
+      - 'README.md'
+      - 'changelog.md'
+  # pull_request:
+  #   branchs:  
+  #     - master
+  #     - test
+  #     - dev
+
+env:
+  BRANCH_NAME: ${{ github.ref }}
+  CO_REF: ${{ secrets.CO_REF }}
+  GH_REF: ${{ secrets.GH_REF }}
 
 jobs:
-  publish:
+  # coding-deploy:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - name: Checkout
+  #     uses: actions/checkout@master
+  #   - name: Deploy To Coding
+  #     run: |
+  #       test ! -d mbfiles && git clone -b `basename ${BRANCH_NAME}` ${CO_REF} 
+  #       ./tools/gitsync.sh pack 
+  #       ./tools/gitsync.sh deploy_lfs mbfiles `basename ${BRANCH_NAME}` ${CO_REF}
+
+  github-deploy:
     runs-on: ubuntu-latest
-    env:
-        GH_REF: ${{ secrets.GH_REF }}
-        CO_REF: ${{ secrets.CO_REF }}
     steps:
     - name: Checkout
       uses: actions/checkout@master
-
+    - name: Deploy To GitHub
-    - name: Pack And Deploy
       run: |
-        bash ./tools/gitsync.sh pack 
+        test ! -d mbfiles && git clone -b `basename ${BRANCH_NAME}` ${GH_REF}
-        bash ./tools/gitsync.sh deploy mbfiles `git branch | awk  '$1 == "*"{print $2}'` ${GH_REF}
+        ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles `git branch | awk  '$1 == "*"{print $2}'` ${CO_REF}
+        ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${GH_REF}
+
+  # gitee空间限制，不再使用
+  # gitee-deploy:
+  #   runs-on: ubuntu-latest
+  #   needs: github-deploy
+  #   steps:
+  #   - name: Sync To Gitee
+  #     uses: wearerequired/git-mirror-action@v1
+  #     env:
+  #         SSH_PRIVATE_KEY: ${{ secrets.GE_TOKEN }}
+  #     with:
+  #         source-repo: 'git@github.com:monlor/mbfiles.git'
+  #         destination-repo: 'git@gitee.com:monlor/mbfiles.git'
+

.gitlab-ci.yml

@@ -0,0 +1,79 @@
+image: lholota/bash-git:latest
+
+stages:
+  - deploy
+
+deploy:branchs:
+  stage: deploy
+  only:        
+    - master
+    - test
+  script:
+    - apk add git-lfs
+    - git clone -b ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    # - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GH_REF}/monlor/mbfiles.git
+
+# deploy:dev:
+#   stage: deploy
+#   only:        
+#     - dev
+#   script:
+#     - apk add git-lfs
+#     - git clone -b ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git 
+#     - bash -e ./tools/gitsync.sh pack
+#     - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+
+deploy:master:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
+    - apk add git-lfs
+    - git fetch origin master
+    - git checkout master
+    - git clone -b master ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    - bash ./tools/gitsync.sh deploy mbfiles master ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: master
+    untracked: true
+
+deploy:test:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
+    - apk add git-lfs
+    - git fetch origin test
+    - git checkout test
+    - git clone -b test ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    - bash ./tools/gitsync.sh deploy mbfiles test ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: test
+    untracked: true
+
+syncode:github:
+  stage: deploy
+  only:        
+    - master
+    - test
+    - dev
+  script:
+    - git fetch origin ${CI_COMMIT_REF_NAME}
+    - git checkout ${CI_COMMIT_REF_NAME}
+    - git push ${GH_REF}/monlor/MIXBOX.git ${CI_COMMIT_REF_NAME}:${CI_COMMIT_REF_NAME}
+
+# cache:
+#   key: ${CI_COMMIT_REF_NAME}
+#   untracked: true
+#   paths: 
+#     - mbfiles/
+

README.md

@@ -1,50 +1,17 @@
 # MIXBOX 
 
-![](https://github.com/monlor/MIXBOX/workflows/CI/badge.svg)
+![](https://github.com/monlor/MIXBOX/workflows/Main-CI/badge.svg)
 
 > MIXBOX是一款全新的，完全基于Shell脚本的工具箱，为在路由器上实现程序的快速配置及运行管理，欢迎大佬们stars、fork及pr.
 
-* Telegram群：[MIXBOX CHAT](https://t.me/joinchat/FMraA0lwzH9fzEW1wXdCFA)
+* Telegram群：[MIXBOX CHAT](https://t.me/mixboxchat)
-* 我的博客：[Monlor's Blog](https://www.monlor.com)
+* 我的博客：[Monlor's Blog](https://www.monlor.com)，[备用地址](https://monlor.github.io)
 * GitHub地址：[monlor/MIXBOX](https://github.com/monlor/MIXBOX)
 
 ***
 
-### 更新日志
+### [更新日志](https://github.com/monlor/MIXBOX/blob/master/changelog.md)
 
-* 2020-03-05-2
-	* 由于cdn缓存不刷新，还是滚回了`coding`源：`https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master`
-	* 新增`DLNA`插件`DMS`
-	* `Qiandao`插件bug修复
-
-* 2020-03-05
-	* 由于`coding`限制仓库容量不能大于`2G`，尝试使用`github`的`cdn`源：`https://cdn.jsdelivr.net/gh/monlor/mbfiles`
-	* 最新版本里选择`github下载源`默认为`cdn`源，**推荐使用**
-	* 仓库已经重置，删除了历史记录
-	* 修复`EasyExployer`启动bug，更新二进制程序版本
-	* 更新`BaiduPCS`二进制程序
-
-* 2020-03-04
-	* 为了减少项目体积，现在采用`Github Actions`自动部署插件安装包
-	* coding下载源地址改为`https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master`
-	* github下载源地址改为`https://raw.githubusercontent.com/monlor/mbfiles/master`
-	* 这一版更新需要手动更新，请执行下方的**手动更新命令**，并手动更换下载源
-	* 不想更新的以前的版本同样会保留，只是不再会更新
-
-* 2020-03-03
-	* 更新工具箱coding下载源，**请手动更换coding下载源：`https://monlor.coding.net/p/MIXBOX/d/MIXBOX/git/raw/master`**
-	* 更新插件`Koolproxy`规则地址
-	* 更新`qiandao`插件，现在支持更多网站签到，**并且支持mips设置，如R3**
-
-* 2020-02-27
-	* 新增插件npc，待测试
-	* aria2版本更新
-
-* 2019-03-03
-	* 修复`v2ray`配置文件问题（未测试），感谢`@leafnsand`的PR
-	* 修复`Entware`插件无法启动`ONMP`的问题
-	* 插件`VerySync`和`BaiduPCS`的程序版本更新
-	* 现在修复小米路由器远程访问后会自动开放8098端口
 
 ### 介绍
 
@@ -59,6 +26,7 @@
 	* 工具箱现在不会特意去兼容某个型号，比如`R3`上的`Aria2`问题，只考虑`CPU`架构，`mips`/`arm`等，所以如果`R3`/`R1CM`发现程序不兼容的情况，可以选择自己替换程序，或同时安装`Monlor-Tools`工具箱
 	* 插件安装去掉了离线安装的功能，后续会加入进来，给用户提供一个自己修改打包插件的机会
 
+
 * ShadowSocks
 	* 订阅现在会多次尝试，如已安装`EntWare`中的`curl`程序会自动调用用作订阅
 	* 现已支持`v2ray`并测试黑白名单和全局模式，正常使用，v2ray订阅暂不支持
@@ -66,10 +34,12 @@
 	* 优化添加`ss`节点时的提示信息
 	* 增加`haveged`程序，用于生成随机数
 
+
 * KoolProxy
 	* 由于作者更新程序修改了视频模式的启用方式，更新了启动脚本
 	* `https`证书生成不再使用`openssl`程序，而使用`kp`自带程序生成
 
+
 * 新增插件
 	* AliDDNS：获取当前网络的ip，自动解析到阿里云
 	* BaiduPCS：第三方百度网盘下载工具，带web界面
@@ -81,31 +51,50 @@
 	* Transmission：强大的`pt`下载工具，基于`EntWare`环境
 	* WebD：极其小巧的网盘工具，功能比较简单
 
+
 * 其他等等等小更新...
 
+
 ### 注意事项
 
 * 用户目录是指存放一下大文件的目录，如下载的文件等
 * **经测试`R3`不支持`EntWare`环境，原因未知，所以基于`EntWare`的程序都无法使用**
+* **0.1.9.7以前的版本请手动更换下载源**，步骤：mixbox => 工具箱管理 => 更换下载源 => 输入以下地址
+```
+https://cdn.jsdelivr.net/gh/monlor/mbfiles
+```
+* 默认源更换为jsdelivr源，coding源不再使用
 
 ### 命令
 
 #### 一键安装
 
 ``` shell
-sh -c "$(curl -kfsSl https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master/install.sh)" && source /etc/profile &> /dev/null
+sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/monlor/mbfiles/install.sh)" && source /etc/profile &> /dev/null
+```
+
+#### github源一键安装命令
+
+``` shell
+sh -c "$(curl -kfsSl https://raw.githubusercontent.com/monlor/mbfiles/master/install_github.sh)" && source /etc/profile &> /dev/null
+```
+
+#### ghcdn源一键安装命令
+
+``` shell
+sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/monlor/mbfiles/install_ghcdn.sh)" && source /etc/profile &> /dev/null
 ```
 
 ### 手动更新命令
 
 ``` shell
-sh -c "$(curl -kfsSl https://raw.githubusercontent.com/monlor/MIXBOX/master/apps/mixbox/scripts/update.sh)" && source /etc/profile &> /dev/null
+sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/monlor/mbfiles/update.sh)" && source /etc/profile &> /dev/null
 ```
 
-#### 卸载`Monlor Tools`工具箱
+### 手动卸载命令
 
 ``` shell
-sh -c "$(curl -kfsSl https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master/temp/uninstall_old.sh)" && source /etc/profile &> /dev/null
+sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/monlor/MIXBOX/apps/mixbox/scripts/uninstall.sh)" && source /etc/profile &> /dev/null
 ```
 
 #### 一键更新所有插件（请先更新工具箱）
@@ -122,20 +111,21 @@ mixbox help
 
 ### 小米路由器目录结构  
 
-	/
+```
-	|--- /etc/mixbox
+/
-	|    |--- /apps/        --- 插件安装目录
+|--- /etc/mixbox
-	|    |--- /config/      --- 工具箱配置文件目录
+|    |--- /apps/        --- 插件安装目录
-	|    |--- /scripts/     --- 工具箱脚本目录
+|    |--- /config/      --- 工具箱配置文件目录
-	|    |--- /mbdb/        --- 工具箱数据文件目录
+|    |--- /scripts/     --- 工具箱脚本目录
-	|	 |--- /var/		--- 工具箱运行pid及日志存放目录
+|    |--- /mbdb/        --- 工具箱数据文件目录
-	|--- /tmp
+|  |--- /var/   --- 工具箱运行pid及日志存放目录
-	|    |--- /messages     --- 系统日志，工具箱日志
+|--- /tmp
-	|--- /userdisk
+|    |--- /messages     --- 系统日志，工具箱日志
-	|    |--- /data/        --- 硬盘目录
+|--- /userdisk
-	|--- /extdisks/
+|    |--- /data/        --- 硬盘目录
-	|    |--- /sd*/         --- 外接盘目录
+|--- /extdisks/
-	
+|    |--- /sd*/         --- 外接盘目录
+```
 
 ### 插件列表
 
@@ -171,6 +161,7 @@ mixbox help
 28. [SSServer]
 29. [Transmission]
 30. [WebD]
+31. [ttyd](https://github.com/tsl0922/ttyd)
 
 ### 快速制作插件
 
@@ -188,8 +179,9 @@ mixbox help
 * 插件名必须为小写，插件服务名一般为驼峰的写法
 * 插件二进制名称建议与插件名对应，二进制名不能出现下划线，建议用横杠，如obfs-local
 * 执行完插件生成脚本后，插件会生成在apps中，注意名称不能与现有插件重复
-* `gitsync.sh`是打包插件的脚本，-v为更新版本号`可无`，打包的插件生成在appstore下
-	
-
 
+#### 请喝咖啡
 
+|                             微信                             |                            支付宝                            |
+| :----------------------------------------------------------: | :----------------------------------------------------------: |
+| ![](https://cdn.jsdelivr.net/gh/monlor/file/img/20200312145215.png) | ![](https://cdn.jsdelivr.net/gh/monlor/file/img/20200312145148.png) |

apps/aliddns/config/aliddns.uci

@@ -1,7 +1,7 @@
 service="AliDDNS"
 appname="aliddns"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="动态将你的路由器IP绑定到域名"
-newinfo=""
+newinfo="支持ipv6，修复bug"
-version="0.0.2"
+version="0.0.5"

apps/aliddns/config/mixbox.conf

@@ -1,28 +0,0 @@
-#------------------【AliDDNS】--------------------
-aliddns() {
-
-        eval `mbdb export aliddns`
-        source /etc/mixbox/bin/base
-        echo "********* $service ***********"
-        echo "[${appinfo}]"
-        readsh "启动${appname}服务[1/0] " "enable" "1"
-        
-        if [ "$enable" == '1' ]; then
-                # Scripts Here
-                read -p "修改${appname}配置？[1/0] " res
-                if [ "$res" = '1' ]; then
-                        readsh "请输入${appname}访问ID" "app_key"
-                        readsh "请输入${appname}访问密钥" "app_secret"
-                        readsh "请输入${appname}域名[例如@.mixbox.com或www.mixbox.com]" "domain"
-                        readsh "请输入${appname}检查分钟间隔(建议10)" "time" "10"
-                fi                
-                # read -p "更新DNS前先清除旧的DNS记录(默认不清除)？[1/0] " res
-                # mbdb set $appname.main.clean="$res"
-
-                ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
-        else
-                ${mbroot}/apps/${appname}/scripts/${appname}.sh stop
-        fi
-
-}
-#------------------【AliDDNS】--------------------

apps/aliddns/config/version.txt

@@ -1 +0,0 @@
-1.0.5

apps/aliddns/scripts/aliddns.sh

@@ -6,7 +6,6 @@ start() {
 
     # [ -n "$(pidof ${appname})" ] && logsh "【$service】" "${appname}已经在运行！" && exit 1
     logsh "【$service】" "正在启动${appname}服务... "
-    
     # Scripts Here
     # open_port
     # write_firewall_start
@@ -14,7 +13,12 @@ start() {
     [ -z "$time" ] && time=10
     
     cru a "${appname}" "*/$time * * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart"
-    daemon ${mbroot}/apps/${appname}/bin/${appname} --id "$app_key" --secret "$app_secret" auto-update --domain "$domain"
+    if [ "${type}" = '1' -o "${type}" = '2' ]; then
+        daemon ${mbroot}/apps/${appname}/bin/${appname} --id "$app_key" --secret "$app_secret" auto-update -6 --domain "$domain"
+    fi
+    if [ "${type}" = '0' -o "${type}" = '2' ]; then
+        daemon ${mbroot}/apps/${appname}/bin/${appname} --id "$app_key" --secret "$app_secret" auto-update --domain "$domain" 
+    fi
     if [ $? -ne 0 ]; then
             logsh "【$service】" "启动${appname}服务失败！"
     else

apps/aliddns/scripts/config.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+#copyright by monlor
+
+eval `mbdb export aliddns`
+source "$(mbdb get mixbox.main.path)"/bin/base
+echo "********* $service ***********"
+echo "[${appinfo}]"
+readsh "启动${appname}服务[1/0] " "enable" "1"
+
+if [ "$enable" == '1' ]; then
+  # Scripts Here
+  read -p "修改${appname}配置？[1/0] " res
+  if [ "$res" = '1' ]; then
+    readsh "请输入${appname}访问ID" "app_key"
+    readsh "请输入${appname}访问密钥" "app_secret"
+    readsh "请输入${appname}域名[例如@.mixbox.com或www.mixbox.com]" "domain"
+    readsh "请输入${appname}检查分钟间隔(建议10)" "time" "10"
+  fi                
+  readsh "支持类型[0仅ipv4/1仅ipv6/2通吃]" "type" "0"
+
+  readsh "重启${appname}服务[1/0]" "res" "1"
+  [ "$res" != '0' ] && exit 0
+fi
+exit 1

apps/aria2/config/aria2.conf

@@ -46,7 +46,7 @@ dir=/extdisks/sda1/下载
 #dht-file-path=/extdisks/sda1/下载/.aria2/dht.dat
 #dht-file-path6=/extdisks/sda1/下载/.aria2/dht6.dat
 #bt-tracker
-#bt-tracker=
+bt-tracker=
 #文件缓存, 使用内置的文件缓存, 如果你不相信Linux内核文件缓存和磁盘内置缓存时使用, 需要1.16及以上版本
 #disk-cache=0
 #另一种Linux文件缓存方式, 使用前确保您使用的内核支持此选项, 需要1.15及以上版本(?)

apps/aria2/config/aria2.uci

@@ -1,7 +1,8 @@
 service="Aria2"
 appname="aria2"
 needver="0.1.7"
+backupfiles="config/aria2.conf"
 supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="Linux下一款高效的下载工具"
-newinfo="支持x86_64设备"
+newinfo="使用尽可能多的trackers以便于加速"
-version="0.0.6"
+version="0.1.0"

apps/aria2/scripts/aria2.sh

@@ -40,7 +40,9 @@ set_config() {
     fi
 
     # 自动更新bt-tracker
-    list=`wgetlist https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt|awk NF|sed ":a;N;s/\n/,/g;ta"`
+    list1="$(wgetlist https://cdn.jsdelivr.net/gh/ngosang/trackerslist/trackers_all.txt)"
+    list2="$(wgetlist https://trackerslist.com/all.txt)"
+    list="$(echo -e "${list1}\n${list2}" | sort -u | awk NF | sed ":a;N;s/\n/,/g;ta")"
     if [ ! -z "${list}" ]; then
         sed -i "s#.*bt-tracker.*#bt-tracker=${list}#" ${mbroot}/apps/${appname}/config/${appname}.conf
         logsh "【$service】" "更新bt-tracker"

apps/baidupcs/config/baidupcs.uci

@@ -2,7 +2,7 @@ service="BaiduPCS"
 appname="baidupcs"
 needver="0.0.1"
 backupfiles=""
-supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="第三方百度网盘web客户端，基于Go语言"
 newinfo="二进制更新至3.7.0"
 version="0.0.6"

apps/dms/config/dms.uci

@@ -2,7 +2,7 @@ service="DMS"
 appname="dms"
 needver="0.0.1"
 backupfiles=""
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 appinfo="dms是一款DLNA数字媒体服务器"
 newinfo=""
 version="0.0.2"

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,6 @@ 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" != '0' ] && exit 0
-else
+fi
-    return 0
+exit 1
-fi

apps/dropbear/config/dropbear.uci

@@ -2,7 +2,7 @@ service="DropBear"
 appname="dropbear"
 needver="0.0.1"
 backupfiles="bin/dropbear,config/dropbear_dss_host_key,config/dropbear_rsa_host_key"
-supports="linux_arm,linux_mips"
+supports="linux_aarch64,linux_arm,linux_mips"
 appinfo="移植小米的SSH功能到工具箱"
-newinfo="添加备份功能支持"
+newinfo="移除dss证书，支持一些新的路由型号"
-version="0.0.2"
+version="0.0.3"

apps/dropbear/scripts/dropbear.sh

@@ -7,12 +7,8 @@ eval `mbdb export dropbear`
 get_config() {
 
     logsh "【$service】" "检查${appname}配置文件中..."
-    [ ! -f ${mbroot}/apps/${appname}/config/dropbear_rsa_host_key -a ! -f /etc/dropbear/dropbear_rsa_host_key ] && logsh "【$service】" "缺失证书文件无法启动！" && exit 1
+    [ ! -f ${mbroot}/apps/${appname}/bin/${appname} ] && cp -rf /usr/sbin/dropbear ${mbroot}/apps/${appname}/bin/${appname} && logsh "【$service】" "移植主程序文件成功！"
-    [ ! -f  ${mbroot}/apps/${appname}/config/dropbear_dss_host_key -a ! -f /etc/dropbear/dropbear_dss_host_key ] && logsh "【$service】" "缺失证书文件无法启动！" && exit 1
+    [ ! -f ${mbroot}/apps/${appname}/config/dropbear_rsa_host_key ] && cp -rf /etc/dropbear/dropbear_rsa_host_key ${mbroot}/apps/${appname}/config/dropbear_rsa_host_key && logsh "【$service】" "移植证书成功！"
-    [ ! -f ${mbroot}/apps/${appname}/bin/${appname} ] && cp -rf /usr/sbin/dropbear ${mbroot}/apps/${appname}/bin/${appname}
-    # [ ! -f ${mbroot}/apps/${appname}/bin/dropbearkey ] && cp -rf /usr/bin/dropbearkey ${mbroot}/apps/${appname}/bin/dropbearkey
-    [ ! -f ${mbroot}/apps/${appname}/config/dropbear_rsa_host_key ] && cp -rf /etc/dropbear/dropbear_rsa_host_key ${mbroot}/apps/${appname}/config/dropbear_rsa_host_key
-    [ ! -f ${mbroot}/apps/${appname}/config/dropbear_dss_host_key ] && cp -rf /etc/dropbear/dropbear_dss_host_key ${mbroot}/apps/${appname}/config/dropbear_dss_host_key
 
 }
 

apps/easyexplorer/config/easyexplorer.uci

@@ -1,7 +1,7 @@
 service="EasyExplorer"
 appname="easyexplorer"
 needver="0.0.1"
-supports="linux_arm,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_aarch64,linux_arm,linux_x86_64,darwin_x86_64"
 appinfo="一款跨设备的P2P文件同步工具"
 newinfo="修复程序无法运行的bug，更新二进制版本为最新版"
 version="0.0.5"

apps/entware/config/entware.uci

@@ -1,7 +1,7 @@
 service=Entware
 appname="entware"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 newinfo="修复了ONMP无法使用的问题"
 appinfo="一款开源且强大的包管理工具，许多功能都通过它来实现"
 version="0.0.4"

apps/fastdick/config/fastdick.uci

@@ -1,8 +1,8 @@
 service="FastDick"
 appname="fastdick"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 backupfiles="bin/fastdick"
 appinfo="迅雷快鸟，宽带提速工具"
-newinfo=""
+newinfo="加入判断没有vim则使用vi"
-version="0.0.2"
+version="0.0.3"

apps/fastdick/config/mixbox.conf

@@ -1,30 +0,0 @@
-#------------------【FastDick】--------------------
-fastdick() {
-
-	eval `mbdb export fastdick`
-	source /etc/mixbox/bin/base
-	echo "********* $service ***********"
-	echo "[${appinfo}]"
-	[ -z "$(mbdb show entware)" ] && echo "请先安装Entware插件！" && return
-	readsh "启动${appname}服务[1/0] " "enable" "1"
-	 	if [ "$enable" == '1' ]; then
-		uid=$(mbdb get ${appname}.main.uid) || uid="空"
-		pwd=$(mbdb get ${appname}.main.pwd) || pwd="空"
-		peerid=$(mbdb get ${appname}.main.peerid) || peerid="空"
-		echo "[请按https://github.com/fffonion/Xunlei-Fastdick这里的教程运行swjsq.py并找到运行成功后生成的swjsq_wget.sh文件，复制其所有内容编辑到配置里]"
-		read -p "修改${appname}配置(将开始使用vim编辑快鸟运行脚本)？[1/0]" res
-		if [ "$res" == '1' ]; then
-			echo "[提示]按i开始编辑，编辑完按ESC键再按:wq即可保存退出[注意冒号]"
-			read -p "清空文件之后再编辑？[1/0]" res
-			[ "$res" = '1' ] && cat /dev/null > ${mbroot}/apps/${appname}/bin/${appname}
-			vim ${mbroot}/apps/${appname}/bin/${appname}
-		fi
-		readsh "请输入${appname}外网访问配置[1/0]" "openport" "1"
-		
-		${mbroot}/apps/${appname}/scripts/${appname}.sh restart
-	else
-		${mbroot}/apps/${appname}/scripts/${appname}.sh stop
-	fi
-	
-}
-#------------------【FastDick】--------------------

apps/fastdick/config/version.txt

@@ -1 +0,0 @@
-1.0.6

apps/fastdick/scripts/config.sh

@@ -0,0 +1,27 @@
+eval `mbdb export fastdick`
+source /etc/mixbox/bin/base
+echo "********* $service ***********"
+echo "[${appinfo}]"
+[ -z "$(mbdb show entware)" ] && echo "请先安装Entware插件！" && return
+readsh "启动${appname}服务[1/0] " "enable" "1"
+if [ "$enable" == '1' ]; then
+  uid=$(mbdb get ${appname}.main.uid) || uid="空"
+  pwd=$(mbdb get ${appname}.main.pwd) || pwd="空"
+  peerid=$(mbdb get ${appname}.main.peerid) || peerid="空"
+  echo "[请按https://github.com/fffonion/Xunlei-Fastdick这里的教程运行swjsq.py并找到运行成功后生成的swjsq_wget.sh文件，复制其所有内容编辑到配置里]"
+  read -p "修改${appname}配置(将开始使用vim编辑快鸟运行脚本)？[1/0]" res
+  if [ "$res" == '1' ]; then
+    echo "[提示]按i开始编辑，编辑完按ESC键再按:wq即可保存退出[注意冒号]"
+    read -p "清空文件之后再编辑？[1/0]" res
+    [ "$res" = '1' ] && cat /dev/null > ${mbroot}/apps/${appname}/bin/${appname}
+    if type vim &> /dev/null; then
+      vim ${mbroot}/apps/${appname}/bin/${appname}
+    else
+      vi ${mbroot}/apps/${appname}/bin/${appname}
+    fi
+  fi
+  readsh "请输入${appname}外网访问配置[1/0]" "openport" "1"
+  readsh "重启${appname}服务[1/0] " "res" "1"
+  [ "$res" != '0' ] && exit 0
+fi
+exit 1

apps/fastdick/scripts/fastdick.sh

@@ -30,7 +30,7 @@ start () {
     logsh "【$service】" "正在启动${appname}服务... "
     # open_port
     # write_firewall_start
-    nohup ${mbroot}/apps/${appname}/bin/${appname} &> ${mbroot}/var/log/${appname}.log & 
+    daemon ${mbroot}/apps/${appname}/bin/${appname}
     logsh "【$service】" "启动${appname}服务完成！"
     
 

apps/filebrowser/config/filebrowser.uci

@@ -2,7 +2,7 @@ service="FileBrowser"
 appname="filebrowser"
 needver="0.0.1"
 appinfo="Web文件浏览器"
-supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 backupfiles="config/filebrowser.conf"
 newinfo="更新arm二进制至2.0.3"
 version="0.0.3"

apps/firewall/config/firewall.uci

@@ -1,7 +1,7 @@
 service="FireWall"
 appname="firewall"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 openport=1
 appinfo="防火墙端口开放插件"
 newinfo="支持添加多种端口号类型"

apps/frpc/config/frpc.uci

@@ -1,7 +1,7 @@
 service=Frpc
 appname="frpc"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="内网穿透工具，相对于ngrok资源占用较多"
 newinfo="修复自定义域名配置错误"
 version="0.0.5"

apps/frps/config/frps.uci

@@ -2,7 +2,7 @@ service="Frps"
 appname="frps"
 needver="0.0.1"
 openport="1"
-supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="内网穿透工具Frp服务端"
-newinfo="frp程序更新到0.21.0"
+newinfo="frp程序更新到0.31.2"
-version="1.1.2"
+version="1.1.4"

apps/frps/config/mixbox.conf

@@ -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】--------------------

apps/frps/config/version.txt

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

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

apps/frps/scripts/frps.sh

@@ -1,4 +1,5 @@
 #!/bin/sh 
+#copyright by monlor
 source /etc/mixbox/bin/base
 eval `mbdb export frps`
 

apps/httpfile/config/httpfile.uci

@@ -1,7 +1,7 @@
 service="HttpFile"
 appname="httpfile"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 newinfo="脚本逻辑错误"
 appinfo="搭建简单的web文件浏览页面"
 version="0.0.3"

apps/jetbrains/config/jetbrains.uci

@@ -1,7 +1,7 @@
 service="JetBrains"
 appname="jetbrains"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="快速搭建JetBrains激活服务器"
 newinfo=""
 version="0.0.2"

apps/kms/config/kms.uci

@@ -1,7 +1,7 @@
 service="Kms"
 appname="kms"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="快速搭建Windows、Office激活服务器"
 newinfo="Support for Windows 10 1809, Windows Server 2019 and Office 2019 built-in"
 version="0.0.2"

apps/kodexplorer/config/kodexplorer.uci

@@ -1,8 +1,7 @@
 service="KodExplorer"
 appname="kodexplorer"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 appinfo="可道云，在线文档管理器，需要entware环境"
 newinfo="修复unzip命令缺失"
-version="0.0.3"
 version="0.0.4"

apps/kodexplorer/config/version.txt

@@ -1 +0,0 @@
-1.4.1

apps/koolproxy/config/koolproxy.uci

@@ -1,13 +1,13 @@
 service=KoolProxy
 appname="koolproxy"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 openport="1"
 backupfiles="config/kpcontrol.conf,bin/data/private,bin/data/certs"
-newinfo="1.修改为coding规则地址，2.现在启动程序时下载规则，3.支持输入mac地址控制局域网设备"
+newinfo="更新主程序，更新规则地址，修复bug"
 appinfo="简单，快速屏蔽网页或视频广告，TG：https://t.me/joinchat/AAAAAD-tO7GPvfOU131_vg"
-kp_rule_koolproxy="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/koolproxy.txt"
+kp_rule_koolproxy="https://cdn.jsdelivr.net/gh/houzi-/CDN/koolproxy.txt"
-kp_rule_daily="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/daily.txt"
+kp_rule_daily="https://cdn.jsdelivr.net/gh/houzi-/CDN/daily.txt"
-kp_rule_dat="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/kp.dat"
+kp_rule_dat="https://cdn.jsdelivr.net/gh/houzi-/CDN/kp.dat"
-kp_rule_user="https://raw.githubusercontent.com/kysdm/ad-rules/master/user-rules-koolproxy.txt"
+kp_rule_user=""
-version="1.5.5"
+version="1.6.1"

apps/koolproxy/config/mixbox.conf

@@ -1,96 +0,0 @@
-#----------------【KoolProxy】------------------
-
-koolproxy() {
-
-	eval `mbdb export koolproxy`
-	source /etc/mixbox/bin/base
-	control=${mbroot}/apps/${appname}/config/kpcontrol.conf
-	[ ! -f "$control" ] && touch $control
-	echo "********* $service ***********"
-	echo "[${appinfo}]"
-	readsh "启动${appname}服务[1/0] " "enable" "1"
-	if [ "$enable" == '1' ]; then
-		echo "[1.全局模式 2.黑名单模式 3.视频模式]"
-		read -p "请选择${appname}模式：" res
-		if [ "$res" == '1' -o "$res" == '2' -o "$res" == '3' ]; then
-			mbdb set $appname.main.mode="$res"
-		fi
-		read -p "自动更新用户自定义规则？[1/0] " res
-		checkread $res && mbdb set $appname.main.autorule="$res"
-		cat $control | while read line
-		do
-			name=$(cutsh ${line} 1)
-			mode=$(cutsh ${line} 3)
-			case "$mode" in
-				0) mode="不过滤" ;;
-				1) mode="http模式" ;;
-				2) mode="https模式" ;;
-				*) mode="空" ;;
-			esac
-			echo "设备[$name]运行模式为: $mode"
-		done
-		mode=$(mbdb get ${appname}.main.ss_acl_default_mode)
-		case "$mode" in
-			0) mode="不过滤" ;;
-			1) mode="http模式" ;;
-			2) mode="https模式" ;;
-			*) mode="http模式" ;;
-		esac
-		echo "其余设备运行模式为: $mode"
-		read -p "设置局域网http/https控制？[1/0] " res
-		if [ "$res" == '1' ]; then
-			read -p "清空之前的配置再添加？[1/0] " res
-			[ "$res" == '1' ] && echo -n > $control
-			i=0
-			cat /tmp/dhcp.leases | while read line
-			do
-				name=$(echo ${line} | cut -d' ' -f4)
-				mac=$(echo ${line} | cut -d' ' -f2)
-				ip=$(echo ${line} | cut -d' ' -f3)
-
-				let i=$i+1
-				echo "$i. $name [$ip] [$mac]"
-				
-			done
-			while(true) 
-			do
-				read -p "请选择一个设备或输入mac地址：" res
-				if echo "$res" | grep -E "^[0-9]{0,3}$" &> /dev/null; then
-					line=$(cat /tmp/dhcp.leases | grep -n . | grep -w "^$res")
-					name=$(echo ${line} | cut -d' ' -f4)
-					mac=$(echo ${line} | cut -d' ' -f2)
-				else 
-					line="1"
-					name="$res"
-					mac="$res"
-				fi
-				if [ ! -z "${line}" ]; then
-					read -p "请选择(0.不过滤 1.http 2.https)：" res
-					if [ "$res" == '0' -o "$res" == '1' -o "$res" == '2' ]; then
-						if [ ! -z "$mac" ]; then
-							sed -i "/^$name,$mac/d" $control
-							echo "$name,$mac,$res" >> $control
-						else
-							echo "mac不能为空, 添加失败！"
-						fi
-					else
-						echo "输入有误, 添加失败"
-					fi
-					read -p "继续增加设备？[1/0] " res
-					[ "$res" == '0' ] && break
-				else
-					echo "输入为空，跳过..."
-					break
-				fi
-			done
-			readsh "请选择其余设备(0.不过滤 1.http 2.https) " "koolproxy_acl_default_mode" "1"
-
-		fi
-
-		${mbroot}/apps/${appname}/scripts/${appname}.sh restart
-	else
-		${mbroot}/apps/${appname}/scripts/${appname}.sh stop
-	fi
-	
-}
-#----------------【KoolProxy】------------------

apps/koolproxy/scripts/config.sh

@@ -0,0 +1,89 @@
+#!/bin/sh
+#copyright by monlor
+
+eval `mbdb export koolproxy`
+source "$(mbdb get mixbox.main.path)"/bin/base
+control=${mbroot}/apps/${appname}/config/kpcontrol.conf
+[ ! -f "$control" ] && touch $control
+echo "********* $service ***********"
+echo "[${appinfo}]"
+readsh "启动${appname}服务[1/0] " "enable" "1"
+if [ "$enable" == '1' ]; then
+	echo "[1.全局模式 2.黑名单模式 3.视频模式]"
+	read -p "请选择${appname}模式：" res
+	if [ "$res" == '1' -o "$res" == '2' -o "$res" == '3' ]; then
+		mbdb set $appname.main.mode="$res"
+	fi
+	# read -p "自动更新用户自定义规则？[1/0] " res
+	# checkread $res && mbdb set $appname.main.autorule="$res"
+	cat $control | while read line
+	do
+		name=$(cutsh ${line} 1)
+		mode=$(cutsh ${line} 3)
+		case "$mode" in
+			0) mode="不过滤" ;;
+			1) mode="http模式" ;;
+			2) mode="https模式" ;;
+			*) mode="空" ;;
+		esac
+		echo "设备[$name]运行模式为: $mode"
+	done
+	mode=$(mbdb get ${appname}.main.ss_acl_default_mode)
+	case "$mode" in
+		0) mode="不过滤" ;;
+		1) mode="http模式" ;;
+		2) mode="https模式" ;;
+		*) mode="http模式" ;;
+	esac
+	echo "其余设备运行模式为: $mode"
+	read -p "设置局域网http/https控制？[1/0] " res
+	if [ "$res" == '1' ]; then
+		read -p "清空之前的配置再添加？[1/0] " res
+		[ "$res" == '1' ] && echo -n > $control
+		i=0
+		cat /tmp/dhcp.leases | while read line
+		do
+			name=$(echo ${line} | cut -d' ' -f4)
+			mac=$(echo ${line} | cut -d' ' -f2)
+			ip=$(echo ${line} | cut -d' ' -f3)
+
+			let i=$i+1
+			echo "$i. $name [$ip] [$mac]"
+		done
+		while(true) 
+		do
+			read -p "请选择一个设备或输入mac地址：" res
+			if echo "$res" | grep -E "^[0-9]{0,3}$" &> /dev/null; then
+				line=$(cat /tmp/dhcp.leases | grep -n . | grep -w "^$res")
+				name=$(echo ${line} | cut -d' ' -f4)
+				mac=$(echo ${line} | cut -d' ' -f2)
+			else 
+				line="1"
+				name="$res"
+				mac="$res"
+			fi
+			if [ ! -z "${line}" ]; then
+				read -p "请选择(0.不过滤 1.http 2.https)：" res
+				if [ "$res" == '0' -o "$res" == '1' -o "$res" == '2' ]; then
+					if [ ! -z "$mac" ]; then
+						sed -i "/^$name,$mac/d" $control
+						echo "$name,$mac,$res" >> $control
+					else
+						echo "mac不能为空, 添加失败！"
+					fi
+				else
+					echo "输入有误, 添加失败"
+				fi
+				read -p "继续增加设备？[1/0] " res
+				[ "$res" == '0' ] && break
+			else
+				echo "输入为空，跳过..."
+				break
+			fi
+		done
+		readsh "请选择其余设备(0.不过滤 1.http 2.https) " "koolproxy_acl_default_mode" "1"
+	fi
+	readsh "重启${appname}服务[1/0] " "res" "1"
+  [ "$res" != '0' ] && exit 0
+fi
+exit 1

apps/koolproxy/scripts/koolproxy.sh

@@ -2,6 +2,8 @@
 source /etc/mixbox/bin/base
 eval `mbdb export koolproxy`
 
+koolproxy_acl_default_mode=${koolproxy_acl_default_mode:-1}
+
 # 1|koolproxy.txt|https://kprule.com/koolproxy.txt|静态规则
 # 1|daily.txt|https://kprule.com/daily.txt|每日规则
 # 1|kp.dat|https://kprule.com/kp.dat|视频规则
@@ -165,7 +167,6 @@ lan_acess_control () {
         logsh "【$service】" "加载ACL规则:【$proxy_name】模式为:$(get_mode_name $proxy_mode)"
         iptables -t nat -A KOOLPROXY $(factor $mac "-m mac --mac-source") -p tcp $(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)
     done
-    koolproxy_acl_default_mode=$(mbdb get ${appname}.main.koolproxy_acl_default_mode) || koolproxy_acl_default_mode=1
     logsh "【$service】" "加载ACL规则:其余主机模式为:$(get_mode_name $koolproxy_acl_default_mode)"
 }
 
@@ -218,14 +219,14 @@ detect_cert () {
     fi
 }
 
-update_userrule () {
+# update_userrule () {
-    result=$(mbdb get ${appname}.main.autorule)
+#     result=$(mbdb get ${appname}.main.autorule)
-    if [ "$result" == '1' ]; then
+#     if [ "$result" == '1' ]; then
-        cru a "${appname}"_rule "20 5 * * * ${mbroot}/apps/${appname}/scripts/updaterules.sh"
+#         cru a "${appname}"_rule "20 5 * * * ${mbroot}/apps/${appname}/scripts/updaterules.sh"
-    else
+#     else
-        cru d "${appname}"_rule
+#         cru d "${appname}"_rule
-    fi
+#     fi
-}
+# }
 
 start () {
 
@@ -237,7 +238,7 @@ start () {
     cru a "${appname}" "0 6 * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart"
     [ -z $mode ] && logsh "【$service】" "${appname}未配置" && exit
     detect_cert
-    update_userrule
+    # update_userrule
     update_rules
     start_koolproxy
     add_ipset_conf && restart_dnsmasq
@@ -260,7 +261,7 @@ stop () {
     cru d "${appname}"
     cru d "${appname}"_rule
     logsh "【$service】" "关闭${appname}主进程..."
-    ps  | grep ${mbroot}/apps/${appname}/bin/${appname} | grep -v grep | grep -v {koolproxy} | grep -v restart | awk '{print $1}' | xargs kill -9 > /dev/null 2>&1
+    killall "${appname}" &> /dev/null
 	
 }
 

apps/miwifi/config/miwifi.uci

@@ -1,7 +1,7 @@
 service="MIWIFI"
 appname="miwifi"
 needver="0.0.1"
-supports="linux_arm,linux_mips"
+supports="linux_aarch64,linux_arm,linux_mips"
 appinfo="小米路由器系统管理，修改samba禁用系统更新等"
 newinfo="现在修复小米路由器远程访问会自动开放8098端口"
 version="0.0.4"

apps/mixbox/bin/applist

@@ -69,7 +69,8 @@ get_applist() {
 update_applist() {
 	
 	wgetsh ${mbtmp}/applist_tmp.txt $mburl/applist.txt
-	if [ $? -eq 0 ]; then
+	# 判断applist的内容，防止软件源异常
+	if [ $? -eq 0 ] && [ -n `cat ${mbtmp}/applist_tmp.txt | grep -E "^mixbox"` ]; then
 		rm -rf ${mbtmp}/applist.txt
 		cat ${mbtmp}/applist_tmp.txt | grep "${model}" | sort -u | while read line; do
 			local install_text=""

apps/mixbox/bin/base

@@ -2,9 +2,10 @@
 #copyright by monlor
 export PATH=$PATH:/etc/mixbox/bin
 
-mburl_coding="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master"
+mburl_coding="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/lfs/master"
-mburl_github="https://raw.githubusercontent.com/monlor/MIXBOX/master"
+mburl_github="https://raw.githubusercontent.com/monlor/mbfiles/master"
-# mburl_test="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/test"
+mburl_gitee="https://gitee.com/monlor/mbfiles/raw/master"
+mburl_ghcdn="https://cdn.jsdelivr.net/gh/monlor/mbfiles"
 mburl=$(mbdb get mixbox.main.url) || mburl="$mburl_coding"
 mbroot=$(mbdb get mixbox.main.path)
 mbdisk=$(mbdb get mixbox.main.mbdisk)
@@ -194,7 +195,11 @@ remove_firewall_start(){
 
 daemon() {
 	local binname="$(basename "${1}")"
-	nohup $@ &> ${mbroot}/var/log/${binname}.log &
+	if type nohup &>/dev/null; then 
+		nohup $@ &> ${mbroot}/var/log/${binname}.log &
+	else 
+		$@ &> ${mbroot}/var/log/${binname}.log &
+	fi
 	return $?
 }
 

apps/mixbox/bin/mixbox

@@ -171,20 +171,23 @@ modify_source() {
 	case "$mburl" in
 		"$mburl_coding") url_text="coding下载源" ;;
 		"$mburl_github") url_text="github下载源" ;;
-		# "$mburl_test") url_text="coding测试源" ;;
+		# "$mburl_gitee") url_text="gitee下载源" ;;
+		"$mburl_ghcdn") url_text="ghcdn下载源" ;;
 		*) url_text="$mburl" ;;
 	esac
 	echo "下载源【$url_text】使用中"
 	echo "0. 不修改"
 	echo "1. coding下载源"
 	echo "2. github下载源"
-	# echo "3. coding测试源(不推荐)"
+	# echo "3. gitee下载源(推荐)"
+	echo "3. ghcdn下载源"
 	read -p "请选择或输入下载源：" res
 	case "$res" in
 		0) return ;;
 		1) mburl_tmp="$mburl_coding" ;;
 		2) mburl_tmp="$mburl_github" ;;
-		# 3) mburl_tmp="$mburl_test" ;;
+		# 3) mburl_tmp="$mburl_gitee" ;;
+		3) mburl_tmp="$mburl_ghcdn" ;;
 		*) [ -n "$res" ] && mburl_tmp="$res" ;;
 	esac
 	if [ -n "$mburl_tmp" ]; then
@@ -286,7 +289,7 @@ menulist() {
 			checkuci $name && continue
 			
 		fi
-		appver="$(cat $mbtmp/applist.txt | grep "^$name|" | cut -d'|' -f4)"
+		appver="$(cat $mbtmp/applist.txt &> /dev/null | grep "^$name|" | cut -d'|' -f4)"
 		echo $name >> ${mbtmp}/applist_menu.txt
 		let i=$i+1
 		args="\t"
@@ -336,8 +339,8 @@ select_app() {
 						[ "$update" == '1' ] && ${mbroot}/scripts/appmanage.sh upgrade ${appname} 
 					fi
 					# todo 配置方式修改
-					if [ -f ${mbroot}/apps/${appname}/config.sh ]; then
+					if [ -f ${mbroot}/apps/${appname}/scripts/config.sh ]; then
-						${mbroot}/apps/${appname}/config.sh
+						${mbroot}/apps/${appname}/scripts/config.sh
 						if [ $? -eq 0 ]; then
 							${mbroot}/apps/${appname}/scripts/${appname}.sh restart
 						else

apps/mixbox/config/mixbox.uci

@@ -1,7 +1,7 @@
 service="MIXBOX"
 appname="mixbox"
 needver=""
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 appinfo="一款支持多平台，多架构的Shell工具箱"
-newinfo="新增base64_encode工具"
+newinfo="新增下载源ghcdn"
-version="0.1.9.1"
+version="0.1.9.13"

apps/mixbox/scripts/helper.sh

@@ -9,14 +9,14 @@ wgetsh() {
 	[ ! -d "$wgetfiledir" ] && mkdir -p $wgetfiledir
 	[ ! -d ${mbtmp} ] && mkdir -p ${mbtmp}
 	rm -rf ${mbtmp}/${wgetfilename}
-	if command -v wget-ssl &> /dev/null; then
+	if command -v curl &> /dev/null; then
-		wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O "${mbtmp}/${wgetfilename}" "$wgeturl"
-		[ $? -eq 0 ] && result="200"
-	else
 		result1=$(curl -skL --connect-timeout 10 -m 20 -w %{http_code} -o "${mbtmp}/${wgetfilename}" "$wgeturl")
+	else
+		wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O "${mbtmp}/${wgetfilename}" "$wgeturl"
+		[ $? -eq 0 ] && result1="200"
 	fi
 	[ -f "${mbtmp}/${wgetfilename}" ] && result2=$(du -sh "${mbtmp}/${wgetfilename}" 2> /dev/null | awk '{print$1}')
-	if [ "$result" = "200" ] && [ "$result2" != '0' ]; then
+	if [ "$result1" = "200" ] && [ "$result2" != '0' ]; then
 		chmod +x ${mbtmp}/${wgetfilename} > /dev/null 2>&1
 		mv -f ${mbtmp}/${wgetfilename} $wgetfilepath > /dev/null 2>&1
 		return 0
@@ -40,11 +40,7 @@ base_encode() {
 	if [ -z "${1}" ]; then
 		echo -n "" 
 	else
-		if command -v base64-encode &> /dev/null; then
+		echo -n "$*" | base64 | tr -d '\n'
-			echo -n "$*" | base64-encode
-		else
-			echo -n "$*" | baseutil --b64
-		fi
 	fi
 }
 
@@ -52,11 +48,7 @@ base_decode() {
 	if [ -z "${1}" ]; then
 		echo -n "" 
 	else
-		if command -v base64-decode &> /dev/null; then
+		echo -n "$*" | base64 -d
-			echo -n "$*" | base64-decode
-		else
-			echo -n "$*" | baseutil --b64 -d
-		fi
 	fi
 }
 
@@ -67,7 +59,7 @@ versioncmp() {
 
 	[ "$1" = "$2" ] && echo -n "0" && return
 
-	if test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; then
+	if test "$(echo "$@" | tr " " "\n" | sort | head -n 1)" != "$1"; then
 		echo -n "-1"
 	else 
 		echo -n "1"

apps/mixbox/scripts/init.sh

@@ -19,7 +19,7 @@ if [ "$result" == 0 ]; then
 fi
 
 logsh "【Tools】" "检查定时任务配置"
-cru a monitor "*/3 * * * * ${mbroot}/scripts/monitor.sh"
+cru a monitor "*/10 * * * * ${mbroot}/scripts/monitor.sh"
 
 logsh "【Tools】" "检查工具箱开机启动配置"
 result=$(cat /etc/firewall.user 2> /dev/null | grep init.sh | wc -l) 

apps/mixbox/scripts/uninstall.sh

@@ -11,7 +11,7 @@ logsh "【Tools】" "正在卸载工具箱..."
 
 logsh "【Tools】" "停止所有插件"
 
-ls ${mbroot}/apps | while read line
+ls ${mbroot}/apps 2> /dev/null | while read line
 do
 	result=$(mbdb get ${line}.main.enable)
 	if [ "$result" == '1' ]; then

apps/mixbox/scripts/update.sh

@@ -1,6 +1,5 @@
 #!/bin/sh
 #copyright by monlor
-[ -n "$(uci -q get monlor.tools 2> /dev/null)" ] && echo "工具箱版本过低，此更新程序已不再支持，请执行[$(uci -q get monlor.tools.path)/scripts/uninstall.sh]卸载工具箱后重新安装新的版本！" && exit 1
 source /etc/mixbox/bin/base
 
 logsh "【Tools】" "正在更新工具箱程序... "
@@ -25,17 +24,13 @@ done
 rm -rf ${mbtmp}/mixbox/scripts/userscript.sh
 cp -rf ${mbtmp}/mixbox/* ${mbroot}/
 
-logsh "【Tools】" "处理工具箱文件"
-# 处理工具箱二进制文件
-ln -sf  ${mbroot}/bin/base64-encode ${mbroot}/bin/base64-decode
-
 logsh "【Tools】" "赋予可执行权限"
 chmod -R +x ${mbroot}/bin
 chmod -R +x ${mbroot}/scripts
 
-# 执行初始化脚本
+# 清理工作
-
+logsh "【Tools】" "一点点清理工作..."
-# ${mbroot}/scripts/init.sh
+rm -rf ${mbroot}/bin/base64*
 
 if [ -z "$(mbdb get mixbox.main.model)" ]; then
 	model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')

apps/ngrok/scripts/ngrok.sh

@@ -1,4 +1,5 @@
 #!/bin/sh 
+#copyright by monlor
 source /etc/mixbox/bin/base
 eval `mbdb export ngrok`
 

apps/npc/config/mixbox.conf

@@ -1,21 +0,0 @@
-#------------------【NPC】--------------------
-npc() {
-
-  eval `mbdb export npc`
-  source "$(mbdb get mixbox.main.path)"/bin/base
-  echo "********* $service ***********"
-  echo "[${appinfo}]"
-  readsh "启动${appname}服务[1/0] " "enable" "1"
-  if [ "$enable" == '1' ]; then
-      # Scripts Here
-      readsh "请输入npc连接命令：" "connect_cmd" 
-
-      # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
-      readsh "重启${appname}服务[1/0] " "res" "1"
-      [ "$res" = '1' -o -z "$res" ] && ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
-  else
-      ${mbroot}/apps/${appname}/scripts/${appname}.sh stop
-  fi
-
-}
-#------------------【NPC】--------------------

apps/npc/config/npc.uci

@@ -2,7 +2,7 @@ service="NPC"
 appname="npc"
 needver="0.0.1"
 backupfiles=""
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 appinfo="一款轻量级、高性能、功能强大的内网穿透代理服务器"
 newinfo=""
-version="0.0.7"
+version="0.0.9"

apps/npc/scripts/config.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+#copyright by monlor
+
+eval `mbdb export npc`
+source "$(mbdb get mixbox.main.path)"/bin/base
+echo "********* $service ***********"
+echo "[${appinfo}]"
+readsh "启动${appname}服务[1/0] " "enable" "1"
+if [ "$enable" == '1' ]; then
+  # Scripts Here
+  readsh "请输入npc连接命令：" "connect_cmd" 
+
+  # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
+  readsh "重启${appname}服务[1/0] " "res" "1"
+  [ "$res" != '0' ] && exit 0
+fi
+exit 1

apps/qiandao/config/qiandao.uci

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

apps/shadowsocks/config/shadowsocks.uci

@@ -1,9 +1,9 @@
 service=ShadowSocks
 appname="shadowsocks"
 needver="0.0.1"
-supports="linux_arm,linux_mips,linux_x86_64"
+supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64"
 openport="1"
 backupfiles="config/ssserver.conf,config/sscontrol.conf,config/customize_black.conf,config/customize_white.conf"
 appinfo="最好的翻墙工具，没有之一，还可以加速国内外游戏"
-newinfo="增加ss混淆插件obfs-local"
+newinfo="现在更新v2ray会测试二进制程序，防止软件源失效更新到错误的程序"
-version="0.1.2"
+version="0.1.11"

apps/shadowsocks/scripts/general_v2ray_config.sh

@@ -22,11 +22,11 @@ ss_mux_concurrency=`cutsh "$idinfo" 15`
 
 rm -rf "$v2ray_config"
 logsh "【$service】" "生成V2Ray配置文件..."
-local kcp="null"
+kcp="null"
-local tcp="null"
+tcp="null"
-local ws="null"
+ws="null"
-local h2="null"
+h2="null"
-local tls="null"
+tls="null"
 
 if [ "$ss_network" != "ws" ]; then
 	IFIP=`echo $ss_server | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"`
@@ -61,19 +61,19 @@ get_path(){
 }
 
 # tcp和kcp下tlsSettings为null，ws和h2下tlsSettings
-[ -z "$ss_mux_enable" ] && local ss_mux_enable=true
+[ -z "$ss_mux_enable" ] && ss_mux_enable=true
-[ -z "$ss_mux_concurrency" ] && local ss_mux_concurrency=8
+[ -z "$ss_mux_concurrency" ] && ss_mux_concurrency=8
 [ "$ss_network_security" == "none" ] && ss_network_security=""
 #if [ "$ss_network" == "ws" -o "$ss_network" == "h2" ];then
 case "$ss_network_security" in
 	tls)
-		local tls="{
+		tls="{
 		\"allowInsecure\": true,
 		\"serverName\": null
 		}"
 	;;
 	*)
-		local tls="null"
+		tls="null"
 	;;
 esac
 #fi
@@ -85,7 +85,7 @@ fi
 case "$ss_network" in
 	tcp)
 		if [ "$ss_headtype_tcp" == "http" ];then
-			local tcp="{
+			tcp="{
 			\"connectionReuse\": true,
 			\"header\": {
 			\"type\": \"http\",
@@ -115,11 +115,11 @@ case "$ss_network" in
 			}
 			}"
 		else
-			local tcp="null"
+			tcp="null"
 		fi        
 	;;
 	kcp)
-		local kcp="{
+		kcp="{
 		\"mtu\": 1350,
 		\"tti\": 50,
 		\"uplinkCapacity\": 12,
@@ -135,14 +135,14 @@ case "$ss_network" in
 		}"
 	;;
 	ws)
-		local ws="{
+		ws="{
 		\"connectionReuse\": true,
 		\"path\": $(get_path $ss_network_path),
 		\"headers\": $(get_ws_header $ss_network_host)
 		}"
 	;;
 	h2)
-		local h2="{
+		h2="{
 	\"path\": $(get_path $ss_network_path),
 	\"host\": $(get_h2_host $ss_network_host)
 	}"