Skip to content

Commit

Permalink
v0.35.0-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
vernesong committed Oct 13, 2019
1 parent f689057 commit 37ddc09
Show file tree
Hide file tree
Showing 34 changed files with 150 additions and 47 deletions.
21 changes: 13 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
</h1>

<p align="center">
<a target="_blank" href="https://github.com/Dreamacro/clash/releases/tag/v0.15.0">
<img src="https://img.shields.io/badge/Clash-v0.15.0-blue.svg">
<a target="_blank" href="https://github.com/Dreamacro/clash/releases/tag/v0.16.0">
<img src="https://img.shields.io/badge/Clash-v0.16.0-blue.svg">
</a>
<a target="_blank" href="https://github.com/vernesong/OpenClash/tree/v0.34.7-beta">
<img src="https://img.shields.io/badge/source code-v0.34.7--beta-green.svg">
<a target="_blank" href="https://github.com/vernesong/OpenClash/tree/v0.35.0-beta">
<img src="https://img.shields.io/badge/source code-v0.35.0--beta-green.svg">
</a>
<a target="_blank" href="https://github.com/vernesong/OpenClash/releases/tag/v0.34.7-beta">
<img src="https://img.shields.io/badge/New Release-v0.34.7--beta-orange.svg">
<a target="_blank" href="https://github.com/vernesong/OpenClash/releases/tag/v0.35.0-beta">
<img src="https://img.shields.io/badge/New Release-v0.35.0--beta-orange.svg">
</a>
</p>

Expand All @@ -21,7 +21,7 @@
本插件是一个可运行在 OpenWrt 上的<a href="https://github.com/Dreamacro/clash" target="_blank"> Clash </a>客户端
</p>
<p align="center">
兼容 Shadowsocks、Vmess 等协议,根据灵活的规则配置实现策略代理
兼容 Shadowsocks、Vmess、Snell 等协议,根据灵活的规则配置实现策略代理
</p>
<p align="center">
- 感谢<a href="https://github.com/frainzy1477" target="_blank"> frainzy1477 </a>,本插件基于<a href="https://github.com/frainzy1477/luci-app-clash" target="_blank"> Luci For Clash </a>进行二次开发 -
Expand Down Expand Up @@ -125,11 +125,16 @@ make package/luci-app-openclash/luci-app-openclash/compile V=99
<img src="https://github.com/vernesong/OpenClash/raw/master/img/state.png">
</p>

* 接管设置
* 全局设置
<p align="center">
<img src="https://github.com/vernesong/OpenClash/raw/master/img/settings.png">
</p>

* 服务器&策略组
<p align="center">
<img src="https://github.com/vernesong/OpenClash/raw/master/img/servers.png">
</p>

* 配置文件
<p align="center">
<img src="https://github.com/vernesong/OpenClash/raw/master/img/config.png">
Expand Down
2 changes: 1 addition & 1 deletion core_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.15.0-57-g52125a3
v0.16.0-2-g2c82a2b
Binary file modified img/config.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/log.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/servers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/set1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/set2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/set3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/set4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/set5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/set6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/set7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/set8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/state.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/state1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion luci-app-openclash/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=luci-app-openclash
PKG_VERSION:=0.34.7
PKG_VERSION:=0.35.0
PKG_RELEASE:=beta
PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>

Expand Down
5 changes: 4 additions & 1 deletion luci-app-openclash/files/etc/init.d/openclash
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ change_dns() {
}

