From d0817418a1c0fc3d637cb3cb2a2fb7f8c1a42d0b Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 23 六月 2022 16:43:39 +0800
Subject: [PATCH] 修改数据库配置
---
ximon-admin/src/main/resources/application-local.yml | 15 ++++++++-------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 3 ++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | 3 ++-
ximon-admin/src/main/resources/application.yml | 2 +-
ximon-admin/src/main/resources/application-dev.yml | 10 ++++++----
5 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
index 2aa8384..8e86083 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
@@ -42,7 +42,8 @@
* 鑾峰彇瑙掕壊涓嬬殑鑿滃崟
*/
public List<Menu> listByRoleIds(List<Long> roleIdList) {
- List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
+ List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class)
+ .in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
.stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());
if (CollectionUtil.isEmpty(menuIdList)) {
return null;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
index 48e2a86..e82b12f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
@@ -81,7 +81,8 @@
*/
public List<Role> listByAdminId(Long adminId) {
// 鑾峰彇绠＄悊鍛樼殑瑙掕壊id
- List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId));
+ List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class)
+ .eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId));
List<Long> roleIdList = list.stream().map(AdminRoleRelation::getRoleId).collect(Collectors.toList());
if (CollectionUtil.isEmpty(roleIdList)) {
return null;
diff --git a/ximon-admin/src/main/resources/application-dev.yml b/ximon-admin/src/main/resources/application-dev.yml
index b642f2b..5feb0ba 100644
--- a/ximon-admin/src/main/resources/application-dev.yml
+++ b/ximon-admin/src/main/resources/application-dev.yml
@@ -1,8 +1,10 @@
spring:
datasource:
- username: sandu
- password: Sandu.520
- url: jdbc:mysql://112.74.63.130:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ # 鏁版嵁搴撶敤鎴峰悕
+ username: dev
+ # 鏁版嵁搴撳瘑鐮�
+ password: xv6d7qviZHQu+pB0
+ url: jdbc:mysql://localhost:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
type: com.alibaba.druid.pool.DruidDataSource
druid:
connection-init-sqls: set names utf8mb4
@@ -11,7 +13,7 @@
host: 112.74.63.130 # Redis鏈嶅姟鍣ㄥ湴鍧�
database: 0 # Redis鏁版嵁搴撶储寮曪紙榛樿涓�0锛�
port: 6379 # Redis鏈嶅姟鍣ㄨ繛鎺ョ鍙�
- password: Sandu.520.ifzdm # Redis鏈嶅姟鍣ㄨ繛鎺ュ瘑鐮侊紙榛樿涓虹┖锛�
+ password: uIEFHmj4bC0wJCyM # Redis鏈嶅姟鍣ㄨ繛鎺ュ瘑鐮侊紙榛樿涓虹┖锛�
timeout: 300ms # 杩炴帴瓒呮椂鏃堕棿锛堟绉掞級
server:
port: 20017
diff --git a/ximon-admin/src/main/resources/application-test.yml b/ximon-admin/src/main/resources/application-local.yml
similarity index 84%
rename from ximon-admin/src/main/resources/application-test.yml
rename to ximon-admin/src/main/resources/application-local.yml
index dab34f9..fea8084 100644
--- a/ximon-admin/src/main/resources/application-test.yml
+++ b/ximon-admin/src/main/resources/application-local.yml
@@ -1,7 +1,9 @@
spring:
datasource:
+ # 鏁版嵁搴撶敤鎴峰悕
username: sandu
- password: Sandu.520
+ # 鏁版嵁搴撳瘑鐮�
+ password: dygOHN4&mZC9X+99
url: jdbc:mysql://112.74.63.130:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -11,10 +13,10 @@
host: 112.74.63.130 # Redis鏈嶅姟鍣ㄥ湴鍧�
database: 0 # Redis鏁版嵁搴撶储寮曪紙榛樿涓�0锛�
port: 6379 # Redis鏈嶅姟鍣ㄨ繛鎺ョ鍙�
- password: Sandu.520.ifzdm # Redis鏈嶅姟鍣ㄨ繛鎺ュ瘑鐮侊紙榛樿涓虹┖锛�
+ password: uIEFHmj4bC0wJCyM # Redis鏈嶅姟鍣ㄨ繛鎺ュ瘑鐮侊紙榛樿涓虹┖锛�
timeout: 300ms # 杩炴帴瓒呮椂鏃堕棿锛堟绉掞級
server:
- port: 8080
+ port: 20017
sandu:
jwt:
header: Authorization
@@ -25,20 +27,19 @@
# 浠ょ墝杩囨湡鏃堕棿 姝ゅ鍗曚綅/姣 锛屽彲鍦ㄦ缃戠珯鐢熸垚 https://www.convertworld.com/zh-hans/time/milliseconds.html 1涓湀
token-validity-in-seconds: 2629800000
# 鍦ㄧ嚎鐢ㄦ埛key
- online-key: light-user
+ online-key: online-token
# 鏄惁鍚姩redis缂撳瓨鐢ㄦ埛淇℃伅
cache-online: false
upload:
upload-root-path: /usr/local/project/ximon-light-20017/file/
storage: local
common:
- urlPrefix: http://112.74.63.130:20017/file/
+ urlPrefix: http://112.74.63.130/file/
quartz:
enable: true
listenter:
- isOpen: false
-
+ isOpen: true
minio:
endpoint: 47.106.172.9
diff --git a/ximon-admin/src/main/resources/application.yml b/ximon-admin/src/main/resources/application.yml
index 3a751a3..3b55cbb 100644
--- a/ximon-admin/src/main/resources/application.yml
+++ b/ximon-admin/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: test
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
--
Gitblit v1.9.3