Merge branch 'feature/1003074' into 'master'

feature [1003074] 修改erp token时长

See merge request rays/pcloud-common-parent!118

pcloud-common/src/main/java/com/pcloud/common/utils/SessionUtil.java

@@ -124,6 +124,7 @@ public abstract class SessionUtil {
 	 * token存redis默认时间(2个小时)
 	 */
 	private static final Integer DEFAULT_SESSION_TIMEOUT = 2 * 60 * 60;
+	private static final Integer DEFAULT_SESSION_TIMEOUT_ERP = 24 * 60 * 60;
 	private static final Integer DEFAULT_SESSION_TIMEOUT_XCX = 15 * 24 * 60 * 60;
 
 	/**
@@ -140,6 +141,9 @@ public abstract class SessionUtil {
 				|| CLIENT_CODE_SAYS.equals(map.get(CLIENT_CODE)))) {
 			timeOut = DEFAULT_SESSION_TIMEOUT_XCX;
 		}
+		if ("pcloud".equals(map.get(SYSTEM_CODE))) {
+			timeOut = DEFAULT_SESSION_TIMEOUT_ERP;
+		}
 		JedisClusterUtils.setObject(token, map, timeOut);
 		return token;
 	}
@@ -173,6 +177,9 @@ public abstract class SessionUtil {
 				|| CLIENT_CODE_SAYS.equals(map.get(CLIENT_CODE)))) {
 			timeOut = DEFAULT_SESSION_TIMEOUT_XCX;
 		}
+		if ("pcloud".equals(map.get(SYSTEM_CODE))) {
+			timeOut = DEFAULT_SESSION_TIMEOUT_ERP;
+		}
 		JedisClusterUtils.expireObject(token, timeOut);
 		return map;
 	}
@@ -194,6 +201,9 @@ public abstract class SessionUtil {
 				|| CLIENT_CODE_SAYS.equals(map.get(CLIENT_CODE)))) {
 			timeOut = DEFAULT_SESSION_TIMEOUT_XCX;
 		}
+		if ("pcloud".equals(map.get(SYSTEM_CODE))) {
+			timeOut = DEFAULT_SESSION_TIMEOUT_ERP;
+		}
 		JedisClusterUtils.expireObject(token, timeOut);
 		return map;
 	}
@@ -218,6 +228,9 @@ public abstract class SessionUtil {
 				|| CLIENT_CODE_SAYS.equals(map.get(CLIENT_CODE)))) {
 			timeOut = DEFAULT_SESSION_TIMEOUT_XCX;
 		}
+		if ("pcloud".equals(map.get(SYSTEM_CODE))) {
+			timeOut = DEFAULT_SESSION_TIMEOUT_ERP;
+		}
 		JedisClusterUtils.expireObject(token, timeOut);
 		Object o = map.get(key);
 		if (o == null) {