diff --git a/code/smart-community/epmet-gateway/src/main/resources/bootstrap.yml b/code/smart-community/epmet-gateway/src/main/resources/bootstrap.yml index f32754aa..4408eb2e 100644 --- a/code/smart-community/epmet-gateway/src/main/resources/bootstrap.yml +++ b/code/smart-community/epmet-gateway/src/main/resources/bootstrap.yml @@ -1,3 +1,9 @@ +logging: + level: + org.springframework: DEBUG + org.springframework.cloud.gateway: DEBUG + reactor.tongweb.http.client: DEBUG + server: tongweb: license: @@ -38,7 +44,7 @@ spring: cloud: gateway: locator: - enabled: true + enabled: false routes: #认证服务 - id: epmet-auth-server diff --git a/code/smart-community/epmet-gateway/src/main/resources/logback-spring.xml b/code/smart-community/epmet-gateway/src/main/resources/logback-spring.xml index 652ce500..c73e9019 100644 --- a/code/smart-community/epmet-gateway/src/main/resources/logback-spring.xml +++ b/code/smart-community/epmet-gateway/src/main/resources/logback-spring.xml @@ -21,7 +21,7 @@ - debug + INFO ${CONSOLE_LOG_PATTERN} @@ -150,7 +150,7 @@ - + diff --git a/code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 38c50a36..670d7f1f 100644 --- a/code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -186,8 +186,8 @@ 172.16.3.87 6379 rEdIs@yAntAI_666 - 10.1.26.45:6379 - 3 + 10.1.26.45:6379 + 3 false 172.16.3.87:8848 diff --git a/code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml b/code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml index ca8821b1..455003ec 100644 --- a/code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml +++ b/code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml @@ -22,19 +22,9 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - database: @spring.redis.index@ password: @spring.redis.password@ timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/code/smart-community/epmet-module/epmet-common-service/common-service-server/pom.xml b/code/smart-community/epmet-module/epmet-common-service/common-service-server/pom.xml index 73adad71..5c49f964 100644 --- a/code/smart-community/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/code/smart-community/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -233,7 +233,7 @@ epmet - epmet12345 + epmet12345 0 172.16.3.87 diff --git a/code/smart-community/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/code/smart-community/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 891f8322..60b39e9c 100644 --- a/code/smart-community/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/code/smart-community/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -315,7 +315,7 @@ epmet - epmet12345 + epmet12345 0 172.16.3.87 diff --git a/code/smart-community/epmet-module/epmet-job/epmet-job-server/pom.xml b/code/smart-community/epmet-module/epmet-job/epmet-job-server/pom.xml index e8de259c..ebf5acba 100644 --- a/code/smart-community/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/code/smart-community/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -245,7 +245,7 @@ epmet - epmet12345 + epmet12345 0 172.16.3.87 diff --git a/code/smart-community/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/code/smart-community/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index 3122b37b..5b24627c 100644 --- a/code/smart-community/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/code/smart-community/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -88,9 +88,9 @@ spring: flyway: enabled: @spring.flyway.enabled@ locations: classpath:db/migration - url: @datasource.druid.url@ - user: @datasource.druid.username@ - password: @datasource.druid.password@ + url: @spring.datasource.druid.url@ + user: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ baseline-on-migrate: true baseline-version: 0 diff --git a/code/smart-community/epmet-module/pom.xml b/code/smart-community/epmet-module/pom.xml index 32578812..6ae7bcf6 100644 --- a/code/smart-community/epmet-module/pom.xml +++ b/code/smart-community/epmet-module/pom.xml @@ -17,7 +17,7 @@ epmet-oss epmet-job epmet-message - epmet-activiti + oper-customize oper-crm