把原来的pj(片角)配置改为sp(沙盘)配置

liurunyu

2024-10-29 3a925497a3f6a776fb2e28b6280822fcaca5430c

把原来的pj(片角)配置改为sp(沙盘)配置

 pipIrr-platform/pipIrr-global/src/main/resources/application-database(¿ª·¢²âÊÔ---µ¥Êý¾Ý¿â).yml

@@ -4,5 +4,5 @@
    main:
        allow-bean-definition-overriding: true #设置为true时，后定义的bean会覆盖之前定义的相同名称的bean
    datasource: #配置数据源
        #多个数据源名称在此配置，要求与spring。datasource。[ym][pj]中的一致
        #多个数据源名称在此配置，要求与spring。datasource。[ym][sp][test]中的一致
        names: ym

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml

File was renamed from pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
@@ -1,18 +1,18 @@
# æ•°æ®æºé…ç½®
spring:
    datasource: #配置数据源
        pj:
            #name: pj
        sp:
            #name: sp
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.130.130.233:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.130.130.233:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#
            druid:
                # æ•°æ®æºåç§°ï¼šå½“存在多个数据源时，设置名字可以很方便的来进行区分,默认自动生成名称，格式是："DataSource-" + System.identityHashCode(this)
                name: druid-mysql-pj
                name: druid-mysql-sp
                #配置初始化大小、最小、最大
                initialSize: 10
                minIdle: 10

 pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml

@@ -4,5 +4,5 @@
    main:
        allow-bean-definition-overriding: true #设置为true时，后定义的bean会覆盖之前定义的相同名称的bean
    datasource: #配置数据源
        #多个数据源名称在此配置，要求与spring。datasource。[ym][pj]中的一致
        #多个数据源名称在此配置，要求与spring。datasource。[ym][sp]中的一致
        names: ym

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(test²âÊÔϵͳ).yml

@@ -289,7 +289,7 @@
#项目编号
#projectCode:
#    ym: 100
#    pj: 101
#    sp: 101

#项目配置
project:
@@ -309,7 +309,7 @@
        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
    sp:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -346,7 +346,7 @@
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
    sp:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(ymԪıϵͳ).yml

@@ -289,7 +289,7 @@
#项目编号
#projectCode:
#    ym: 100
#    pj: 101
#    sp: 101

#项目配置
project:
@@ -309,7 +309,7 @@
        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
    sp:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -346,7 +346,7 @@
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
    sp:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(¿ª·¢²âÊÔ---166PC»ú).yml

@@ -291,7 +291,7 @@
#项目编号
#projectCode:
#    ym: 100
#    pj: 101
#    sp: 101

#项目配置
project:
@@ -311,7 +311,7 @@
        comSendUrl: "http://192.168.40.166:8070/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
    sp:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -348,7 +348,7 @@
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
    sp:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send

 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml

@@ -295,7 +295,7 @@
#项目编号
#projectCode:
#    ym: 100
#    pj: 101
#    sp: 101

#项目配置
project:
@@ -315,7 +315,7 @@
        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
    sp:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -352,7 +352,7 @@
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
    sp:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send

 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml

@@ -50,11 +50,11 @@
                <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
            </irrigateProfile>
        </org1>
        <org2 tag="pj" name="片角" enable="false">
        <org2 tag="sp" name="沙盘" enable="false">
            <districts>
                <province name="云南省" num="53" level="0">
                    <city name="丽江市" num="23" level="1">
                        <country name="永胜县" num="28" level="2" />
                <province name="甘肃省" num="53" level="0">
                    <city name="酒泉市" num="23" level="1">
                        <country name="大禹集团" num="28" level="2" />
                    </city>
                </province>
            </districts>

 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test
user:
    defaultTrueRandomFalsePassword: true #true:采用默认密码，false:系统产生随机密码
    defaultPassword: "abc_123"

 pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    include: global, database, database-ym, database-pj, database-test
    include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    include: global, database, database-ym, database-pj, database-test
    include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    include: global, database, database-ym, database-pj, database-test
    include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management: