SZH
2022-11-16 4dca59b54c8fc8815e3f533ce04f5e1b1328852f
1、调整部署环境配置
2、升级依赖
已重命名1个文件
已修改4个文件
89 ■■■■ 文件已修改
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/schedule/KeepAliveRobot.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-online-uat.yaml 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application.yaml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/schedule/KeepAliveRobot.java
@@ -21,7 +21,7 @@
    @Scheduled(cron = "0 0/30 * * * ?")
    public void keepAlive(){
        //
        equipmentInfoBaseService.getById(-1L);
        equipmentInfoBaseService.getById(1L);
    }
pom.xml
@@ -31,9 +31,9 @@
        <project.build.sourceencoding>UTF-8</project.build.sourceencoding>
        <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
        <java.version>1.8</java.version>
        <dubbo.version>3.0.8</dubbo.version>
        <nacos.client.version>2.1.0</nacos.client.version>
        <minio.version>8.4.2</minio.version>
        <dubbo.version>3.1.2</dubbo.version>
        <nacos.client.version>2.1.2</nacos.client.version>
        <minio.version>8.4.5</minio.version>
        <okhttp.version>4.10.0</okhttp.version>
        <fastjson.version>1.2.47</fastjson.version>
        <mysql.connector.version>8.0.29</mysql.connector.version>
@@ -42,10 +42,10 @@
        <account.rpc.model.version>1.0-SNAPSHOT</account.rpc.model.version>
        <mybatis.plus.version>3.5.2</mybatis.plus.version>
        <poi.version>4.1.2</poi.version>
        <com.alibaba.cloud.version>2.2.8.RELEASE</com.alibaba.cloud.version>
        <jta.starter.version>2.7.1</jta.starter.version>
        <com.alibaba.cloud.version>2.2.9.RELEASE</com.alibaba.cloud.version>
        <jta.starter.version>2.7.5</jta.starter.version>
        <commons.utils.version>1.9.4</commons.utils.version>
        <redission.version>3.17.4</redission.version>
        <redission.version>3.18.0</redission.version>
    </properties>
    <dependencyManagement>
@@ -63,7 +63,7 @@
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>2.7.0</version>
                <version>2.7.5</version>
            </dependency>
            <dependency>
                <groupId>com.alibaba.nacos</groupId>
@@ -221,7 +221,7 @@
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
            <version>1.2.9</version>
            <version>1.2.15</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
@@ -239,7 +239,7 @@
        <dependency>
            <groupId>org.apache.dubbo</groupId>
            <artifactId>dubbo-serialization-kryo</artifactId>
            <version>2.7.15</version>
            <version>2.7.18</version>
        </dependency>
        <dependency>
            <groupId>org.apache.dubbo</groupId>
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
@@ -2,7 +2,7 @@
  tomcat:
    uri-encoding: UTF-8
    basedir: /
  port: 16009
  port: 16012
  servlet:
    context-path: /
@@ -14,31 +14,31 @@
    type: com.alibaba.druid.pool.xa.DruidXADataSource
    emergency:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    goalmanage:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    incidentmanage:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    equipment:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
  redis:
    host: 192.168.30.107
    port: 6376
    port: 6375
    password: SEF98uvs98dUAUEF90Udssa
    database: 0           # Redis 数据库号,默认为 0
    timeout: 15000        # Redis 连接超时时间,单位:毫秒。
@@ -57,14 +57,14 @@
    nacos:
      discovery:
        server-addr: http://192.168.30.107:8848
        namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e
        namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e
        username: gkhy_dev_out_team
        password: 9485uyJHISes09t
        enabled: true
        register-enabled: true
      config:
        server-addr: http://192.168.30.107:8848
        namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e
        namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e
        username: gkhy_dev_out_team
        password: 9485uyJHISes09t
    inetutils:
@@ -83,7 +83,7 @@
dubbo:
  registry:
    protocol: nacos
    address: nacos://192.168.30.107:8848?namespace=8e59b946-36d6-4d29-81f1-27a55951b86e&username=gkhy_dev_out_team&password=9485uyJHISes09t
    address: nacos://192.168.30.107:8848?namespace=78fe80cc-6159-4381-8e42-1cc6c68eb22e&username=gkhy_dev_out_team&password=9485uyJHISes09t
  application:
    name: gkhy-safeplatform-out
  scan:
@@ -91,7 +91,7 @@
    base-packages: com.gkhy.safePlatform
  protocol:
    name: dubbo
    port: 18083
    port: 18089
    serialization: kryo
    host: ${spring.cloud.client.ip-address}
  consumer:
