Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

2025-12-31 10:57:22 +08:00
parent 0e8940668c 7540ad6c88
commit 286265d15b
9 changed files with 459 additions and 27 deletions
--- a/data/src/main/resources/application-yian.yml
+++ b/data/src/main/resources/application-yian.yml
@@ -0,0 +1,134 @@
+server:
+  port: 7104
+
+spring:
+  application:
+    name: data
+  datasource:
+    username: root
+    password: mysql
+    jdbc-url: jdbc:mysql://192.168.0.88: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
+      # 连接池在空闲时保持的最小连接数。
+      minimum-idle: 5
+      # 一个连接在被标记为空闲之前可以保持空闲状态的最长时间（毫秒）。当连接的空闲时间超过此值后，它可能会被连接池 evict（驱逐）。
+      idle-timeout: 60000       # 1 min
+      # 一个连接从被创建开始，其生命周期的最大时长（毫秒）。HikariCP的默认值就是30分钟，这是一个非常合理的设置。
+      max-lifetime: 1800000     # 30 min（Hikari 默认）
+      # 应用程序尝试从连接池获取一个连接时，等待的最长时间（毫秒）。建议值：30-60秒。
+      connection-timeout: 30000 # 30s
+    master:
+      username: root
+      password: mysql
+      jdbc-url: jdbc:mysql://192.168.0.88: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: mysql
+      jdbc-url: jdbc:mysql://192.168.0.88: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: 192.168.0.88:8848
+        group: DEV_GROUP
+        #                  server-addr: 127.0.0.1:8848
+        enabled: true
+  servlet:
+    multipart:
+      # 单个文件的最大值
+      max-file-size: 500MB
+      # 上传文件总的最大值
+      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
+  #    cache-enabled: true
+  mapper-locations: classpath*:mapper/**/*.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+
+# 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: /data/home/sdm
+  privatePath: /data/home
+
+#logging:
+#  config: ./config/logback.xml
+
+# 配置文件系统类型
+fileSystem:
+  minio: minio
+  system: system
+  chose: minio  # 这里选择minio或者system
+
+# spdmadmin/spdmadmin 作为普通用户只能看到spdm桶的数据
+minio:
+  endpoint: 192.168.0.88
+  port: 9000
+  access-key: minioadmin
+  secret-key: minioadmin
+  secure: false
+  secret-business-bucket: secretbusiness # 存放保密业务代码、脚本的桶（仅超级管理员访问）
+  spdm-bucket: spdm   # 普通业务数据桶（分配给用户读写权限）
+  directMemory: 16384 # 16kb
+  lifecycleConfig: '{"auto-expire-1d":"1d"}'
+
+security:
+  whitelist:
+    paths:
+      - /data/previewImage
+      - /data/approveDataFile
+      - /data/downloadFile
+      - /data/flowableUpFileToLocal
+      - /data/flowableUpFileToLocalMerge
+      - /data/getFileBaseInfo
+      - /data/uploadFiles
+      - /data/initNewTenant
+
+data:
+  storage-monitor:
+    cron: 0 0 0/1 * * ?
--- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java
+++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java
@@ -2,6 +2,8 @@ package com.sdm.flowable.delegate.handler;

 import com.alibaba.fastjson2.JSONObject;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.common.ThreadLocalContext;
+import com.sdm.common.config.FlowableConfig;
 import com.sdm.common.entity.flowable.executeConfig.HPCExecuteConfig;
 import com.sdm.common.entity.req.data.GetFileBaseInfoReq;
 import com.sdm.common.entity.req.pbs.SubmitHpcTaskRemoteReq;
@@ -9,7 +11,6 @@ import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import com.sdm.common.feign.inter.data.IDataFeignClient;
 import com.sdm.common.feign.inter.pbs.ITaskFeignClient;
 import com.sdm.common.log.CoreLogger;
-import com.sdm.common.config.FlowableConfig;
 import com.sdm.flowable.entity.ProcessNodeParam;
 import com.sdm.flowable.enums.AsyncTaskStatusEnum;
 import com.sdm.flowable.service.IAsyncTaskRecordService;
