From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/resources/application-dev.yml | 72 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 082c9dc..3ec8fff 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -2,46 +2,42 @@
port: 8081
tomcat:
uri-encoding: UTF-8
- #���������������
+ #���������������
min-spare-threads: 500
- #���������������
+ #���������������
max-threads: 2500
- #���������������
+ #���������������
max-connections: 6500
- #������������������������
+ #������������������������
accept-count: 1000
spring:
profiles:
active: dev
application:
- name: screen-api
+ name: screen-manage
redis:
- #cluster:
- #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: 39.97.177.149
- port: 6379
- password: chenkaiyu111
- timeout: 30000
- jedis:
- pool:
- max-active: 256
- max-wait: 30000
- max-idle: 64
- min-idle: 32
- lettuce:
- pool:
- max-active: 256
- max-idle: 64
- max-wait: 30000
- min-idle: 32
- tokenRedis:
- host: 39.97.177.149
+ host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
port: 6379
- password: chenkaiyu111
+ password: moral_123456
timeout: 30000
- database: 14
+ jedis:
+ pool:
+ max-active: 256
+ max-wait: 30000
+ max-idle: 64
+ min-idle: 32
+ lettuce:
+ pool:
+ max-active: 256
+ max-idle: 64
+ max-wait: 30000
+ min-idle: 32
+ tokenRedis:
+ host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ port: 6379
+ password: moral_123456
+ timeout: 30000
+ database: 15
pool:
max-active: 256
max-wait: 30000
@@ -57,9 +53,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: chenkaiyu111
+ password: moral_123456
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
@@ -77,9 +73,9 @@
field-strategy: NOT_EMPTY
db-type: MYSQL
configuration:
- map-underscore-to-camel-case: true
- call-setters-on-nulls: true
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ map-underscore-to-camel-case: true
+ call-setters-on-nulls: true
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
kafka:
listener:
@@ -113,7 +109,13 @@
mvc:
interceptor:
exclude:
- - /account/login
+ - /login
+ - /swagger-ui.html
+ - /swagger-resources/**
+ - /swagger-ui.html/**
+ - /webjars/**
+ - /verificationCode/**
+
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
--
Gitblit v1.8.0