配置文件修改

Dockerfile

@@ -16,10 +16,19 @@ RUN npm run build
 
 FROM nginx:alpine
 
+# 安装必要的工具
+RUN apk add --no-cache curl
+
 COPY --from=builder /app/dist /usr/share/nginx/html
 
+# 复制 Nginx 配置
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 
+# 创建 SSL 目录
+RUN mkdir -p /etc/nginx/ssl
+
+# 暴露端口
+EXPOSE 80 443
 
 # 启动 nginx
 CMD ["nginx", "-g", "daemon off;"]

Jenkinsfile

@@ -4,19 +4,18 @@ pipeline {
     parameters {
         choice(name: 'env', choices: ['dev', 'test', 'prod'], description: '部署环境')
         string(name: 'NAMESPACE', defaultValue: 'portal-frontend', description: 'K8s 命名空间')
-        string(name: 'DOMAIN', defaultValue: '', description: 'Ingress 域名（留空则不创建 Ingress）')
+        string(name: 'DOMAIN', defaultValue: 'radar-power.asia', description: 'Ingress 域名（留空则不创建 Ingress）')
+        string(name: 'TLS_SECRET', defaultValue: 'portal-tls', description: 'TLS Secret 名称（仅在 DOMAIN 非空时使用）')
     }
 
     environment {
-        PROJECT_NAME       = 'portal-service-frontend'
-        BUILD_DIR          = 'dist'
-        NODE_ENV           = 'production'
-        HARBOR_HOST        = '8.130.28.21:81'
-        KUBECONFIG_PATH    = '/root/.kube/config'
-        NODE1_IP           = '172.27.73.147'
-        NODE2_IP           = '172.27.73.146'
-        HARBOR_USER        = 'admin'
-        HARBOR_PASS        = 'Hfln@1024'
+        PROJECT_NAME    = 'new-portal-frontend'
+        BUILD_DIR       = 'dist'
+        NODE_ENV        = 'production'
+        HARBOR_HOST     = '8.130.28.21:81'
+        KUBECONFIG_PATH = '/root/.kube/config'
+        HARBOR_USER     = 'admin'
+        HARBOR_PASS     = 'Hfln@1024'
         HARBOR_RETENTION_ID = '1'
     }
 
@@ -25,9 +24,11 @@ pipeline {
             steps {
                 script {
                     env.HARBOR_PROJECT = params.env
-                    env.IMAGE_TAG = "${env.HARBOR_HOST}/${env.HARBOR_PROJECT}/${env.PROJECT_NAME}:${BUILD_NUMBER}"
+                    env.IMAGE_TAG = "${HARBOR_HOST}/${env.HARBOR_PROJECT}/${PROJECT_NAME}:${BUILD_NUMBER}"
                     echo ">>> 环境：${params.env}, Harbor项目：${env.HARBOR_PROJECT}, K8s命名空间：${params.NAMESPACE}"
-                    echo ">>> IMAGE_TAG = ${env.IMAGE_TAG}"
+                    if (params.DOMAIN?.trim()) {
+                        echo ">>> 域名：${params.DOMAIN}, TLS Secret：${params.TLS_SECRET}"
+                    }
                 }
             }
         }
@@ -43,10 +44,10 @@ pipeline {
             steps {
                 script {
                     sh """
-                        docker login -u ${env.HARBOR_USER} -p ${env.HARBOR_PASS} ${env.HARBOR_HOST}
-                        docker build --build-arg ENV=${params.env} -t ${env.IMAGE_TAG} .
+                        docker login -u ${HARBOR_USER} -p ${HARBOR_PASS} ${HARBOR_HOST}
+                        docker build --build-arg ENV=${params.env} -t ${IMAGE_TAG} .
                     """
-                    echo "✅ 镜像构建成功：${env.IMAGE_TAG}"
+                    echo "✅ 镜像构建成功：${IMAGE_TAG}"
                 }
             }
         }
@@ -55,47 +56,50 @@ pipeline {
             steps {
                 script {
                     sh """
-                        docker push ${env.IMAGE_TAG}
-                        docker rmi ${env.IMAGE_TAG} || true
+                        docker push ${IMAGE_TAG}
+                        docker rmi ${IMAGE_TAG}
                     """
                     echo "✅ 镜像推送并本地清理完成"
                 }
             }
         }
 
-        stage('🔍 测试节点能否拉取镜像') {
+        stage('   Kubernetes 部署') {
             steps {
                 script {
-                    echo ">>> 测试节点能否拉取镜像..."
-                    // 注意：确保 Jenkins 节点能免密 SSH 到这些节点，或将这一步改为跳过
+                    def domain = params.DOMAIN?.trim()
                     sh """
-                        ssh root@${env.NODE1_IP} docker login -u ${env.HARBOR_USER} -p ${env.HARBOR_PASS} ${env.HARBOR_HOST} && docker pull ${env.IMAGE_TAG} || echo '[❌ 节点 ${env.NODE1_IP} 拉取失败]'
-                        ssh root@${env.NODE2_IP} docker login -u ${env.HARBOR_USER} -p ${env.HARBOR_PASS} ${env.HARBOR_HOST} && docker pull ${env.IMAGE_TAG} || echo '[❌ 节点 ${env.NODE2_IP} 拉取失败]'
-                    """
-                }
-            }
-        }
+                        export KUBECONFIG=${KUBECONFIG_PATH}
 
-        stage('📦 部署到 Kubernetes') {
-            steps {
-                script {
-                    def domain = params.DOMAIN?.trim()
-                    // 组装 ingress 块（如果 domain 非空）
-                    def ingressBlock = ''
-                    if (domain) {
-                        ingressBlock = """---
+                        # 确保命名空间存在
+                        kubectl get ns ${params.NAMESPACE} >/dev/null 2>&1 || kubectl create ns ${params.NAMESPACE}
+
+                        # 如果 Deployment 存在，更新镜像
+                        if kubectl get deployment ${PROJECT_NAME} -n ${params.NAMESPACE} >/dev/null 2>&1; then
+                            echo ">>> Deployment 已存在，更新镜像..."
+                            kubectl set image deployment/${PROJECT_NAME} ${PROJECT_NAME}=${IMAGE_TAG} -n ${params.NAMESPACE}
+                            kubectl rollout status deployment/${PROJECT_NAME} -n ${params.NAMESPACE} --timeout=120s
+
+                            # 更新 Ingress（如果提供了域名）
+                            if [ -n "${domain}" ]; then
+                                kubectl apply -n ${params.NAMESPACE} -f - <<EOF
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ${env.PROJECT_NAME}
-  namespace: ${params.NAMESPACE}
+  name: ${PROJECT_NAME}-ingress
   annotations:
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+    nginx.ingress.kubernetes.io/proxy-body-size: "8m"
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
   tls:
   - hosts:
     - ${domain}
-    secretName: portal-tls
+    secretName: ${params.TLS_SECRET}
   rules:
   - host: ${domain}
     http:
@@ -104,66 +108,97 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: ${env.PROJECT_NAME}
+            name: ${PROJECT_NAME}
             port:
               number: 80
-"""
-                    }
-
-                    // 生成完整 deploy.yaml 内容
-                    def deployYaml = """apiVersion: apps/v1
+EOF
+                            fi
+                        else
+                            # 创建新的 Deployment 和 Service
+                            kubectl apply -n ${params.NAMESPACE} -f - <<EOF
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ${env.PROJECT_NAME}
-  namespace: ${params.NAMESPACE}
+  name: ${PROJECT_NAME}
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app: ${env.PROJECT_NAME}
+      app: ${PROJECT_NAME}
   template:
     metadata:
       labels:
-        app: ${env.PROJECT_NAME}
+        app: ${PROJECT_NAME}
     spec:
       containers:
-      - name: ${env.PROJECT_NAME}
-        image: ${env.IMAGE_TAG}
+      - name: ${PROJECT_NAME}
+        image: ${IMAGE_TAG}
         ports:
         - containerPort: 80
-        env:
-        - name: NODE_ENV
-          value: "${params.env}"
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: ${env.PROJECT_NAME}
-  namespace: ${params.NAMESPACE}
+  name: ${PROJECT_NAME}
 spec:
-  type: NodePort
+  type: ClusterIP
   selector:
-    app: ${env.PROJECT_NAME}
+    app: ${PROJECT_NAME}
   ports:
   - port: 80
     targetPort: 80
-    nodePort: 30088
-${ingressBlock}
-"""
+EOF
 
-                    writeFile file: 'deploy.yaml', text: deployYaml
-                    sh """
-                        export KUBECONFIG=${env.KUBECONFIG_PATH}
-                        kubectl get ns ${params.NAMESPACE} >/dev/null 2>&1 || kubectl create ns ${params.NAMESPACE}
-                        kubectl apply -f deploy.yaml
-                        kubectl rollout status deployment/${env.PROJECT_NAME} -n ${params.NAMESPACE} --timeout=120s || echo '[rollout timeout or incomplete]'
-                    """
+                            # 创建 Ingress（如果提供了域名）
+                            if [ -n "${domain}" ]; then
+                                kubectl apply -n ${params.NAMESPACE} -f - <<EOF
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ${PROJECT_NAME}-ingress
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+    nginx.ingress.kubernetes.io/proxy-body-size: "8m"
+    nginx.ingress.kubernetes.io/rewrite-target: /
+spec:
+  tls:
+  - hosts:
+    - ${domain}
+    secretName: ${params.TLS_SECRET}
+  rules:
+  - host: ${domain}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: ${PROJECT_NAME}
+            port:
+              number: 80
+EOF
+                            fi
+                        fi
 
-                    if (domain) {
-                        echo ">>> ✅ 部署完成（含 Ingress），访问地址：https://${domain}/ （请确保 DNS 已指向 Ingress 公网 IP 且 secret portal-tls 已创建）"
-                    } else {
-                        echo ">>> ✅ 部署完成（NodePort），访问地址：http://${env.NODE1_IP}:30088/ 或 http://${env.NODE2_IP}:30088/"
-                    }
+                        # 显示部署状态
+                        echo ">>> 部署状态："
+                        kubectl get all -n ${params.NAMESPACE}
+                        kubectl get ingress -n ${params.NAMESPACE} || echo ">>> 未配置 Ingress"
+
+                        # 如果配置了域名，显示访问信息
+                        if [ -n "${domain}" ]; then
+                            echo ">>> 应用部署完成！"
+                            echo ">>> 访问地址：https://${domain}"
+                            echo ">>> 注意：确保域名 ${domain} 已正确解析到集群"
+                        else
+                            echo ">>> 应用部署完成！"
+                            echo ">>> 注意：未配置域名，请手动配置 Ingress 或使用 NodePort 访问"
+                        fi
+                    """
                 }
             }
         }
@@ -171,7 +206,7 @@ ${ingressBlock}
         stage('🧹 清理本地旧镜像（保留最新3个）') {
             steps {
                 script {
-                    def baseImage = "${env.HARBOR_HOST}/${env.HARBOR_PROJECT}/${env.PROJECT_NAME}"
+                    def baseImage = "${HARBOR_HOST}/${env.HARBOR_PROJECT}/${PROJECT_NAME}"
                     sh """
                         docker images ${baseImage} --format "{{.Repository}}:{{.Tag}}" \\
                         | grep -v latest \\
@@ -184,7 +219,7 @@ ${ingressBlock}
             }
         }
 
-        stage('🧼 清理 dangling 镜像') {
+        stage('   清理悬空镜像 <none>') {
             steps {
                 script {
                     sh """
@@ -195,13 +230,14 @@ ${ingressBlock}
             }
         }
 
-        stage('🔁 触发 Harbor 镜像保留策略（可选）') {
+        stage('   触发 Harbor 镜像保留策略') {
             steps {
                 script {
                     sh """
-                        curl -u ${env.HARBOR_USER}:${env.HARBOR_PASS} -X POST "http://${env.HARBOR_HOST}/api/v2.0/retentions/${env.HARBOR_RETENTION_ID}/executions" || echo '[retention trigger failed]'
+                        curl -u ${HARBOR_USER}:${HARBOR_PASS} -X POST \\
+                        "http://${HARBOR_HOST}/api/v2.0/retentions/${HARBOR_RETENTION_ID}/executions"
                     """
-                    echo "✅ Harbor 镜像保留策略已触发（若配置）"
+                    echo "✅ Harbor 镜像保留策略已触发"
                 }
             }
         }
@@ -209,7 +245,7 @@ ${ingressBlock}
 
     post {
         success {
-            echo "✅ 构建 & 部署成功 🎉"
+            echo "✅ 构建 & 部署成功   "
         }
         failure {
             echo "❌ 构建或部署失败，请检查日志"
@@ -218,4 +254,4 @@ ${ingressBlock}
             cleanWs()
         }
     }
-}
+}

nginx.conf

@@ -1,30 +1,44 @@
-# 主配置文件：/etc/nginx/nginx.conf
-# 确保包含以下行：
-# include /etc/nginx/conf.d/*.conf;
-
-# 在 /etc/nginx/conf.d/ 目录下创建新文件：radar-power.asia.conf
+# 处理 radar-power.asia 域名 - 代理到 Kubernetes Ingress
 server {
     listen 80;
     server_name radar-power.asia;
-    return 301 https://$server_name$request_uri;
+
+    location / {
+        proxy_pass http://127.0.0.1:31046;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Port $server_port;
+
+        # 超时设置
+        proxy_connect_timeout 30s;
+        proxy_send_timeout 30s;
+        proxy_read_timeout 30s;
+
+        # 缓冲设置
+        proxy_buffering on;
+        proxy_buffer_size 4k;
+        proxy_buffers 8 4k;
+    }
 }
 
 server {
     listen 443 ssl;
     server_name radar-power.asia;
-    
+
     # SSL 证书配置
     ssl_certificate /etc/nginx/ssl/radar-power.asia.crt;
     ssl_certificate_key /etc/nginx/ssl/radar-power.asia.key;
-    
+
     # SSL 安全配置
     ssl_protocols TLSv1.2 TLSv1.3;
     ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384;
     ssl_prefer_server_ciphers off;
     ssl_session_cache shared:SSL:10m;
     ssl_session_timeout 10m;
-    
-    # 代理到 Kubernetes Ingress
+
     location / {
         proxy_pass http://127.0.0.1:31046;
         proxy_set_header Host $host;
@@ -33,12 +47,12 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-Host $host;
         proxy_set_header X-Forwarded-Port $server_port;
-        
+
         # 超时设置
         proxy_connect_timeout 30s;
         proxy_send_timeout 30s;
         proxy_read_timeout 30s;
-        
+
         # 缓冲设置
         proxy_buffering on;
         proxy_buffer_size 4k;
@@ -46,7 +60,7 @@ server {
     }
 }
 
-# 保留您现有的配置，修改为：default.conf
+# 处理其他域名和 localhost - 静态文件服务
 server {
     listen 80;
     server_name localhost;