From bfbb67fdfbf03e7f214bdc7b46e5c2964a5e9de0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Jun 2026 00:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=85=20Sync=202026-06-21=2000:00:08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gecoosac/Makefile | 2 +- gecoosac/files/etc/config/gecoosac | 6 +++--- gecoosac/files/etc/init.d/gecoosac | 12 ++++++------ gecoosac/files/etc/uci-defaults/gecoosac | 10 +++++----- luci-app-gecoosac/Makefile | 2 +- .../htdocs/luci-static/resources/view/gecoosac.js | 10 +++++----- luci-app-gecoosac/po/zh_Hans/gecoosac.po | 15 +++++++++++---- luci-app-gecoosac/po/zh_Hant/gecoosac.po | 15 +++++++++++---- .../root/usr/libexec/rpcd/luci.gecoosac | 2 +- 9 files changed, 44 insertions(+), 30 deletions(-) diff --git a/gecoosac/Makefile b/gecoosac/Makefile index 34ea60f6..2a546dce 100644 --- a/gecoosac/Makefile +++ b/gecoosac/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gecoosac PKG_VERSION:=2.2.20251015 -PKG_RELEASE:=10 +PKG_RELEASE:=11 ifeq ($(ARCH),aarch64) PKG_ARCH:=ac_linux_arm64 diff --git a/gecoosac/files/etc/config/gecoosac b/gecoosac/files/etc/config/gecoosac index 4dfa3511..3192f3e1 100644 --- a/gecoosac/files/etc/config/gecoosac +++ b/gecoosac/files/etc/config/gecoosac @@ -6,9 +6,9 @@ config gecoosac 'config' option https '0' option crt_file '/etc/gecoosac/tls/gecoosac.crt' option key_file '/etc/gecoosac/tls/gecoosac.key' - option upload_dir '/tmp/gecoosac/upload/' - option db_dir '/etc/gecoosac/' - option piddir '/var/run/' + option upload_dir '/tmp/gecoosac/upload' + option db_dir '/etc/gecoosac' + option piddir '/var/run' option lang 'zh' option debug '0' option showtip '0' diff --git a/gecoosac/files/etc/init.d/gecoosac b/gecoosac/files/etc/init.d/gecoosac index b222a663..f7a8217b 100644 --- a/gecoosac/files/etc/init.d/gecoosac +++ b/gecoosac/files/etc/init.d/gecoosac @@ -10,11 +10,11 @@ START=90 STOP=10 PROG=/usr/bin/gecoosac -DEFAULT_DB_DIR=/etc/gecoosac/ -DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload/ +DEFAULT_DB_DIR=/etc/gecoosac +DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload DEFAULT_CRT_FILE=/etc/gecoosac/tls/gecoosac.crt DEFAULT_KEY_FILE=/etc/gecoosac/tls/gecoosac.key -DEFAULT_PID_DIR=/var/run/ +DEFAULT_PID_DIR=/var/run DEFAULT_LANG=zh CERT_TIMEOUT=60 @@ -282,19 +282,19 @@ generate_default_cert() { normalize_conf() { if is_safe_upload_dir "$upload_dir"; then - upload_dir="$(normalize_path "$upload_dir")/" + upload_dir="$(normalize_path "$upload_dir")" else upload_dir="$DEFAULT_UPLOAD_DIR" fi if is_safe_db_dir "$db_dir" "$upload_dir"; then - db_dir="$(normalize_path "$db_dir")/" + db_dir="$(normalize_path "$db_dir")" else db_dir="$DEFAULT_DB_DIR" fi is_abs_path "$crt_file" || crt_file="$DEFAULT_CRT_FILE" is_abs_path "$key_file" || key_file="$DEFAULT_KEY_FILE" if is_safe_pid_dir "$piddir" "$upload_dir"; then - piddir="$(normalize_path "$piddir")/" + piddir="$(normalize_path "$piddir")" else piddir="$DEFAULT_PID_DIR" fi diff --git a/gecoosac/files/etc/uci-defaults/gecoosac b/gecoosac/files/etc/uci-defaults/gecoosac index f8385332..854db109 100644 --- a/gecoosac/files/etc/uci-defaults/gecoosac +++ b/gecoosac/files/etc/uci-defaults/gecoosac @@ -1,11 +1,11 @@ #!/bin/sh changed=0 -DEFAULT_DB_DIR=/etc/gecoosac/ -DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload/ +DEFAULT_DB_DIR=/etc/gecoosac +DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload DEFAULT_CRT_FILE=/etc/gecoosac/tls/gecoosac.crt DEFAULT_KEY_FILE=/etc/gecoosac/tls/gecoosac.key -DEFAULT_PID_DIR=/var/run/ +DEFAULT_PID_DIR=/var/run OLD_CRT_FILE=/etc/gecoosac/tls/1.crt OLD_KEY_FILE=/etc/gecoosac/tls/1.key @@ -132,7 +132,7 @@ normalize_upload_dir() { [ -n "$upload_dir" ] || return 0 if is_safe_upload_dir "$upload_dir"; then - normalized="$(normalize_path "$upload_dir")/" + normalized="$(normalize_path "$upload_dir")" else normalized="$DEFAULT_UPLOAD_DIR" fi @@ -154,7 +154,7 @@ normalize_dir_option() { [ -n "$upload_dir" ] || upload_dir="$DEFAULT_UPLOAD_DIR" if "$validator" "$value" "$upload_dir"; then - normalized="$(normalize_path "$value")/" + normalized="$(normalize_path "$value")" else normalized="$default" fi diff --git a/luci-app-gecoosac/Makefile b/luci-app-gecoosac/Makefile index 5b70fedf..436bcf66 100644 --- a/luci-app-gecoosac/Makefile +++ b/luci-app-gecoosac/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-gecoosac PKG_VERSION:=2.2 -PKG_RELEASE:=12 +PKG_RELEASE:=13 LUCI_TITLE:=LuCI Support for gecoosac LUCI_DEPENDS:=+luci-base +gecoosac diff --git a/luci-app-gecoosac/htdocs/luci-static/resources/view/gecoosac.js b/luci-app-gecoosac/htdocs/luci-static/resources/view/gecoosac.js index 6836645d..f39e42c7 100644 --- a/luci-app-gecoosac/htdocs/luci-static/resources/view/gecoosac.js +++ b/luci-app-gecoosac/htdocs/luci-static/resources/view/gecoosac.js @@ -6,11 +6,11 @@ 'require ui'; 'require view'; -const DEFAULT_UPLOAD_DIR = '/tmp/gecoosac/upload/'; -const DEFAULT_DB_DIR = '/etc/gecoosac/'; +const DEFAULT_UPLOAD_DIR = '/tmp/gecoosac/upload'; +const DEFAULT_DB_DIR = '/etc/gecoosac'; const DEFAULT_CRT_FILE = '/etc/gecoosac/tls/gecoosac.crt'; const DEFAULT_KEY_FILE = '/etc/gecoosac/tls/gecoosac.key'; -const DEFAULT_PID_DIR = '/var/run/'; +const DEFAULT_PID_DIR = '/var/run'; const CONFIG_BACKUP_DIR = '/etc/gecoosac'; const DB_DIR_PREFIXES = [ '/etc/gecoosac', '/tmp/gecoosac', '/var/lib/gecoosac' ]; const PID_DIR_PREFIXES = [ '/var/run', '/tmp/gecoosac' ]; @@ -191,7 +191,7 @@ return view.extend({ let m, s, o, uploadDirOption; m = new form.Map('gecoosac', _('Gecoos AC'), - _('Supports Gecoos AP firmware 7.6 and above.') + '
' + + _('Only supports Gecoos AP firmware 7.6 and above.') + '
' + _('Default login password: "admin". Change it immediately after first login.')); s = m.section(form.TypedSection, 'gecoosac'); @@ -256,7 +256,7 @@ return view.extend({ o.depends({ isonlyoneprot: '0', https: '1' }); o = s.option(form.Value, 'upload_dir', _('Upload dir path'), - _('Upload AP upgrade firmware here. Use an absolute path ending with /gecoosac/upload, for example /tmp/gecoosac/upload/. Do not place it under /etc/gecoosac because that directory is backed up during sysupgrade.')); + _('Upload AP upgrade firmware here. Use an absolute path ending with /gecoosac/upload, for example /tmp/gecoosac/upload.\nDo not place it under /etc/gecoosac because that directory is backed up during sysupgrade.')); uploadDirOption = o; o.placeholder = DEFAULT_UPLOAD_DIR; o.default = DEFAULT_UPLOAD_DIR; diff --git a/luci-app-gecoosac/po/zh_Hans/gecoosac.po b/luci-app-gecoosac/po/zh_Hans/gecoosac.po index 4fc6289b..d4a3be5a 100644 --- a/luci-app-gecoosac/po/zh_Hans/gecoosac.po +++ b/luci-app-gecoosac/po/zh_Hans/gecoosac.po @@ -15,8 +15,8 @@ msgstr "默认证书文件会在 HTTPS 启动时生成；自定义路径必须 msgid "Gecoos AC" msgstr "集客AC控制器" -msgid "Supports Gecoos AP firmware 7.6 and above." -msgstr "支持集客 AP 7.6 及以上版本固件。" +msgid "Only supports Gecoos AP firmware 7.6 and above." +msgstr "仅支持集客 AP 7.6 及以上版本固件。" msgid "Default login password: \"admin\". Change it immediately after first login." msgstr "初始登录密码为「admin」，首次登录后请立即修改。" @@ -51,8 +51,15 @@ msgstr "指定 key 证书文件" msgid "Upload dir path" msgstr "上传目录" -msgid "Upload AP upgrade firmware here. Use an absolute path ending with /gecoosac/upload, for example /tmp/gecoosac/upload/. Do not place it under /etc/gecoosac because that directory is backed up during sysupgrade." -msgstr "AP 升级固件会上传到此目录。请使用以 /gecoosac/upload 结尾的绝对路径，例如 /tmp/gecoosac/upload/。不要放在 /etc/gecoosac 下，因为该目录会在 sysupgrade 时被备份。" +msgid "" +"Upload AP upgrade firmware here. Use an absolute path ending with " +"/gecoosac/upload, for example /tmp/gecoosac/upload.\n" +"Do not place it under /etc/gecoosac because that directory is backed up " +"during sysupgrade." +msgstr "" +"AP 升级固件会上传到此目录。请使用以 /gecoosac/upload 结尾的绝对路径，例如 " +"/tmp/gecoosac/upload。\n" +"不要放在 /etc/gecoosac 下，因为该目录会在 sysupgrade 时被备份。" msgid "Upload directory must be an absolute path ending with /gecoosac/upload and must not be under /etc/gecoosac." msgstr "上传目录必须是以 /gecoosac/upload 结尾的绝对路径，且不能位于 /etc/gecoosac 下。" diff --git a/luci-app-gecoosac/po/zh_Hant/gecoosac.po b/luci-app-gecoosac/po/zh_Hant/gecoosac.po index be9f9f91..a6b965ce 100644 --- a/luci-app-gecoosac/po/zh_Hant/gecoosac.po +++ b/luci-app-gecoosac/po/zh_Hant/gecoosac.po @@ -15,8 +15,8 @@ msgstr "預設憑證檔案會在 HTTPS 啟動時產生；自訂路徑必須指 msgid "Gecoos AC" msgstr "集客 AC 控制器" -msgid "Supports Gecoos AP firmware 7.6 and above." -msgstr "支援集客 AP 7.6 及以上版本韌體。" +msgid "Only supports Gecoos AP firmware 7.6 and above." +msgstr "僅支援集客 AP 7.6 及以上版本韌體。" msgid "Default login password: \"admin\". Change it immediately after first login." msgstr "初始登入密碼為「admin」，首次登入後請立即修改。" @@ -51,8 +51,15 @@ msgstr "指定 key 私鑰檔案" msgid "Upload dir path" msgstr "上傳目錄" -msgid "Upload AP upgrade firmware here. Use an absolute path ending with /gecoosac/upload, for example /tmp/gecoosac/upload/. Do not place it under /etc/gecoosac because that directory is backed up during sysupgrade." -msgstr "AP 升級韌體會上傳到此目錄。請使用以 /gecoosac/upload 結尾的絕對路徑，例如 /tmp/gecoosac/upload/。不要放在 /etc/gecoosac 下，因為該目錄會在 sysupgrade 時被備份。" +msgid "" +"Upload AP upgrade firmware here. Use an absolute path ending with " +"/gecoosac/upload, for example /tmp/gecoosac/upload.\n" +"Do not place it under /etc/gecoosac because that directory is backed up " +"during sysupgrade." +msgstr "" +"AP 升級韌體會上傳到此目錄。請使用以 /gecoosac/upload 結尾的絕對路徑，例如 " +"/tmp/gecoosac/upload。\n" +"不要放在 /etc/gecoosac 下，因為該目錄會在 sysupgrade 時被備份。" msgid "Upload directory must be an absolute path ending with /gecoosac/upload and must not be under /etc/gecoosac." msgstr "上傳目錄必須是以 /gecoosac/upload 結尾的絕對路徑，且不能位於 /etc/gecoosac 下。" diff --git a/luci-app-gecoosac/root/usr/libexec/rpcd/luci.gecoosac b/luci-app-gecoosac/root/usr/libexec/rpcd/luci.gecoosac index caa5a538..389891d1 100755 --- a/luci-app-gecoosac/root/usr/libexec/rpcd/luci.gecoosac +++ b/luci-app-gecoosac/root/usr/libexec/rpcd/luci.gecoosac @@ -2,7 +2,7 @@ . /usr/share/libubox/jshn.sh -DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload/ +DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload json_result() { local ok="$1"