Quellcode durchsuchen

1:修正cicd 文件

wmy vor 2 Wochen
Ursprung
Commit
066a86b448
6 geänderte Dateien mit 19 neuen und 134 gelöschten Zeilen
  1. 0 8
      .idea/.gitignore
  2. 0 8
      Dockerfile
  3. 0 83
      Jenkinsfile
  4. 0 6
      build.sh
  5. 19 14
      device_states.json
  6. 0 15
      docker-compose.yaml

+ 0 - 8
.idea/.gitignore

@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

+ 0 - 8
Dockerfile

@@ -1,8 +0,0 @@
-# 基于你已构建的基础镜像(包含所有依赖)
-FROM 172.16.0.165:5000/simulations/ultrafiltration_model:v1
-
-WORKDIR /app
-
-COPY . .
-
-CMD ["python", "loop_main.py"]

+ 0 - 83
Jenkinsfile

@@ -1,83 +0,0 @@
-pipeline {
-    agent any
-
-    environment {
-        DEPLOY_SERVER = "greentech@39.105.38.31"
-        DEPLOY_REPO_PATH = "/home/greentech/services/ultrafiltration_model"
-        HARBOR_URL = "172.16.0.165:5000/simulations"
-        IMAGE_NAME = "ultrafiltration_model"
-    }
-
-    stages {
-        stage('获取commit哈希') {
-            steps {
-                git branch: "${APP_GIT_BRANCH}",
-                    url: "${APP_GIT_URL}",
-                    credentialsId: "git-public"
-            }
-        }
-
-        stage('拉取代码') {
-            steps {
-                withCredentials([usernamePassword(
-                    credentialsId: 'gpu1key',
-                    usernameVariable: 'USER',
-                    passwordVariable: 'PWD'
-                )]) {
-                    sh """
-                        sshpass -p '$PWD' ssh -o StrictHostKeyChecking=no $USER@39.105.38.31 "
-                            cd ${DEPLOY_REPO_PATH} &&
-                            git pull origin ${APP_GIT_BRANCH}
-                        "
-                    """
-                }
-            }
-        }
-
-        stage('构建并推送镜像') {
-            steps {
-                script {
-                    def gitCommitShort = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                    withCredentials([usernamePassword(
-                        credentialsId: 'gpu1key',
-                        usernameVariable: 'USER',
-                        passwordVariable: 'PWD'
-                    )]) {
-                        sh """
-                            sshpass -p '$PWD' ssh -o StrictHostKeyChecking=no $USER@39.105.38.31 "
-                                cd ${DEPLOY_REPO_PATH} &&
-                                export HARBOR_URL=${HARBOR_URL} &&
-                                export IMAGE_NAME=${IMAGE_NAME} &&
-                                export GIT_COMMIT_SHORT=${gitCommitShort} &&
-                                chmod +x build.sh &&
-                                ./build.sh
-                            "
-                        """
-                    }
-                }
-            }
-        }
-
-        stage('部署到生产环境') {
-            steps {
-                script {
-                    def gitCommitShort = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                    
-                    withCredentials([usernamePassword(
-                        credentialsId: 'gpu1key',
-                        usernameVariable: 'USER',
-                        passwordVariable: 'PWD'
-                    )]) {
-                        sh """
-                            sshpass -p '$PWD' ssh -o StrictHostKeyChecking=no $USER@39.105.38.31 "
-                            export GIT_COMMIT_SHORT=${gitCommitShort}
-                                cd ${DEPLOY_REPO_PATH} &&
-								docker compose pull && docker compose up -dV 
-                            "
-                        """
-                    }
-                }
-            }
-        }
-    }
-}

+ 0 - 6
build.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-#zoumuyu
-
-docker build -t ${HARBOR_URL}/${IMAGE_NAME}:${GIT_COMMIT_SHORT} .
-docker push ${HARBOR_URL}/${IMAGE_NAME}:${GIT_COMMIT_SHORT}
-docker pull ${HARBOR_URL}/${IMAGE_NAME}:${GIT_COMMIT_SHORT}

+ 19 - 14
device_states.json

@@ -1,27 +1,32 @@
 {
     "_comment": "此文件用于存储每个设备的运行时状态。时间格式为 YYYY-MM-DD HH:MM:SS",
     "UF1": {
-        "model_prev_L_s": 4160.0,
-        "model_prev_t_bw_s": 92.0,
-        "last_cycle_end_time": "2025-10-23 05:01:24",
-        "recent_tmp_values": []
-    },
-    "UF2": {
         "model_prev_L_s": 4220.0,
         "model_prev_t_bw_s": 90.0,
-        "last_cycle_end_time": "2025-10-26 15:34:23",
-        "recent_tmp_values": []
+        "last_cycle_end_time": "2025-10-29 09:29:48",
+         "recent_tmp_values": [
+            0.0246
+        ]
+    },
+    "UF2": {
+        "model_prev_L_s": 4280.0,
+        "model_prev_t_bw_s": 88.0,
+        "last_cycle_end_time": "2025-10-29 14:17:57",
+        "recent_tmp_values": [
+            0.0236
+        ]
     },
     "UF3": {
-        "model_prev_L_s": 4220.0,
-        "model_prev_t_bw_s": 90.0,
-        "last_cycle_end_time": "2025-10-26 18:17:28",
-        "recent_tmp_values": []
+        "model_prev_L_s": 4280.0,
+        "model_prev_t_bw_s": 88.0,
+        "last_cycle_end_time": "2025-10-29 16:55:15",
+        "recent_tmp_values": [
+            0.0227
+        ]
     },
     "UF4": {
         "model_prev_L_s": 4220.0,
         "model_prev_t_bw_s": 90.0,
-        "last_cycle_end_time": "2025-10-27 13:44:33",
-        "recent_tmp_values": []
+        "last_cycle_end_time": "2025-10-27 13:44:35"
     }
 }

+ 0 - 15
docker-compose.yaml

@@ -1,15 +0,0 @@
-version: '3.8'
-
-services:
-  ultrafiltration_model:
-    image: 172.16.0.165:5000/simulations/ultrafiltration_model:${GIT_COMMIT_SHORT}
-    container_name: ultrafiltration_model
-    restart: always
-    environment:
-      - TZ=Asia/Shanghai
-    networks:
-      - ultrafiltration_model
-
-networks:
-  ultrafiltration_model:
-    driver: bridge