diff --git a/doc/Ruoyi-Flex-Guide.docx b/doc/Ruoyi-Flex-Guide.docx index 46e4255..068631e 100644 Binary files a/doc/Ruoyi-Flex-Guide.docx and b/doc/Ruoyi-Flex-Guide.docx differ diff --git a/ruoyi-extra/ruoyi-easyretry-server/src/main/resources/application-dev.yml b/ruoyi-extra/ruoyi-easyretry-server/src/main/resources/application-dev.yml index 8ac1845..86b8e86 100644 --- a/ruoyi-extra/ruoyi-easyretry-server/src/main/resources/application-dev.yml +++ b/ruoyi-extra/ruoyi-easyretry-server/src/main/resources/application-dev.yml @@ -1,10 +1,16 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource + # mysql数据库 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root password: Root@369 + # postgresql数据库 +# driver-class-name: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: postgres +# password: postgres@369 hikari: connection-timeout: 30000 validation-timeout: 5000 diff --git a/ruoyi-extra/ruoyi-easyretry-server/src/main/resources/application-prod.yml b/ruoyi-extra/ruoyi-easyretry-server/src/main/resources/application-prod.yml index 8ac1845..5616a78 100644 --- a/ruoyi-extra/ruoyi-easyretry-server/src/main/resources/application-prod.yml +++ b/ruoyi-extra/ruoyi-easyretry-server/src/main/resources/application-prod.yml @@ -1,10 +1,16 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource + # mysql数据库 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root password: Root@369 + # postgresql数据库 + #driver-class-name: org.postgresql.Driver + #url: jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + #username: postgres + #password: postgres@369 hikari: connection-timeout: 30000 validation-timeout: 5000 diff --git a/ruoyi-extra/ruoyi-monitor/src/main/resources/application.yml b/ruoyi-extra/ruoyi-monitor/src/main/resources/application.yml index ec419bf..5fa3a1b 100644 --- a/ruoyi-extra/ruoyi-monitor/src/main/resources/application.yml +++ b/ruoyi-extra/ruoyi-monitor/src/main/resources/application.yml @@ -38,7 +38,7 @@ spring.boot.admin.client: # 增加客户端开关 enabled: true # 设置 Spring Boot Admin Server 地址 - url: http://172.16.0.151:9090/admin + url: http://localhost:9090/admin instance: service-host-type: IP username: ruoyi diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties index 287ba33..c5ea85c 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties @@ -1,7 +1,7 @@ oms.env=prod ####### Database properties(Configure according to the the environment) ####### -spring.datasource.remote.hibernate.properties.hibernate.dialect=tech.powerjob.server.persistence.config.dialect.PowerJobPGDialect +#spring.datasource.remote.hibernate.properties.hibernate.dialect=tech.powerjob.server.persistence.config.dialect.PowerJobPGDialect #spring.datasource.core.driver-class-name=org.postgresql.Driver #spring.datasource.core.jdbc-url=jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true #spring.datasource.core.username=postgres