From ec25027a0b82d2388d5cf7cd47cc4a3620b293a3 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 24 Jun 2021 11:56:40 +0800
Subject: [PATCH] 修改、删除因子是，对组织型号关系表进行修改、删除
---
screen-manage/src/main/resources/application-dev.yml | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 984b1a4..e81262e 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=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
@@ -94,12 +92,9 @@
enable:
auto:
commit: false
- group:
- id: test
servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
session:
timeout: 6000
- topic: test_topic
zookeeper:
connect: 192.168.0.16:2181,192.168.0.17:2181,192.168.0.18:2181
producer:
@@ -113,14 +108,13 @@
mvc:
interceptor:
exclude:
- - /account/login
+ - /login
- /swagger-ui.html
- /swagger-resources/**
- /webjars/**
- - /account/logout
- - /account/insert
- - /account/query
- - /account/update
+ - /verificationCode/**
+ - /manageLog/**
+
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
@@ -128,3 +122,4 @@
KEY:
foh3wi2ooghiCh5
+
--
Gitblit v1.8.0