From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/resources/application-dev.yml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 6f70051..d865d5a 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -57,7 +57,7 @@
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://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: chenkaiyu111
test-on-borrow: false
@@ -125,6 +125,16 @@
- /account/yanzhengma
- /verificationCode/get
- /verificationCode/verify
+ - /verificationCode/config
+ - /organization/insert
+ - /organization/update
+ - /organization/delete
+
+ - /role/getAllManageRole
+ - /role/getManageRoleByNameFuzzy
+ - /role/updateRoleMenu
+ - /menu/getAllManageMenu
+ - /menu/getManageMenuByNameFuzzy
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
--
Gitblit v1.8.0