配置文件

2025-12-11 15:07:58 +08:00
parent 3c218626c1
commit 56bb2bc50d
35 changed files with 1342 additions and 469 deletions
--- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
@@ -2344,8 +2344,8 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
                    if(ObjectUtils.isNotEmpty(taskBaseInfo)) {
                        taskBaseInfo.setPoolId(fileSimulationMappingResp.getSimulationPoolId());
                        taskBaseInfo.setFileId(fileSimulationMappingResp.getFileId());
+                        result.add(taskBaseInfo);
                    }
-                    result.add(taskBaseInfo);
                }
            });

--- a/data/src/main/resources/application-prod.yml
+++ b/data/src/main/resources/application-prod.yml
@@ -5,6 +5,10 @@ spring:
  application:
    name: data
  datasource:
+    username: root
+    password: mysql
+    jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+    driver-class-name: com.mysql.cj.jdbc.Driver
    hikari:
      # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。
      maximum-pool-size: 20
@@ -18,53 +22,22 @@ spring:
      connection-timeout: 30000 # 30s
    master:
      username: root
-      password: ENC(+QKYnI6gAYu1SbLaZQTkZA==)
-      jdbc-url: jdbc:mysql://172.27.2.238:3306/spdm_prod?useUnicode=true&characterEncoding=utf-8&useSSL=true&clientCertificateKeyStoreUrl=file:/opt/spdm/mysql_ssl/keystoremysql&clientCertificateKeyStorePassword=guangqi&trustCertificateKeyStoreUrl=file:/opt/spdm/mysql_ssl/truststoremysql&trustCertificateKeyStorePassword=guangqi&serverTimezone=Asia/Shanghai
-#      jdbc-url: jdbc:mysql://10.30.10.210:3306/spdm?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+      password: mysql
+      jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
      driver-class-name: com.mysql.cj.jdbc.Driver
    slave:
      username: root
-      password: ENC(+QKYnI6gAYu1SbLaZQTkZA==)
-      jdbc-url: jdbc:mysql://172.27.2.238:3306/spdm_prod?useUnicode=true&characterEncoding=utf-8&useSSL=true&clientCertificateKeyStoreUrl=file:/opt/spdm/mysql_ssl/keystoremysql&clientCertificateKeyStorePassword=guangqi&trustCertificateKeyStoreUrl=file:/opt/spdm/mysql_ssl/truststoremysql&trustCertificateKeyStorePassword=guangqi&serverTimezone=Asia/Shanghai
-#      jdbc-url: jdbc:mysql://10.30.10.210:3306/spdm?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+      password: mysql
+      jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
      driver-class-name: com.mysql.cj.jdbc.Driver
      enable: true
  cloud:
    nacos:
      discovery:
-        server-addr: 172.27.2.238:8848
+        server-addr: 192.168.30.146:8848
        group: PROD_GROUP
-#                  server-addr: 127.0.0.1:8848
+        #                  server-addr: 127.0.0.1:8848
        enabled: true
-        username: nacos
-        password: ENC(+QKYnI6gAYu1SbLaZQTkZA==)
-        namespace: 3
-  data:
-    redis:
-      # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0
-      database: 1
-      # redis服务器地址（填写自己的服务器地址）
-      host: 172.27.2.238
-      # redis端口（默认6379）
-      port: 6379
-      #redis连接超时等待,10秒
-      timeout: PT10S
-      # redis访问密码（默认为空）
-      password: ENC(+QKYnI6gAYu1SbLaZQTkZA==)
-      lettuce:
-        pool:
-          # 连接池最大连接数（使用负值表示没有限制） 默认 8
-          max-active: 50
-          # 连接池中的最大空闲连接 默认 8
-          max-idle: 20
-          # 连接池中的最小空闲连接 默认 0
-          min-idle: 1
-          # 连接池最大阻塞等待时间(使用负值表示没有限制) 默认 -1，这里配置10s
-          max-wait: PT10S
-#    password:
-#    sentinel:
-#      master: mymaster
-#      nodes: 10.18.109.50:26379,10.18.109.51:26379,10.18.109.52:26379
  servlet:
    multipart:
      # 单个文件的最大值
@@ -72,11 +45,29 @@ spring:
      # 上传文件总的最大值
      max-request-size: 10240MB

+management:
+  endpoints:
+    web:
+      exposure:
+        include: health,info
+  endpoint:
+    health:
+      show-details: always
+      group:
+        readiness:
+          include: discoveryComposite,ping,refreshScope
+  health:
+    redis:
+      enabled: false
+    db:
+      enabled: false
+
 mybatis-plus:
  configuration:
    map-underscore-to-camel-case: true
    auto-mapping-behavior: full
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  #    cache-enabled: true
  mapper-locations: classpath*:mapper/**/*.xml
  global-config:
    # 逻辑删除配置
