From 047e1ec0b94317cc2a65657b4b101c5f769c3530 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 29 Jan 2021 11:59:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-ops/blade-resource/src/main/resources/application.yml | 12 ++++++------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/blade-ops/blade-resource/src/main/resources/application.yml b/blade-ops/blade-resource/src/main/resources/application.yml
index f5e2576..66627e8 100644
--- a/blade-ops/blade-resource/src/main/resources/application.yml
+++ b/blade-ops/blade-resource/src/main/resources/application.yml
@@ -2,12 +2,12 @@
server:
port: 8010
-#默认对象存储配置
+#oss配置
oss:
enabled: true
name: minio
- tenant-mode: true
- endpoint: http://127.0.0.1:9000
- access-key: D99KGE6ZTQXSATTJWU24
- secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
- bucket-name: bladex
+ tenant-mode: false
+ endpoint: http://s16s652780.51mypc.cn:21403
+ bucket-name: caster
+ access-key: minioadmin
+ secret-key: minioadmin
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 33fb909..caf4216 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -106,7 +106,7 @@
<if test="jtype!=null and jtype!=''">
and a.jtype=#{jtype}
</if>
- <if test="district!=null and district!=''">
+ <if test="addvcd!=null and addvcd!=''">
and a.district=#{district}
</if>
<if test="waringType!=null and waringType!=''">
--
Gitblit v1.9.3