From d254385484b2baf2b4c76388e93bb850c9a6e2b3 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 14:53:00 +0800
Subject: [PATCH] screen-manage 添加组织返回字段
---
screen-manage/src/main/resources/application-dev.yml | 47 ++++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index ba63a0c..6cba84f 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=Asia/Shanghai
+ #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
@@ -117,28 +116,13 @@
- /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
- - /organization/query
+ - /verificationCode/**
+ - /manageLog/**
- - /role/getAllManageRole
- - /role/getManageRoleByNameFuzzy
- - /role/insertOneManageRole
- - /role/updateManageRole
- - /role/updateRoleMenu
- - /role/deleteManageRole
- - /menu/getAllManageMenu
- - /menu/getManageMenuByNameFuzzy
+ - /manageRole/**
+ - /manageMenu/**
+ - /api/**
+ - /sensor/**
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
@@ -146,3 +130,4 @@
KEY:
foh3wi2ooghiCh5
+
--
Gitblit v1.8.0