云前置文件文件目录功能

pom.xml

@@ -44,9 +44,9 @@
         <!--                <middle.server.url>10.95.53.49</middle.server.url>-->
         <middle.server.url>192.168.1.103</middle.server.url>
         <!--微服务模块发布地址-->
-        <service.server.url>192.168.2.130</service.server.url>
+        <service.server.url>192.168.2.124</service.server.url>
         <!--docker仓库地址-->
-        <docker.server.url>192.168.1.22</docker.server.url>
+        <docker.server.url>192.168.1.103</docker.server.url>
         <!--nacos的ip:port-->
         <nacos.url>${middle.server.url}:18848</nacos.url>
         <!--nacos开启鉴权后的用户名-->
@@ -54,7 +54,7 @@
         <!--nacos的ip:port-->
         <nacos.password>njcnpqs</nacos.password>
         <!--服务器发布内容为空-->
-        <nacos.namespace>hswbpm</nacos.namespace>
+        <nacos.namespace>cb3a03dd-47f6-4a83-9408-b3182b3d0619</nacos.namespace>
         <!--                <nacos.namespace>30c701c4-2a94-49d9-82e1-76aa9456573f</nacos.namespace>-->
         <!--        <nacos.namespace>12b467cc-a7e6-411d-8944-090cbfa09dde</nacos.namespace>-->
         <!--        <nacos.namespace>910d0d69-2254-481b-b9f7-7ecf9cb881b0</nacos.namespace>-->

pqs-common/common-mq/src/main/java/com/njcn/mq/constant/BusinessTopic.java

