v2.6.2

Author: lmq8267

easytier/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 -include $(dir $(lastword $(MAKEFILE_LIST)))../version.mk
 
 PKG_NAME:=easytier
-PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.1)
+PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.2)
 
 ifeq ($(ARCH),mipsel)
 	APP_ARCH:=mipsel

luci-app-easytier/Makefile

@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 -include $(dir $(lastword $(MAKEFILE_LIST)))../version.mk
 
-PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.0)
-PKG_RELEASE:=2
+PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.2)
+PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI support for EasyTier
 LUCI_DEPENDS:=+kmod-tun +luci-compat

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

@@ -163,7 +163,7 @@ function get_upload_config()
 		easytierbin = uci:get_first("easytier", "easytier", "easytierbin") or "/usr/bin/easytier-core",
 		webbin = uci:get_first("easytier", "easytier", "webbin") or "/usr/bin/easytier-web",
 		github_proxys = {},
-		fallback_version = uci:get_first("easytier", "easytier", "fallback_version") or "v2.6.1"
+		fallback_version = uci:get_first("easytier", "easytier", "fallback_version") or "v2.6.2"
 	}
 
 	-- 读取代理列表（list 类型）
@@ -200,7 +200,7 @@ function save_upload_config()
 	-- 保存配置
 	uci:set("easytier", "@easytier[0]", "easytierbin", data.easytierbin or "/usr/bin/easytier-core")
 	uci:set("easytier", "@easytier[0]", "webbin", data.webbin or "/usr/bin/easytier-web")
-	uci:set("easytier", "@easytier[0]", "fallback_version", data.fallback_version or "v2.6.1")
+	uci:set("easytier", "@easytier[0]", "fallback_version", data.fallback_version or "v2.6.2")
 
 	-- 删除旧的代理列表
 	uci:delete("easytier", "@easytier[0]", "github_proxys")

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

@@ -649,7 +649,7 @@
 		var displayVersion = data.version === 'unknown' ? '<%=translate("Unknown")%>' : data.version;
 		html += '<span>' + (displayVersion || '-') + '</span>';
 		if (!versionInfo.match && versionInfo.latest && data.version !== 'unknown') {
-			html += '<span class="et-version-badge"><%=translate("New")%>: ' + versionInfo.latest + '</span>';
+			html += '<span class="et-version-badge"><%=translate("New Version")%>: ' + versionInfo.latest + '</span>';
 		}
 		html += '</div>';
 		html += '</div></div>';

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

@@ -383,7 +383,7 @@
 					<select id="fallback_version_select" class="config-input" style="display:none;width:100%;">
 						<option value=""><%=translate("Loading versions...")%></option>
 					</select>
-					<input type="text" id="fallback_version" class="config-input" placeholder="v2.6.1" style="display:none;width:100%;">
+					<input type="text" id="fallback_version" class="config-input" placeholder="v2.6.2" style="display:none;width:100%;">
 				</div>
 				<button type="button" class="upload-btn" onclick="showDownloadModal()" style="padding:8px 16px;min-width:auto;flex-shrink:0;">
 					<%=translate("Online Download")%>
@@ -758,14 +758,14 @@ <h3><%=translate("Online Download EasyTier")%></h3>
 				proxyList = Array.isArray(proxys) ? proxys : [];
 
 				renderProxyList();
-				versionManager.setVersion(config.fallback_version || 'v2.6.1');
+				versionManager.setVersion(config.fallback_version || 'v2.6.2');
 
 				// 保存原始配置
 				originalConfig = {
 					easytierbin: config.easytierbin || '/usr/bin/easytier-core',
 					webbin: config.webbin || '/usr/bin/easytier-web',
 					github_proxys: JSON.stringify(proxyList),
-					fallback_version: config.fallback_version || 'v2.6.1'
+					fallback_version: config.fallback_version || 'v2.6.2'
 				};
 
 				checkDiskSpace('easytierbin');
@@ -843,7 +843,7 @@ <h3><%=translate("Online Download EasyTier")%></h3>
 		easytierbin: document.getElementById('easytierbin').value || '/usr/bin/easytier-core',
 		webbin: document.getElementById('webbin').value || '/usr/bin/easytier-web',
 		github_proxys: JSON.stringify(proxyList),
-		fallback_version: versionManager.getCurrentVersion() || 'v2.6.1'
+		fallback_version: versionManager.getCurrentVersion() || 'v2.6.2'
 	};
 }
 
@@ -868,7 +868,7 @@ <h3><%=translate("Online Download EasyTier")%></h3>
 		easytierbin: document.getElementById('easytierbin').value || '/usr/bin/easytier-core',
 		webbin: document.getElementById('webbin').value || '/usr/bin/easytier-web',
 		github_proxys: proxyList,
-		fallback_version: versionManager.getCurrentVersion() || 'v2.6.1'
+		fallback_version: versionManager.getCurrentVersion() || 'v2.6.2'
 	};
 
 	var xhr = new XMLHttpRequest();

luci-app-easytier/po/zh_Hans/easytier.po

@@ -1072,7 +1072,7 @@ msgstr "Web 控制台主页"
 msgid "Service not running"
 msgstr "服务未运行"
 
-msgid "New"
+msgid "New Version"
 msgstr "发现新版本"
 
 msgid "Unknown"

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

@@ -103,7 +103,7 @@ check_bin() {
 	# 如果获取失败，从 UCI 配置或使用默认版本
 	if [ -z "$tag" ]; then
 		tag=$(uci -q get easytier.@easytier[0].fallback_version)
-		[ -z "$tag" ] && tag="v2.6.1"
+		[ -z "$tag" ] && tag="v2.6.2"
 	fi
 	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
 	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

luci-app-easytier/root/usr/share/easytier/download.sh

@@ -42,7 +42,7 @@ get_latest_version() {
 	# 如果获取失败，从 UCI 配置或使用默认版本
 	if [ -z "$tag" ]; then
 		tag=$(uci -q get easytier.@easytier[0].fallback_version)
-		[ -z "$tag" ] && tag="v2.6.0"
+		[ -z "$tag" ] && tag="v2.6.2"
 	fi
 
 	echo "$tag"

version.mk

@@ -2,4 +2,4 @@
 # This file is the single source of truth for the EasyTier version
 # Used by: easytier/Makefile, luci-app-easytier/Makefile, init.d/easytier
 
-EASYTIER_VERSION=2.6.1
+EASYTIER_VERSION=2.6.2