aaden-cli 1.6.91 → 1.6.95

package/AadenDeploy/Utils/cottiNetplan.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# 此脚本为指定的网卡设置静态 IP
+# IP: 192.168.121.20/24
+# 网关: 192.168.121.1
+# DNS: 192.168.121.1
+# 在 /etc/netplan/ 下新增文件 30-cotti.yaml 并应用配置
+# 需要 root 权限运行（推荐使用 sudo）
+
+set -e  # 遇到错误立即退出
+
+# 查找所有非 lo 的以太网接口
+mapfile -t INTERFACES < <(ip -o link show | awk -F': ' '/state UP|state DOWN/ && $2 !~ /lo/ {print $2}')
+
+if [ ${#INTERFACES[@]} -eq 0 ]; then
+    echo "错误：未找到任何可用网卡！"
+    exit 1
+fi
+
+# 优先尝试自动选择以 enp 开头的网卡
+INTERFACE=""
+for iface in "${INTERFACES[@]}"; do
+    if [[ $iface == enp* ]]; then
+        INTERFACE="$iface"
+        break
+    fi
+done
+
+# 如果没有找到 enp 开头的网卡，或者用户想手动选择，则进入手动选择流程
+if [ -z "$INTERFACE" ]; then
+    echo "未找到以 enp 开头的网卡，下面列出所有可用网卡："
+    for i in "${!INTERFACES[@]}"; do
+        idx=$((i+1))
+        echo "$idx) ${INTERFACES[i]}"
+    done
+
+    if [ ${#INTERFACES[@]} -eq 1 ]; then
+        echo "只检测到一个网卡，将自动选择：${INTERFACES[0]}"
+        INTERFACE="${INTERFACES[0]}"
+    else
+        while true; do
+            echo -n "请输入要配置的网卡编号（1-${#INTERFACES[@]}）："
+            read choice
+            if [[ "$choice" =~ ^[0-9]+$ ]] && [ "$choice" -ge 1 ] && [ "$choice" -le ${#INTERFACES[@]} ]; then
+                INTERFACE="${INTERFACES[$((choice-1))]}"
+                break
+            else
+                echo "输入无效，请输入有效的编号！"
+            fi
+        done
+    fi
+else
+    echo "自动选择网卡：$INTERFACE"
+fi
+
+echo "将为网卡 $INTERFACE 配置静态 IP 192.168.121.20/24"
+
+CONFIG_FILE="/etc/netplan/30-cotti.yaml"
+
+# 使用 cat 和 heredoc 写入 YAML 文件（注意缩进严格要求）
+sudo bash -c "cat > $CONFIG_FILE" << EOF
+network:
+  version: 2
+  renderer: NetworkManager
+  ethernets:
+    $INTERFACE:
+      dhcp4: false
+      addresses:
+        - 192.168.121.20/24
+      gateway4: 192.168.121.1
+      nameservers:
+        addresses:
+          - 192.168.121.1
+EOF
+
+echo "已生成配置文件：$CONFIG_FILE"
+echo "内容如下："
+sudo cat $CONFIG_FILE
+
+# 应用配置
+echo "正在应用配置..."
+sudo netplan apply
+
+echo "配置完成！请使用 ip addr show $INTERFACE 检查 IP 是否已生效。"

package/dist/index.js

@@ -18507,7 +18507,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.91"};
+module.exports = {"i8":"1.6.95"};
 
 /***/ })
 
@@ -18630,6 +18630,7 @@ program.command('update-tse').action(updateTse)
 program.command('update-win-tse').action(updateWindowsTse)
 program.command('check-version').action(getBackendVersionOffline)
 program.command('full-update').action(fullUpdate)
+program.command('cotti-netplan').action(cottiNetplan)
 
 program.command('db').action(enterDatabase)
 program.command('printer-test').action(testPrinter)
@@ -18843,7 +18844,8 @@ async function fullUpdate() {
         'sudo service apache2 restart',
         'aaden-cli fix-cronjob',
         'aaden-cli auto-write-gdpdu',
-        'sudo systemctl daemon-reload'
+        'sudo systemctl daemon-reload',
+        'aaden-cli ensure-print-log-rotate',
     ]
     const {code} = await cli.executeInShell(command, program.debug)
     await logAction("进行了full-update", code)
@@ -19335,6 +19337,11 @@ function ensurePrintLogRotate() {
     }
 }
 
+async function cottiNetplan() {
+    await run('AadenDeploy/Utils/cottiNetplan.sh')
+    logAction("手动设置cotti netplan")
+}
+
 })();
 
 module.exports = __webpack_exports__;

package/index.js

@@ -49,6 +49,7 @@ program.command('update-tse').action(updateTse)
 program.command('update-win-tse').action(updateWindowsTse)
 program.command('check-version').action(getBackendVersionOffline)
 program.command('full-update').action(fullUpdate)
+program.command('cotti-netplan').action(cottiNetplan)
 
 program.command('db').action(enterDatabase)
 program.command('printer-test').action(testPrinter)
@@ -262,7 +263,8 @@ async function fullUpdate() {
         'sudo service apache2 restart',
         'aaden-cli fix-cronjob',
         'aaden-cli auto-write-gdpdu',
-        'sudo systemctl daemon-reload'
+        'sudo systemctl daemon-reload',
+        'aaden-cli ensure-print-log-rotate',
     ]
     const {code} = await cli.executeInShell(command, program.debug)
     await logAction("进行了full-update", code)
@@ -753,3 +755,8 @@ function ensurePrintLogRotate() {
         cli.executeInShell(command, program.debug)
     }
 }
+
+async function cottiNetplan() {
+    await run('AadenDeploy/Utils/cottiNetplan.sh')
+    logAction("手动设置cotti netplan")
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.6.91",
+  "version": "1.6.95",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -8,11 +8,11 @@
     "update": "git add . && release-it --ci"
   },
   "bin": {
-    "aaden-cli": "./dist/index.js"
+    "aaden-cli": "dist/index.js"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/innerken-gmbh/aaden-cli.git"
+    "url": "git+https://github.com/innerken-gmbh/aaden-cli.git"
   },
   "keywords": [],
   "author": "JuHaodong@innerken",