From c847209536865655ffb867d1b6fe5af0088b98ad Mon Sep 17 00:00:00 2001
From: NM$L <798456947@qq.com>
Date: Thu, 23 Apr 2020 12:09:10 +0800
Subject: [PATCH 1/3] Update ServiceImpl.ftl (#318)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

生成代码 deleteAll 方法 参数错误
---
 .../main/resources/template/generator/admin/ServiceImpl.ftl   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl
index 76eb12ee..10b47094 100644
--- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl
@@ -130,7 +130,7 @@ public class ${className}ServiceImpl implements ${className}Service {
     @Override
     //@CacheEvict(allEntries = true)
     public void deleteAll(${pkColumnType}[] ids) {
-        for (${pkColumnType} id : ids) {
+        for (${pkColumnType} ${pkChangeColName} : ids) {
             ${changeClassName}Repository.deleteById(${pkChangeColName});
         }
     }
@@ -153,4 +153,4 @@ public class ${className}ServiceImpl implements ${className}Service {
         }
         FileUtil.downloadExcel(list, response);
     }
-}
\ No newline at end of file
+}

From 95e9128b80332c8a3aeaa50f858d69335b3912d5 Mon Sep 17 00:00:00 2001
From: wtune <59522871+wtune@users.noreply.github.com>
Date: Thu, 23 Apr 2020 12:10:31 +0800
Subject: [PATCH 2/3] Change quartz_log engine to MyISAM (#316)

---
 sql/eladmin.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/eladmin.sql b/sql/eladmin.sql
index 53631173..2a776c6e 100644
--- a/sql/eladmin.sql
+++ b/sql/eladmin.sql
@@ -593,7 +593,7 @@ CREATE TABLE `quartz_log`  (
   `params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `time` bigint(20) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 288 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '定时任务日志' ROW_FORMAT = Compact;
+) ENGINE = MyISAM AUTO_INCREMENT = 288 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '定时任务日志' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for role

From 0783648c0183f798b9d231b1beac4bd66ab1c812 Mon Sep 17 00:00:00 2001
From: zbq2019 <49929998+zbq2019@users.noreply.github.com>
Date: Thu, 23 Apr 2020 12:16:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20bug:=20=E5=BD=93=E5=89=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E4=BB=BB=E4=BD=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=97=B6=EF=BC=8C=E5=9C=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=90=8E=EF=BC=8C=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E4=BC=9A=E6=8A=9BIllegalArgumentExc?=
 =?UTF-8?q?eption=20(#333)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dingwq <aa@mmm.com>
---
 .../modules/security/security/TokenProvider.java         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java
index fb19eb96..efe58768 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java
@@ -1,5 +1,6 @@
 package me.zhengjie.modules.security.security;
 
+import cn.hutool.core.util.ObjectUtil;
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
@@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.security.Key;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.stream.Collectors;
 
@@ -63,10 +65,13 @@ public class TokenProvider implements InitializingBean {
          .parseClaimsJws(token)
          .getBody();
 
+      // fix bug: 当前用户如果没有任何权限时，在输入用户名后，刷新验证码会抛IllegalArgumentException
+       Object authoritiesStr = claims.get(AUTHORITIES_KEY);
       Collection<? extends GrantedAuthority> authorities =
-         Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
+              ObjectUtil.isNotEmpty(authoritiesStr) ?
+       Arrays.stream(authoritiesStr.toString().split(","))
             .map(SimpleGrantedAuthority::new)
-            .collect(Collectors.toList());
+            .collect(Collectors.toList()) : Collections.emptyList();
 
       User principal = new User(claims.getSubject(), "", authorities);