From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/application-dev.yml | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index fb512b8..2c657e4 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -13,6 +13,8 @@
spring:
profiles:
active: dev
+ include:
+ moduleFormColumn
application:
name: screen-manage
redis:
@@ -57,7 +59,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
@@ -117,19 +119,18 @@
- /swagger-ui.html
- /swagger-resources/**
- /webjars/**
- - /logout
- - /account/insert
- - /account/query
- - /account/update
- - /account/delete
- - /account/yanzhengma
- - /verificationCode/get
- - /verificationCode/verify
+ - /verificationCode/**
+ - /system/**
+
- /role/getAllManageRole
- /role/getManageRoleByNameFuzzy
+ - /role/insertOneManageRole
+ - /role/updateManageRole
- /role/updateRoleMenu
+ - /role/deleteManageRole
- /menu/getAllManageMenu
- /menu/getManageMenuByNameFuzzy
+ - /api/**
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
@@ -137,3 +138,4 @@
KEY:
foh3wi2ooghiCh5
+
--
Gitblit v1.8.0