2024-09-18 朱宝民 增加新的组织test使用test数据库

zhubaomin

2024-09-18 cfcea32f2af158fd56d901548a4fbe52f30f375f

2024-09-18 朱宝民 增加新的组织test使用test数据库

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

New file
@@ -0,0 +1,69 @@
# æ•°æ®æºé…ç½®
spring:
  datasource: #配置数据源
    test:
      #name: test
      type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: com.mysql.cj.jdbc.Driver
#      url: jdbc:mysql://192.168.40.166:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#      url: jdbc:mysql://8.130.130.233:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
      url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?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-test
        #配置初始化大小、最小、最大
        initialSize: 10
        minIdle: 10
        maxActive: 100
        # èŽ·å–连接时最大等待时间,单位毫秒。配置了maxWait之后,缺省启用公平锁,并发效率会有所下降,如果需要可以通过配置useUnfairLock属性为true使用非公平锁
        maxWait: 60000
        #配置间隔多久进行一次检测，检测需要关闭的空闲连接，单位毫秒。 é»˜è®¤æ˜¯60s，太长可能会导致无法及时检测到连接中断
        timeBetweenEvictionRunsMillis: 60000
        #配置一个连接在连接池中的最小生存时间、最大生存时间，超过最大生存时间会被移除，单位毫秒。
        minEvictableIdleTimeMillis: 300000
        maxEvictableIdleTimeMillis: 900000
        #探活、验证链接有效性的查询，新版本默认使用mysqlPing代替
        #validation-query: select 1 #注释掉，采用默认的mysqlPing
        #配置从连接池获取连接时，当连接空闲时间大于timeBetweenEvictionRunsMillis时是否检查连接有效性，true每次都检查；false不检查。
        testWhileIdle: true
        #配置从连接池获取连接时和向连接池归还连接时，是否检查连接有效性
        #每次获取或归还连接都检测太频繁，除非特别重要或网络特别不可靠等情况，建议用testWhileIdle + timeBetweenEvictionRunsMillis代替。-->
        testOnBorrow: false
        testOnReturn: false
        #配置是否定期探活、探活间隔, é»˜è®¤120s
        keepAlive: true
        #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
        keepAliveBetweenTimeMillis: 1200000
        #配置一个连接最大使用次数，避免长时间使用相同连接造成服务器端负载不均衡。
        phyMaxUseCount: 1000
        #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
        poolPreparedStatements: false
        #要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。在Druid中，不会存在Oracle下PSCache占用内存过多的问题，可以把这个数值配置大一些，比如说100
        maxOpenPreparedStatements: -1
        #指定每个连接上PSCache的大小
        maxPoolPreparedStatementPerConnectionSize: 20
        #属性类型是字符串，通过别名的方式配置扩展插件，常用的插件有：
        #监控统计用的filter:stat，日志用的filter:log4j，防御sql注入的filter:wall
        #filters: stat,wall,config
        filters: wall,config
        webStatFilter:
          # æ·»åŠ è¿‡æ»¤è§„则
          urlPattern: /*
          # å¿½ç•¥è¿‡æ»¤æ ¼å¼
          exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
          statViewServlet:
            # è®¾ç½®ip白名单
            # allow: 127.0.0.1
            # è®¾ç½®ip黑名单，优先级高于白名单
            deny:
            # è®¾ç½®æŽ§åˆ¶å°ç®¡ç†ç”¨æˆ·
            #  loginUsername: root
            #  loginPassword: root
            # æ˜¯å¦å¯ä»¥é‡ç½®æ•°æ®
            resetEnable: false
            # å¼€å¯druid监控页面
            #enabled: true
            enabled: false


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

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

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

@@ -155,6 +155,10 @@
        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"
    test:
        comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
    #监测控制模块回调地址
    rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
    #微信小程序回调地址

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

@@ -94,5 +94,51 @@
                <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
            </irrigateProfile>
        </org2>
        <org3 tag="test" name="测试" enable="true">
            <districts>
                <province name="天津市" num="12" level="0">
                    <city name="市辖区" num="01" level="1">
                        <country name="武清区" num="14" level="2" />
                    </city>
                </province>
            </districts>
            <dictionaries>
                <dict code="protocol" title="协议" valueType="2">
                    <dictItem>
                        <item1 dictCode="protocol" value="p206V1_0_1" name="老协议" status="1" sort="0" />
                        <item2 dictCode="protocol" value="p206V202404" name="新协议" status="0" sort="1" />
                    </dictItem>
                </dict>
            </dictionaries>
            <user name="超级管理员" phone="admin" password="admin" supperAdmin="1" />
            <payments>
                <item1 name="现金"/>
                <item2 name="微信支付"/>
                <item3 name="支付宝支付"/>
                <item4 name="银行转账"/>
            </payments>
            <settings>
                <item1 item_name="lng" item_value="101.87345" remarks="经度"/>
                <item2 item_name="lat" item_value="25.70424" remarks="纬度"/>
            </settings>
            <waterTypes>
                <item1 typeName="灌溉用水"/>
                <item2 typeName="工业用水"/>
                <item3 typeName="生活用水"/>
                <item4 typeName="养殖用水"/>
                <item5 typeName="绿化用水"/>
            </waterTypes>
            <waterPrice price="0.90" />
            <irrigateProfile>
                <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
                <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
                <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
                <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
                <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
                <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
                <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
                <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
            </irrigateProfile>
        </org3>
    </orgs>
</config>

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml

@@ -5,8 +5,8 @@
        driver-class-name: com.mysql.cj.jdbc.Driver
#        url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#        url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
        #url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
        url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#        url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
        username: root
        password: dysql,;.abc!@#
        druid:

 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
        include: global, database, database-ym, database-pj, 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
        include: global, database, database-ym, database-pj, database-test
user:
    defaultTrueRandomFalsePassword: true #true:采用默认密码，false:系统产生随机密码
    defaultPassword: "abc_123"

 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
        include: global, database, database-ym, database-pj, 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
    include: global, database, database-ym, database-pj, 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
        include: global, database, database-ym, database-pj, 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
    include: global, database, database-ym, database-pj, 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
        include: global, database, database-ym, database-pj, 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
    include: global, database, database-ym, database-pj, 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
        include: global, database, database-ym, database-pj, 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
        include: global, database, database-ym, database-pj, 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
        include: global, database, database-ym, database-pj, database-test

#actutor的web端口
management:

 pipIrr-platform/Îĵµ/~$Ò»¸öÓ¦Óûú¹¹.docx

Binary files differ