From 9b4ea2631cc800c376116ed97aca11c8fac956d8 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 12 十月 2022 17:54:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/entity/sys/AuthEntity.java | 1
src/main/java/com/lf/server/entity/sys/ResEntity.java | 1
src/main/java/com/lf/server/entity/data/DirEntity.java | 1
src/main/java/com/lf/server/helper/Md5Helper.java | 4 +-
src/main/java/com/lf/server/entity/all/SettingData.java | 20 +++++++--
src/main/java/com/lf/server/entity/sys/LoginEntity.java | 1
src/main/java/com/lf/server/service/sys/TokenService.java | 31 ++-------------
src/main/java/com/lf/server/entity/data/DictEntity.java | 1
src/main/java/com/lf/server/helper/PathHelper.java | 5 +-
src/main/java/com/lf/server/helper/WebHelper.java | 5 +-
src/main/java/com/lf/server/entity/sys/TokenEntity.java | 1
src/main/java/com/lf/server/entity/sys/MenuEntity.java | 1
src/main/java/com/lf/server/entity/data/StyleEntity.java | 1
src/main/java/com/lf/server/entity/sys/DepEntity.java | 5 +-
src/main/java/com/lf/server/entity/sys/RoleEntity.java | 1
src/main/java/com/lf/server/entity/data/VerEntity.java | 1
16 files changed, 29 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/lf/server/entity/all/SettingData.java b/src/main/java/com/lf/server/entity/all/SettingData.java
index 98b981f..e48334c 100644
--- a/src/main/java/com/lf/server/entity/all/SettingData.java
+++ b/src/main/java/com/lf/server/entity/all/SettingData.java
@@ -6,27 +6,37 @@
*/
public class SettingData {
/**
- * 鎺掗櫎璺緞锛�"/druid/",
+ * 璁块棶鎺掗櫎璺緞
*/
public static String[] EXCLUDE_PATH = new String[]{"/swagger", "/sign/", "/proxy"};
/**
* 鑷姩鐧诲嚭鏃堕棿
*/
- public static Integer AUTO_LOGOUT = 15;
+ public static int AUTO_LOGOUT = 15;
/**
* 浠ょ墝鏈夋晥鏈�
*/
- public static Integer TOKEN_EXPIRE = 240;
+ public static int TOKEN_EXPIRE = 240;
/**
* 缂撳瓨鏈夋晥鏈�
*/
- public static Integer CACHE_EXPIRE = 240;
+ public static int CACHE_EXPIRE = 240;
+
+ /**
+ * 鏈�澶ф枃浠舵暟
+ */
+ public static int MAX_FILES = 2000;
+
+ /**
+ * Cookie鏈夋晥鏈�
+ */
+ public static int COOKIE_MAX_AGE = 4 * 60 * 60;
/**
* 闄勪欢澶у皬
*/
- public static Integer MAX_FILE_SIZE = 20 * 1024 * 1024;
+ public static long MAX_FILE_SIZE = 20 * 1024 * 1024;
}
diff --git a/src/main/java/com/lf/server/entity/data/DictEntity.java b/src/main/java/com/lf/server/entity/data/DictEntity.java
index 154d6c2..7d18eb1 100644
--- a/src/main/java/com/lf/server/entity/data/DictEntity.java
+++ b/src/main/java/com/lf/server/entity/data/DictEntity.java
@@ -10,7 +10,6 @@
*/
public class DictEntity implements Serializable {
-
private static final long serialVersionUID = -343890141066128689L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/data/DirEntity.java b/src/main/java/com/lf/server/entity/data/DirEntity.java
index aa96c70..6aebcc6 100644
--- a/src/main/java/com/lf/server/entity/data/DirEntity.java
+++ b/src/main/java/com/lf/server/entity/data/DirEntity.java
@@ -17,7 +17,6 @@
@AllArgsConstructor
@NoArgsConstructor
public class DirEntity implements Serializable {
-
private static final long serialVersionUID = -2184993363389504088L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/data/StyleEntity.java b/src/main/java/com/lf/server/entity/data/StyleEntity.java
index f5bddf5..f0ca077 100644
--- a/src/main/java/com/lf/server/entity/data/StyleEntity.java
+++ b/src/main/java/com/lf/server/entity/data/StyleEntity.java
@@ -10,7 +10,6 @@
*/
public class StyleEntity implements Serializable {
-
private static final long serialVersionUID = 2421229801055033955L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/data/VerEntity.java b/src/main/java/com/lf/server/entity/data/VerEntity.java
index 7996e37..ef99156 100644
--- a/src/main/java/com/lf/server/entity/data/VerEntity.java
+++ b/src/main/java/com/lf/server/entity/data/VerEntity.java
@@ -9,7 +9,6 @@
* @date 2022-09-29
*/
public class VerEntity implements Serializable {
-
private static final long serialVersionUID = 4765222572551658531L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/sys/AuthEntity.java b/src/main/java/com/lf/server/entity/sys/AuthEntity.java
index eb3d81f..87442f7 100644
--- a/src/main/java/com/lf/server/entity/sys/AuthEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/AuthEntity.java
@@ -9,7 +9,6 @@
* @date 2022-09-28
*/
public class AuthEntity implements Serializable {
-
private static final long serialVersionUID = 2590447372444367285L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/sys/DepEntity.java b/src/main/java/com/lf/server/entity/sys/DepEntity.java
index 63cb656..6373386 100644
--- a/src/main/java/com/lf/server/entity/sys/DepEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/DepEntity.java
@@ -17,7 +17,6 @@
@AllArgsConstructor
@NoArgsConstructor
public class DepEntity implements Serializable {
-
private static final long serialVersionUID = -3673810416800666364L;
private int id;
@@ -36,7 +35,7 @@
private String contact;
- private String fax ;
+ private String fax;
private String email;
@@ -48,7 +47,7 @@
private int orderNum;
- private int createUser;
+ private int createUser;
private Timestamp createTime;
diff --git a/src/main/java/com/lf/server/entity/sys/LoginEntity.java b/src/main/java/com/lf/server/entity/sys/LoginEntity.java
index 158558d..25599db 100644
--- a/src/main/java/com/lf/server/entity/sys/LoginEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/LoginEntity.java
@@ -10,7 +10,6 @@
*/
public class LoginEntity implements Serializable {
-
private static final long serialVersionUID = 2156194736679188516L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/sys/MenuEntity.java b/src/main/java/com/lf/server/entity/sys/MenuEntity.java
index 366d274..bf176e6 100644
--- a/src/main/java/com/lf/server/entity/sys/MenuEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/MenuEntity.java
@@ -17,7 +17,6 @@
@AllArgsConstructor
@NoArgsConstructor
public class MenuEntity implements Serializable {
-
private static final long serialVersionUID = -4174396918804003518L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/sys/ResEntity.java b/src/main/java/com/lf/server/entity/sys/ResEntity.java
index 961b9ee..33987e0 100644
--- a/src/main/java/com/lf/server/entity/sys/ResEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/ResEntity.java
@@ -14,7 +14,6 @@
@AllArgsConstructor
@NoArgsConstructor
public class ResEntity implements Serializable {
-
private static final long serialVersionUID = 9047079519693255710L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/sys/RoleEntity.java b/src/main/java/com/lf/server/entity/sys/RoleEntity.java
index 3eed789..eb9ecb0 100644
--- a/src/main/java/com/lf/server/entity/sys/RoleEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/RoleEntity.java
@@ -9,7 +9,6 @@
* @date 2022-09-29
*/
public class RoleEntity implements Serializable {
-
private static final long serialVersionUID = -1738125301491645446L;
private int id;
diff --git a/src/main/java/com/lf/server/entity/sys/TokenEntity.java b/src/main/java/com/lf/server/entity/sys/TokenEntity.java
index 40ffbca..6b5299d 100644
--- a/src/main/java/com/lf/server/entity/sys/TokenEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/TokenEntity.java
@@ -9,7 +9,6 @@
* @date 2022-09-28
*/
public class TokenEntity implements Serializable {
-
private static final long serialVersionUID = 1419309705830103150L;
private int id;
diff --git a/src/main/java/com/lf/server/helper/Md5Helper.java b/src/main/java/com/lf/server/helper/Md5Helper.java
index 7bdfee7..7feee00 100644
--- a/src/main/java/com/lf/server/helper/Md5Helper.java
+++ b/src/main/java/com/lf/server/helper/Md5Helper.java
@@ -10,11 +10,11 @@
* @author WWW
*/
public class Md5Helper {
+ private final static int M3 = 3;
+
private final static int M16 = 16;
private final static int M48 = 48;
-
- private final static int M3 = 3;
/**
* 鐢熸垚鍚湁闅忔満鐩愮殑瀵嗙爜
diff --git a/src/main/java/com/lf/server/helper/PathHelper.java b/src/main/java/com/lf/server/helper/PathHelper.java
index be75b94..fe2eaca 100644
--- a/src/main/java/com/lf/server/helper/PathHelper.java
+++ b/src/main/java/com/lf/server/helper/PathHelper.java
@@ -1,6 +1,7 @@
package com.lf.server.helper;
import com.lf.server.config.PropertiesConfig;
+import com.lf.server.entity.all.SettingData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -14,8 +15,6 @@
public class PathHelper {
@Autowired
private PropertiesConfig config;
-
- private static int MAX_FILES = 2000;
private static int importPath = 1;
@@ -66,7 +65,7 @@
}
File[] files = file.listFiles();
- if (files.length < MAX_FILES) {
+ if (files.length < SettingData.MAX_FILES) {
return subPath;
}
diff --git a/src/main/java/com/lf/server/helper/WebHelper.java b/src/main/java/com/lf/server/helper/WebHelper.java
index d2b7f9f..7bb7673 100644
--- a/src/main/java/com/lf/server/helper/WebHelper.java
+++ b/src/main/java/com/lf/server/helper/WebHelper.java
@@ -1,5 +1,6 @@
package com.lf.server.helper;
+import com.lf.server.entity.all.SettingData;
import com.lf.server.entity.all.StaticData;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -147,7 +148,7 @@
public static void saveCookie(String key, String value, HttpServletResponse response) {
Cookie cookie = new Cookie(key, value);
// 璁剧疆cookie澶辨晥鏃堕棿锛屽崟浣嶄负绉�
- cookie.setMaxAge(4 * 60 * 60);
+ cookie.setMaxAge(SettingData.COOKIE_MAX_AGE);
cookie.setHttpOnly(false);
cookie.setPath("/");
//cookie.setDomain("*")
@@ -195,7 +196,7 @@
/**
* 鏍规嵁閿幏鍙朇ookie鍊�
*/
- public static String getCookieByKey(String key,HttpServletRequest request) {
+ public static String getCookieByKey(String key, HttpServletRequest request) {
Cookie[] cookies = request.getCookies();
if (cookies == null || cookies.length == 0) {
return null;
diff --git a/src/main/java/com/lf/server/service/sys/TokenService.java b/src/main/java/com/lf/server/service/sys/TokenService.java
index 49dc57d..ed66ab5 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -1,5 +1,6 @@
package com.lf.server.service.sys;
+import com.lf.server.entity.all.SettingData;
import com.lf.server.entity.sys.LoginEntity;
import com.lf.server.entity.sys.TokenEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -39,12 +40,12 @@
@Override
public Integer selectCount(String name, Integer type) {
- return tokenMapper.selectCount(name,type);
+ return tokenMapper.selectCount(name, type);
}
@Override
public List<TokenEntity> selectByPage(String name, Integer type, Integer limit, Integer offset) {
- return tokenMapper.selectByPage(name,type, limit, offset);
+ return tokenMapper.selectByPage(name, type, limit, offset);
}
@Override
@@ -94,32 +95,21 @@
/**
* 鑾峰彇鏂扮殑浠ょ墝瀹炰綋绫�
- *
- * @param userid
- * @param req
- * @return
*/
public TokenEntity getNewToken(int userid, HttpServletRequest req) {
- int duration = 240;
-
TokenEntity te = new TokenEntity();
te.setToken(WebHelper.getGuid());
- te.setDuration(duration);
- te.setExpire(WebHelper.getTimestamp(duration));
+ te.setDuration(SettingData.TOKEN_EXPIRE);
+ te.setExpire(WebHelper.getTimestamp(SettingData.TOKEN_EXPIRE));
te.setType(0);
te.setIp(WebHelper.getIpAddress(req));
te.setCreateUser(userid);
-
return te;
}
/**
* 鏄�/鍚︾櫥褰�
- *
- * @param req
- * @param res
- * @return
*/
public Boolean isLogin(HttpServletRequest req, HttpServletResponse res) {
String token = WebHelper.getToken(req);
@@ -145,10 +135,6 @@
/**
* 鐧诲嚭
- *
- * @param token
- * @param req
- * @return
*/
public Boolean logout(String token, HttpServletRequest req, HttpServletResponse res) {
TokenEntity te = getEntityByToken(token);
@@ -187,9 +173,6 @@
/**
* 鏍规嵁浠ょ墝鑾峰彇瀹炰綋
- *
- * @param token
- * @return
*/
public TokenEntity getEntityByToken(String token) {
if (StringHelper.isNull(token)) {
@@ -215,10 +198,6 @@
/**
* 淇濆瓨token
- *
- * @param te
- * @param req
- * @param res
*/
public void saveToken(UserEntity ue, TokenEntity te, HttpServletRequest req, HttpServletResponse res) {
// 淇濆瓨鑷矯ookie
--
Gitblit v1.9.3