From cdf57ef11128f7df6f216c1c717ac783c625fa1b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 14 Apr 2021 17:31:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/application-dev.yml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 984b1a4..5e3b8e1 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
@@ -113,14 +115,16 @@
mvc:
interceptor:
exclude:
- - /account/login
+ - /login
- /swagger-ui.html
- /swagger-resources/**
- /webjars/**
- - /account/logout
- - /account/insert
- - /account/query
- - /account/update
+ - /verificationCode/**
+ - /system/**
+
+ - /role/**
+ - /menu/**
+ - /api/**
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
@@ -128,3 +132,4 @@
KEY:
foh3wi2ooghiCh5
+
--
Gitblit v1.8.0