更新EMQX为5.8.8可运行版本

.idea/workspace.xml

@@ -4,18 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6047a167-18d5-4f8e-a170-63c3fd101bda" name="Changes" comment="优化镜像同步的内容">
+    <list default="true" id="6047a167-18d5-4f8e-a170-63c3fd101bda" name="Changes" comment="优化镜像同步，新增雄安集团监管平台项目">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.run/DCU-中间件.run.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.run/DCU-中间件-35.80.run.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.run/DCU全部CMII镜像.run.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.run/DCU-CMII-35.80.run.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.run/Middle镜像-35.70.run.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.run/Middle镜像-35.70.run.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.run/Middle镜像-ARM-11.8.run.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/agent-deploy/a_dashboard/TemplateK8SDashboard.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-deploy/a_dashboard/TemplateK8SDashboard.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/agent-deploy/c_middle/CmiiEmqxTemplate.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-deploy/c_middle/CmiiEmqxTemplate.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/agent-deploy/c_middle/CmiiRedisTemplate.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-deploy/c_middle/CmiiRedisTemplate.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/agent-deploy/d_app/CmiiImageConfig.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-deploy/d_app/CmiiImageConfig.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/agent-operator/CmiiDeployOperator_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-operator/CmiiDeployOperator_test.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/agent-operator/CmiiImageSyncOperator_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-operator/CmiiImageSyncOperator_test.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/agent-wdd/build/agent-wdd_linux_amd64" beforeDir="false" afterPath="$PROJECT_DIR$/agent-wdd/build/agent-wdd_linux_amd64" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -32,6 +24,11 @@
   </component>
   <component name="GOROOT" url="file://$PROJECT_DIR$/../../../../../Program Files/Go" />
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="master-260116" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="KubernetesApiPersistence">{}</component>
@@ -60,46 +57,46 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">{
-  "keyToString": {
+  &quot;keyToString&quot;: {
-    "DefaultGoTemplateProperty": "Go File",
+    &quot;DefaultGoTemplateProperty&quot;: &quot;Go File&quot;,
-    "Go Build.agent-wdd运行.executor": "Run",
+    &quot;Go Build.agent-wdd运行.executor&quot;: &quot;Run&quot;,
-    "Go Build.go build agent-wdd.executor": "Run",
+    &quot;Go Build.go build agent-wdd.executor&quot;: &quot;Run&quot;,
-    "Go Test.3580-cmii镜像.executor": "Run",
+    &quot;Go Test.3580-cmii镜像.executor&quot;: &quot;Run&quot;,
-    "Go Test.DCU-CMII.executor": "Run",
+    &quot;Go Test.DCU-CMII.executor&quot;: &quot;Run&quot;,
-    "Go Test.DCU-RKE-35.80.executor": "Run",
+    &quot;Go Test.DCU-RKE-35.80.executor&quot;: &quot;Run&quot;,
-    "Go Test.DCU-中间件.executor": "Run",
+    &quot;Go Test.DCU-中间件.executor&quot;: &quot;Run&quot;,
-    "Go Test.DCU全部CMII镜像.executor": "Run",
+    &quot;Go Test.DCU全部CMII镜像.executor&quot;: &quot;Run&quot;,
-    "Go Test.TestCmiiEnvDeploy_WddSuperCluster in wdd.io/agent-operator (1).executor": "Run",
+    &quot;Go Test.TestCmiiEnvDeploy_WddSuperCluster in wdd.io/agent-operator (1).executor&quot;: &quot;Run&quot;,
-    "Go Test.TestCmiiEnvDeploy_WddSuperCluster in wdd.io/agent-operator.executor": "Run",
+    &quot;Go Test.TestCmiiEnvDeploy_WddSuperCluster in wdd.io/agent-operator.executor&quot;: &quot;Run&quot;,
-    "Go Test.TestCmiiEnvDeploy_XiongAnJianGuanPingTai in wdd.io/agent-operator.executor": "Run",
+    &quot;Go Test.TestCmiiEnvDeploy_XiongAnJianGuanPingTai in wdd.io/agent-operator.executor&quot;: &quot;Run&quot;,
-    "Go Test.TestCmiiEnvDeploy_XiongAnKongNengYuan in wdd.io/agent-operator.executor": "Run",
+    &quot;Go Test.TestCmiiEnvDeploy_XiongAnKongNengYuan in wdd.io/agent-operator.executor&quot;: &quot;Run&quot;,
-    "Go Test.TestCmiiEnvDeploy_ZhejiangErjiPingTai in wdd.io/agent-operator.executor": "Run",
+    &quot;Go Test.TestCmiiEnvDeploy_ZhejiangErjiPingTai in wdd.io/agent-operator.executor&quot;: &quot;Run&quot;,
-    "Go Test.TestHarborOperator_ArtifactListAll in wdd.io/agent-operator/image (1).executor": "Run",
+    &quot;Go Test.TestHarborOperator_ArtifactListAll in wdd.io/agent-operator/image (1).executor&quot;: &quot;Run&quot;,
-    "Go Test.TestHarborOperator_ArtifactListAll in wdd.io/agent-operator/image.executor": "Run",
+    &quot;Go Test.TestHarborOperator_ArtifactListAll in wdd.io/agent-operator/image.executor&quot;: &quot;Run&quot;,
-    "Go Test.TestHarborOperator_RepoListAll in wdd.io/agent-operator/image.executor": "Run",
+    &quot;Go Test.TestHarborOperator_RepoListAll in wdd.io/agent-operator/image.executor&quot;: &quot;Run&quot;,
-    "Go Test.查询可删除Tag3580.executor": "Run",
+    &quot;Go Test.查询可删除Tag3580.executor&quot;: &quot;Run&quot;,
-    "Go Test.清理CMII镜像-35.80.executor": "Run",
+    &quot;Go Test.清理CMII镜像-35.80.executor&quot;: &quot;Run&quot;,
-    "Go Test.院内Harbor清理-35.80.executor": "Run",
+    &quot;Go Test.院内Harbor清理-35.80.executor&quot;: &quot;Run&quot;,
-    "PowerShell.one-build-and-upload.ps1 (1).executor": "Run",
+    &quot;PowerShell.one-build-and-upload.ps1 (1).executor&quot;: &quot;Run&quot;,
-    "PowerShell.one-build-and-upload.ps1.executor": "Run",
+    &quot;PowerShell.one-build-and-upload.ps1.executor&quot;: &quot;Run&quot;,
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    "RunOnceActivity.git.unshallow": "true",
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    "RunOnceActivity.go.formatter.settings.were.checked": "true",
+    &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
-    "RunOnceActivity.go.migrated.go.modules.settings": "true",
+    &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    "git-widget-placeholder": "main",
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    "go.import.settings.migrated": "true",
+    &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
-    "last_opened_file_path": "C:/Users/wddsh/Documents/IdeaProjects/WddSuperAgent/agent-common/SplitProject/监管平台-Doris-k8s",
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/wddsh/Documents/IdeaProjects/WddSuperAgent/agent-common/SplitProject/监管平台-Doris-k8s&quot;,
-    "node.js.detected.package.eslint": "true",
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    "node.js.detected.package.tslint": "true",
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    "node.js.selected.package.eslint": "(autodetect)",
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    "node.js.selected.package.tslint": "(autodetect)",
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    "nodejs_package_manager_path": "npm",
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    "settings.editor.selected.configurable": "Errors",
+    &quot;settings.editor.selected.configurable&quot;: &quot;Errors&quot;,
-    "vue.rearranger.settings.migration": "true"
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\wddsh\Documents\IdeaProjects\WddSuperAgent\agent-common\SplitProject\监管平台-Doris-k8s" />
@@ -107,7 +104,7 @@
       <recent name="C:\Users\wddsh\Documents\IdeaProjects\WddSuperAgent\agent-common\real_project\pre_pro" />
     </key>
   </component>
-  <component name="RunManager" selected="Go Test.DCU-CMII-35.80">
+  <component name="RunManager" selected="PowerShell.one-build-and-upload.ps1">
     <configuration name="one-build-and-upload.ps1 (1)" type="PowerShellRunType" factoryName="PowerShell" temporary="true" scriptUrl="$PROJECT_DIR$/agent-wdd/a_run/one-build-and-upload.ps1" executablePath="$PROJECT_DIR$/../../../../../Windows/System32/WindowsPowerShell/v1.0/powershell.exe">
       <envs />
       <method v="2" />
@@ -130,6 +127,7 @@
     </configuration>
     <list>
       <item itemvalue="Go Build.agent-wdd运行" />
+      <item itemvalue="Go Test.Middle镜像-35.70" />
       <item itemvalue="Go Test.DCU-中间件-35.80" />
       <item itemvalue="Go Test.DCU-RKE-35.80" />
       <item itemvalue="Go Test.DCU-CMII-35.80" />
@@ -142,6 +140,8 @@
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="PowerShell.one-build-and-upload.ps1 (1)" />
+        <item itemvalue="PowerShell.one-build-and-upload.ps1" />
         <item itemvalue="PowerShell.one-build-and-upload.ps1" />
       </list>
     </recent_temporary>
@@ -243,7 +243,10 @@
       <workItem from="1768785685963" duration="596000" />
       <workItem from="1768788634424" duration="1474000" />
       <workItem from="1768790433453" duration="1946000" />
-      <workItem from="1768794675745" duration="2424000" />
+      <workItem from="1768794675745" duration="2661000" />
+      <workItem from="1768874379183" duration="75000" />
+      <workItem from="1768876032901" duration="8000" />
+      <workItem from="1768879526468" duration="182000" />
     </task>
     <task id="LOCAL-00001" summary="git">
       <option name="closed" value="true" />
@@ -285,19 +288,39 @@
       <option name="project" value="LOCAL" />
       <updated>1768788677741</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="优化镜像同步，新增雄安集团监管平台项目">
+      <option name="closed" value="true" />
+      <created>1768811251589</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1768811251589</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="git" />
     <MESSAGE value="uas-agent yaml" />
     <MESSAGE value="新增xa空能院项目，新增大量的更新内容" />
     <MESSAGE value="升级EMQX的版本为5.8.8" />
     <MESSAGE value="优化镜像同步的内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="优化镜像同步的内容" />
+    <MESSAGE value="优化镜像同步，新增雄安集团监管平台项目" />
+    <option name="LAST_COMMIT_MESSAGE" value="优化镜像同步，新增雄安集团监管平台项目" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

agent-deploy/c_middle/CmiiEmqxTemplate.go

@@ -2,6 +2,26 @@ package c_middle
 
 const CmiiEmqxTemplate = `
 ---
+# ============== Secret - 密码管理 ==============
+apiVersion: v1
+kind: Secret
+metadata:
+  name: emqx-credentials
+  namespace: {{ .Namespace }}
+  labels:
+    cmii.type: middleware
+    cmii.app: helm-emqxs
+    app.kubernetes.io/managed-by: octopus-control
+    app.kubernetes.io/version: {{ .TagVersion }}
+type: Opaque
+stringData:
+  # Dashboard管理员密码
+  dashboard-admin-password: "{{ .EmqxPassword }}"
+  # MQTT用户密码
+  mqtt-admin-password: "{{ .EmqxPassword }}"
+
+---
+# ============== ServiceAccount ==============
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,155 +29,336 @@ metadata:
   namespace: {{ .Namespace }}
 
 ---
-apiVersion: v1
+# ============== Role - RBAC ==============
-kind: ConfigMap
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
 metadata:
-  name: helm-emqxs-env
+  name: helm-emqxs
   namespace: {{ .Namespace }}
-  labels:
+rules:
-    cmii.type: middleware
+  - apiGroups: [""]
-    cmii.app: helm-emqxs
+    resources:
-    cmii.emqx.architecture: cluster
+      - endpoints
-    helm.sh/chart: emqx-1.1.0
+      - pods
-    app.kubernetes.io/managed-by: octopus-control
+    verbs:
-    app.kubernetes.io/version: {{ .TagVersion }}
+      - get
-data:
+      - watch
-  # 集群相关
+      - list
-  EMQX_CLUSTER__DISCOVERY: "k8s"
-  EMQX_CLUSTER__K8S__APISERVER: "https://kubernetes.default.svc.cluster.local:443"
-  EMQX_CLUSTER__K8S__APP_NAME: "helm-emqxs"
-  EMQX_CLUSTER__K8S__SERVICE_NAME: "helm-emqxs-headless"
-  EMQX_CLUSTER__K8S__ADDRESS_TYPE: "dns"
-  EMQX_CLUSTER__K8S__NAMESPACE: "{{ .Namespace }}"
-  EMQX_CLUSTER__K8S__SUFFIX: "svc.cluster.local"
-  # 关闭匿名，默认 ACL 不匹配拒绝
-  EMQX_AUTH__ALLOW_ANONYMOUS: "false"
-  EMQX_AUTHZ__NO_MATCH: "deny"
-  # Dashboard 初始管理员密码（只在第一次启动时生效）
-  EMQX_DASHBOARD__DEFAULT_PASSWORD: "{{ .EmqxPassword }}"
 
 ---
+# ============== RoleBinding ==============
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: helm-emqxs
+  namespace: {{ .Namespace }}
+subjects:
+  - kind: ServiceAccount
+    name: helm-emqxs
+    namespace: {{ .Namespace }}
+roleRef:
+  kind: Role
+  name: helm-emqxs
+  apiGroup: rbac.authorization.k8s.io
+
+---
+# ============== ConfigMap - Bootstrap配置文件 ==============
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: helm-emqxs-init-script
+  name: emqx-bootstrap-config
   namespace: {{ .Namespace }}
   labels:
     cmii.type: middleware
     cmii.app: helm-emqxs
 data:
-  init-mqtt-user.sh: |
+  # 主配置文件 - 覆盖默认配置
-    #!/bin/sh
+  emqx.conf: |
+    # 节点配置
+    node {
+      name = "emqx@${POD_NAME}.helm-emqxs-headless.{{ .Namespace }}.svc.cluster.local"
+      cookie = "emqx-cluster-cookie-secret"
+      data_dir = "/opt/emqx/data"
+    }
+    
+    # 集群配置
+    cluster {
+      name = emqxcl
+      # 单节点 建议为 manual 多节点为k8s
+      discovery_strategy = manual
+      k8s {
+        apiserver = "https://kubernetes.default.svc.cluster.local:443"
+        service_name = "helm-emqxs-headless"
+        # 这里可以改为 hostname
+        address_type = dns
+        namespace = "{{ .Namespace }}"
+        suffix = "svc.cluster.local"
+      }
+    }
+    
+    # 日志配置
+    log {
+      console {
+        enable = true
+        level = info
+      }
+      file {
+        enable = true
+        level = warning
+        path = "/opt/emqx/log"
+      }
+    }
+    
+    # Dashboard配置
+    dashboard {
+      listeners.http {
+        bind = "0.0.0.0:18083"
+      }
+      default_username = "admin"
+      default_password = "public"
+    }
+    
+    # 监听器配置
+    listeners.tcp.default {
+      bind = "0.0.0.0:1883"
+      max_connections = 1024000
+    }
+    
+    listeners.ws.default {
+      bind = "0.0.0.0:8083"
+      max_connections = 1024000
+      websocket.mqtt_path = "/mqtt"
+    }
+    
+    listeners.ssl.default {
+      bind = "0.0.0.0:8883"
+      max_connections = 512000
+    }
+    
+    # 认证配置 - 使用内置数据库
+    authentication = [
+      {
+        mechanism = password_based
+        backend = built_in_database
+        user_id_type = username
+        password_hash_algorithm {
+          name = sha256
+          salt_position = suffix
+        }
+        # Bootstrap文件路径 - 用于初始化用户
+        bootstrap_file = "/opt/emqx/data/bootstrap_users.json"
+        bootstrap_type = plain
+      }
+    ]
+    
+    # 授权配置
+    authorization {
+      no_match = deny
+      deny_action = disconnect
+    
+      sources = [
+        {
+          type = built_in_database
+          enable = true
+        }
+      ]
+    }
+    
+    # MQTT协议配置
+    mqtt {
+      max_packet_size = "1MB"
+      max_clientid_len = 65535
+      max_topic_levels = 128
+      max_qos_allowed = 2
+      max_topic_alias = 65535
+      retain_available = true
+      wildcard_subscription = true
+      shared_subscription = true
+    }
+
+---
+# ============== ConfigMap - Users & ACL (严格 JSON 格式) ==============
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: emqx-bootstrap-users
+  namespace: {{ .Namespace }}
+data:
+  bootstrap_users.json: |
+    [
+      { "user_id": "admin", "password": "{{ .EmqxPassword }}", "is_superuser": true },
+      { "user_id": "cmlc", "password": "{{ .EmqxPassword }}", "is_superuser": false }
+    ]
+
+  # 【修改点】既然有jq，这里使用标准的 JSON 数组格式，最不容易出错
+  bootstrap_acl.json: |
+    [
+      {
+        "username": "admin",
+        "rules": [
+          {"action": "all", "permission": "allow", "topic": "#"}
+        ]
+      },
+      {
+        "username": "cmlc",
+        "rules": [
+          {"action": "publish", "permission": "allow", "topic": "#"},
+          {"action": "subscribe", "permission": "allow", "topic": "#"}
+        ]
+      }
+    ]
+
+---
+# ============== ConfigMap - 初始化脚本 (修正版) ==============
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: emqx-init-dashboard
+  namespace: {{ .Namespace }}
+data:
+  init-dashboard.sh: |
+    #!/bin/bash
     set -e
+    
     DASHBOARD_USER="admin"
-    DASHBOARD_PASS="{{ .EmqxPassword }}"
+    DASHBOARD_PASS="${DASHBOARD_ADMIN_PASSWORD}"
-    MQTT_USER="admin"
-    MQTT_PASS="{{ .EmqxPassword }}"
-    # 等待 EMQX 本地 API 就绪
     EMQX_API="http://localhost:18083/api/v5"
-    echo "等待 EMQX API 就绪..."
+    ACL_FILE="/bootstrap/bootstrap_acl.json"
-    for i in $(seq 1 120); do
+    
+    # 辅助函数：打印带时间戳的日志
+    log() {
+      echo "[$(date +'%H:%M:%S')] $1"
+    }
+    
+    log "======================================"
+    log "初始化 Dashboard 与 ACL (Debug Version)"
+    log "======================================"
+    
+    # ----------------------------------------------------------------
+    # 1. 等待 EMQX API 就绪
+    # ----------------------------------------------------------------
+    log "[1/4] 等待 EMQX API 就绪..."
+    for i in $(seq 1 60); do
       if curl -s -f -m 5 "${EMQX_API}/status" > /dev/null 2>&1; then
-        echo "EMQX API 已就绪"
+        log "✓ EMQX API 已就绪"
         break
       fi
-      echo "等待中... ($i/120)"
+      if [ $i -eq 60 ]; then
+        log "✗ EMQX API 启动超时"
+        exit 1
+      fi
       sleep 5
     done
-    # 修改 Dashboard 管理员密码
+    
-    echo "修改 Dashboard 管理员密码..."
+    # ----------------------------------------------------------------
-    /opt/emqx/bin/emqx ctl admins passwd "${DASHBOARD_USER}" "${DASHBOARD_PASS}" || echo "密码可能已设置"
+    # 2. 修改 Dashboard 密码
-    echo "Dashboard 密码设置完成"
+    # ----------------------------------------------------------------
-    # 获取 Dashboard Token
+    log "[2/4] 检查/更新 Dashboard 密码..."
-    echo "获取 Dashboard Token..."
+    
-    TOKEN=$(curl -s -X POST "${EMQX_API}/login" \
+    # 获取 Token (尝试默认密码)
+    LOGIN_RESP=$(curl -s -X POST "${EMQX_API}/login" \
       -H 'Content-Type: application/json' \
-      -d "{\"username\":\"${DASHBOARD_USER}\",\"password\":\"${DASHBOARD_PASS}\"}" \
+      -d "{\"username\":\"${DASHBOARD_USER}\",\"password\":\"public\"}")
-      | grep -o '"token":"[^"]*' | cut -d'"' -f4)
+    
-    if [ -z "$TOKEN" ]; then
+    TOKEN=$(echo "$LOGIN_RESP" | jq -r '.token // empty')
-      echo "ERROR: 无法获取 Token"
+    
-      exit 1
+    if [ -n "$TOKEN" ]; then
+      log "  检测到默认密码，正在更新..."
+      curl -s -f -X POST "${EMQX_API}/users/${DASHBOARD_USER}/change_pwd" \
+        -H "Authorization: Bearer ${TOKEN}" \
+        -H 'Content-Type: application/json' \
+        -d "{\"old_pwd\":\"public\",\"new_pwd\":\"${DASHBOARD_PASS}\"}"
+      log "  ✓ Dashboard 密码已更新"
+    else
+      log "  ℹ 无法使用默认密码登录，跳过更新（可能已修改）"
     fi
-    echo "Token 获取成功"
+    
-    # 创建内置数据库认证器（使用 listeners 作用域）
+    # ----------------------------------------------------------------
-    echo "检查并创建内置数据库认证器..."
+    # 3. 导入 ACL 规则
-    # 为 tcp:default listener 添加认证器
+    # ----------------------------------------------------------------
-    echo "为 listener tcp:default 配置认证器..."
+    echo "[3/3] 导入ACL规则..."
-    curl -s -X POST "${EMQX_API}/authentication/tcp:default" \
+
-      -H "Authorization: Bearer ${TOKEN}" \
+    # 重新登录获取最新 Token
+    LOGIN_RESP=$(curl -sS -X POST "${EMQX_API}/login" \
       -H 'Content-Type: application/json' \
-      -d '{
+      -d "{\"username\":\"${DASHBOARD_USER}\",\"password\":\"${DASHBOARD_PASS}\"}")
-      "mechanism": "password_based",
+
-      "backend": "built_in_database",
+    TOKEN=$(echo "$LOGIN_RESP" | jq -r '.token // empty')
-      "user_id_type": "username",
+
-      "password_hash_algorithm": {
+    if [ -z "$TOKEN" ]; then
-        "name": "sha256",
+      echo "  ✗ 无法获取Token，请检查密码设置"
-        "salt_position": "suffix"
+      exit 0
-      }
+    fi
-    }' 2>/dev/null || echo "tcp:default 认证器可能已存在"
+
-    # 为 ws:default listener 添加认证器
+    if [ -f "$ACL_FILE" ]; then
-    echo "为 listener ws:default 配置认证器..."
+      echo "  正在解析 ACL 文件: $ACL_FILE"
-    curl -s -X POST "${EMQX_API}/authentication/ws:default" \
+
-      -H "Authorization: Bearer ${TOKEN}" \
+      if ! jq -e . "$ACL_FILE" >/dev/null 2>&1; then
-      -H 'Content-Type: application/json' \
+         echo "  ✗ ACL 文件 JSON 格式错误，跳过处理"
-      -d '{
+         exit 0
-      "mechanism": "password_based",
+      fi
-      "backend": "built_in_database",
+
-      "user_id_type": "username",
+      jq -c '.[]' "$ACL_FILE" | while read -r user_config; do
-      "password_hash_algorithm": {
+        USERNAME=$(echo "$user_config" | jq -r '.username // empty')
-        "name": "sha256",
+
-        "salt_position": "suffix"
+        # ✅ PUT/POST 都需要 username + rules（username 是 required）
-      }
+        REQ_BODY=$(echo "$user_config" | jq -c '{username: .username, rules: .rules}')
-    }' 2>/dev/null || echo "ws:default 认证器可能已存在"
+
-    # 等待认证器创建完成
+        if [ -z "$USERNAME" ]; then
-    sleep 2
+          echo "  ✗ ACL 条目缺少 username，跳过"
-    # 创建 MQTT 用户
+          continue
-    echo "创建 MQTT 用户: ${MQTT_USER}..."
+        fi
-    curl -s -X POST "${EMQX_API}/authentication/password_based:built_in_database/users?listener_id=tcp:default" \
+
-      -H "Authorization: Bearer ${TOKEN}" \
+        echo "  配置用户 ${USERNAME} 的ACL规则..."
-      -H 'Content-Type: application/json' \
+
-      -d "{\"user_id\":\"${MQTT_USER}\",\"password\":\"${MQTT_PASS}\",\"is_superuser\":true}" \
+        # 1) 优先 PUT（覆盖更新）
-      2>/dev/null || echo "用户可能已存在，尝试更新..."
+        http_code=$(curl -sS -o /tmp/emqx_acl_resp.json -w '%{http_code}' \
-    # 尝试更新密码
+          -X PUT "${EMQX_API}/authorization/sources/built_in_database/rules/users/${USERNAME}" \
-    curl -s -X PUT "${EMQX_API}/authentication/password_based:built_in_database/users/${MQTT_USER}?listener_id=tcp:default" \
+          -H "Authorization: Bearer ${TOKEN}" \
-      -H "Authorization: Bearer ${TOKEN}" \
+          -H 'Content-Type: application/json' \
-      -H 'Content-Type: application/json' \
+          -d "$REQ_BODY")
-      -d "{\"password\":\"${MQTT_PASS}\",\"is_superuser\":true}" \
+
-      2>/dev/null || true
+        if [ "$http_code" = "204" ]; then
-    echo "MQTT 用户创建/更新完成"
+          echo "    ✓ PUT 更新成功"
-    # 创建授权规则
+        elif [ "$http_code" = "404" ]; then
-    echo "配置授权规则..."
+          # 2) 不存在则 POST 创建
-    # 创建内置数据库授权源
+          http_code2=$(curl -sS -o /tmp/emqx_acl_resp.json -w '%{http_code}' \
-    curl -s -X POST "${EMQX_API}/authorization/sources" \
+            -X POST "${EMQX_API}/authorization/sources/built_in_database/rules/users" \
-      -H "Authorization: Bearer ${TOKEN}" \
+            -H "Authorization: Bearer ${TOKEN}" \
-      -H 'Content-Type: application/json' \
+            -H 'Content-Type: application/json' \
-      -d '{
+            -d "$REQ_BODY")
-      "type": "built_in_database",
+
-      "enable": true
+          if [ "$http_code2" = "204" ]; then
-    }' 2>/dev/null || echo "授权源可能已存在"
+            echo "    ✓ POST 创建成功"
-    sleep 2
+          else
-    # 为 admin 用户添加授权规则（使用数组格式）
+            echo "    ✗ POST 失败 (HTTP ${http_code2})：$(cat /tmp/emqx_acl_resp.json 2>/dev/null || true)"
-    echo "为 ${MQTT_USER} 用户添加 ACL 规则..."
+            exit 1
-    curl -s -X POST "${EMQX_API}/authorization/sources/built_in_database/rules/users" \
+          fi
-      -H "Authorization: Bearer ${TOKEN}" \
+        else
-      -H 'Content-Type: application/json' \
+          echo "    ✗ PUT 失败 (HTTP ${http_code})：$(cat /tmp/emqx_acl_resp.json 2>/dev/null || true)"
-      -d "[{\"username\":\"${MQTT_USER}\",\"rules\":[{\"action\":\"all\",\"permission\":\"allow\",\"topic\":\"#\"}]}]" \
+          exit 1
-      2>/dev/null && echo "ACL 规则创建成功" || echo "规则可能已存在，尝试更新..."
+        fi
-    # 尝试更新规则（PUT 请求需要单个对象，不是数组）
+
-    curl -s -X PUT "${EMQX_API}/authorization/sources/built_in_database/rules/users/${MQTT_USER}" \
+        # 3) 导入后验证（可选但强烈建议保留）
-      -H "Authorization: Bearer ${TOKEN}" \
+        verify_code=$(curl -sS -o /tmp/emqx_acl_verify.json -w '%{http_code}' \
-      -H 'Content-Type: application/json' \
+          -H "Authorization: Bearer ${TOKEN}" \
-      -d "{\"rules\":[{\"action\":\"all\",\"permission\":\"allow\",\"topic\":\"#\"}]}" \
+          "${EMQX_API}/authorization/sources/built_in_database/rules/users/${USERNAME}")
-      2>/dev/null && echo "ACL 规则更新成功" || true
+
-    echo "ACL 规则配置完成"
+        if [ "$verify_code" = "200" ]; then
-    echo "初始化完成！MQTT 用户: ${MQTT_USER}"
+          echo "    ✓ 验证成功：$(cat /tmp/emqx_acl_verify.json | jq -c '.')"
-    echo "可通过以下方式连接:"
+        else
-    echo " - MQTT: localhost:1883"
+          echo "    ✗ 验证失败 (HTTP ${verify_code})：$(cat /tmp/emqx_acl_verify.json 2>/dev/null || true)"
-    echo " - WebSocket: localhost:8083"
+          exit 1
-    echo " - Dashboard: http://localhost:18083"
+        fi
-    echo " - 用户名: ${MQTT_USER}"
+      done
+
+      echo "  ✓ ACL 规则导入完成"
+    else
+      echo "  ℹ 未找到 ACL 文件"
+    fi
 
 ---
+# ============== StatefulSet ==============
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -173,6 +374,7 @@ metadata:
 spec:
   replicas: 1
   serviceName: helm-emqxs-headless
+  podManagementPolicy: Parallel
   updateStrategy:
     type: RollingUpdate
   selector:
@@ -180,6 +382,7 @@ spec:
       cmii.type: middleware
       cmii.app: helm-emqxs
       cmii.emqx.architecture: cluster
+
   template:
     metadata:
       labels:
@@ -203,106 +406,246 @@ spec:
                       {{- else }}
                       - {{ .Namespace }}
                       {{- end }}
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: cmii.app
+                      operator: In
+                      values:
+                        - helm-emqxs
+                topologyKey: kubernetes.io/hostname
+
       imagePullSecrets:
-      - name: harborsecret
+        - name: harborsecret
+
       serviceAccountName: helm-emqxs
+
+      securityContext:
+        fsGroup: 1000
+        runAsUser: 1000
+
+      # InitContainer - 准备bootstrap文件
+      initContainers:
+        - name: prepare-bootstrap
+          # 动态选择 tools 镜像
+          {{- if .HarborPort }}
+          image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/tools:1.0
+          {{- else }}
+          image: {{ .HarborIPOrCustomImagePrefix }}cmii/tools:1.0
+          {{- end }}
+          imagePullPolicy: IfNotPresent
+          # =========================================================
+          # 权限: 必须以 root 身份运行才能 chown
+          # =========================================================
+          securityContext:
+            runAsUser: 0
+          command:
+            - /bin/sh
+            - -c
+            - |
+              echo "准备bootstrap文件..."
+              
+              # 创建数据目录
+              mkdir -p /opt/emqx/data
+              
+              # 复制bootstrap文件到数据目录
+              # 只在文件不存在时复制，避免覆盖已有数据
+              if [ ! -f /opt/emqx/data/bootstrap_users.json ]; then
+                cp /bootstrap-src/bootstrap_users.json /opt/emqx/data/
+                echo "✓ 已复制用户bootstrap文件"
+              else
+                echo "ℹ 用户bootstrap文件已存在，跳过"
+              fi
+              
+              # 设置权限 (现在有root权限，可以成功)
+              chown -R 1000:1000 /opt/emqx/data
+              
+              echo "✓ Bootstrap准备完成"
+          volumeMounts:
+            - name: emqx-data
+              mountPath: /opt/emqx/data
+            - name: bootstrap-users
+              mountPath: /bootstrap-src
+
       containers:
-      - name: helm-emqxs
+        # 主容器 - EMQX
-        {{- if .HarborPort }}
+        - name: emqx
-        image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/emqx:5.8.8
+          # 动态选择 emqx 镜像
-        {{- else }}
+          {{- if .HarborPort }}
-        image: {{ .HarborIPOrCustomImagePrefix }}emqx:5.8.8
+          image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/emqx:5.8.8
-        {{- end }}
+          {{- else }}
-        imagePullPolicy: Always
+          image: {{ .HarborIPOrCustomImagePrefix }}emqx:5.8.8
-        ports:
+          {{- end }}
-        - name: mqtt
+          imagePullPolicy: IfNotPresent
-          containerPort: 1883
+
-        - name: mqttssl
+          env:
-          containerPort: 8883
+            # Pod信息
-        - name: mgmt
+            - name: POD_NAME
-          containerPort: 8081
+              valueFrom:
-        - name: ws
+                fieldRef:
-          containerPort: 8083
+                  fieldPath: metadata.name
-        - name: wss
+            - name: EMQX_DATA_DIR
-          containerPort: 8084
+              value: "/opt/emqx/data"
-        - name: dashboard
+
-          containerPort: 18083
+          ports:
-        - name: ekka
+            - name: mqtt
-          containerPort: 4370
+              containerPort: 1883
-        envFrom:
+            - name: mqttssl
-        - configMapRef:
+              containerPort: 8883
-            name: helm-emqxs-env
+            - name: ws
-        # 添加生命周期钩子
+              containerPort: 8083
-        lifecycle:
+            - name: dashboard
-          postStart:
+              containerPort: 18083
-            exec:
+            - name: ekka
-              command:
+              containerPort: 4370
-              - /bin/sh
+
-              - -c
+          resources:
-              - |
+            requests:
-                # 后台执行初始化脚本，避免阻塞容器启动
+              cpu: "500m"
-                nohup /bin/sh /scripts/init-mqtt-user.sh > /tmp/init.log 2>&1 &
+              memory: "512Mi"
-        # 添加健康检查，确保 initContainer 执行时 API 已就绪
+            limits:
-        livenessProbe:
+              cpu: "2000m"
-          httpGet:
+              memory: "2Gi"
-            path: /status
+
-            port: 18083
+          livenessProbe:
-          initialDelaySeconds: 60
+            httpGet:
-          periodSeconds: 30
+              path: /status
-        readinessProbe:
+              port: 18083
-          httpGet:
+            initialDelaySeconds: 60
-            path: /status
+            periodSeconds: 30
-            port: 18083
+            timeoutSeconds: 10
-          initialDelaySeconds: 10
+            failureThreshold: 3
-          periodSeconds: 5
+
-        resources: {}
+          readinessProbe:
-        volumeMounts:
+            httpGet:
-        # 5.x 默认 data 目录，包含所有持久化数据
+              path: /status
-        - name: emqx-data
+              port: 18083
-          mountPath: "/opt/emqx/data"
+            initialDelaySeconds: 10
-          readOnly: false
+            periodSeconds: 10
-        - name: init-script
+            timeoutSeconds: 5
-          mountPath: /scripts
+            failureThreshold: 3
+
+          startupProbe:
+            httpGet:
+              path: /status
+              port: 18083
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            failureThreshold: 30
+
+          volumeMounts:
+            - name: emqx-data
+              mountPath: /opt/emqx/data
+            # 使用 subPath 挂载单个配置文件，避免覆盖目录
+            - name: bootstrap-config
+              mountPath: /opt/emqx/etc/emqx.conf
+              subPath: emqx.conf
+
+        # Sidecar - 初始化Dashboard密码和ACL
+        - name: init-dashboard
+          # 动态选择 tools 镜像
+          {{- if .HarborPort }}
+          image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/tools:1.0
+          {{- else }}
+          image: {{ .HarborIPOrCustomImagePrefix }}cmii/tools:1.0
+          {{- end }}
+          imagePullPolicy: IfNotPresent
+
+          command:
+            - /bin/sh
+            - -c
+            - |
+              # 等待主容器启动
+              echo "等待EMQX启动..."
+              sleep 20
+              
+              # 执行初始化
+              /bin/sh /scripts/init-dashboard.sh
+              
+              # 保持运行
+              echo "初始化完成，进入守护模式..."
+              while true; do sleep 3600; done
+
+          env:
+            - name: DASHBOARD_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: emqx-credentials
+                  key: dashboard-admin-password
+
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "64Mi"
+            limits:
+              cpu: "200m"
+              memory: "128Mi"
+
+          volumeMounts:
+            - name: init-script
+              mountPath: /scripts
+            - name: bootstrap-users
+              mountPath: /bootstrap
+
       volumes:
-      - name: emqx-data
+        - name: bootstrap-config
-        persistentVolumeClaim:
+          configMap:
+            name: emqx-bootstrap-config
+        - name: bootstrap-users
+          configMap:
+            name: emqx-bootstrap-users
+        - name: init-script
+          configMap:
+            name: emqx-init-dashboard
+            defaultMode: 0755
+        - name: emqx-data
+          persistentVolumeClaim:
             claimName: helm-emqxs
-      - name: init-script
-        configMap:
-          name: helm-emqxs-init-script
-          defaultMode: 0755
 
 ---
-kind: Role
+# ============== Service - Headless ==============
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: v1
+kind: Service
 metadata:
-  name: helm-emqxs
+  name: helm-emqxs-headless
   namespace: {{ .Namespace }}
-rules:
+  labels:
-- apiGroups: [""]
+    cmii.type: middleware
-  resources:
+    cmii.app: helm-emqxs
-  - endpoints
+    cmii.emqx.architecture: cluster
-  verbs:
+    helm.sh/chart: emqx-1.1.0
-  - get
+    app.kubernetes.io/managed-by: octopus-control
-  - watch
+    app.kubernetes.io/version: {{ .TagVersion }}
-  - list
+spec:
-
+  type: ClusterIP
----
+  clusterIP: None
-kind: RoleBinding
+  publishNotReadyAddresses: true
-apiVersion: rbac.authorization.k8s.io/v1
+  selector:
-metadata:
+    cmii.type: middleware
-  name: helm-emqxs
+    cmii.app: helm-emqxs
-  namespace: {{ .Namespace }}
+    cmii.emqx.architecture: cluster
-subjects:
+  ports:
-- kind: ServiceAccount
+    - name: mqtt
-  name: helm-emqxs
+      port: 1883
-  namespace: {{ .Namespace }}
+      targetPort: 1883
-roleRef:
+    - name: mqttssl
-  kind: Role
+      port: 8883
-  name: helm-emqxs
+      targetPort: 8883
-  apiGroup: rbac.authorization.k8s.io
+    - name: ws
+      port: 8083
+      targetPort: 8083
+    - name: dashboard
+      port: 18083
+      targetPort: 18083
+    - name: ekka
+      port: 4370
+      targetPort: 4370
 
 ---
+# ============== Service - NodePort ==============
 apiVersion: v1
 kind: Service
 metadata:
@@ -322,66 +665,19 @@ spec:
     cmii.app: helm-emqxs
     cmii.emqx.architecture: cluster
   ports:
-  - port: 1883
+    - name: mqtt
-    name: mqtt
+      port: 1883
-    targetPort: 1883
+      targetPort: 1883
-    nodePort: {{ .EmqxNodePort }}
+      nodePort: {{ .EmqxNodePort }}
-  - port: 18083
+    - name: dashboard
-    name: dashboard
+      port: 18083
-    targetPort: 18083
+      targetPort: 18083
-    nodePort: {{ .EmqxDashboardNodePort }}
+      nodePort: {{ .EmqxDashboardNodePort }}
-  - port: 8083
+    - name: ws
-    name: mqtt-websocket
+      port: 8083
-    targetPort: 8083
+      targetPort: 8083
-    nodePort: {{ .EmqxWebSocketNodePort }}
+      nodePort: {{ .EmqxWebSocketNodePort }}
-
+    - name: mqttssl
----
+      port: 8883
-apiVersion: v1
+      targetPort: 8883
-kind: Service
-metadata:
-  name: helm-emqxs-headless
-  namespace: {{ .Namespace }}
-  labels:
-    cmii.type: middleware
-    cmii.app: helm-emqxs
-    cmii.emqx.architecture: cluster
-    helm.sh/chart: emqx-1.1.0
-    app.kubernetes.io/managed-by: octopus-control
-    app.kubernetes.io/version: {{ .TagVersion }}
-spec:
-  type: ClusterIP
-  clusterIP: None
-  selector:
-    cmii.type: middleware
-    cmii.app: helm-emqxs
-    cmii.emqx.architecture: cluster
-  ports:
-  - name: mqtt
-    port: 1883
-    protocol: TCP
-    targetPort: 1883
-  - name: mqttssl
-    port: 8883
-    protocol: TCP
-    targetPort: 8883
-  - name: mgmt
-    port: 8081
-    protocol: TCP
-    targetPort: 8081
-  - name: websocket
-    port: 8083
-    protocol: TCP
-    targetPort: 8083
-  - name: wss
-    port: 8084
-    protocol: TCP
-    targetPort: 8084
-  - name: dashboard
-    port: 18083
-    protocol: TCP
-    targetPort: 18083
-  - name: ekka
-    port: 4370
-    protocol: TCP
-    targetPort: 4370
 `

agent-deploy/d_app/CmiiImageConfig.go

@@ -186,11 +186,11 @@ var MiddlewareAmd64 = []string{
 	"harbor.cdcyy.com.cn/cmii/nfs-subdir-external-provisioner:v4.0.2",
 	"docker.m.daocloud.io/jerrychina2020/rke-tools:v0.175-linux",
 	"docker.m.daocloud.io/jerrychina2020/rke-tools:v0.175",
-	"harbor.cdcyy.com.cn/cmii/busybox:1.37",
 	"harbor.cdcyy.com.cn/cmii/doris.be-ubuntu:2.1.6",
 	"harbor.cdcyy.com.cn/cmii/doris.fe-ubuntu:2.1.6",
 	"harbor.cdcyy.com.cn/cmii/doris.k8s-operator:1.3.1",
-	"harbor.cdcyy.com.cn/cmii/alpine:3.23.0",
+	"harbor.cdcyy.com.cn/cmii/tools:1.0",
+	"harbor.cdcyy.com.cn/cmii/curl:8.18.0",
 	"harbor.cdcyy.com.cn/cmii/nginx:1.27.0",
 }