From 639f263e83acfd07117ac6eba1a812d2209080aa Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Wed, 27 Dec 2017 23:36:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90druid-springboot=E5=AE=8C?= =?UTF-8?q?=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ms/cms/src/main/resources/bootstrap.yml | 2 +- ms/gateway/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- ms/ucenter/src/main/resources/bootstrap.yml | 48 +------------------ ms/upms/src/main/resources/bootstrap.yml | 3 +- pom.xml | 9 +--- 7 files changed, 9 insertions(+), 59 deletions(-) diff --git a/ms/cms/src/main/resources/bootstrap.yml b/ms/cms/src/main/resources/bootstrap.yml index 8ab47dc..64b3ea4 100644 --- a/ms/cms/src/main/resources/bootstrap.yml +++ b/ms/cms/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ spring: cloud: config: profile: dev - label: druid-springboot + label: master name: cms discovery: enabled: true diff --git a/ms/gateway/src/main/resources/bootstrap.yml b/ms/gateway/src/main/resources/bootstrap.yml index a34061d..5888fe6 100644 --- a/ms/gateway/src/main/resources/bootstrap.yml +++ b/ms/gateway/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ spring: cloud: config: profile: dev - label: druid-springboot + label: master name: gateway discovery: enabled: true diff --git a/ms/register-center1/src/main/resources/bootstrap.yml b/ms/register-center1/src/main/resources/bootstrap.yml index 77e0220..61e2980 100644 --- a/ms/register-center1/src/main/resources/bootstrap.yml +++ b/ms/register-center1/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ spring: config: uri: http://config:server@www.config.com:10000/ profile: dev - label: druid-springboot + label: master name: eureka-server eureka: client: diff --git a/ms/register-center2/src/main/resources/bootstrap.yml b/ms/register-center2/src/main/resources/bootstrap.yml index 1a0d8bd..da23d1a 100644 --- a/ms/register-center2/src/main/resources/bootstrap.yml +++ b/ms/register-center2/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ spring: config: name: eureka-server2 profile: dev - label: druid-springboot + label: master uri: http://config:server@www.config.com:10000/ eureka: client: diff --git a/ms/ucenter/src/main/resources/bootstrap.yml b/ms/ucenter/src/main/resources/bootstrap.yml index 608e68c..bea055e 100644 --- a/ms/ucenter/src/main/resources/bootstrap.yml +++ b/ms/ucenter/src/main/resources/bootstrap.yml @@ -3,59 +3,13 @@ spring: cloud: config: profile: dev - label: druid-springboot + label: master name: ucenter discovery: service-id: config-server enabled: true username: config password: server - datasource: - druid: - username: root - password: studyj2e - url: jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false - master: - initial-size: 19 - username: root - password: studyj2e - url: jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false -# 数据源共用基本配置 - driver-class-name: com.mysql.jdbc.Driver - initial-size: 20 - max-active: 50 - min-idle: 10 - max-wait: 1000 - time-between-log-stats-millis: 10000 - min-evictable-idle-time-millis: 100000 - max-evictable-idle-time-millis: 200000 - default-auto-commit: true - filters: stat,wall -# url监控配置 - web-stat-filter: - enabled: true - url-pattern: /* - exclusions: /static/*,/druid/* - session-stat-enable: false - stat-view-servlet: - login-username: micro - login-password: fast - reset-enable: true - allow: 127.0.0.1,172.17.0.1 - deny: 127.0.0.2 - enabled: true - url-pattern: /druid/* -# aop拦截监控 - aop-patterns: com.micro.* -# statFilter配置 - filter: - stat: - connection-stack-trace-enable: true - db-type: mysql - enabled: true - log-slow-sql: true - merge-sql: true - slow-sql-millis: 2000 eureka: client: serviceUrl: diff --git a/ms/upms/src/main/resources/bootstrap.yml b/ms/upms/src/main/resources/bootstrap.yml index f720dca..5446aec 100644 --- a/ms/upms/src/main/resources/bootstrap.yml +++ b/ms/upms/src/main/resources/bootstrap.yml @@ -1,11 +1,12 @@ # 从配置中心加载文件 +# druid 数据库加密的公钥 spring: session: store-type: none cloud: config: profile: dev - label: druid-springboot + label: master name: upms discovery: service-id: config-server diff --git a/pom.xml b/pom.xml index 205f04b..7d0499c 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,7 @@ 20.0 3.5 3.2.1 + 1.1.6 2.3 1.0.1 3.1 @@ -65,7 +66,6 @@ 0.9.4 1.3.0 5.1.44 - 1.0.27 5.3.5.Final 8.5.16 2.6.1 @@ -258,15 +258,10 @@ runtime - - com.alibaba - druid - ${druid.version} - com.alibaba druid-spring-boot-starter - 1.1.6 + ${druid.springboot.version}