@@ -112,12 +112,12 @@
rocketmq:
  name-server: 192.168.30.107:9876
  producer:
    group: gkhy-safeplatform-guotai
    group: gkhy-safeplatform-guotai-uat
    sendMessageTimeout: 300000
  consumer:
    group: gkhy-safeplatform-guotai
    group: gkhy-safeplatform-guotai-uat
  topic:
    demoTopic: gkhy-safeplatform-topic-demo
    demoTopic: gkhy-safeplatform-topic-demo-uat
minio:
  endPoint: 121.239.169.27
@@ -125,7 +125,7 @@
  accessKey: QR0J7S55SZO8QI1TC2AD
  secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK
  secure: false
  bucketName: safeplatform-demo
  bucketName: safeplatform-guotai-uat
  urlPrefix: http://121.239.169.27/file
  #用户名 gkhy_team_out_dev
  #密码 12345678
safePlatfrom-out-web/src/main/resources/config/application-online-uat.yaml
文件名从 safePlatfrom-out-web/src/main/resources/config/application-guotai-uat.yaml 修改
@@ -2,7 +2,7 @@
  tomcat:
    uri-encoding: UTF-8
    basedir: /
  port: 16012
  port: 16009
  servlet:
    context-path: /
@@ -14,31 +14,31 @@
    type: com.alibaba.druid.pool.xa.DruidXADataSource
    emergency:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    goalmanage:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    incidentmanage:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    equipment:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
  redis:
    host: 192.168.30.107
    port: 6375
    port: 6376
    password: SEF98uvs98dUAUEF90Udssa
    database: 0           # Redis 数据库号,默认为 0
    timeout: 15000        # Redis 连接超时时间,单位:毫秒。
@@ -57,14 +57,14 @@
    nacos:
      discovery:
        server-addr: http://192.168.30.107:8848
        namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e
        namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e
        username: gkhy_dev_out_team
        password: 9485uyJHISes09t
        enabled: true
        register-enabled: true
      config:
        server-addr: http://192.168.30.107:8848
        namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e
        namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e
        username: gkhy_dev_out_team
        password: 9485uyJHISes09t
    inetutils:
@@ -83,7 +83,7 @@
dubbo:
  registry:
    protocol: nacos
    address: nacos://192.168.30.107:8848?namespace=78fe80cc-6159-4381-8e42-1cc6c68eb22e&username=gkhy_dev_out_team&password=9485uyJHISes09t
    address: nacos://192.168.30.107:8848?namespace=8e59b946-36d6-4d29-81f1-27a55951b86e&username=gkhy_dev_out_team&password=9485uyJHISes09t
  application:
    name: gkhy-safeplatform-out
  scan:
@@ -91,7 +91,7 @@
    base-packages: com.gkhy.safePlatform
  protocol:
    name: dubbo
    port: 18089
    port: 18083
    serialization: kryo
    host: ${spring.cloud.client.ip-address}
  consumer:
@@ -112,12 +112,12 @@
rocketmq:
  name-server: 192.168.30.107:9876
  producer:
    group: gkhy-safeplatform-guotai-uat
    group: gkhy-safeplatform-guotai
    sendMessageTimeout: 300000
  consumer:
    group: gkhy-safeplatform-guotai-uat
    group: gkhy-safeplatform-guotai
  topic:
    demoTopic: gkhy-safeplatform-topic-demo-uat
    demoTopic: gkhy-safeplatform-topic-demo
minio:
  endPoint: 121.239.169.27
@@ -125,7 +125,7 @@
  accessKey: QR0J7S55SZO8QI1TC2AD
  secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK
  secure: false
  bucketName: safeplatform-guotai-uat
  bucketName: safeplatform-demo
  urlPrefix: http://121.239.169.27/file
  #用户名 gkhy_team_out_dev
  #密码 12345678
safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -2,11 +2,14 @@
  application:
    name: safeplatform-out
  profiles:
    active: dev
#    active: guotai-demo
#### test  uat  guotai-demo guotai-uat
#    active: test
#    active: uat
    active: online-uat
#### dev out-dev  test  uat  online-uat guotai-demo
#    active: guotai-demo  国泰试运行环境
#    active: online-uat   线上预发环境
#    active: dev  本地开发环境
#    active: out-dev  外包对接环境
#    active: test 内网测试环境
#    active: uat  内网预发环境
logging:
  config: classpath:config/log/log4j2.xml