revert_dns() {
uci del dhcp.@dnsmasq[-1].server >/dev/null 2>&1
dns_port=$(uci get openclash.config.dns_port 2>/dev/null)
uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$dns_port" >/dev/null 2>&1
uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
uci set dhcp.@dnsmasq[0].noresolv=0
uci delete dhcp.@dnsmasq[0].cachesize
Expand All @@ -70,6 +71,8 @@ fake_block() {
sh /usr/share/openclash/openclash_fake_block.sh
elif [ "$(awk -F '/' '{print $3}' /etc/openclash/dnsmasq_fake_block.conf |head -1)" != "$2" ] && [ ! -z "$2" ]; then
sh /usr/share/openclash/openclash_fake_block.sh
elif [ ! -z "$(grep "config servers" /etc/config/openclash)" ] && [ -z "$(grep -F '#Server Nodes' /etc/openclash/dnsmasq_fake_block.conf)" ]; then
sh /usr/share/openclash/openclash_fake_block.sh
fi
mkdir -p /tmp/dnsmasq.d
ln -s /etc/openclash/dnsmasq_fake_block.conf /tmp/dnsmasq.d/dnsmasq_openclash.conf
Expand Down
4 changes: 2 additions & 2 deletions luci-app-openclash/files/etc/openclash/openclash_version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
v0.34.7-beta
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkQ2REEzNjlFRTNBQjExRTk4RjQzQTFDNDQ1NjIxMTgwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkQ2REEzNjlGRTNBQjExRTk4RjQzQTFDNDQ1NjIxMTgwIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RDZEQTM2OUNFM0FCMTFFOThGNDNBMUM0NDU2MjExODAiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RDZEQTM2OURFM0FCMTFFOThGNDNBMUM0NDU2MjExODAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz44R3YsAAADAFBMVEUGVYKEhIQGZp26urokhLtFmspFgKIGcKwFXI4ahMHR5vKCgoKenp7a2tpjlbGlpaXR4epTiqpknLt4eHgGXpHf39/n5+c/Pz/GxsYXgb2hoaHOzs5paWmizOWGv98JZJkJdbRXpdKTvNSRkZFxcXG/v79GRkasrKy1tbU0dZtmrdYFbakJca0FWokka5LKysp2ttpiYmKTxeFLS0tDQ0MIXY3g4OCLi4sFYJVkq9OiwNEJaqCStcgGdLJ2dnYXYo2y1urAwMCcnJzw9ffCwsJBQUGx0eMEU4BGirFCQkImcJtsbGy2trajx9yEss2Xl5eDrcYnicE4lMg2kcbS0tIFaaLQ0NAKYZNKn89FkbxlZWWNjY2DtNDB1OBHnM1zobuxzdwFcrArjsevr6+DqsEIaJ5gYGAFa6UFZZujyd9vb28Zdapyn7iUlJQHbKXB2ecJWIVJns50dHSyytgEYpikzuaJweIwk8t0sdUKebhDfqA1h7VGhakodqIRgsMCc7QBcrNRUVFUVFRVVVVSUlIFdrcLfL1WVlYHeLkKe7wGd7gOf8ADdLUDdbUEdrYOgMAEdbYDdLQSg8NXV1cSg8QShMQAcrIThMUOf78Nfr8Nfr4Mfb4Mfb0JersJe7sIebkIeboJero6OjqqqqrU1NTV1dWrq6tISEg9PT2pqak7OzuAgIB+fn48PDzw9/sHVoTC3u5JSUmBgYGEvd3q6uqEvN3z8/P19fVMTEzh7/f09PTB3u5/f3+DvNyFvt7B3e3g6u+CqcDB1eDv9PfC3++JiYno6Ojg6vDB3e7D3+/A1N87l8uErMKDq8Khv9AUXomFvd7W1tbg7vYFZ590s9gHWIcLerlGm8tInc05lckEWIiCutsKeLfv9vqFvd0KdLCDr8gVaJcGdbTB1+NVos8Lb6jg7/cEVYMJcKxkp82jxdiyz+DP5PGRuM/B2+pTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////8M/V9oAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADBZJREFUeNrsmAtUVHUex+/44uEA6iCjoqKiAwpiOCP4InWVMHFTU9d03czUJNPymbnV7orEiO2bfdgWiLwxGECQl6k8fGU+KjXTLHvjtttO67pBGF/29//fe2funQHjbB3PmTl+zun+f//f897vf7gzJrS1Va4YeNMd+KsLsPVpS1ub0Ba18aZ78GeXYKt3m1A5vNlN+JNrsNUirHAXyZv/6CI8LQz/1l34hYuwVfj2ruZ3GjfS/N+ugvC123BX8zvPV66C8F+34a7md57fuQrCf9yGF12FdjXXhISE/HTND6/KEo1miW2zRqPpTI1Oo+tk990d8sY9g+95w9H5ldfQwYMHP6TyPfqQOu2Nh2yoA4MxePf/jXDDkcjZleBEzYm88T3RhGhU+0rMsdnTMKYzLd7CW50c9lIHeL3OH+d1rxeV3kdFL6qHKnwWvK4qlXJ4uSpAmnc07qUNgze8dFucNNeVAz65Wm0gzdF8X81DEKLcmkcgyna0QPAPq/nfOuAoevWZ2acXjqq8G4Bep09PnA5skDy7vbyhTto9rF7ihEP1YRzuaNxtYxzhlprIKFSs0TOM2oqet74npLlqPxyIl8w5qEjqTAuD3tDJYS+3zyicmLJ+/fop0zFK6d4wMWI9c5/AFtnljek4qqpdtF6iHo+rAqTryx1xuxhHcFKpIlJvKjUaDXq9eWBntdX1VB1Pz57x7WueF4ABkpmD2a1Ssq79jpEOmserh0TKGTKvtM9ULBv32bXPxp3GVKX72vr14yZNWnXxNI5Kni2YaN+IrFok8hzwvCpAur7yyqMbLitcG+Qdj9mcqhwRR80rodVv55bZyIwc7Oe7/ciRrnOigNxbuciNzKXXEIvmsi+AylyeB0TybU4k34jYum/XolwSEFhjJuGmsXh59C1V81sDyrmbtcyF2Diau6ZFSpnxvHC28taTJYaiWrKqMTQ52YLn3iH7nedgSVZwLegqW975Eo+LjsPoNWUuSpLboxoTg1QO0nVoNf82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
v0.35.0-beta
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkZEQTM5QzhBRUQ3MzExRTk4NzA0ODk0OTNENjY2MTdEIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkZEQTM5QzhCRUQ3MzExRTk4NzA0ODk0OTNENjY2MTdEIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkRBMzlDODhFRDczMTFFOTg3MDQ4OTQ5M0Q2NjYxN0QiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RkRBMzlDODlFRDczMTFFOTg3MDQ4OTQ5M0Q2NjYxN0QiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz77BusSAAADAFBMVEVtbW09PT0GVYIHVoQHXpE5lcqEhIRFgKKUxeG6urokhbwjapKiwNIGZp3R4uwahMEGcKwKa6FXpdIJeLiCgoKenp7a2trR5vKlpaVTiqp4eHjf399ilLHn5+c/Pz/GxsahoaGizOXOzs4EXI5paWk0dJplnLuSu9KRkZFxcXEJdbQJca2/v78XgL1GRkYGbqmsrKyx0eO1tbUHXI0ne6vKyspiYmIEU4B3t9sFYJRkqtJmrNVLS0tDQ0MFWYlGkr7g4OBFmsqz1uqLi4tHi7Kixdh2dnYYdKjAwMCcnJyStMgqjcaDrsYGdLLCwsJBQUEJZJlXlbmyythCQkImcJu2trYYYo2Ess2Xl5cnicEIbKTS0tI2ksbB1ODQ0NBHnM0FcrBlZWWNjY0FaaIJYZRzor3B2uixzt40fKWvr69yn7hgYGDw9feiyN4FZZsJWIWUlJTR3+hKn89Jns4EYph0dHQJcKukzuaJweIwk8t0sdU1h7UGdbQRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYFdrcKe7wHeLkOgMADdbUEdrYDdLQOf8AEdbYDdLUSg8NXV1cSg8QShMQThMUAcrIGd7gOf78Nfr8Nfr4Mfb4Mfb0IeboJeroJe7sJers6OjqqqqrU1NTV1dWrq6tISEipqak7Ozt+fn6AgIDw9/tJSUnC3u6EvN2BgYHq6urz8/NMTEz19fWHv9+Evd309PTh7/eErMJ/f3+DvNyGvt+Fvt7v9PeCqcDA1N/B3e3g6u/B3e6Gv9+JiYno6OhGm8uFvd7g6vDB3u4UXomDq8LW1tYFZ6BHm8yhv9ALdK8IaJ90s9iEtNALerkFa6bC3+/D3++Fvd2DqsHg7vZInc0KeLcLb6hEf6GDr8gHWIc1jsKDu9zv9vpVoMwVaJdEmcrB1eDg7/cmbZVGiK6yzNzP5PFnrtaAudmz0OBTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////9AtV9gAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADEpJREFUeNrsVwlUVNcZfgPDBFcQHcARRgUX3B4EIxPNoCBZrAYxRo1bGz1EG00CGreYpq0IBNM0bWkbkyaobINkQFkUjAqKW1xi3GL2RLOVaGoyqbUBMXz0v/e9N7w3iOE0refMHL9zuPff7vff99037z2ElpbKRQOueAL+6gZY/ZS9pUVoiVtxxTPwF7fA6qAWoXJIo4fgz+6B1XZhkadI3vgnN8FTwpAfPAW/dhOsFn64pfnNhgdp/k93gfC9x+CW5jcf37kLhH97DG5pfvPxnLtA+JfH4AV3wXU1N0RFRUX8H05jvsEw3+kIBkNH1pgMpg6yv9QenvO5c9udPq7R7/wCtm3b9qTsPblNwZPatZMuuYYY9mP/S/81hMuuiJleCY64mTGXfyIMUQaNX4mZTnsCRnWE4k282cFmL7cDv3f55bzr94I6OkmKojqAu/uhYL9msa9U5OPCud+lTI1l+5e9fEO00dxUBgQWGo1h1MrwUzWPQpTazRyOOOfRAhH/W83/1g7eQfdBdw/qjnc00WXA0h07uj4OLGPuLhzeIWGcumoX7AvufuBb2P20nLuwq712N8xxCNe0iIlDuaBjsBrLe137iSDNNf4QQGk4E+XpHaEQdWIHm71yfVzC4RmpqakzHscldXhZ1wupLHwYq5i7C/WpEnqoiiYBA1PPp6bWS0WtIF1faQ83ynEIbVQqj9HFllitok6XOaCj2pp6aY6nVy/h+prbQtFPNgswvVkuNl2fMcZFc0HbJEapUPDq9TEeC/Qfn/xYvwPj1eGTqan6Hj2mnN+Bd5i7Gwt7SDipKroTX6fOPrlyym2wa0l3Y/err05a5qMKLVM8nnMGNTUSXDWvhNG8hluZVmYUYCv3tqJAHmfGAYXXClEYU0iPIZYtZC+AykJeB8RwtyCGOxKc7GuMKJMFpDs+m4SbwPJlCdc05Nf6lfEwoyyERJzAQxNi5EqBL5yu3nqGjABUy1Y1AjIy7Lj4Edlvk24ZKpycwqIZbw/G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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function index()
entry({"admin", "services", "openclash", "update_ma"},call("action_update_ma"))
entry({"admin", "services", "openclash", "opupdate"},call("action_opupdate"))
entry({"admin", "services", "openclash", "coreupdate"},call("action_coreupdate"))
entry({"admin", "services", "openclash", "ping"}, call("act_ping"))
entry({"admin", "services", "openclash", "settings"},cbi("openclash/settings"),_("Global Settings"), 30).leaf = true
entry({"admin", "services", "openclash", "servers"},cbi("openclash/servers"),_("Severs&Groups"), 40).leaf = true
entry({"admin", "services", "openclash", "servers-config"},cbi("openclash/servers-config"), nil).leaf = true
Expand Down Expand Up @@ -280,4 +281,12 @@ function action_coreupdate()
luci.http.write_json({
coreup = coreup();
})
end

function act_ping()
local e={}
e.index=luci.http.formvalue("index")
e.ping=luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'"%luci.http.formvalue("domain"))
luci.http.prepare_content("application/json")
luci.http.write_json(e)
end
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ o.inputstyle = "apply"
o.write = function()
m.uci:commit(openclash)
sys.call("/usr/share/openclash/yml_groups_name_ch.sh start")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "openclash", "servers"))
luci.http.redirect(m.redirect)
end

o = a:option(Button,"Back")
o.inputtitle = translate("Back Configurations")
o.inputstyle = "reset"
o.write = function()
m.uci:revert(openclash)
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "openclash", "servers"))
luci.http.redirect(m.redirect)
end

return m
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ o.inputtitle = translate("Commit Configurations")
o.inputstyle = "apply"
o.write = function()
m.uci:commit(openclash)
sys.call("sh /usr/share/openclash/cfg_servers_address_fake_block.sh &")
luci.http.redirect(m.redirect)
end

Expand Down
Loading

0 comments on commit 37ddc09

Please sign in to comment.