去除字样

jero-boot/db/Dockerfile

@@ -8,6 +8,6 @@ RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 COPY ./tables_nacos.sql /docker-entrypoint-initdb.d
 
-COPY jeroboot-mysql-5.7-20220224.sql /docker-entrypoint-initdb.d
+COPY jeroboot-mysql-5.7-20220331.sql /docker-entrypoint-initdb.d
 
 COPY ./tables_xxl_job.sql /docker-entrypoint-initdb.d

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java

@@ -29,7 +29,7 @@ import com.jero.common.util.oConvertUtils;
 public class JwtUtil {
 
 	// Token过期时间30分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
-	public static final long EXPIRE_TIME = 30 * 60 * 1000;
+	public static final long EXPIRE_TIME = 60 * 60 * 1000;
 
 	/**
 	 * 校验token是否正确

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jero.modules.system.service.impl;
 
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.RSA;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
@@ -71,7 +72,12 @@ public class LoginServiceImpl implements ILoginService {
         String username = sysLoginModel.getUsername();
         String password = sysLoginModel.getPassword();
         String rsaPublicKey = sysLoginModel.getRsaPublicKey();
-        String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
+        String rsaPrivateKey = redisUtil.get(rsaPublicKey) != null ? String.valueOf(redisUtil.get(rsaPublicKey)) : null;
+
+        if(StrUtil.isEmpty(rsaPrivateKey)){
+            return result.error500("页面过期，请刷新页面");
+        }
+
         //update-begin--Author:scott  Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
         //前端密码加密，后端进行密码解密
         //password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密