From 521f5d5cf8510fdf67f3ca315523e241869d2b25 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 7 Oct 2018 19:25:50 +0800 Subject: [PATCH] =?UTF-8?q?[fix=20start=20issue][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkBApi/src/main/resources/application-dev.yml | 14 +++++++++----- .../src/main/resources/application-prod.yml | 14 ++++++++------ mallinkCApi/src/main/resources/application-dev.yml | 13 ++++++++----- .../src/main/resources/application-prod.yml | 14 ++++++++------ 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 7786bc132..c556c680d 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -27,14 +27,18 @@ spring: host: 202.165.179.86 port: 6789 password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco) - timeout: 0 + timeout: 2000 expire: 1800 #30分钟 - pool: - max-active: 8 - max-idle: 8 - max-wait: -1 + database: 2 + jedis: + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + min-idle: 0 logging: level: tk.mybatis: debug com.iformall.mapper: debug + path: ./logs/b diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index f264b67ec..d42f1d6ba 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -24,13 +24,15 @@ spring: host: 202.165.179.86 port: 6789 password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco) - timeout: 0 + timeout: 2000 expire: 1800 #30分钟 - pool: - max-active: 8 - max-idle: 8 - max-wait: -1 - min-idle: 0 + database: 2 + jedis: + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + min-idle: 0 logging: level: diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 7786bc132..c781606d8 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -27,12 +27,15 @@ spring: host: 202.165.179.86 port: 6789 password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco) - timeout: 0 + timeout: 2000 expire: 1800 #30分钟 - pool: - max-active: 8 - max-idle: 8 - max-wait: -1 + database: 3 + jedis: + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + min-idle: 0 logging: level: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index f264b67ec..b2678f545 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -24,13 +24,15 @@ spring: host: 202.165.179.86 port: 6789 password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco) - timeout: 0 + timeout: 2000 expire: 1800 #30分钟 - pool: - max-active: 8 - max-idle: 8 - max-wait: -1 - min-idle: 0 + database: 3 + jedis: + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + min-idle: 0 logging: level: