From e7bc156f901b06e5af54cfe86fe53e7491af7b7f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:22:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/application-dev.yml | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 426aa21..ecc1f6f 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -13,16 +13,14 @@
spring:
profiles:
active: dev
+ include:
+ moduleFormColumn
application:
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
+ host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
port: 6379
- password: chenkaiyu111
+ password: moral_123456
timeout: 30000
jedis:
pool:
@@ -37,9 +35,9 @@
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
pool:
@@ -57,9 +55,10 @@
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://vp9l57dtd2vng7oxft1t.rwlb.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://vp9l57dtd2vng7oxft1t-rw4rm.rwlb.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
@@ -113,7 +112,13 @@
mvc:
interceptor:
exclude:
- - /account/login
+ - /login
+ - /swagger-ui.html
+ - /swagger-resources/**
+ - /webjars/**
+ - /verificationCode/**
+ - /manageLog/**
+
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
@@ -121,3 +126,4 @@
KEY:
foh3wi2ooghiCh5
+
--
Gitblit v1.8.0