From abd3e695ce1e88f948a5edc41f4b9c4c1cc0e942 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Tue, 16 Mar 2021 16:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E7=A7=98=E9=92=A5bug=E4=BF=AE=E6=94=B9=20=E3=80=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91jimu=E6=8A=A5=E8=A1=A8=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/jero-boot-module-system/pom.xml                       | 2 +-
 .../jero/modules/system/controller/SysDataSourceController.java | 1 +
 .../main/java/com/jero/modules/system/util/SecurityUtil.java    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/pom.xml b/jero-boot/jero-boot-module-system/pom.xml
index fda90ed6..c00599e8 100644
--- a/jero-boot/jero-boot-module-system/pom.xml
+++ b/jero-boot/jero-boot-module-system/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>com.jimureport</groupId>
 			<artifactId>spring-boot-starter-jimureport</artifactId>
-			<version>1.1.09-beta</version>
+			<version>1.2.0</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>autopoi-web</artifactId>
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java
index 22b5113b..5c1bf134 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java
@@ -73,6 +73,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
             });
         } catch (Exception e) {
             e.printStackTrace();
+            return Result.error(e.getMessage());
         }
         return Result.OK(pageList);
     }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/SecurityUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/SecurityUtil.java
index f4e77dcd..366ee1e8 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/SecurityUtil.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/SecurityUtil.java
@@ -12,7 +12,7 @@ import cn.hutool.crypto.symmetric.SymmetricCrypto;
  */
 public class SecurityUtil {
     /**加密key*/
-    private static String key = "JEROBOOT1423670";
+    private static String key = "JERO-BOOT1423670";
 
     //---AES加密---------begin---------
     /**加密