diff --git a/fw-hestia-server/src/main/resources/application-gray.yml b/fw-hestia-server/src/main/resources/application-gray.yml index 1f8b8ab..989c79e 100644 --- a/fw-hestia-server/src/main/resources/application-gray.yml +++ b/fw-hestia-server/src/main/resources/application-gray.yml @@ -26,9 +26,6 @@ fastdfs: servers: 192.168.0.91:22122 token: 'no' -jedis: - pool: - host: 192.168.0.101 logging: file: max-history: 7 diff --git a/fw-hestia-server/src/main/resources/application-prd.yml b/fw-hestia-server/src/main/resources/application-prd.yml index d8c06cf..fb0dd8d 100644 --- a/fw-hestia-server/src/main/resources/application-prd.yml +++ b/fw-hestia-server/src/main/resources/application-prd.yml @@ -26,9 +26,6 @@ fastdfs: servers: 192.168.0.91:22122 token: 'no' -jedis: - pool: - host: 192.168.0.101 logging: file: max-history: 15 diff --git a/fw-hestia-server/src/main/resources/application-test.yml b/fw-hestia-server/src/main/resources/application-test.yml index e8d0e81..927ad58 100644 --- a/fw-hestia-server/src/main/resources/application-test.yml +++ b/fw-hestia-server/src/main/resources/application-test.yml @@ -13,6 +13,7 @@ spring: username: test redis: host: 192.168.0.9 + password: fw@test@redis url: http-file-url: https://testgate.feewee.cn/file @@ -34,9 +35,6 @@ fastdfs: servers: 192.168.0.230:22122 token: 'no' -jedis: - pool: - host: 192.168.0.9 logging: file: max-history: 15 diff --git a/fw-hestia-server/src/main/resources/application.yml b/fw-hestia-server/src/main/resources/application.yml index 42a3368..add30b3 100644 --- a/fw-hestia-server/src/main/resources/application.yml +++ b/fw-hestia-server/src/main/resources/application.yml @@ -18,7 +18,7 @@ spring: hikari: connection-test-query: SELECT 1 FROM DUAL password: mysql@pwd123 - url: jdbc:mysql://192.168.0.8:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://192.168.0.234:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false username: root jackson: default-property-inclusion: non_null @@ -30,7 +30,7 @@ spring: profiles: active: cache,${activatedProfiles} redis: - host: 192.168.0.8 + host: 192.168.0.234 lettuce: pool: max-active: 20 @@ -79,19 +79,7 @@ info: groupId: ${project.groupId} name: ${project.name} version: ${project.version} -jedis: - pool: - config: - max-active: 30 - max-idle: 5 - max-wait-millis: 1000 - min-idle: 3 - test-on-borrow: false - test-on-return: false - test-while-idle: true - host: 192.168.0.8 - port: 6379 - db: 4 + mybatis-plus: configuration: cache-enabled: false