@@ -86,53 +77,27 @@ mybatis-plus:
      # 删除后
      logic-delete-value: 0

-#showSql
-#logging:
-#  level:
-#    com.sdm.dao: debug
+# MyBatis SQL日志配置
+logging:
+  level:
+    com.baomidou.mybatisplus.core.MybatisConfiguration: debug
+    com.baomidou.mybatisplus.core.override.MybatisMapperRegistry: trace
+    com.sdm.data.mapper: debug
+    java.sql: debug
+    java.sql.Connection: debug
+    java.sql.Statement: debug
+    java.sql.PreparedStatement: debug

 lombok:
  anyConstructor:
    addConstructorProperties: true

 file:
-  rootPath: /SPDM/prod_server
-  viewDataPath: /SPDM/simright/viewdata
+  rootPath: /data/home/sdm
+  privatePath: /data/home

-hpc:
-  url: http://172.27.3.135/JSONAPI/JSONAPI.ashx
-  # 0单机，1执行和文件传输分开
-  fileType: 0
-  postName: root
-  postCode: '&bwM%Tgsn@cw'
-  postServer: 10.1.3.166
-  #后处理执行模式，0本机，1ssh到其他机器
-  postType: 0
-  #最多同时执行的后处理数量
-  postCount: 2
-
-idme:
-  tenantId: 700993435561107456
-  #  prefixUrl: https://10.30.8.192/rdm_d7cfc15006a04012934fcbb120ef3f18_app/services/
-  prefixUrl: https://idme-runtime.gacrnd.com/rdm_9630dbf335434b5aa5a4a5d9f655876c_app/services/
-  privateKeyStr: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC2Lt/AHP9kPCqQuGxpLEfsE9JmwdNe1DyvWQGC8l4oKOIIBuJRJr2DlVcdfIT1KO49mmP4ucS10OoxGgXclW24BBzvGtQFJ6aF9e7pHq3m/lq6zAVTV8smr23XBe6+n8rDaG0IEtFCnsyizA/idzcKs3KSnSXN9AU0fwI+nAJZ8896liK/A5H/YYnVxvJlgy4/fGdHzgEjzFbi54AqfZTfcFbYA5W0S1h6L4TE/BSVV6cgtL3bpIUQuaLKiPP/E//PwNU7aZ11WaopIkXxB15cZ7JOXHpyHs49sdShIDY+75L8QKykWX7xm/Kg+p2y1HmjpK0sYDZwgc2B3D/myTDlAgMBAAECggEAM5JhVIjg4wcFJaKPTdZzJakWzm/f3eBGrXyMqPzjGos4MP2B42cMDsuftYEiQiQsDNQ/qJEt1ioloXC0aBUE0iqX5je5/RuUUCemUeeVYuZt2KMYftdDctgGR/At/VhOlbJh6v8oras2Un9hn8IPmr/hlw9VPE/viUTK5d5T7BJUqYxiakEVYofnUWeOGvQJCsC8HT32kMsl3U3zCtut5t2v4afV+16yB8CasBYpgWZ9TBbh8FldxngEvHTJwNSIEm0KR2puFDIwctEvHxd8bxbNYMYfQL0KBW6f2GZQ061zoOQzwo4ZAH/foVq2WrUPp9KTzhawG8NqLOjpQHodAQKBgQD+T3VBda3gANhX3Ti5cmR+N9nOlYp9xifkaC0kcrFcFIVTbK/f1OobPmUQkXoGKqI+swc6Z3wvmM/BT8qGCLCQIjhL7oiIGks6ALZYFSO4rTaP16qL37utlnp3exinEhnq0Yb8u9VpVjC/5v7uOdKwWd0ZXjvbMudDc9bHukMxXQKBgQC3ZL0kF7hkHiVDud5Dg0NIY1jCc90ENfzj2J6I23jddodYprjVu1POpEvM1jb3rpmbZOYsCJb5En5QePTgsWq1rliPpD67Etsm5g2glJhPmRGcc/9RDr2AOArNip9U+IhICbhonKaWkJaUoKvD7k6WODJG2kAzPqiyrLkabn3dKQKBgF1T5bEvMa86QCsGmZGdBHo5nuosgRWlSfCNtrtgh+xF76PtCCI5rexvmoFZEhH/RWmDJAzv+2gwSVYlJSrJN5q9pDFhiaOBGshfiIuMvn5AuvxQ5lrMscCDr8/3UdXGU9KUMFjByhENO3jBmh7tA4AKipSLu6W26Z4cfd7wYUZVAoGBAJvfPXstxgUiMh4MHkNXj5o5BjnP7GwlztmBRc2gbGwe0A6jNbpDS4n4zow9Dd8aQWh4K8IFUvxDoaSYCdnoMYBVvOPpf3/VGPtI0RBI++O7f+JwHPMyChKuj0//oEjCLGK+EESp0FVscu/EV/lh1N2Myf66hZKIkS277F/wxX1xAoGBAIleLj+Yl4G/QAj4Cp99rEF7LvClooLsSa1s344xe5F6IWdd3jk5UlUywPeLD+x2aiPKYra/4W7msfAwLhhjaADPHtqp4q7Xm60kWkuTfWZe0hRvcH+lnar1gYksJOa2jaosYTAiUR59VOzGaQqgJ6oVHV4PlE5Cv5xO0Rvg2dQe
-  userId: PerformancePlanningV
-  userName: SPDMSystem
-
-ftp:
-  host: 172.27.3.135
-  port: 6318
-
-#hpc定时任务开关
-scheduled:
-  cleanZip: 0 0 4 * * ?
-  getProjectSize: 0 0/30 9-19 * * ?
-  syncHpcTaskStatus: 30 * * * * ?
-  taskResultSync: 0 0/1 * * * ?
-
-  loadcaseNotice: 0 0 9 * * ?
-  updateExeStatus: 0 0 4 * * ?
-  syncUser: 0 0 4 * * ?
+#logging:
+#  config: ./config/logback.xml

 # 配置文件系统类型
 fileSystem:
