From 616dca8f5bbb17f0b3a124340965c0232fdae894 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sun, 25 Apr 2021 10:32:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/application-dev.yml | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index d865d5a..fd79cd8 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:
@@ -60,6 +62,9 @@
url: jdbc:mysql://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: chenkaiyu111
+ #url: jdbc:mysql://vp9l57dtd2vng7oxft1t.rwlb.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ #username: root
+ #password: moral_123456
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
@@ -117,24 +122,12 @@
- /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
+ - /verificationCode/**
+ - /manageLog/**
- - /role/getAllManageRole
- - /role/getManageRoleByNameFuzzy
- - /role/updateRoleMenu
- - /menu/getAllManageMenu
- - /menu/getManageMenuByNameFuzzy
+ - /manageRole/**
+ - /manageMenu/**
+ - /api/**
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
@@ -142,3 +135,4 @@
KEY:
foh3wi2ooghiCh5
+
--
Gitblit v1.8.0