@@ -55,7 +56,8 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
        String masterFileRegularStr = config.getMasterFileRegularStr();
        String inputFilesRegularStr = config.getInputFilesRegularStr();
        CoreLogger.info("beforeNodeId:{},currentNodeId:{},masterFileRegularStr:{},inputFilesRegularStr:{}",beforeNodeId,currentNodeId,masterFileRegularStr,inputFilesRegularStr);
-
+        // 初始化用户/租户信息
+        initUserInfo(execution);
        // params 取只是测试使用
        String processDefinitionId = (execution==null||StringUtils.isBlank(execution.getProcessDefinitionId()))?
                params.get("processDefinitionId").toString():execution.getProcessDefinitionId();
@@ -98,6 +100,17 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
        log.info("HPC 任务 {} 已提交", "hpcTaskId");
    }

+    private void initUserInfo(DelegateExecution execution) {
+        // 获取当前流程实例参数
+        Long userId = (Long) execution.getVariable("userId");
+        String userName = (String) execution.getVariable("userName");
+        Long tenantId = (Long) execution.getVariable("tenantId");
+        ThreadLocalContext.setUserId(userId);
+        ThreadLocalContext.setUserName(userName);
+        ThreadLocalContext.setTenantId(tenantId);
+        CoreLogger.info("hpcHander initUserInfo userId:{},tenantId:{},userName:{}",userId,tenantId,userName);
+    }
+
    private void dealHpcFile(SubmitHpcTaskRemoteReq submitHpcTaskRemoteReq, String beforeNodeId, String currentNodeId,
                             String processDefinitionId, String processInstanceId, String executeMode,Map<String, Object> params) {
        String simulationBaseDir = FlowableConfig.FLOWABLE_SIMULATION_BASEDIR;
--- a/gateway2/src/main/resources/application-yian.yml
+++ b/gateway2/src/main/resources/application-yian.yml
@@ -0,0 +1,123 @@
+server:
+  port: 7100
+
+spring:
+  application:
+    name: gateway2
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.88:8848
+        file-extension: yaml
+        import-check:
+          enabled: false
+      discovery:
+        server-addr: 192.168.0.88:8848
+        group: DEV_GROUP
+        enabled: true
+    gateway:
+      httpclient:
+        connect-timeout: 10000
+        response-timeout: 10000
+      routes:
+        - id: approve-service
+          uri: lb://approve
+          predicates:
+            - Path=/simulation/approve/**
+          filters:
+            - StripPrefix=2
+        - id: capability-service
+          uri: lb://capability
+          predicates:
+            - Path=/simulation/capability/**
+          filters:
+            - StripPrefix=2
+        - id: data-service
+          uri: lb://data
+          predicates:
+            - Path=/simulation/data/**
+          filters:
+            - StripPrefix=2
+          metadata:
+            group: DEV_GROUP  # 指定目标服务的分组
+        - id: pbs-service
+          uri: lb://pbs
+          predicates:
+            - Path=/simulation/pbs/**
+          filters:
+            - StripPrefix=2
+        - id: performance-service
+          uri: lb://performance
+          predicates:
+            - Path=/simulation/performance/**
+          filters:
+            - StripPrefix=2
+        - id: project-service
+          uri: lb://project
+          predicates:
+            - Path=/simulation/project/**
+          filters:
+            - StripPrefix=2
+          metadata:
+            group: DEV_GROUP  # 指定目标服务的分组
+        - id: system-service
+          uri: lb://system
+          predicates:
+            - Path=/simulation/system/**
+          filters:
+            - StripPrefix=2
+          metadata:
+            group: DEV_GROUP  # 指定目标服务的分组
+        - id: task-service
+          uri: lb://task
+          predicates:
+            - Path=/simulation/task/**
+          filters:
+            - StripPrefix=2
+          metadata:
+            group: DEV_GROUP  # 指定目标服务的分组
+        - id: flowable-service
+          uri: lb://flowable
+          predicates:
+            - Path=/simulation/flowable/**
+          filters:
+            - StripPrefix=2
+          metadata:
+            group: LOCAL_GROUP  # 指定目标服务的分组
+      discovery:
+        locator:
+          enabled: true
+          lower-case-service-id: true
+
+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
+
+logging:
+  level:
+    com.sdm.gateway2: INFO
+    org.springframework.cloud.gateway: INFO
+    reactor.netty: INFO
+
+# 0单机处理，1负载均衡轮询
+serverType: 0
+serverIp: 192.168.0.88
+#serverIp: 192.168.65.73
+
+security:
+  whitelist:
+    paths:
+      - aa
--- a/pbs/src/main/java/com/sdm/pbs/model/entity/SimulationJob.java
+++ b/pbs/src/main/java/com/sdm/pbs/model/entity/SimulationJob.java
@@ -151,6 +151,10 @@ public class SimulationJob implements Serializable {
    @TableField("creatorId")
    private Long creatorId;

+    @Schema(description = "租户id")
+    @TableField("tenantId")
+    private Long tenantId;
+
    @Schema(description = "创建时间")
    @TableField(value = "createTime", fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--- a/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceDecorator.java
+++ b/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceDecorator.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.common.ThreadLocalContext;
 import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
 import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.common.entity.resp.pbs.hpc.FileNodeInfo;
@@ -101,6 +102,7 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
        if(StringUtils.isBlank(command)) {
            return SdmResponse.failed("command命令不能为空，软件名称:"+req.getSoftware());
        }
+        // 处理 拼接命令 \\CARSAFE\share\solver\RLithium\reta.exe -i %s
        String formatCommand = String.format(command, masterFilePath);
        req.setCommand(formatCommand);
        req.setMasterFilePath(masterFilePath);
@@ -120,7 +122,7 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
            simulationJob.setJobType(req.getJobType());
            simulationJob.setIndependence(req.isIndependence());
 //            simulationJob.setInputFiles(JSONObject.toJSONString(req.getInputFiles()));
-            // 主文件位置 todo
+            // 主文件位置
            simulationJob.setMasterFile(req.getMasterFilePath());
            // 求解文件集合
            simulationJob.setInputFiles(JSONObject.toJSONString(req.getInputFilePaths()));
@@ -130,37 +132,39 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
            simulationJob.setRunName(req.getRunName());
            // 软件及文件关联
            simulationJob.setSoftwareId(req.getSoftwareId());
-            // 下面的待定 todo
-            simulationJob.setInputFileId(1l);
+            // 下面的待定
+//            simulationJob.setInputFileId(null);
            simulationJob.setJobId(jobId);
            // 没必要要
-            simulationJob.setJobDetailId("todo");
-            // 文件路径 todo 共享目录+jobName（文件回传)+uuid，下面可能有多个文件
+//            simulationJob.setJobDetailId("");
+            // 文件路径 共享目录+jobName（文件回传)+uuid，下面可能有多个文件
            simulationJob.setStdoutHpcFilePath(hpcOutPutDir);
            simulationJob.setStdoutSpdmMinoFilePath(req.getStdoutSpdmMinoFilePath());
            simulationJob.setStdoutSpdmNasFilePath(req.getStdoutSpdmNasFilePath());
-            // todo 执行信息 定时任务回传的时候修改
-            simulationJob.setNodeName("todo");
-            simulationJob.setExecutCommand("ansys -b -input input.dat -output output.log");
-            // todo 执行信息 定时任务回传的时候修改
-            simulationJob.setStartTime("2025-11-30 10:00:00");
-            simulationJob.setEndTime("2025-11-30 12:30:00");
+            //  执行信息 定时任务回传的时候修改
+//            simulationJob.setNodeName("");
+            simulationJob.setExecutCommand(command);
+            //  执行信息 定时任务回传的时候修改
+//            simulationJob.setStartTime("2025-11-30 10:00:00");
+//            simulationJob.setEndTime("2025-11-30 12:30:00");
            simulationJob.setJobStatus("Configuring");
-            // ? todo 没比要
-            simulationJob.setSolverName("LS-DYNA");
-            // todo 执行信息 定时任务回传的时候修改
+            // 求解器名称
+            simulationJob.setSolverName(req.getSoftware());
+            // 执行信息 定时任务回传的时候修改
            simulationJob.setTotalKernelTime(null);
            simulationJob.setTotalUserTime(null);
            simulationJob.setTotalElapsedTime(null);
-
            // 标识及状态
-            simulationJob.setUuid("f81d4fae7dec11d0a76500a0c91e6bf6");
+//            simulationJob.setUuid(null);
            simulationJob.setFileStatus("generating");
-
            // 审计字段
-            simulationJob.setCreatorId(10086L);
+            Long userId = ThreadLocalContext.getUserId();
+            Long tenantId = ThreadLocalContext.getTenantId();
+            CoreLogger.info("submitHpcJob save db userId:{},tenantId:{}",userId,tenantId);
+            simulationJob.setCreatorId(userId);
+            simulationJob.setTenantId(tenantId);
            simulationJob.setCreateTime(LocalDateTime.now());
-            simulationJob.setUpdaterId(10086L);
+            simulationJob.setUpdaterId(userId);
            simulationJob.setUpdateTime(LocalDateTime.now());
            simulationJobService.save(simulationJob);
        }
--- a/project/src/main/java/com/sdm/project/controller/YAModelController.java
+++ b/project/src/main/java/com/sdm/project/controller/YAModelController.java
@@ -110,6 +110,7 @@ public class YAModelController {
            rsp.setMessage("鉴权失败");
            return rsp;
        }
+        adaptContext();
        UploadFilesReq fileReq = new UploadFilesReq();
        fileReq.setFileName(req.getName());
        fileReq.setProjectId(req.getProject());
@@ -162,6 +163,7 @@ public class YAModelController {
            rsp.setMessage("鉴权失败");
            return rsp;
        }
+        adaptContext();
        UploadFilesReq fileReq = new UploadFilesReq();
        fileReq.setFileName(req.getName());
        fileReq.setProjectId(req.getProject());
@@ -193,6 +195,7 @@ public class YAModelController {
    private void adaptContext()
    {
        ThreadLocalContext.setTenantId(tenantId);
+        ThreadLocalContext.setUserId(userId);
    }

    /**
@@ -221,6 +224,7 @@ public class YAModelController {
            rsp.setMessage("鉴权失败");
            return rsp;
        }
+        adaptContext();
        KeyResultReq addTaskRunReq = new KeyResultReq();
        addTaskRunReq.setFile(req.getFile());
        SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getScenario(), NodeTypeEnum.TASK.getValue(), 0L);
@@ -260,6 +264,7 @@ public class YAModelController {
            rsp.setMessage("鉴权失败");
            return rsp;
        }
+        adaptContext();
        KeyResultReq keyResultReq = new KeyResultReq();
        keyResultReq.setRunId(req.getScenario());
        keyResultReq.setKeyResultType(req.getCode());
@@ -351,6 +356,7 @@ public class YAModelController {
    {
        if(!verifyBackEndJwt(authorization))
            return SdmResponse.failed("鉴权失败");
+        adaptContext();
        GetSimulationTaskFileReq req = new GetSimulationTaskFileReq();
        req.setUuid(outsideReq.getTaskId());
        req.setFileBizType(1);
@@ -369,6 +375,7 @@ public class YAModelController {
    {
        if(!verifyBackEndJwt(authorization))
            return SdmResponse.failed("鉴权失败");
+        adaptContext();
        GetSimulationTaskFileReq req = new GetSimulationTaskFileReq();
        req.setUuid(outsideReq.getTaskId());
        req.setFileBizType(2);
@@ -393,6 +400,7 @@ public class YAModelController {
            rsp.setMessage("鉴权失败");
            return rsp;
        }
+        adaptContext();
        return nodeService.syncProject(req);
    }

@@ -405,6 +413,7 @@ public class YAModelController {
            rsp.setMessage("鉴权失败");
            return rsp;
        }
+        adaptContext();
        return taskService.syncCidTask(req);
    }

--- a/project/src/main/resources/application-yian.yml
+++ b/project/src/main/resources/application-yian.yml
@@ -0,0 +1,143 @@
+server:
+  port: 7101
+
+spring:
+  application:
+    name: project
+  datasource:
+    username: root
+    password: mysql
+    jdbc-url: jdbc:mysql://192.168.0.88: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
+      # 连接池在空闲时保持的最小连接数。
+      minimum-idle: 5
+      # 一个连接在被标记为空闲之前可以保持空闲状态的最长时间（毫秒）。当连接的空闲时间超过此值后，它可能会被连接池 evict（驱逐）。
+      idle-timeout: 60000       # 1 min
+      # 一个连接从被创建开始，其生命周期的最大时长（毫秒）。HikariCP的默认值就是30分钟，这是一个非常合理的设置。
+      max-lifetime: 1800000     # 30 min（Hikari 默认）
+      # 应用程序尝试从连接池获取一个连接时，等待的最长时间（毫秒）。建议值：30-60秒。
+      connection-timeout: 30000 # 30s
+    master:
+      username: root
+      password: mysql
+      jdbc-url: jdbc:mysql://192.168.0.88: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: mysql
+      jdbc-url: jdbc:mysql://192.168.0.88: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: 192.168.0.88:8848
+        enabled: true
+        group: DEV_GROUP
+#        username: nacos
+#        password: ENC(+QKYnI6gAYu1SbLaZQTkZA==)
+  data:
+    redis:
+      # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0
+      database: 0
+      # redis服务器地址（填写自己的服务器地址）
+      host: 192.168.2.166
+      # redis端口（默认6379）
+      port: 6379
+      #redis连接超时等待,10秒
+      timeout: PT10S
+      # redis访问密码（默认为空）
+      password:
+      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:
+      # 单个文件的最大值
+      max-file-size: 500MB
+      # 上传文件总的最大值
+      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
+    cache-enabled: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+
+#showSql
+logging:
+  level:
+    com.sdm.dao: debug
+
+lombok:
+  anyConstructor:
+    addConstructorProperties: true
+
+file:
+  rootPath: /data/home/sdm
+
+security:
+  whitelist:
+    paths:
+      - /run/deliverableApproveCallback
+      - /run/getSimulationKeyResultFileIds
+      - /run/generateReportInternal
+      - /dataManager/tree/node/listUserByIds
+#logging:
+#  config: ./config/logback.xml
+
+YA:
+  backend:
+    backendPublicKey : MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo4hmt4m5CpMIE5DL8G60cg63X6nEiNPt1yWB+kXDXQA0RaiqXhT4O78HT9BldrQVpyj6g4Z2mwPMfLBP6LjR8QyLlwfMBJ2uUV5B4PlEWiF9pUK9tU0lPlByS+p0oIxX8XlvzbbGbkyWQaOQ6SflFxB7eHu3r/hDOYtsMDcNe4hsuz1BnrAuRY6Yj+Hq2d4zPDetDgXeXs066z3qO6bLN9r/2UkHZc4tdkpMJgxucwTuvAvmgRgdDfnd6sAVDHYPaIVuJHqWnEnEcQzq6zWb1YPItc2FgDbXWpi8noz7wSjXDfBiTHU11nU5vv//xLVF83h5mbhk8dWHKq7bLUGp9QIDAQAB
+
+  frontend:
+    #publicKeyUrl : http://s279983e.natappfree.cc/api-auth/clients/getPublicKey
+    publicKeyUrl : http://pisxwh.8866.org:8015/gateway/api-auth/clients/getPublicKey
+    frontendPrivateKey : MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCjz2pItCtM2Itf3knLhA1ZWzTVtKKY692Eptk3ZUy4qjlv+2e6u78/cBYZsVa/1nOyHPtb2j9xZAsHYGKZGoh64UWSewUhRdUO15xBRr5DyGEdTWHjwc1GHf7c99rKCjKDO2Xdp7cpqYABOAxgkSA2vP5zqhSCq0FCqwleEPLG1aAa/kh/oUzCZLUoSjZIdqQOgHJTZojqNeQCOC6U8Q+kUcHdKbptewu1A6XK8DHV0WqiJJEG3kyaoAZ1kGtr6ETtGy++aRvJT9gZN4M4bIgucKtAu2dcqQHj9jZ1i2xwhY3nmLjqaz3y313/IEYpMTG8pnPb8eP5usHDaDmH8RqJAgMBAAECggEAAzz05WYGWxkGvEjpHYhJOUR3yWeuNSaodNhVf+ZVO2tGAmQuWz8d2zOshCqAw/8Jv3IaN+kbCvNG0okBufQP0ZoFZY1f/xXhzc7OTG4JEc7yuIEQl897btDl+lk97nOAJx7z9ws7MCwlFyEUAY6s29glkYTBrgmTmy1FXKIqImsLfVV3LgfL2Mkixn0YSSsbUh2b+dki1zxjct3hTGZVh29bKOpbflOaG0LqEO0UwSX92Y/ir+fKmC8zEFbi5HZANYODivm8DiwF7khpraayf78kG3liccOTMMLVxIHwNiS9wcLG8WPuVEphlXMT4Ev4lq5VFM3mVxtd9g21ESbuvwKBgQDmsgE8u66qKVBsndp2K9FV9VWYDA4fYfRswDAWnZDCzIdanT0NFPp8s3nZCVU4FfX4m958yOrJ/MVp6d58z6fgkYQh2qL2Wy6zRPaIxCc6JG3FheFSxfWyULU/mBBK02ntUZCXEs8XKjAfDvmxaVVeonv0nCSgVwxJ4ypB5BZ+owKBgQC1x0GDnWtMbNGUMx6tYtFGWQIgop4hVQe6ZNgkKaQX7gtMa5egEda6ga6wCTV3+ZvQ9tBa1DxUFb5N/TrtQdFm39gOSXyhWSrntUKqaSFo03GvXXvvze2D3+uXpk7S8yzWuuD3OYyYj9S3nFVZffymabfukuY7oY3AN0E0PALw4wKBgQDQiyGrMU6X7HkTdy9BnCLEvd7+cAdkPzyiAqp2B0IRlqrVM0c5SDmX+PaxSEqNROzyLJVX4Ji+t44OTKgf0+hCjckQgYDHi24QCMuEny2G1d+Vq40hMmsFIwh10JUJz0v2iMFYkFw86JpPuU3nHv1ZazD60xwZBhfJw10z62iaWQKBgH+EVgsUJS8pryO9cKnFBnXI/tsR+Mf9NDynfZBwvbIjxT1IxMb/fJi9XGQVMbMGIS5H1gXBmMiLsEJZgDrrzw/Ru2jaWFl/ib+dwjR1J4C3w6p3c/fXh+TY8hYiDm2hNTU1R5dmgaCMVXawbpcm8FN1Ghh8aJIwVJYgrNcNuiptAoGAO14DHGqUXZZ//erIYWVfL0CAMXqy38dqNmfbzSAXYyLDl6cn49CCHF0GXOfCOesQN9ToQbqpLrntFgcFe0hil5dIWYafk9fHjjR8N8g74ijErQmCEAQy22b06V0q7rLzEsU/HDVL+RZg2aY4hDN+ODHRdpdFkOxsCYV73gevVeo=
+  default:
+    tenantId: 1999362907622948866
+    userId: 1999363561237610497
+
+scheduler:
+  todo: 10.10.00
+  project: 10.11.00
--- a/system/src/main/resources/application-yian.yml
+++ b/system/src/main/resources/application-yian.yml
@@ -7,7 +7,7 @@ spring:
  datasource:
    username: root
    password: mysql
-    jdbc-url: jdbc:mysql://192.168.65.161:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+    jdbc-url: jdbc:mysql://192.168.0.88: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。
@@ -23,19 +23,19 @@ spring:
    master:
      username: root
      password: mysql
-      jdbc-url: jdbc:mysql://192.168.65.161:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+      jdbc-url: jdbc:mysql://192.168.0.88: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: mysql
-      jdbc-url: jdbc:mysql://192.168.65.161:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+      jdbc-url: jdbc:mysql://192.168.0.88: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: 127.0.0.1:8848
-        group: LOCAL_GROUP
+        server-addr: 192.168.0.88:8848
+        group: DEV_GROUP
        # server-addr: localhost:8848
        enabled: true
  data:
@@ -140,7 +140,7 @@ tenantSystem:


 cid:
-  url: http://127.0.0.1:7101 # 请根据实际CID服务地址修改
+  url: http://192.168.0.88:7101 # 请根据实际CID服务地址修改
  ## url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址
  user:
    listUser: /spdm-user/listUser
--- a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java
+++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java
@@ -533,6 +533,8 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
            String standardName = "";
            for(FileMetadataInfoResp fileMetadataInfoResp : fileMetas)
            {
+                if(fileMetadataInfoResp == null)
+                    continue;
                long parentId = fileMetadataInfoResp.getParentId();
                long fileId = fileMetadataInfoResp.getId();
                String fileName = fileMetadataInfoResp.getOriginalName();