@@ -140,15 +105,9 @@ fileSystem:
  system: system
  chose: minio  # 这里选择minio或者system

-#地址: https://play.min.io
-#凭据:
-#账号: minioadmin / 密码: minioadmin
-#特点:
-#由 MinIO 官方提供，用于演示和测试。
-#公开可访问，但数据可能定期清理。
-#支持 S3 API，适合快速验证代码
+# spdmadmin/spdmadmin 作为普通用户只能看到spdm桶的数据
 minio:
-  endpoint: 192.168.65.161
+  endpoint: 192.168.30.146
  port: 9000
  access-key: minioadmin
  secret-key: minioadmin
@@ -156,8 +115,18 @@ minio:
  secret-business-bucket: secretbusiness # 存放保密业务代码、脚本的桶（仅超级管理员访问）
  spdm-bucket: spdm   # 普通业务数据桶（分配给用户读写权限）
  directMemory: 16384 # 16kb
+  lifecycleConfig: '{"auto-expire-1d":"1d"}'

 security:
  whitelist:
    paths:
-      - /data/previewImage
+      - /data/previewImage
+      - /data/approveDataFile
+      - /data/downloadFile
+      - /data/flowableUpFileToLocal
+      - /data/flowableUpFileToLocalMerge
+      - /data/getFileBaseInfo
+
+data:
+  storage-monitor:
+    cron: 0 0 9 * * ?
--- a/data/src/main/resources/bin/start.sh
+++ b/data/src/main/resources/bin/start.sh
@@ -42,4 +42,4 @@ fi

 # 启动项目
 echo "正在启动项目..."
-nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 &
+nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5002 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 &
--- a/data/src/main/resources/bin/startprod.sh
+++ b/data/src/main/resources/bin/startprod.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Spring Boot 项目启动脚本
+JAR_PATH="/home/app/data"
+JAR_NAME="data-0.0.1-SNAPSHOT.jar"
+FULL_JAR_PATH="${JAR_PATH}/${JAR_NAME}"
+
+# 与logback.xml保持一致的日志路径
+LOG_HOME="/home/app/data/logs"
+LOG_FILE="${LOG_HOME}/running.log"
+
+# JVM参数
+JVM_OPTS="-Xms512m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${LOG_HOME}/heapdump.hprof"
+
+# 函数定义
+check_jar_exists() {
+    if [ ! -f "${FULL_JAR_PATH}" ]; then
+        echo "ERROR: Jar包不存在！路径：${FULL_JAR_PATH}"
+        exit 1
+    fi
+}
+
+get_running_pid() {
+    ps -ef | grep "${JAR_NAME}" | grep -v "grep" | awk '{print $2}'
+}
+
+# 检查是否已运行
+PID=$(get_running_pid)
+if [ -n "${PID}" ]; then
+    echo "项目已在运行中！PID: ${PID}"
+    exit 0
+fi
+
+# 检查Jar包是否存在
+check_jar_exists
+
+# 确保日志目录存在
+if [ ! -d "${LOG_HOME}" ]; then
+    mkdir -p "${LOG_HOME}"
+    echo "日志目录不存在，已自动创建：${LOG_HOME}"
+fi
+
+
+# 启动项目
+echo "正在启动项目..."
+nohup java ${JVM_OPTS} -Dspring.profiles.active=prod -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5002 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 &