From e9d261cdf42525bdc8a0c34ba00e685d0716ea56 Mon Sep 17 00:00:00 2001
From: 1163167506 <1163167506@qq.com>
Date: Mon, 6 May 2024 11:11:00 +0800
Subject: [PATCH 1/3] Update xunyou (#64)
---
applications/xunyou/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/applications/xunyou/Makefile b/applications/xunyou/Makefile
index c773b3a..fdc9330 100644
--- a/applications/xunyou/Makefile
+++ b/applications/xunyou/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xunyou
-PKG_VERSION:=2.0.3.6
+PKG_VERSION:=2.0.4.5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)_v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://partnerdownload.xunyou.com/routerplugin/koolshare/
-PKG_HASH:=9ee6fd35ad9a8dc491457f42f08dae1d489d4247254421388bde8ea12c4eb63d
+PKG_HASH:=00d8dfd34dc4033c53f7e751edc2f7e266f951c4dca0f22a6e77cbe6d813ddab
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_v$(PKG_VERSION)
From 6ea4dc19020c99a34df82d5a1d4b6117b56bed8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=8C?= <13731754667@163.com>
Date: Mon, 6 May 2024 23:22:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh b/applications/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh
index f9997dd..bb3346d 100755
--- a/applications/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh
+++ b/applications/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh
@@ -18,7 +18,7 @@ do_install() {
docker pull ${image_name}
docker rm -f feishuvpn
- local cmd="docker run --restart=unless-stopped -d -h FeiShuVpnServer -v \"$config:/data/feishu/conf\" "
+ local cmd="docker run --restart=unless-stopped -d -h FeiShuVpnServer -v \"$config:/data/conf\" "
cmd="$cmd\
--cap-add=ALL \
From f2f641f7bbfb2544d4910b3aa4ab78d812dbc65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=8C?= <13731754667@163.com>
Date: Wed, 8 May 2024 17:43:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=B6=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../luci-app-feishuvpn/luasrc/controller/feishuvpn.lua | 9 +++++++--
.../root/usr/libexec/istorec/feishuvpn.sh | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/applications/luci-app-feishuvpn/luasrc/controller/feishuvpn.lua b/applications/luci-app-feishuvpn/luasrc/controller/feishuvpn.lua
index 5e97e7e..fcea53a 100755
--- a/applications/luci-app-feishuvpn/luasrc/controller/feishuvpn.lua
+++ b/applications/luci-app-feishuvpn/luasrc/controller/feishuvpn.lua
@@ -1,7 +1,12 @@
-
+-- 定义luci.controller.feishuvpn模块
module("luci.controller.feishuvpn", package.seeall)
+-- index函数：配置FeiShuVpn的管理界面入口
function index()
+ -- 创建admin/services/feishuvpn目录下的入口，重定向到config页面
+ -- dependent = true表示该入口依赖于其他服务
entry({"admin", "services", "feishuvpn"}, alias("admin", "services", "feishuvpn", "config"), _("FeiShuVpn"), 30).dependent = true
+
+ -- 创建admin/services/feishuvpn/config页面，用于配置FeiShuVpn
entry({"admin", "services", "feishuvpn", "config"}, cbi("feishuvpn"))
-end
+end
\ No newline at end of file
diff --git a/applications/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh b/applications/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh
index bb3346d..0ba2e80 100755
--- a/applications/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh
+++ b/applications/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh
@@ -27,8 +27,8 @@ do_install() {
--dns=127.0.0.1 \
--network=host "
- local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
- [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
+ # local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
+ # [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt"
mountpoint -q /mnt && cmd="$cmd:rslave"