Merge branch 'linkease:main' into main

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

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 \
@@ -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"

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)