@@ -81,6 +81,29 @@ public interface BusinessTopic {
 
     String RMP_EVENT_DETAIL_TOPIC = "rmpEventDetailTopic";
 
+//    /**
+//     * 云前置文件信息请求主题
+//     */
+//    String FILE_INFO_REQUEST_TOPIC = "fileInfoRequestTopic";
+//
+//    /**
+//     * 云前置文件信息响应主题
+//     */
+//    String FILE_INFO_RESPONSE_TOPIC = "fileInfoResponseTopic";
+//
+//    /**
+//     * 云前置文件下载请求主题
+//     */
+//    String FILE_DOWNLOAD_REQUEST_TOPIC = "fileDownloadRequestTopic";
+//    /**
+//     * 云前置文件下载响应主题
+//     */
+//    String FILE_DOWNLOAD_RESPONSE_TOPIC = "fileDownloadResponseTopic";
+
+    String CLOUD_TOPIC = "Cloud_Topic";
+
+    String CLOUD_REPLY_TOPIC = "Cloud_Reply_Topic";
+
 
     interface AppDataTag {
 

pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java

@@ -2,9 +2,12 @@ package com.njcn.oss.utils;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
+import com.aliyun.oss.OSS;
+import com.njcn.ali.oss.config.AliYunOssConfig;
 import com.njcn.ali.oss.util.AliYunOssUtils;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.huawei.obs.config.HuaweiObsProperties;
 import com.njcn.huawei.obs.util.OBSUtil;
 import com.njcn.minioss.bo.MinIoUploadResDTO;
 import com.njcn.minioss.config.MinIossProperties;
@@ -12,6 +15,8 @@ import com.njcn.minioss.util.MinIoUtils;
 import com.njcn.oss.constant.GeneralConstant;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.enums.OssResponseEnum;
+import com.obs.services.ObsClient;
+import com.obs.services.model.PutObjectRequest;
 import io.minio.*;
 import io.minio.messages.Item;
 import lombok.RequiredArgsConstructor;
@@ -70,6 +75,11 @@ public class FileStorageUtil {
      */
     private final AliYunOssUtils aliYunOssUtils;
 
+    private final HuaweiObsProperties huaweiObsProperties;
+
+    private final OSS ossClient;
+    private final AliYunOssConfig ossConfig;
+
 
     /***
      * 上传MultipartFile文件，
@@ -442,4 +452,62 @@ public class FileStorageUtil {
         return file;
     }
 
+    public void mkdir(String directoryPath) {
+        if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) {
+            this.createDirectoryHW(directoryPath);
+        } else if (generalInfo.getBusinessFileStorage() == GeneralConstant.MINIO_OSS) {
+            minIoUtils.createDirectory(minIossProperties.getBucket(), directoryPath);
+        } else if (generalInfo.getBusinessFileStorage() == GeneralConstant.AliYUN_OSS) {
+            this.createDirectoryAli(directoryPath);
+        } else {
+
+        }
+    }
+
+    /**
+     * 华为文件服务器创建空目录
+     *
+     * @param dirPath
+     */
+    private void createDirectoryHW(String dirPath) {
+        ObsClient obsClient = null;
+        try {
+            obsClient = this.huaweiObsProperties.getInstance();
+            String bucketName = this.huaweiObsProperties.getObs().getBucket();
+
+            // 确保路径以 / 结尾
+            String directoryKey = dirPath.endsWith("/") ? dirPath : dirPath + "/";
+
+            // 创建空对象作为目录占位符
+            InputStream emptyStream = new ByteArrayInputStream(new byte[0]);
+            PutObjectRequest request = new PutObjectRequest(bucketName, directoryKey, emptyStream);
+            obsClient.putObject(request);
+
+            log.info("已创建目录占位符：" + directoryKey);
+        } catch (Exception e) {
+            throw new RuntimeException("创建目录失败" + dirPath, e);
+        } finally {
+            this.huaweiObsProperties.destroy(obsClient);
+        }
+    }
+
+
+    /**
+     * 阿里云文件服务器创建空目录
+     *
+     * @param dirPath
+     */
+    public void createDirectoryAli(String dirPath) {
+        try {
+            // 确保路径以 / 结尾，表示目录
+            String directoryKey = dirPath.endsWith("/") ? dirPath : dirPath + "/";
+
+            // 创建空输入流作为目录占位符
+            ByteArrayInputStream emptyStream = new ByteArrayInputStream(new byte[0]);
+
+            this.ossClient.putObject(this.ossConfig.getBucket(), directoryKey, emptyStream);
+        } catch (Exception e) {
+            throw new RuntimeException("创建目录失败：" + dirPath, e);
+        }
+    }
 }

pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java

@@ -115,4 +115,8 @@ public interface AppRedisKey {
      * 补召文件
      */
     String MAKE_UP_FILES = "makeUpFilesKey:";
+
+    String COMMON_REQUEST = "commonRequestKey:";
+
+    String COMMON_RESOPNSE = "commonResponseKey:";
 }

pqs-gateway/src/main/resources/bootstrap.yml

@@ -1,3 +1,283 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: "@name@"
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10215
 spring:
-  profiles:
+  application:
-    active: @spring.profiles.active@
+    name: @artifactId@
+  main:
+    allow-bean-definition-overriding: true
+  #nacos注册中心以及配置中心的指定
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
+        namespace: @nacos.namespace@
+      config:
+        server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
+        namespace: @nacos.namespace@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-id: share-config-datasource-db.yaml
+            refresh: true
+    gateway:
+      globalcors:
+        corsConfigurations:
+          '[/**]':
+            allowCredentials: true
+            exposedHeaders: "Content-Disposition,Content-Type,Cache-Control"
+            allowedHeaders: "*"
+            allowedOrigins: "*"
+            allowedMethods: "*"
+      discovery:
+        locator:
+          # 开启自动代理 (自动装载从配置中心serviceId)
+          enabled: true
+          # 服务id为true --> 这样小写服务就可访问了
+          lower-case-service-id: true
+      routes:
+        - id: pqs-auth
+          uri: lb://pqs-auth
+          predicates:
+            - Path=/pqs-auth/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: user-boot
+          uri: lb://user-boot
+          predicates:
+            - Path=/user-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: device-boot
+          uri: lb://device-boot
+          predicates:
+            - Path=/device-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: system-boot
+          uri: lb://system-boot
+          predicates:
+            - Path=/system-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: harmonic-boot
+          uri: lb://harmonic-boot
+          predicates:
+            - Path=/harmonic-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: energy-boot
+          uri: lb://energy-boot
+          predicates:
+            - Path=/energy-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: event-boot
+          uri: lb://event-boot
+          predicates:
+            - Path=/event-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: quality-boot
+          uri: lb://quality-boot
+          predicates:
+            - Path=/quality-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: harmonic-prepare
+          uri: lb://harmonic-prepare
+          predicates:
+            - Path=/harmonic-prepare/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: process-boot
+          uri: lb://process-boot
+          predicates:
+            - Path=/process-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: prepare-boot
+          uri: lb://prepare-boot
+          predicates:
+            - Path=/prepare-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: algorithm-boot
+          uri: lb://algorithm-boot
+          predicates:
+            - Path=/algorithm-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: access-boot
+          uri: lb://access-boot
+          predicates:
+            - Path=/access-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: cs-device-boot
+          uri: lb://cs-device-boot
+          predicates:
+            - Path=/cs-device-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: cs-system-boot
+          uri: lb://cs-system-boot
+          predicates:
+            - Path=/cs-system-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: cs-warn-boot
+          uri: lb://cs-warn-boot
+          predicates:
+            - Path=/cs-warn-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: cs-harmonic-boot
+          uri: lb://cs-harmonic-boot
+          predicates:
+            - Path=/cs-harmonic-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: advance-boot
+          uri: lb://advance-boot
+          predicates:
+            - Path=/advance-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: bpm-boot
+          uri: lb://bpm-boot
+          predicates:
+            - Path=/bpm-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: supervision-boot
+          uri: lb://supervision-boot
+          predicates:
+            - Path=/supervision-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        - id: cs-report-boot
+          uri: lb://cs-report-boot
+          predicates:
+            - Path=/cs-report-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+        #河北国网总部调用省侧接口，路径总部统一规定
+        - id: hb_pms_down
+          uri: lb://harmonic-boot
+          predicates:
+            - Path=/IndexAnalysis/**
+            - Path=/pms-tech-powerquality-start/**
+        - id: zl-event-boot
+          uri: lb://zl-event-boot
+          predicates:
+            - Path=/zl-event-boot/**
+          filters:
+            - SwaggerHeaderFilter
+            - StripPrefix=1
+
+#项目日志的配置
+logging:
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+
+whitelist:
+  urls:
+    - /user-boot/user/generateSm2Key
+    - /user-boot/theme/getTheme
+    - /user-boot/user/updateFirstPassword
+    - /user-boot/appUser/authCode
+    - /user-boot/appUser/register
+    - /user-boot/appUser/resetPsd
+    - /pqs-auth/oauth/logout
+    - /pqs-auth/oauth/token
+    - /pqs-auth/oauth/autoLogin
+    - /pqs-auth/auth/getImgCode
+    - /pqs-auth/oauth/getPublicKey
+    - /pqs-auth/judgeToken/heBei
+    - /pqs-auth/judgeToken/guangZhou
+
+    - /webjars/**
+    - /actuator/**
+    - /doc.html
+    - /swagger-resources/**
+    - /*/v2/api-docs
+    - /favicon.ico
+    - /system-boot/theme/getTheme
+    - /system-boot/image/toStream
+    - /system-boot/file/download
+    - /cs-system-boot/appinfo/queryAppInfoByType
+    - /system-boot/dictType/dictDataCache
+    - /system-boot/file/**
+    - /system-boot/area/**
+    - /bpm-boot/**
+    - /harmonic-boot/comAccess/getComAccessData
+    - /harmonic-boot/harmonic/getHistoryResult
+    - /event-boot/transient/getTransientAnalyseWave
+#    - /**
+    #开始
+#    - /advance-boot/**
+#    - /device-boot/**
+#    - /system-boot/**
+#    - /harmonic-boot/**
+#    - /energy-boot/**
+#    - /event-boot/**
+#    - /quality-boot/**
+#    - /harmonic-prepare/**
+#    - /process-boot/**
+#    - /bpm-boot/**
+#   - /system-boot/**
+#   - /supervision-boot/**
+#    - /user-boot/**
+#    - /harmonic-boot/**
+#    - /cs-device-boot/**
+    #结束
+    - /user-boot/user/listAllUserByDeptId
+    - /IndexAnalysis/**
+#mqtt:
+#  client-id: @artifactId@${random.value}
+
+
+
+
+
+
+
+
+

pqs.iws

@@ -6,13 +6,11 @@
   <component name="ChangeListManager">
     <list default="true" id="2448d918-1a26-4571-be80-21a8dfa375ac" name="Default" comment="海南bug修改提交">
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/BpmApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/BpmApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/BusinessTopic.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/BusinessTopic.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/DeviceComflagTasks.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/ScheduledTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/ScheduledTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-gateway/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-gateway/src/main/resources/bootstrap.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/TerminalServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/TerminalServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pqs.ipr" beforeDir="false" afterPath="$PROJECT_DIR$/pqs.ipr" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pqs.iws" beforeDir="false" afterPath="$PROJECT_DIR$/pqs.iws" afterDir="false" />
     </list>
@@ -274,9 +272,10 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="localRepository" value="D:\maven3.6.3\repository" />
+        <option name="customMavenHome" value="D:\program\apache-maven-3.8.1" />
-        <option name="mavenHome" value="Use Maven wrapper" />
+        <option name="localRepository" value="D:\maven-repository" />
-        <option name="userSettingsFile" value="D:\java\apache-maven-3.3.9\conf\settings.xml" />
+        <option name="mavenHomeTypeForPersistence" value="CUSTOM" />
+        <option name="userSettingsFile" value="D:\program\apache-maven-3.8.1\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -315,6 +314,9 @@
     <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
     <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
   </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 6
+}</component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-9" />
     <option name="y" value="-9" />
@@ -423,16 +425,49 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    "Maven.common-core [compile].executor": "Run",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "Maven.common-core [install].executor": "Run",
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    "Maven.common-huawei [install].executor": "Run",
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    "Maven.common-mq [install].executor": "Run",
-    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    "Maven.common-oss [clean].executor": "Run",
-    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;
+    "Maven.common-oss [compile].executor": "Run",
+    "Maven.common-oss [install].executor": "Run",
+    "Maven.common-redis [install].executor": "Run",
+    "Maven.event-boot [compile].executor": "Run",
+    "Maven.event-boot [install].executor": "Run",
+    "Maven.harmonic-boot [clean].executor": "Run",
+    "Maven.harmonic-boot [compile].executor": "Run",
+    "Maven.pqs [clean].executor": "Run",
+    "Maven.pqs [compile].executor": "Run",
+    "Maven.pqs [install].executor": "Run",
+    "Maven.pqs-event [compile].executor": "Run",
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "Spring Boot.AuthApplication.executor": "Debug",
+    "Spring Boot.GatewayMain.executor": "Debug",
+    "Spring Boot.SystemBootMain.executor": "Debug",
+    "Spring Boot.UserBootApplication.executor": "Debug",
+    "ignore.virus.scanning.warn.message": "true",
+    "kotlin-language-version-configured": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Libraries",
+    "project.structure.proportion": "0.15",
+    "project.structure.side.proportion": "0.31609195",
+    "run.configurations.included.in.services": "true",
+    "settings.editor.selected.configurable": "File.Encoding",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
@@ -458,6 +493,8 @@
       <set>
         <option value="Application" />
         <option value="JarApplication" />
+        <option value="MicronautRunConfigurationType" />
+        <option value="QuarkusRunConfigurationType" />
         <option value="SpringBootApplicationConfigurationType" />
       </set>
     </option>
@@ -470,15 +507,6 @@
       <option name="HEIGHT" value="300" />
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
     </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
-      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
-      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="DeviceBootApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.njcn.DeviceBootApplication" />
       <module name="device-boot" />
@@ -572,20 +600,48 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="AdvanceBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="advance-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.advance.AdvanceBootApplication" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="AuthApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="pqs-auth" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.auth.AuthApplication" />
-      <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.auth.AuthApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="BpmApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="bpm-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.bpm.BpmApplication" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="DeviceBootApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="device-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.DeviceBootApplication" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="DeviceBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="device-boot" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.device.DeviceBootApplication" />
-      <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.device.DeviceBootApplication" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -599,9 +655,8 @@
     </configuration>
     <configuration name="EventBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="event-boot" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.event.EventBootApplication" />
-      <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.event.EventBootApplication" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -614,12 +669,11 @@
       </method>
     </configuration>
     <configuration name="HarmonicBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="harmonic-boot" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.harmonic.HarmonicBootApplication" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
-      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="harmonic-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.harmonic.HarmonicBootApplication" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -633,40 +687,74 @@
     </configuration>
     <configuration name="JobExecutorApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="job-executor" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.executor.JobExecutorApplication" />
-      <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SHORTEN_COMMAND_LINE" value="CLASSPATH_FILE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.executor.JobExecutorApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="PrepareApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="prepare-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.prepare.PrepareApplication" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="ProcessApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="process-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.process.ProcessApplication" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="QualityBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="quality-boot" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.quality.QualityBootApplication" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
-      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="quality-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.quality.QualityBootApplication" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="SupervisionBootMain" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="supervision-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.supervision.SupervisionBootMain" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="SystemBootMain" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="system-boot" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.system.SystemBootMain" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
-      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <module name="system-boot" />
+      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.system.SystemBootMain" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="UserBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="user-boot" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.user.UserBootApplication" />
-      <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.user.UserBootApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -677,6 +765,23 @@
       <item itemvalue="Application.HarmonicBootApplication" />
       <item itemvalue="Application.EventBootApplication" />
       <item itemvalue="Application.DeviceBootApplication" />
+      <item itemvalue="Spring Boot.AdvanceBootApplication" />
+      <item itemvalue="Spring Boot.AuthApplication" />
+      <item itemvalue="Spring Boot.BpmApplication" />
+      <item itemvalue="Spring Boot.DeviceBootApplication" />
+      <item itemvalue="Spring Boot.DeviceBootApplication (1)" />
+      <item itemvalue="Spring Boot.EnergyBootApplication" />
+      <item itemvalue="Spring Boot.EventBootApplication" />
+      <item itemvalue="Spring Boot.GatewayMain" />
+      <item itemvalue="Spring Boot.HarmonicBootApplication" />
+      <item itemvalue="Spring Boot.JobAdminApplication" />
+      <item itemvalue="Spring Boot.JobExecutorApplication" />
+      <item itemvalue="Spring Boot.PrepareApplication" />
+      <item itemvalue="Spring Boot.ProcessApplication" />
+      <item itemvalue="Spring Boot.QualityBootApplication" />
+      <item itemvalue="Spring Boot.SupervisionBootMain" />
+      <item itemvalue="Spring Boot.SystemBootMain" />
+      <item itemvalue="Spring Boot.UserBootApplication" />
     </list>
     <recent_temporary>
       <list>
@@ -773,6 +878,15 @@
       <workItem from="1664328876284" duration="428000" />
       <workItem from="1664329319344" duration="573000" />
       <workItem from="1664329912185" duration="38768000" />
+      <workItem from="1773642083180" duration="22757000" />
+      <workItem from="1773886549173" duration="3097000" />
+      <workItem from="1773974783783" duration="31292000" />
+      <workItem from="1774856426890" duration="3134000" />
+      <workItem from="1775091589260" duration="166000" />
+      <workItem from="1775091790955" duration="710000" />
+      <workItem from="1775093137399" duration="2418000" />
+      <workItem from="1775543391617" duration="3118000" />
+      <workItem from="1776299986570" duration="1702000" />
     </task>
     <task id="LOCAL-00001" summary="EventTemplate控制器编写">
       <created>1663058049505</created>
@@ -1072,11 +1186,6 @@
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/pqs-auth/src/main/java/com/njcn/auth/config/AuthorizationServerConfig.java</url>
-          <line>161</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java</url>
           <line>85</line>