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-manage/src/main/resources/application-dev.yml | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index d865d5a..4a6899a 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,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=Asia/Shanghai
+ 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
@@ -117,24 +115,9 @@
- /swagger-ui.html
- /swagger-resources/**
- /webjars/**
- - /logout
- - /account/insert
- - /account/query
- - /account/update
- - /account/delete
- - /account/yanzhengma
- - /verificationCode/get
- - /verificationCode/verify
- - /verificationCode/config
- - /organization/insert
- - /organization/update
- - /organization/delete
+ - /verificationCode/**
+ - /manageLog/**
- - /role/getAllManageRole
- - /role/getManageRoleByNameFuzzy
- - /role/updateRoleMenu
- - /menu/getAllManageMenu
- - /menu/getManageMenuByNameFuzzy
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
@@ -142,3 +125,4 @@
KEY:
foh3wi2ooghiCh5
+
--
Gitblit v1.8.0