From 4edd63bcd21b999e0782047ca0602f9e915cd94c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 11 Mar 2021 08:23:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/resources/application-dev.yml | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 67627c3..082c9dc 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -20,9 +20,9 @@
#nodes: 47.112.126.78:7001,47.112.126.78:7002,47.112.126.132:7003,47.112.126.132:7004,47.112.132.193:7005,47.112.132.193:7006
#password: test
#timeout: 500
- host: 127.0.0.1
+ host: 39.97.177.149
port: 6379
- password: 123456
+ password: chenkaiyu111
timeout: 30000
jedis:
pool:
@@ -36,6 +36,18 @@
max-idle: 64
max-wait: 30000
min-idle: 32
+ tokenRedis:
+ host: 39.97.177.149
+ port: 6379
+ password: chenkaiyu111
+ timeout: 30000
+ database: 14
+ pool:
+ max-active: 256
+ max-wait: 30000
+ max-idle: 64
+ min-idle: 32
+
datasource:
minIdle: 1
time-between-eviction-runs-millis: 60000
@@ -45,8 +57,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
- password: 123456
+ url: jdbc:mysql://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ username: root
+ password: chenkaiyu111
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
@@ -55,7 +68,6 @@
driver-class-name: com.mysql.cj.jdbc.Driver
max-conn-lifetime-millis: 20
test-on-return: false
- username: root
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
@@ -84,7 +96,7 @@
commit: false
group:
id: test
- servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
+ servers: 192.168.0.191:9092
session:
timeout: 6000
topic: test_topic
@@ -98,4 +110,13 @@
linger: 1
retries: 0
servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
-
+mvc:
+ interceptor:
+ exclude:
+ - /account/login
+AES:
+ KEY:
+ AD42F7787B035B7580000EF93BE20BAD
+TOKEN:
+ KEY:
+ foh3wi2ooghiCh5
\ No newline at end of file
--
Gitblit v1.8.0