配置更改

liding

5 天以前 270633c5613ba7f7933f671ddc0a9638ed176ea2

配置更改

 ruoyi-admin/src/main/resources/application-docker.yml.example

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
# æ•°æ®æºé…ç½®
spring:
    datasource:
        type: com.alibaba.druid.pool.DruidDataSource
#        driverClassName: com.mysql.cj.jdbc.Driver     # mysql驱动
        driverClassName: org.postgresql.Driver
        druid:
            # ä¸»åº“数据源
            master:
#                mysql
#                url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                pg
                url: jdbc:postgresql://172.17.0.1:5432/zd_production
                username: postgres
                password: bYD#nM+-BiLb
            # ä»Žåº“数据源
            slave:
                # ä»Žæ•°æ®æºå¼€å…³/默认关闭
                enabled: false
                url:
                username:
                password:
            # åˆå§‹è¿žæŽ¥æ•°
            initialSize: 5
            # æœ€å°è¿žæŽ¥æ± æ•°é‡
            minIdle: 10
            # æœ€å¤§è¿žæŽ¥æ± æ•°é‡
            maxActive: 20
            # é…ç½®èŽ·å–连接等待超时的时间
            maxWait: 60000
            # é…ç½®è¿žæŽ¥è¶…时时间
            connectTimeout: 30000
            # é…ç½®ç½‘络超时时间
            socketTimeout: 60000
            # é…ç½®é—´éš”多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
            timeBetweenEvictionRunsMillis: 60000
            # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å°ç”Ÿå­˜çš„时间，单位是毫秒
            minEvictableIdleTimeMillis: 300000
            # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å¤§ç”Ÿå­˜çš„时间，单位是毫秒
            maxEvictableIdleTimeMillis: 900000
            # é…ç½®æ£€æµ‹è¿žæŽ¥æ˜¯å¦æœ‰æ•ˆ
            validationQuery: SELECT VERSION()
            testWhileIdle: true
            testOnBorrow: false
            testOnReturn: false
            webStatFilter: 
                enabled: true
            statViewServlet:
                enabled: true
                # è®¾ç½®ç™½åå•ï¼Œä¸å¡«åˆ™å…è®¸æ‰€æœ‰è®¿é—®
                allow:
                url-pattern: /druid/*
                # æŽ§åˆ¶å°ç®¡ç†ç”¨æˆ·åå’Œå¯†ç 
                login-username: ruoyi
                login-password: 123456
            filter:
                stat:
                    enabled: true
                    # æ…¢SQL记录
                    log-slow-sql: true
                    slow-sql-millis: 1000
                    merge-sql: true
                wall:
                    config:
                        multi-statement-allow: true

    data:
        # redis é…ç½®
        redis:
            # åœ°å€
            host: 172.17.0.1
            # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
            port: 6379
            # æ•°æ®åº“索引
            database: 0
            # å¯†ç 
            #            password: root2022!
            #      password: 123456
            password: 123456
            # è¿žæŽ¥è¶…时时间
            timeout: 10s
            lettuce:
                pool:
                    # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
                    min-idle: 0
                    # è¿žæŽ¥æ± ä¸­çš„最大空闲连接
                    max-idle: 8
                    # è¿žæŽ¥æ± çš„最大数据库连接数
                    max-active: 8
                    # #连接池最大阻塞等待时间（使用负值表示没有限制）
                    max-wait: -1ms

# å…¬å¸æœåŠ¡å™¨ minio
minio:
    endpoint: http://172.17.0.1/
    port: 7019
    secure: false
    accessKey: admin
    secretKey: 12345678
    preview-expiry: 24 # é¢„览地址默认24小时
    default-bucket: ruoyi-zd #  é»˜è®¤å­˜å‚¨æ¡¶


 ruoyi-admin/src/main/resources/application-druid.yml.example1

@@ -11,7 +11,7 @@
#                url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                pg
#                url: jdbc:postgresql://localhost:5433/ruoyi-zd
                url: jdbc:postgresql://localhost:5433/zd-01
                url: jdbc:postgresql://localhost:5433/zd-02
                username: postgres
                password: 123456
            # ä»Žåº“数据源
@@ -65,6 +65,32 @@
                    config:
                        multi-statement-allow: true

    data:
        # redis é…ç½®
        redis:
            # åœ°å€
            host: 127.0.0.1
            # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
            port: 6379
            # æ•°æ®åº“索引
            database: 0
            # å¯†ç 
#            password: root2022!
            #      password: 123456
            password: 123456
            # è¿žæŽ¥è¶…时时间
            timeout: 10s
            lettuce:
                pool:
                    # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
                    min-idle: 0
                    # è¿žæŽ¥æ± ä¸­çš„最大空闲连接
                    max-idle: 8
                    # è¿žæŽ¥æ± çš„最大数据库连接数
                    max-active: 8
                    # #连接池最大阻塞等待时间（使用负值表示没有限制）
                    max-wait: -1ms

# å…¬å¸æœåŠ¡å™¨ minio
minio:
#    endpoint: http://114.132.189.42/

 ruoyi-admin/src/main/resources/application-prod.yml.example

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,76 @@
# æ•°æ®æºé…ç½®
spring:
    datasource:
        type: com.alibaba.druid.pool.DruidDataSource
#        driverClassName: com.mysql.cj.jdbc.Driver     # mysql驱动
        driverClassName: org.postgresql.Driver
        druid:
            # ä¸»åº“数据源
            master:
#                mysql
#                url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                pg
                url: jdbc:postgresql://114.132.189.42:5432/zd_production
                username: postgres
                password: bYD#nM+-BiLb
            # ä»Žåº“数据源
            slave:
                # ä»Žæ•°æ®æºå¼€å…³/默认关闭
                enabled: false
                url:
                username:
                password:
            # åˆå§‹è¿žæŽ¥æ•°
            initialSize: 5
            # æœ€å°è¿žæŽ¥æ± æ•°é‡
            minIdle: 10
            # æœ€å¤§è¿žæŽ¥æ± æ•°é‡
            maxActive: 20
            # é…ç½®èŽ·å–连接等待超时的时间
            maxWait: 60000
            # é…ç½®è¿žæŽ¥è¶…时时间
            connectTimeout: 30000
            # é…ç½®ç½‘络超时时间
            socketTimeout: 60000
            # é…ç½®é—´éš”多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
            timeBetweenEvictionRunsMillis: 60000
            # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å°ç”Ÿå­˜çš„时间，单位是毫秒
            minEvictableIdleTimeMillis: 300000
            # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å¤§ç”Ÿå­˜çš„时间，单位是毫秒
            maxEvictableIdleTimeMillis: 900000
            # é…ç½®æ£€æµ‹è¿žæŽ¥æ˜¯å¦æœ‰æ•ˆ
            validationQuery: SELECT VERSION()
            testWhileIdle: true
            testOnBorrow: false
            testOnReturn: false
            webStatFilter: 
                enabled: true
            statViewServlet:
                enabled: true
                # è®¾ç½®ç™½åå•ï¼Œä¸å¡«åˆ™å…è®¸æ‰€æœ‰è®¿é—®
                allow:
                url-pattern: /druid/*
                # æŽ§åˆ¶å°ç®¡ç†ç”¨æˆ·åå’Œå¯†ç 
                login-username: ruoyi
                login-password: 123456
            filter:
                stat:
                    enabled: true
                    # æ…¢SQL记录
                    log-slow-sql: true
                    slow-sql-millis: 1000
                    merge-sql: true
                wall:
                    config:
                        multi-statement-allow: true

# å…¬å¸æœåŠ¡å™¨ minio
minio:
    endpoint: http://114.132.189.42/
    port: 7019
    secure: false
    accessKey: admin
    secretKey: 12345678
    preview-expiry: 24 # é¢„览地址默认24小时
    default-bucket: ruoyi-zd #  é»˜è®¤å­˜å‚¨æ¡¶


 ruoyi-admin/src/main/resources/application-zd.yml.example

@@ -10,7 +10,7 @@
#                mysql
#                url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                pg
                url: jdbc:postgresql://127.0.0.1:5432/zd_java
                url: jdbc:postgresql://127.0.0.1:5432/zd_java01
                username: postgres
                password: ZDadmin123!
            # ä»Žåº“数据源
@@ -64,6 +64,32 @@
                    config:
                        multi-statement-allow: true

    data:
        # redis é…ç½®
        redis:
            # åœ°å€
            host: 127.0.0.1
            # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
            port: 6379
            # æ•°æ®åº“索引
            database: 0
            # å¯†ç 
#            password: root2022!
#                  password: 123456
            password:
            # è¿žæŽ¥è¶…时时间
            timeout: 10s
            lettuce:
                pool:
                    # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
                    min-idle: 0
                    # è¿žæŽ¥æ± ä¸­çš„最大空闲连接
                    max-idle: 8
                    # è¿žæŽ¥æ± çš„最大数据库连接数
                    max-active: 8
                    # #连接池最大阻塞等待时间（使用负值表示没有限制）
                    max-wait: -1ms

# å®¢æˆ·æœåŠ¡å™¨ minio
minio:
    endpoint: 127.0.0.1