Skip to content

Commit e6bf09a

Browse files
committed
2.6.1
1 parent a56641c commit e6bf09a

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

easytier/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
22
-include $(dir $(lastword $(MAKEFILE_LIST)))../version.mk
33

44
PKG_NAME:=easytier
5-
PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.0)
5+
PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.1)
66

77
ifeq ($(ARCH),mipsel)
88
APP_ARCH:=mipsel

luci-app-easytier/luasrc/controller/easytier.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ function get_upload_config()
163163
easytierbin = uci:get_first("easytier", "easytier", "easytierbin") or "/usr/bin/easytier-core",
164164
webbin = uci:get_first("easytier", "easytier", "webbin") or "/usr/bin/easytier-web",
165165
github_proxys = {},
166-
fallback_version = uci:get_first("easytier", "easytier", "fallback_version") or "v2.6.0"
166+
fallback_version = uci:get_first("easytier", "easytier", "fallback_version") or "v2.6.1"
167167
}
168168

169169
-- 读取代理列表(list 类型)
@@ -200,7 +200,7 @@ function save_upload_config()
200200
-- 保存配置
201201
uci:set("easytier", "@easytier[0]", "easytierbin", data.easytierbin or "/usr/bin/easytier-core")
202202
uci:set("easytier", "@easytier[0]", "webbin", data.webbin or "/usr/bin/easytier-web")
203-
uci:set("easytier", "@easytier[0]", "fallback_version", data.fallback_version or "v2.6.0")
203+
uci:set("easytier", "@easytier[0]", "fallback_version", data.fallback_version or "v2.6.1")
204204

205205
-- 删除旧的代理列表
206206
uci:delete("easytier", "@easytier[0]", "github_proxys")

luci-app-easytier/luasrc/view/easytier/easytier_upload.htm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
<select id="fallback_version_select" class="config-input" style="display:none;width:100%;">
384384
<option value=""><%=translate("Loading versions...")%></option>
385385
</select>
386-
<input type="text" id="fallback_version" class="config-input" placeholder="v2.6.0" style="display:none;width:100%;">
386+
<input type="text" id="fallback_version" class="config-input" placeholder="v2.6.1" style="display:none;width:100%;">
387387
</div>
388388
<button type="button" class="upload-btn" onclick="showDownloadModal()" style="padding:8px 16px;min-width:auto;flex-shrink:0;">
389389
<%=translate("Online Download")%>
@@ -758,14 +758,14 @@ <h3><%=translate("Online Download EasyTier")%></h3>
758758
proxyList = Array.isArray(proxys) ? proxys : [];
759759

760760
renderProxyList();
761-
versionManager.setVersion(config.fallback_version || 'v2.6.0');
761+
versionManager.setVersion(config.fallback_version || 'v2.6.1');
762762

763763
// 保存原始配置
764764
originalConfig = {
765765
easytierbin: config.easytierbin || '/usr/bin/easytier-core',
766766
webbin: config.webbin || '/usr/bin/easytier-web',
767767
github_proxys: JSON.stringify(proxyList),
768-
fallback_version: config.fallback_version || 'v2.6.0'
768+
fallback_version: config.fallback_version || 'v2.6.1'
769769
};
770770

771771
checkDiskSpace('easytierbin');
@@ -843,7 +843,7 @@ <h3><%=translate("Online Download EasyTier")%></h3>
843843
easytierbin: document.getElementById('easytierbin').value || '/usr/bin/easytier-core',
844844
webbin: document.getElementById('webbin').value || '/usr/bin/easytier-web',
845845
github_proxys: JSON.stringify(proxyList),
846-
fallback_version: versionManager.getCurrentVersion() || 'v2.6.0'
846+
fallback_version: versionManager.getCurrentVersion() || 'v2.6.1'
847847
};
848848
}
849849

@@ -868,7 +868,7 @@ <h3><%=translate("Online Download EasyTier")%></h3>
868868
easytierbin: document.getElementById('easytierbin').value || '/usr/bin/easytier-core',
869869
webbin: document.getElementById('webbin').value || '/usr/bin/easytier-web',
870870
github_proxys: proxyList,
871-
fallback_version: versionManager.getCurrentVersion() || 'v2.6.0'
871+
fallback_version: versionManager.getCurrentVersion() || 'v2.6.1'
872872
};
873873

874874
var xhr = new XMLHttpRequest();

luci-app-easytier/root/etc/init.d/easytier

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ check_bin() {
103103
# 如果获取失败,从 UCI 配置或使用默认版本
104104
if [ -z "$tag" ]; then
105105
tag=$(uci -q get easytier.@easytier[0].fallback_version)
106-
[ -z "$tag" ] && tag="v2.6.0"
106+
[ -z "$tag" ] && tag="v2.6.1"
107107
fi
108108
echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 开始在线下载${tag}版本,${proxy}https://github.com/EasyTier/EasyTier/releases/download/${tag}/easytier-linux-${cpucore}-${tag}.zip下载较慢耐心等候" >>/tmp/easytier.log
109109
echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 开始在线下载${tag}版本,${proxy}https://github.com/EasyTier/EasyTier/releases/download/${tag}/easytier-linux-${cpucore}-${tag}.zip下载较慢耐心等候" >>/tmp/easytierweb.log

version.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# This file is the single source of truth for the EasyTier version
33
# Used by: easytier/Makefile, luci-app-easytier/Makefile, init.d/easytier
44

5-
EASYTIER_VERSION=2.6.0
5+
EASYTIER_VERSION=2.6.1

0 commit comments

Comments
 (0)